doorkeeper_hub 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: e01c7be3d1154849752b48682bceab879775dcd774c049db7cdc18373169a37f
-  data.tar.gz: c951afa7fa61d3dd9d11cb5ad8d72ae52131b2d9d4091bf0bdab541dfdc508e8
+SHA1:
+  metadata.gz: 4886a1e7e646155e1ece5c76032fbe062bf349e2
+  data.tar.gz: 46dcb35435f9ecd36f26618143b8e86898fa0adf
 SHA512:
-  metadata.gz: f3f3ec131caeae19359187cb63cb42f2e0dfab72beaf0d45c6ad80977291f92aacca26add13eae79a683cca8fcb8a5d1017c43752da09f8c0a44717595c770b7
-  data.tar.gz: 0d93d6c7a57bb170f3aa744bcbfa120366e7cfd1c2816e041373f0a88aa85893e8623b7abfd22cce902fcdd9dfd5062394cfb132a37281152ac9d09306d63bd8
+  metadata.gz: cef5140bb3c95bc5839a25a46f905d1e326bd89b96b022ff6f9f8ad79779de8ae60a615ab0bb498153b7581eb433eeda344d7a7b04d8eb036b0f5d0e75e91663
+  data.tar.gz: f67e59d3d307c29317aa5296e5444402e57b07b49de20d363a4093b5a041f1a51985d2660e9eb5fdee66e5a40f863f764f4a5e3342dcbf868852892d577fce51

data/app/controllers/doorkeeper_hub/omniauth_callbacks_controller.rb

@@ -6,6 +6,7 @@ module DoorkeeperHub
     def saml
       @user = DoorkeeperHub
                 .user_model
+                .constantize
                 .from_omniauth(request.env["omniauth.auth"])
 
       if @user.present? && @user.persisted?

data/lib/doorkeeper_hub/configurator.rb

@@ -8,8 +8,8 @@ module DoorkeeperHub
 
     def initialize
       self.service_token = ENV["SERVICE_TOKEN"]
-      self.user_model = ::User rescue nil
-      self.scope_model = ::Company rescue nil
+      self.user_model = 'User'
+      self.scope_model = 'Company'
       self.doorkeeper_token_name = :doorkeeper_token
       self.client_mode = false
     end

data/lib/doorkeeper_hub/saml.rb

@@ -10,7 +10,7 @@ module DoorkeeperHub
 
     class_methods do
       def from_omniauth(auth)
-        return if DoorkeeperHub.client_mode? && scope_results(auth).empty?
+        return if !DoorkeeperHub.client_mode? && scope_results(auth).empty?
 
         user = where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
           user.email = auth.info.email
@@ -28,6 +28,7 @@ module DoorkeeperHub
       def scope_results(auth)
         @scope_results ||= DoorkeeperHub
                              .config.scope_model
+                             .constantize
                              .where(scope_query(auth))
       end
 

data/lib/doorkeeper_hub/version.rb

@@ -1,3 +1,3 @@
 module DoorkeeperHub
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/lib/doorkeeper_hub.rb

@@ -14,11 +14,11 @@ module DoorkeeperHub
   end
 
   def self.devise_routes_scope
-    user_model.to_s.tableize.to_sym
+    user_model.tableize.to_sym
   end
 
   def self.devise_scope
-    user_model.to_s.underscore.to_sym
+    user_model.underscore.to_sym
   end
 
   def self.user_model

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper_hub
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Jimmy Fan
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: SSO Gem from DevHub.