github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 08:09:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: Allow user_status scope for UserApiKey (#19296)

Browse Source 
Follow-up to 6357a3ce33
where we allowed a general API key scope for user status
GET/PUT/DELETE, this commit allows the same for the
UserApiKey system.
This commit is contained in:
Martin Brennan 2022-12-06 08:56:03 +10:00 committed by GitHub
parent 22a55ef0ce
commit e6f9504dd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/user_api_key_scope.rb
View File

@ -16,7 +16,12 @@ class UserApiKeyScope < ActiveRecord::Base
RouteMatcher.new(methods: :get, actions: 'session#current'),
RouteMatcher.new(methods: :get, actions: 'users#topic_tracking_state')
],
bookmarks_calendar: [ RouteMatcher.new(methods: :get, actions: 'users#bookmarks', formats: :ics, params: %i[username]) ]
bookmarks_calendar: [ RouteMatcher.new(methods: :get, actions: 'users#bookmarks', formats: :ics, params: %i[username]) ],
user_status: [
RouteMatcher.new(methods: :get, actions: 'user_status#get'),
RouteMatcher.new(methods: :put, actions: 'user_status#set'),
RouteMatcher.new(methods: :delete, actions: 'user_status#clear')
]
}
def self.all_scopes
@ -36,7 +41,6 @@ class UserApiKeyScope < ActiveRecord::Base
def matchers
@matchers ||= Array(self.class.all_scopes[name.to_sym])
end
end
# == Schema Information

1
config/locales/server.en.yml
View File

@ -1089,6 +1089,7 @@ en:
write: "Write all"
one_time_password: "Create a one-time login token"
bookmarks_calendar: "Read bookmark reminders"
user_status: "Read and update user status"
invalid_public_key: "Sorry, the public key is invalid."
invalid_auth_redirect: "Sorry, this auth_redirect host is not allowed."
invalid_token: "Missing, invalid or expired token."