doorkeeper_hub 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57317b863c1df69f8ef98933a88adeefe67d16a9045b34a651f50040e7d0660a
-  data.tar.gz: 608d6f40b3f891882847825f615a537a32218be747eb4e754809b6d860349518
+  metadata.gz: 50b7e28e158b353429f556bb4f171ce8d385ff44cd20105c1450d2a2f82dc6ae
+  data.tar.gz: 892dd0510930e88cb8d113ca099db81b3c5ec026818d4abbd3dbdf5da7679ef4
 SHA512:
-  metadata.gz: 9610fe1a924385f480ffde41a24ad5428b32ad838b9666398d11bc3073d06518d689a8e3f7b6e246b1330c68f475560d4ce3d97aeb13d601d1606ef7237173fc
-  data.tar.gz: dd9825328ded32b28d500813a530f6845f9a45710bb71dd955996f91c3aed67b05e3bb043a8650a009c8352a49ef4db0439db9ae1bda8c093d67bb0cc96021d1
+  metadata.gz: ae0b8aa90bc7886c2ac279d7b2a674129b320fa9f7a2084c07708b2ee3214dfe11174ded731f6f4f414a1656033b7d4b65c4345def6b3bd3fa0f38ed9bca33da
+  data.tar.gz: 168d6a716b87ed915dcd2755e08db3f70ab2ba42e8ff6eaeb0ee05986052288c3bb56d5f4fc9a2b1bbf2e45e883d0597633a42e3225e83557f26ba320113a4fd

data/app/controllers/doorkeeper_hub/omniauth_callbacks_controller.rb

@@ -1,8 +1,7 @@
 module DoorkeeperHub
   class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     skip_before_action :verify_authenticity_token,
-                       :check_login!,
-                       :check_d_token, only: :saml
+                       :authenticate_doorkeeper!, only: :saml
 
     def saml
       @user = DoorkeeperHub

data/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-  devise_for DoorkeeperHub.devise_scope,
+  devise_for DoorkeeperHub.devise_routes_scope,
              controllers: {
                omniauth_callbacks: 'doorkeeper_hub/omniauth_callbacks'
              }

data/lib/doorkeeper_hub/helpers.rb

@@ -3,25 +3,17 @@ module DoorkeeperHub
     extend ActiveSupport::Concern
 
     included do
-      before_action :check_login!, :check_d_token
+      before_action :authenticate_doorkeeper!
     end
 
-    def check_login!
-      redirect_to user_saml_omniauth_authorize_path unless user_signed_in?
-    end
-
-    def company
-      @company ||=
-        current_user.companies.active.find_by(doorkeeper_token: params[:d_token]) ||
-          raise(ActionController::RoutingError.new('Not Found'))
-    end
-
-    def check_login!
-      redirect_to user_saml_omniauth_authorize_path unless user_signed_in?
-    end
-
-    def after_sign_in_path_for(current_user)
-      root_path(d_token: params_or_default_d_token)
+    def authenticate_doorkeeper!
+      if signed_in?(DoorkeeperHub.devise_scope)
+        redirect_to root_path_with_token if params[:d_token].nil?
+      else
+        redirect_to omniauth_authorize_path(
+          DoorkeeperHub.devise_scope, :saml
+        )
+      end
     end
 
     def default_url_options(options = {})
@@ -29,14 +21,22 @@ module DoorkeeperHub
       options
     end
 
-    def check_d_token
-      if params[:d_token].nil? && current_user.present?
-        redirect_to root_path d_token: params_or_default_d_token
-      end
+    def after_sign_in_path_for(_)
+      root_path_with_token
+    end
+
+    def root_path_with_token
+      root_path d_token: params_or_default_d_token
     end
 
     def params_or_default_d_token
       params[:d_token] || current_user.companies.first.doorkeeper_token
     end
+
+    def company
+      @company ||=
+        current_user.companies.active.find_by(doorkeeper_token: params[:d_token]) ||
+          raise(ActionController::RoutingError.new('Not Found'))
+    end
   end
 end

data/lib/doorkeeper_hub/version.rb

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

data/lib/doorkeeper_hub.rb

@@ -13,8 +13,12 @@ module DoorkeeperHub
     yield config
   end
 
+  def self.devise_routes_scope
+    user_model.to_s.downcase.pluralize.to_sym
+  end
+
   def self.devise_scope
-    config.user_model.to_s.downcase.pluralize.to_sym
+    user_model.to_s.downcase.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.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jimmy Fan