heimdall_auth_bw 2.0.0 → 2.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f2a8a430d7049e7062586b624b6f63d3fc5d06218a14d8f865e604f2f6662faf
|
|
4
|
+
data.tar.gz: 479af5ddf79e1bce8e824698a86e6d939be77ea962f8d9b2e520c34b84187e44
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d60775d6af64e2340ada2c62f9c04fa2072b78182f663700a862709f32ba5792063d33b8cfa8f6ef59334a1df82ff604c6dda17cf954e2e4d5e7a0b606137a69
|
|
7
|
+
data.tar.gz: eacac892895fc401aa54acd6a890f311cc62195e64a4990ad6711c23b1780e5d8aa552219e511ee97845f01dcd3452d70682feac1f7a48e774965916a3402629
|
|
@@ -21,7 +21,8 @@ class HeimdallAuth::SessionsController < ApplicationController
|
|
|
21
21
|
def destroy
|
|
22
22
|
last_url = session[:last_url]
|
|
23
23
|
reset_session
|
|
24
|
-
|
|
24
|
+
heimdall_server_url = Rails.application.credentials["HEIMDALL_SERVER_URL"] || ENV['HEIMDALL_SERVER_URL']
|
|
25
|
+
redirect_to("#{heimdall_server_url}/signout?redirect_to=#{last_url || request.base_url}", :notice => 'Signed out!', allow_other_host: true)
|
|
25
26
|
end
|
|
26
27
|
|
|
27
28
|
def failure
|
|
@@ -33,7 +34,8 @@ class HeimdallAuth::SessionsController < ApplicationController
|
|
|
33
34
|
|
|
34
35
|
private
|
|
35
36
|
def do_a_signin_precall(user_token, heimdall_auth_url)
|
|
36
|
-
|
|
37
|
+
heimdall_server_url = Rails.application.credentials["HEIMDALL_SERVER_URL"] || ENV['HEIMDALL_SERVER_URL']
|
|
38
|
+
redirect_to "#{heimdall_server_url}/?user_token=#{user_token}&redirect_to=#{heimdall_auth_url}", allow_other_host: true
|
|
37
39
|
end
|
|
38
40
|
|
|
39
41
|
end
|
|
@@ -36,7 +36,10 @@ module HeimdallAuth
|
|
|
36
36
|
end
|
|
37
37
|
|
|
38
38
|
def get_user_from_auth_server(access_token)
|
|
39
|
-
|
|
39
|
+
heimdall_server_url = Rails.application.credentials["HEIMDALL_SERVER_URL"] || ENV['HEIMDALL_SERVER_URL']
|
|
40
|
+
heimdall_application_id = Rails.application.credentials["HEIMDALL_APPLICATION_ID"] || ENV['HEIMDALL_APPLICATION_ID']
|
|
41
|
+
heimdall_application_secret = Rails.application.credentials["HEIMDALL_APPLICATION_SECRET"] || ENV['HEIMDALL_APPLICATION_SECRET']
|
|
42
|
+
client = OAuth2::Client.new(heimdall_application_id, heimdall_application_secret, :site => heimdall_server_url)
|
|
40
43
|
user_data = OAuth2::AccessToken.new(client,access_token).get('/me.json').parsed
|
|
41
44
|
User.new(user_data)
|
|
42
45
|
end
|
data/lib/heimdall_auth/engine.rb
CHANGED
|
@@ -5,13 +5,16 @@ module HeimdallAuth
|
|
|
5
5
|
end
|
|
6
6
|
|
|
7
7
|
initializer "heimdall_auth.middleware" do |app|
|
|
8
|
-
|
|
8
|
+
heimdall_server_url = Rails.application.credentials["HEIMDALL_SERVER_URL"] || ENV['HEIMDALL_SERVER_URL']
|
|
9
|
+
heimdall_application_id = Rails.application.credentials["HEIMDALL_APPLICATION_ID"] || ENV['HEIMDALL_APPLICATION_ID']
|
|
10
|
+
heimdall_application_secret = Rails.application.credentials["HEIMDALL_APPLICATION_SECRET"] || ENV['HEIMDALL_APPLICATION_SECRET']
|
|
11
|
+
unless [heimdall_server_url, heimdall_application_id, heimdall_application_secret].any? &:nil?
|
|
9
12
|
app.config.middleware.use OmniAuth::Builder do
|
|
10
13
|
provider :heimdall,
|
|
11
|
-
ENV['HEIMDALL_APPLICATION_ID'],
|
|
12
|
-
ENV['HEIMDALL_APPLICATION_SECRET'],
|
|
14
|
+
Rails.application.credentials["HEIMDALL_APPLICATION_ID"] || ENV['HEIMDALL_APPLICATION_ID'],
|
|
15
|
+
Rails.application.credentials["HEIMDALL_APPLICATION_SECRET"] || ENV['HEIMDALL_APPLICATION_SECRET'],
|
|
13
16
|
client_options: {
|
|
14
|
-
site: ENV['HEIMDALL_SERVER_URL']
|
|
17
|
+
site: Rails.application.credentials["HEIMDALL_SERVER_URL"] || ENV['HEIMDALL_SERVER_URL']
|
|
15
18
|
}
|
|
16
19
|
end
|
|
17
20
|
else
|