mirror of
https://github.com/discourse/discourse.git
synced 2025-05-23 15:31:11 +08:00
DEV: Apply syntax_tree formatting to app/*
This commit is contained in:
@ -8,40 +8,40 @@ class Admin::ApiController < Admin::AdminController
|
||||
offset = (params[:offset] || 0).to_i
|
||||
limit = (params[:limit] || 50).to_i.clamp(1, 50)
|
||||
|
||||
keys = ApiKey
|
||||
.where(hidden: false)
|
||||
.includes(:user, :api_key_scopes)
|
||||
# Sort revoked keys by revoked_at and active keys by created_at
|
||||
.order("revoked_at DESC NULLS FIRST, created_at DESC")
|
||||
.offset(offset)
|
||||
.limit(limit)
|
||||
keys =
|
||||
ApiKey
|
||||
.where(hidden: false)
|
||||
.includes(:user, :api_key_scopes)
|
||||
# Sort revoked keys by revoked_at and active keys by created_at
|
||||
.order("revoked_at DESC NULLS FIRST, created_at DESC")
|
||||
.offset(offset)
|
||||
.limit(limit)
|
||||
|
||||
render_json_dump(
|
||||
keys: serialize_data(keys, ApiKeySerializer),
|
||||
offset: offset,
|
||||
limit: limit
|
||||
)
|
||||
render_json_dump(keys: serialize_data(keys, ApiKeySerializer), offset: offset, limit: limit)
|
||||
end
|
||||
|
||||
def show
|
||||
api_key = ApiKey.includes(:api_key_scopes).find_by!(id: params[:id])
|
||||
render_serialized(api_key, ApiKeySerializer, root: 'key')
|
||||
render_serialized(api_key, ApiKeySerializer, root: "key")
|
||||
end
|
||||
|
||||
def scopes
|
||||
scopes = ApiKeyScope.scope_mappings.reduce({}) do |memo, (resource, actions)|
|
||||
memo.tap do |m|
|
||||
m[resource] = actions.map do |k, v|
|
||||
{
|
||||
scope_id: "#{resource}:#{k}",
|
||||
key: k,
|
||||
name: k.to_s.gsub('_', ' '),
|
||||
params: v[:params],
|
||||
urls: v[:urls]
|
||||
}
|
||||
scopes =
|
||||
ApiKeyScope
|
||||
.scope_mappings
|
||||
.reduce({}) do |memo, (resource, actions)|
|
||||
memo.tap do |m|
|
||||
m[resource] = actions.map do |k, v|
|
||||
{
|
||||
scope_id: "#{resource}:#{k}",
|
||||
key: k,
|
||||
name: k.to_s.gsub("_", " "),
|
||||
params: v[:params],
|
||||
urls: v[:urls],
|
||||
}
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
render json: { scopes: scopes }
|
||||
end
|
||||
@ -52,7 +52,7 @@ class Admin::ApiController < Admin::AdminController
|
||||
api_key.update!(update_params)
|
||||
log_api_key(api_key, UserHistory.actions[:api_key_update], changes: api_key.saved_changes)
|
||||
end
|
||||
render_serialized(api_key, ApiKeySerializer, root: 'key')
|
||||
render_serialized(api_key, ApiKeySerializer, root: "key")
|
||||
end
|
||||
|
||||
def destroy
|
||||
@ -76,7 +76,7 @@ class Admin::ApiController < Admin::AdminController
|
||||
api_key.save!
|
||||
log_api_key(api_key, UserHistory.actions[:api_key_create], changes: api_key.saved_changes)
|
||||
end
|
||||
render_serialized(api_key, ApiKeySerializer, root: 'key')
|
||||
render_serialized(api_key, ApiKeySerializer, root: "key")
|
||||
end
|
||||
|
||||
def undo_revoke_key
|
||||
@ -105,7 +105,7 @@ class Admin::ApiController < Admin::AdminController
|
||||
|
||||
def build_scopes
|
||||
params.require(:key)[:scopes].to_a.map do |scope_params|
|
||||
resource, action = scope_params[:scope_id].split(':')
|
||||
resource, action = scope_params[:scope_id].split(":")
|
||||
|
||||
mapping = ApiKeyScope.scope_mappings.dig(resource.to_sym, action.to_sym)
|
||||
raise Discourse::InvalidParameters if mapping.nil? # invalid mapping
|
||||
@ -113,7 +113,7 @@ class Admin::ApiController < Admin::AdminController
|
||||
ApiKeyScope.new(
|
||||
resource: resource,
|
||||
action: action,
|
||||
allowed_parameters: build_params(scope_params, mapping[:params])
|
||||
allowed_parameters: build_params(scope_params, mapping[:params]),
|
||||
)
|
||||
end
|
||||
end
|
||||
@ -121,11 +121,13 @@ class Admin::ApiController < Admin::AdminController
|
||||
def build_params(scope_params, params)
|
||||
return if params.nil?
|
||||
|
||||
scope_params.slice(*params).tap do |allowed_params|
|
||||
allowed_params.each do |k, v|
|
||||
v.blank? ? allowed_params.delete(k) : allowed_params[k] = v.split(',')
|
||||
scope_params
|
||||
.slice(*params)
|
||||
.tap do |allowed_params|
|
||||
allowed_params.each do |k, v|
|
||||
v.blank? ? allowed_params.delete(k) : allowed_params[k] = v.split(",")
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def update_params
|
||||
@ -146,5 +148,4 @@ class Admin::ApiController < Admin::AdminController
|
||||
def log_api_key_restore(*args)
|
||||
StaffActionLogger.new(current_user).log_api_key_restore(*args)
|
||||
end
|
||||
|
||||
end
|
||||
|
Reference in New Issue
Block a user