doorkeeper_hub 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfb7d97ee1cdf3f2b3348d1d5cef1fb7100ccc4db37863111ce6e8f2554a2ebf
-  data.tar.gz: 59c9fe7dd9c9d1d62063d1d0f162c4d42405a7372fc6e8d8a3ca127caaf522f1
+  metadata.gz: 57317b863c1df69f8ef98933a88adeefe67d16a9045b34a651f50040e7d0660a
+  data.tar.gz: 608d6f40b3f891882847825f615a537a32218be747eb4e754809b6d860349518
 SHA512:
-  metadata.gz: 2e381ab5e9a1b0aebeed72bb03d4688ace0e3f2472ec35f8b0ff30b10d1c86f07659e422da68197bc45ece332e61a9d741dd1475f8b7bebf1d5e2bf45d86c349
-  data.tar.gz: ab70a67c61aef22707756fb540c2702d8916a401b278cafd01a727e4ac7e80444b7022079156d30f86be2a8a6973b174dd3b45ed983d2efae79e508e4e7ccae9
+  metadata.gz: 9610fe1a924385f480ffde41a24ad5428b32ad838b9666398d11bc3073d06518d689a8e3f7b6e246b1330c68f475560d4ce3d97aeb13d601d1606ef7237173fc
+  data.tar.gz: dd9825328ded32b28d500813a530f6845f9a45710bb71dd955996f91c3aed67b05e3bb043a8650a009c8352a49ef4db0439db9ae1bda8c093d67bb0cc96021d1

data/Rakefile

@@ -1,2 +1,8 @@
-require "bundler/gem_tasks"
-task :default => :spec
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+end
+
+desc "Run tests"
+task :default => :test

data/lib/doorkeeper_hub/helpers.rb

@@ -16,7 +16,6 @@ module DoorkeeperHub
           raise(ActionController::RoutingError.new('Not Found'))
     end
 
-
     def check_login!
       redirect_to user_saml_omniauth_authorize_path unless user_signed_in?
     end

data/lib/doorkeeper_hub/saml.rb

@@ -4,26 +4,36 @@ module DoorkeeperHub
   module Saml
     extend ActiveSupport::Concern
 
-    def self.included(base)
-      base.devise :omniauthable, omniauth_providers: %i[saml]
-    end
-
-    def instance_method
-      puts "instance method here"
+    included do
+      devise :omniauthable, omniauth_providers: %i[saml]
     end
 
     class_methods do
       def from_omniauth(auth)
-        companies = Company.where(doorkeeper_token: auth.extra.raw_info[:doorkeeper_token])
-
-        return if companies.empty?
+        return if scope_results(auth).empty?
 
         user = where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
           user.email = auth.info.email
         end
-        companies.each { |c| user.users_companies.find_or_create_by(company: c) }
+
+        scope_results(auth).each do |result|
+          user.users_companies.find_or_create_by(company: result)
+        end
+
         user
       end
+
+      def scope_results(auth)
+        @scope_results ||= DoorkeeperHub
+                             .config.scope_model
+                             .where(scope_query(auth))
+      end
+
+      def scope_query(auth)
+        {
+          DoorkeeperHub.token_name => auth.extra.raw_info[DoorkeeperHub.token_name]
+        }
+      end
     end
   end
 end

data/lib/doorkeeper_hub/version.rb

@@ -1,3 +1,3 @@
 module DoorkeeperHub
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper_hub
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Jimmy Fan