heimdall_auth_bw 2.0.1 → 2.0.2

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.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/heimdall_auth/sessions_controller.rb +2 -2
  3. data/lib/heimdall_auth/authentication_additions.rb +3 -3
  4. data/lib/heimdall_auth/engine.rb +6 -6
  5. data/lib/heimdall_auth/version.rb +1 -1
  6. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f2a8a430d7049e7062586b624b6f63d3fc5d06218a14d8f865e604f2f6662faf
4
- data.tar.gz: 479af5ddf79e1bce8e824698a86e6d939be77ea962f8d9b2e520c34b84187e44
3
+ metadata.gz: 7c4b58379028022c7f0199f1dc47b5f7c2a97409f7d953d815ad932453d36d19
4
+ data.tar.gz: a2d2ffa5a070e508752ab4e4350eee5e43c41a801075a9068bbd0ffb5e4e8652
5
5
  SHA512:
6
- metadata.gz: d60775d6af64e2340ada2c62f9c04fa2072b78182f663700a862709f32ba5792063d33b8cfa8f6ef59334a1df82ff604c6dda17cf954e2e4d5e7a0b606137a69
7
- data.tar.gz: eacac892895fc401aa54acd6a890f311cc62195e64a4990ad6711c23b1780e5d8aa552219e511ee97845f01dcd3452d70682feac1f7a48e774965916a3402629
6
+ metadata.gz: d4a2c738788a2ecac2cc85b605905d885a9aa5be2fae6a1c025d5ca08d598aa89fa342eaef96c13ff6095a7f930d187b8c8c0e3c8c04507a78f2e89b44ee34cc
7
+ data.tar.gz: df24d7dad32b6b1abc18b091fc3b57a3a59b488663ca902646f6e31d34fb7bda9aa9cf8a93e87efba7e67630a4644f513362af8ded46b1c37df5b5142d8f9219
data/app/controllers/heimdall_auth/sessions_controller.rb CHANGED
@@ -21,7 +21,7 @@ class HeimdallAuth::SessionsController < ApplicationController
21
21
  def destroy
22
22
  last_url = session[:last_url]
23
23
  reset_session
24
- heimdall_server_url = Rails.application.credentials["HEIMDALL_SERVER_URL"] || ENV['HEIMDALL_SERVER_URL']
24
+ heimdall_server_url = ::Rails.application.credentials["HEIMDALL_SERVER_URL"] || ENV['HEIMDALL_SERVER_URL']
25
25
  redirect_to("#{heimdall_server_url}/signout?redirect_to=#{last_url || request.base_url}", :notice => 'Signed out!', allow_other_host: true)
26
26
  end
27
27
 
@@ -34,7 +34,7 @@ class HeimdallAuth::SessionsController < ApplicationController
34
34
 
35
35
  private
36
36
  def do_a_signin_precall(user_token, heimdall_auth_url)
37
- heimdall_server_url = Rails.application.credentials["HEIMDALL_SERVER_URL"] || ENV['HEIMDALL_SERVER_URL']
37
+ heimdall_server_url = ::Rails.application.credentials["HEIMDALL_SERVER_URL"] || ENV['HEIMDALL_SERVER_URL']
38
38
  redirect_to "#{heimdall_server_url}/?user_token=#{user_token}&redirect_to=#{heimdall_auth_url}", allow_other_host: true
39
39
  end
40
40
 
data/lib/heimdall_auth/authentication_additions.rb CHANGED
@@ -36,9 +36,9 @@ module HeimdallAuth
36
36
  end
37
37
 
38
38
  def get_user_from_auth_server(access_token)
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']
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
42
  client = OAuth2::Client.new(heimdall_application_id, heimdall_application_secret, :site => heimdall_server_url)
43
43
  user_data = OAuth2::AccessToken.new(client,access_token).get('/me.json').parsed
44
44
  User.new(user_data)
data/lib/heimdall_auth/engine.rb CHANGED
@@ -5,16 +5,16 @@ module HeimdallAuth
5
5
  end
6
6
 
7
7
  initializer "heimdall_auth.middleware" do |app|
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']
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
11
  unless [heimdall_server_url, heimdall_application_id, heimdall_application_secret].any? &:nil?
12
12
  app.config.middleware.use OmniAuth::Builder do
13
13
  provider :heimdall,
14
- Rails.application.credentials["HEIMDALL_APPLICATION_ID"] || ENV['HEIMDALL_APPLICATION_ID'],
15
- Rails.application.credentials["HEIMDALL_APPLICATION_SECRET"] || 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'],
16
16
  client_options: {
17
- site: Rails.application.credentials["HEIMDALL_SERVER_URL"] || ENV['HEIMDALL_SERVER_URL']
17
+ site: ::Rails.application.credentials["HEIMDALL_SERVER_URL"] || ENV['HEIMDALL_SERVER_URL']
18
18
  }
19
19
  end
20
20
  else
data/lib/heimdall_auth/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module HeimdallAuth
2
- VERSION = '2.0.1'
2
+ VERSION = '2.0.2'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: heimdall_auth_bw
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.1
4
+ version: 2.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - René Meye