Run rubocop --fix-layout and remove encoding comments
This commit is contained in:
parent
fa63e6e81d
commit
ea2862fdef
283 changed files with 1164 additions and 1969 deletions
|
|
@ -1,11 +1,11 @@
|
|||
class DiscourseController < ApplicationController
|
||||
|
||||
before_action -> { require_plugin_enabled FoodsoftDiscourse }
|
||||
|
||||
protected
|
||||
|
||||
def valid_signature?
|
||||
return false if params[:sso].blank? || params[:sig].blank?
|
||||
|
||||
get_hmac_hex_string(params[:sso]) == params[:sig]
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
class DiscourseLoginController < DiscourseController
|
||||
|
||||
before_action -> { require_config_disabled :discourse_sso }
|
||||
skip_before_action :authenticate
|
||||
|
||||
|
|
@ -11,8 +10,8 @@ class DiscourseLoginController < DiscourseController
|
|||
|
||||
session[:discourse_sso_nonce] = nonce
|
||||
redirect_to_with_payload "#{discourse_url}/session/sso_provider",
|
||||
nonce: nonce,
|
||||
return_sso_url: return_sso_url
|
||||
nonce: nonce,
|
||||
return_sso_url: return_sso_url
|
||||
end
|
||||
|
||||
def callback
|
||||
|
|
@ -21,6 +20,7 @@ class DiscourseLoginController < DiscourseController
|
|||
payload = parse_payload
|
||||
|
||||
raise I18n.t('discourse.callback.invalid_nonce') if payload[:nonce] != session[:discourse_sso_nonce]
|
||||
|
||||
session[:discourse_sso_nonce] = nil
|
||||
|
||||
id = payload[:external_id].to_i
|
||||
|
|
@ -39,5 +39,4 @@ class DiscourseLoginController < DiscourseController
|
|||
rescue => error
|
||||
redirect_to login_url, alert: error.to_s
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
class DiscourseSsoController < DiscourseController
|
||||
|
||||
before_action -> { require_config_enabled :discourse_sso }
|
||||
|
||||
def sso
|
||||
|
|
@ -12,14 +11,13 @@ class DiscourseSsoController < DiscourseController
|
|||
raise I18n.t('discourse.sso.nonce_missing') if nonce.blank?
|
||||
|
||||
redirect_to_with_payload return_sso_url,
|
||||
nonce: nonce,
|
||||
email: current_user.email,
|
||||
require_activation: true,
|
||||
external_id: "#{FoodsoftConfig.scope}/#{current_user.id}",
|
||||
username: current_user.nick,
|
||||
name: current_user.name
|
||||
nonce: nonce,
|
||||
email: current_user.email,
|
||||
require_activation: true,
|
||||
external_id: "#{FoodsoftConfig.scope}/#{current_user.id}",
|
||||
username: current_user.nick,
|
||||
name: current_user.name
|
||||
rescue => error
|
||||
redirect_to root_url, alert: error.to_s
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue