doorkeeper_hub 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f70c3114ac23d14dffe588b16c1a7455eaf7e7e9e349c314f4e833241e9eed6
-  data.tar.gz: 31870d832f5fc2f993df9bc7c63e697db5be524b3241dd3cef2464b1ca51deb0
+  metadata.gz: 2003e63a8f06385f671a2d721627f464a1674ab5d5c59133f0bbd4ce0a330b07
+  data.tar.gz: cdc61a7e345792ba6237786b1d890cfa55be0d3d03775292a102ce03a5dcfed0
 SHA512:
-  metadata.gz: ab007e60bd466f83779c536f3815903fee9973c9ee67bf4fe2678961cd24a7e324070f3ade514505d22ea4bac080a6285850dc8c96a190e865646c44c2205b7d
-  data.tar.gz: 78b91d725dba5dc9b4a04087a0750d68cac85ded855a1c5179e8bbcedd02b7d6669184f6c73ab7300d00dd0ee707701f665f304c8e5359ee7877e2e19dace76f
+  metadata.gz: bb1be655cc62257997527740ce6cd1fcf32cb194ea2acb75bb03f316c780cf708579b7ddf87cebd83293de561fbbc1a64d2b43ab05e42c2ee0b5583a952e8cd3
+  data.tar.gz: 81833e76cce3e967975c4010c8c4c1fa15a0a138df04bc0c672d601f158b6a2c680669449e0edd7471bcb4e97eb7b46f048adbf02d891c8fab04894ab52993ca

data/config/routes.rb

@@ -4,5 +4,7 @@ Rails.application.routes.draw do
                omniauth_callbacks: 'doorkeeper_hub/omniauth_callbacks'
              }
 
-  post 'doorkeeper/activation', to: 'doorkeeper_hub/callbacks#activation'
+  unless DoorkeeperHub.client_mode?
+    post 'doorkeeper/activation', to: 'doorkeeper_hub/callbacks#activation'
+  end
 end

data/lib/doorkeeper_hub/configurator.rb

@@ -4,12 +4,14 @@ module DoorkeeperHub
     attr_accessor :scope_model
     attr_accessor :user_model
     attr_accessor :doorkeeper_token_name
+    attr_accessor :client_mode
 
     def initialize
       self.service_token = ENV["SERVICE_TOKEN"]
       self.scope_model = ::Company
       self.user_model = ::User
       self.doorkeeper_token_name = :doorkeeper_token
+      self.client_mode = false
     end
   end
 end

data/lib/doorkeeper_hub/helpers.rb

@@ -3,11 +3,13 @@ module DoorkeeperHub
     extend ActiveSupport::Concern
 
     included do
-      before_action :authenticate_doorkeeper!
+      before_action :authenticate_doorkeeper!, unless: -> { DoorkeeperHub.client_mode? }
     end
 
     def authenticate_doorkeeper!
       if signed_in?(DoorkeeperHub.devise_scope)
+        return if DoorkeeperHub.client_mode?
+
         redirect_to root_path_with_token if params[DoorkeeperHub.token_param].nil?
       else
         redirect_to omniauth_authorize_path(
@@ -18,6 +20,8 @@ module DoorkeeperHub
     end
 
     def default_url_options(options = {})
+      return options if DoorkeeperHub.client_mode?
+
       options[DoorkeeperHub.token_param] = params[DoorkeeperHub.token_param]
       options
     end

data/lib/doorkeeper_hub/saml.rb

@@ -10,14 +10,16 @@ module DoorkeeperHub
 
     class_methods do
       def from_omniauth(auth)
-        return if 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
         end
 
-        scope_results(auth).each do |result|
-          user.users_companies.find_or_create_by(company: result)
+        unless DoorkeeperHub.client_mode?
+          scope_results(auth).each do |result|
+            user.users_companies.find_or_create_by(company: result)
+          end
         end
 
         user

data/lib/doorkeeper_hub/version.rb

@@ -1,3 +1,3 @@
 module DoorkeeperHub
-  VERSION = "0.1.7"
+  VERSION = "0.2.0"
 end

data/lib/doorkeeper_hub.rb

@@ -32,4 +32,8 @@ module DoorkeeperHub
   def self.token_param
     :doorkeeper_token
   end
+
+  def self.client_mode?
+    config.client_mode
+  end
 end

metadata

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