heimdall_auth_bw 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 897e838e92686bdc993d3528f0907ab07d894c9f2962f6ca601ba79bc4b4552d
-  data.tar.gz: d6abc328c02dfd3c278db93384755844e2a2e8a34f5af6209a971e53aa847546
+  metadata.gz: 7c4b58379028022c7f0199f1dc47b5f7c2a97409f7d953d815ad932453d36d19
+  data.tar.gz: a2d2ffa5a070e508752ab4e4350eee5e43c41a801075a9068bbd0ffb5e4e8652
 SHA512:
-  metadata.gz: 3e97a168649f24437530649f4401a39948a27138f73453415953c160ee6a1ccc42b09c6598d22251bb4d37c7300731fdb09d81292d73f822f1f83887ff233086
-  data.tar.gz: 7a48c02ea680b9029746c840d8a3d044f16e34f814a81bed5256095c88cc4e68a123e56dca1a500f648b3fc52c74b1d19501c385f5a593a7ff4a07734c721a64
+  metadata.gz: d4a2c738788a2ecac2cc85b605905d885a9aa5be2fae6a1c025d5ca08d598aa89fa342eaef96c13ff6095a7f930d187b8c8c0e3c8c04507a78f2e89b44ee34cc
+  data.tar.gz: df24d7dad32b6b1abc18b091fc3b57a3a59b488663ca902646f6e31d34fb7bda9aa9cf8a93e87efba7e67630a4644f513362af8ded46b1c37df5b5142d8f9219

data/app/controllers/heimdall_auth/sessions_controller.rb

@@ -21,7 +21,8 @@ class HeimdallAuth::SessionsController < ApplicationController
   def destroy
     last_url = session[:last_url]
     reset_session
-    redirect_to("#{ENV['HEIMDALL_SERVER_URL']}/signout?redirect_to=#{last_url || request.base_url}", :notice => 'Signed out!', allow_other_host: true)
+    heimdall_server_url = ::Rails.application.credentials["HEIMDALL_SERVER_URL"] || ENV['HEIMDALL_SERVER_URL']
+    redirect_to("#{heimdall_server_url}/signout?redirect_to=#{last_url || request.base_url}", :notice => 'Signed out!', allow_other_host: true)
   end
 
   def failure
@@ -33,7 +34,8 @@ class HeimdallAuth::SessionsController < ApplicationController
 
   private
   def do_a_signin_precall(user_token, heimdall_auth_url)
-    redirect_to "#{ENV['HEIMDALL_SERVER_URL']}/?user_token=#{user_token}&redirect_to=#{heimdall_auth_url}", allow_other_host: true
+    heimdall_server_url = ::Rails.application.credentials["HEIMDALL_SERVER_URL"] || ENV['HEIMDALL_SERVER_URL']
+    redirect_to "#{heimdall_server_url}/?user_token=#{user_token}&redirect_to=#{heimdall_auth_url}", allow_other_host: true
   end
 
 end

data/lib/heimdall_auth/authentication_additions.rb

@@ -36,7 +36,10 @@ module HeimdallAuth
     end
 
     def get_user_from_auth_server(access_token)
-      client = OAuth2::Client.new(ENV['HEIMDALL_APPLICATION_ID'], ENV['HEIMDALL_APPLICATION_SECRET'], :site => ENV['HEIMDALL_SERVER_URL'])
+      heimdall_server_url = ::Rails.application.credentials["HEIMDALL_SERVER_URL"] || ENV['HEIMDALL_SERVER_URL']
+      heimdall_application_id = ::Rails.application.credentials["HEIMDALL_APPLICATION_ID"] || ENV['HEIMDALL_APPLICATION_ID']
+      heimdall_application_secret = ::Rails.application.credentials["HEIMDALL_APPLICATION_SECRET"] || ENV['HEIMDALL_APPLICATION_SECRET']
+      client = OAuth2::Client.new(heimdall_application_id, heimdall_application_secret, :site => heimdall_server_url)
       user_data = OAuth2::AccessToken.new(client,access_token).get('/me.json').parsed
       User.new(user_data)
     end

data/lib/heimdall_auth/engine.rb

@@ -5,13 +5,16 @@ module HeimdallAuth
     end
 
     initializer "heimdall_auth.middleware" do |app|
-      unless [ENV['HEIMDALL_SERVER_URL'], ENV['HEIMDALL_APPLICATION_ID'], ENV['HEIMDALL_APPLICATION_SECRET']].any? &:nil?
+      heimdall_server_url = ::Rails.application.credentials["HEIMDALL_SERVER_URL"] || ENV['HEIMDALL_SERVER_URL']
+      heimdall_application_id = ::Rails.application.credentials["HEIMDALL_APPLICATION_ID"] || ENV['HEIMDALL_APPLICATION_ID']
+      heimdall_application_secret = ::Rails.application.credentials["HEIMDALL_APPLICATION_SECRET"] || ENV['HEIMDALL_APPLICATION_SECRET']
+      unless [heimdall_server_url, heimdall_application_id, heimdall_application_secret].any? &:nil?
         app.config.middleware.use OmniAuth::Builder do
           provider :heimdall,
-            ENV['HEIMDALL_APPLICATION_ID'],
-            ENV['HEIMDALL_APPLICATION_SECRET'],
+            ::Rails.application.credentials["HEIMDALL_APPLICATION_ID"] || ENV['HEIMDALL_APPLICATION_ID'],
+            ::Rails.application.credentials["HEIMDALL_APPLICATION_SECRET"] || ENV['HEIMDALL_APPLICATION_SECRET'],
             client_options: {
-              site: ENV['HEIMDALL_SERVER_URL']
+              site: ::Rails.application.credentials["HEIMDALL_SERVER_URL"] || ENV['HEIMDALL_SERVER_URL']
             }
         end
       else

data/lib/heimdall_auth/version.rb

@@ -1,3 +1,3 @@
 module HeimdallAuth
-  VERSION = '2.0.0'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heimdall_auth_bw
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - René Meye