heimdall_auth 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4274ae024aaafdfed06a07d367a84d6791c3371fea392642ee0472925b52805c
-  data.tar.gz: 2ceea6e5acb7a85c18c126e81c44613a924b4698e7c11e087e28faf514db1059
+  metadata.gz: 5538f6cfc7a18364ba8f0212ccef6666ddc54aedecb5e98431ab696ae00201ad
+  data.tar.gz: fe36860b89bb61c225be5204f4522d77d96a87cf07ec9b05c9694f4333780383
 SHA512:
-  metadata.gz: a5da2bbf6ea4141f3461ddd4ac57cff7deda52ac2af2abf38fe3ccadae8700e8e1efb3e217f1917945962e6f4093aee25ab6014802507f414a0047ff98bc1ab4
-  data.tar.gz: 206d5df045f59a22bc9739024bf19d75334f1ee21f814db019eccdbcd1989f4163ec2838312962e354b5c0ba6fbfae73b0cfa8fb818cfb88489902286b68fa95
+  metadata.gz: ea5fc9d268377f56cc01eb8a00339331430f417181394b453d0350b146f2af14eea8d6a8f99e1fbe6048bd24d02a9bac357d67328c2a5d0f245fdf28349c97b8
+  data.tar.gz: 3a05fcd17f9ab05663de6761468b11b83c0be6b748f1a2b83011a02e272d9d807c015095d756908e858bfec2edc343e7993154c89ff3e7b25bccae6f0533e2c0

data/lib/heimdall_auth/controller_additions.rb

@@ -7,7 +7,7 @@ module HeimdallAuth
   module ControllerAdditions
 
     def self.included(base)
-      base.helper_method :current_user, :current_access_token, :user_signed_in? if base.respond_to? :helper_method
+      base.helper_method :current_user, :current_access_token, :current_environment, :user_signed_in? if base.respond_to? :helper_method
       base.before_action :store_location_in_session
 
       base.rescue_from CanCan::AccessDenied do |exception|
@@ -57,6 +57,14 @@ module HeimdallAuth
       end
     end
 
+    def current_environment
+      begin
+        @current_environment ||= current_user.key_environment || params[:environment]
+      rescue NoMethodError, Exception => e
+        nil
+      end
+    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'])
       user_data = OAuth2::AccessToken.new(client,access_token).get('/me.json').parsed

data/lib/heimdall_auth/user.rb

@@ -3,7 +3,7 @@ class HeimdallAuth::User
   extend ActiveModel::Naming
 
   attr_accessor :is_invalid
-  attr_accessor :id, :name, :email, :is_editor, :is_operator, :is_admin, :is_user_admin, :is_police, :is_ride_on_demand_provider, :is_ride_on_demand_accounting
+  attr_accessor :id, :name, :key_type, :key_environment, :email, :is_editor, :is_operator, :is_admin, :is_user_admin, :is_police, :is_ride_on_demand_provider, :is_ride_on_demand_accounting
 
   def initialize(attributes = {})
     attributes.each do |name, value|

data/lib/heimdall_auth/version.rb

@@ -1,3 +1,3 @@
 module HeimdallAuth
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heimdall_auth
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - René Meye
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-08 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails