github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 23:31:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Apply syntax_tree formatting to app/*

Browse Source
This commit is contained in:
David Taylor
2023-01-09 12:20:10 +00:00
parent a641ce4b62
commit 5a003715d3
696 changed files with 18447 additions and 15481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/models/user_api_key.rb
View File

@ -2,7 +2,7 @@
class UserApiKey < ActiveRecord::Base
self.ignored_columns = [
"scopes" # TODO(2020-12-18): remove
"scopes", # TODO(2020-12-18): remove
]
REVOKE_MATCHER = RouteMatcher.new(actions: "user_api_keys#revoke", methods: :post, params: [:id])
@ -23,7 +23,9 @@ class UserApiKey < ActiveRecord::Base
end
def key
raise ApiKey::KeyAccessError.new "API key is only accessible immediately after creation" unless key_available?
unless key_available?
raise ApiKey::KeyAccessError.new "API key is only accessible immediately after creation"
end
@key
end
@ -41,7 +43,7 @@ class UserApiKey < ActiveRecord::Base
# invalidate old dupe api key for client if needed
UserApiKey
.where(client_id: client_id, user_id: self.user_id)
.where('id <> ?', self.id)
.where("id <> ?", self.id)
.destroy_all
update_args[:client_id] = client_id
@ -59,8 +61,7 @@ class UserApiKey < ActiveRecord::Base
end
def has_push?
scopes.any? { |s| s.name == "push" || s.name == "notifications" } &&
push_url.present? &&
scopes.any? { |s| s.name == "push" || s.name == "notifications" } && push_url.present? &&
SiteSetting.allowed_user_api_push_urls.include?(push_url)
end
@ -69,8 +70,9 @@ class UserApiKey < ActiveRecord::Base
end
def self.invalid_auth_redirect?(auth_redirect)
SiteSetting.allowed_user_api_auth_redirects
.split('|')
SiteSetting
.allowed_user_api_auth_redirects
.split("|")
.none? { |u| WildcardUrlChecker.check_url(u, auth_redirect) }
end