mirror of
https://github.com/discourse/discourse.git
synced 2025-05-23 11:01:11 +08:00
DEV: Apply syntax_tree formatting to app/*
This commit is contained in:
@ -1,17 +1,15 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class UserApiKeysController < ApplicationController
|
||||
layout "no_ember"
|
||||
|
||||
layout 'no_ember'
|
||||
|
||||
requires_login only: [:create, :create_otp, :revoke, :undo_revoke]
|
||||
skip_before_action :redirect_to_login_if_required, only: [:new, :otp]
|
||||
requires_login only: %i[create create_otp revoke undo_revoke]
|
||||
skip_before_action :redirect_to_login_if_required, only: %i[new otp]
|
||||
skip_before_action :check_xhr, :preload_json
|
||||
|
||||
AUTH_API_VERSION ||= 4
|
||||
|
||||
def new
|
||||
|
||||
if request.head?
|
||||
head :ok, auth_api_version: AUTH_API_VERSION
|
||||
return
|
||||
@ -24,9 +22,9 @@ class UserApiKeysController < ApplicationController
|
||||
cookies[:destination_url] = request.fullpath
|
||||
|
||||
if SiteSetting.enable_discourse_connect?
|
||||
redirect_to path('/session/sso')
|
||||
redirect_to path("/session/sso")
|
||||
else
|
||||
redirect_to path('/login')
|
||||
redirect_to path("/login")
|
||||
end
|
||||
return
|
||||
end
|
||||
@ -44,13 +42,11 @@ class UserApiKeysController < ApplicationController
|
||||
@push_url = params[:push_url]
|
||||
@localized_scopes = params[:scopes].split(",").map { |s| I18n.t("user_api_key.scopes.#{s}") }
|
||||
@scopes = params[:scopes]
|
||||
|
||||
rescue Discourse::InvalidAccess
|
||||
@generic_error = true
|
||||
end
|
||||
|
||||
def create
|
||||
|
||||
require_params
|
||||
|
||||
if params.key?(:auth_redirect)
|
||||
@ -66,13 +62,14 @@ class UserApiKeysController < ApplicationController
|
||||
# destroy any old keys we had
|
||||
UserApiKey.where(user_id: current_user.id, client_id: params[:client_id]).destroy_all
|
||||
|
||||
key = UserApiKey.create!(
|
||||
application_name: @application_name,
|
||||
client_id: params[:client_id],
|
||||
user_id: current_user.id,
|
||||
push_url: params[:push_url],
|
||||
scopes: scopes.map { |name| UserApiKeyScope.new(name: name) }
|
||||
)
|
||||
key =
|
||||
UserApiKey.create!(
|
||||
application_name: @application_name,
|
||||
client_id: params[:client_id],
|
||||
user_id: current_user.id,
|
||||
push_url: params[:push_url],
|
||||
scopes: scopes.map { |name| UserApiKeyScope.new(name: name) },
|
||||
)
|
||||
|
||||
# we keep the payload short so it encrypts easily with public key
|
||||
# it is often restricted to 128 chars
|
||||
@ -80,7 +77,7 @@ class UserApiKeysController < ApplicationController
|
||||
key: key.key,
|
||||
nonce: params[:nonce],
|
||||
push: key.has_push?,
|
||||
api: AUTH_API_VERSION
|
||||
api: AUTH_API_VERSION,
|
||||
}.to_json
|
||||
|
||||
public_key = OpenSSL::PKey::RSA.new(params[:public_key])
|
||||
@ -94,8 +91,10 @@ class UserApiKeysController < ApplicationController
|
||||
if params[:auth_redirect]
|
||||
uri = URI.parse(params[:auth_redirect])
|
||||
query_attributes = [uri.query, "payload=#{CGI.escape(@payload)}"]
|
||||
query_attributes << "oneTimePassword=#{CGI.escape(otp_payload)}" if scopes.include?("one_time_password")
|
||||
uri.query = query_attributes.compact.join('&')
|
||||
if scopes.include?("one_time_password")
|
||||
query_attributes << "oneTimePassword=#{CGI.escape(otp_payload)}"
|
||||
end
|
||||
uri.query = query_attributes.compact.join("&")
|
||||
|
||||
redirect_to(uri.to_s, allow_other_host: true)
|
||||
else
|
||||
@ -116,9 +115,9 @@ class UserApiKeysController < ApplicationController
|
||||
cookies[:destination_url] = request.fullpath
|
||||
|
||||
if SiteSetting.enable_discourse_connect?
|
||||
redirect_to path('/session/sso')
|
||||
redirect_to path("/session/sso")
|
||||
else
|
||||
redirect_to path('/login')
|
||||
redirect_to path("/login")
|
||||
end
|
||||
return
|
||||
end
|
||||
@ -144,7 +143,7 @@ class UserApiKeysController < ApplicationController
|
||||
def revoke
|
||||
revoke_key = find_key if params[:id]
|
||||
|
||||
if current_key = request.env['HTTP_USER_API_KEY']
|
||||
if current_key = request.env["HTTP_USER_API_KEY"]
|
||||
request_key = UserApiKey.with_key(current_key).first
|
||||
revoke_key ||= request_key
|
||||
end
|
||||
@ -168,13 +167,7 @@ class UserApiKeysController < ApplicationController
|
||||
end
|
||||
|
||||
def require_params
|
||||
[
|
||||
:public_key,
|
||||
:nonce,
|
||||
:scopes,
|
||||
:client_id,
|
||||
:application_name
|
||||
].each { |p| params.require(p) }
|
||||
%i[public_key nonce scopes client_id application_name].each { |p| params.require(p) }
|
||||
end
|
||||
|
||||
def validate_params
|
||||
@ -186,11 +179,7 @@ class UserApiKeysController < ApplicationController
|
||||
end
|
||||
|
||||
def require_params_otp
|
||||
[
|
||||
:public_key,
|
||||
:auth_redirect,
|
||||
:application_name
|
||||
].each { |p| params.require(p) }
|
||||
%i[public_key auth_redirect application_name].each { |p| params.require(p) }
|
||||
end
|
||||
|
||||
def meets_tl?
|
||||
@ -198,7 +187,9 @@ class UserApiKeysController < ApplicationController
|
||||
end
|
||||
|
||||
def one_time_password(public_key, username)
|
||||
raise Discourse::InvalidAccess unless UserApiKey.allowed_scopes.superset?(Set.new(["one_time_password"]))
|
||||
unless UserApiKey.allowed_scopes.superset?(Set.new(["one_time_password"]))
|
||||
raise Discourse::InvalidAccess
|
||||
end
|
||||
|
||||
otp = SecureRandom.hex
|
||||
Discourse.redis.setex "otp_#{otp}", 10.minutes, username
|
||||
|
Reference in New Issue
Block a user