doorkeeper_hub 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50b7e28e158b353429f556bb4f171ce8d385ff44cd20105c1450d2a2f82dc6ae
-  data.tar.gz: 892dd0510930e88cb8d113ca099db81b3c5ec026818d4abbd3dbdf5da7679ef4
+  metadata.gz: dfb06ca0396efde164d1c14d6c7c12f0e02ad59a50cf068697416afe9447b900
+  data.tar.gz: '09567c5b4314bbc6b58523fdac2ed21e39aca3c9d599e6a36675f5ec4daecb4d'
 SHA512:
-  metadata.gz: ae0b8aa90bc7886c2ac279d7b2a674129b320fa9f7a2084c07708b2ee3214dfe11174ded731f6f4f414a1656033b7d4b65c4345def6b3bd3fa0f38ed9bca33da
-  data.tar.gz: 168d6a716b87ed915dcd2755e08db3f70ab2ba42e8ff6eaeb0ee05986052288c3bb56d5f4fc9a2b1bbf2e45e883d0597633a42e3225e83557f26ba320113a4fd
+  metadata.gz: dca8ed993b703d66d6bb96c6a1dde4918e4be976fc24f19d570b0d63672c4116e525b9c7744426acca5f4f2bab008a70cca7a2ff55a91e29d290eb9d0e46e289
+  data.tar.gz: 1e2a67e9364e0d68891dc5c2cba20004d5b6fdd58e9e3e8d4bc4ffdd5183960b711cc7b4e5bb4677b4570143491823efbb4a2a5e65b84b657f623f2a58948f3b

data/lib/doorkeeper_hub/helpers.rb

@@ -8,7 +8,7 @@ module DoorkeeperHub
 
     def authenticate_doorkeeper!
       if signed_in?(DoorkeeperHub.devise_scope)
-        redirect_to root_path_with_token if params[:d_token].nil?
+        redirect_to root_path_with_token if params[DoorkeeperHub.token_param].nil?
       else
         redirect_to omniauth_authorize_path(
           DoorkeeperHub.devise_scope, :saml
@@ -17,25 +17,26 @@ module DoorkeeperHub
     end
 
     def default_url_options(options = {})
-      options[:d_token] = params[:d_token]
+      options[DoorkeeperHub.token_param] = params[DoorkeeperHub.token_param]
       options
     end
 
-    def after_sign_in_path_for(_)
+    def after_sign_in_path_for(user)
       root_path_with_token
     end
 
     def root_path_with_token
-      root_path d_token: params_or_default_d_token
+      root_path DoorkeeperHub.token_param => params_or_default_token
     end
 
-    def params_or_default_d_token
-      params[:d_token] || current_user.companies.first.doorkeeper_token
+    def params_or_default_token
+      params[DoorkeeperHub.token_param] ||
+        current_user.companies.first.send(DoorkeeperHub.config.doorkeeper_token_name)
     end
 
     def company
       @company ||=
-        current_user.companies.active.find_by(doorkeeper_token: params[:d_token]) ||
+        current_user.companies.active.find_by(DoorkeeperHub.config.doorkeeper_token_name => params[DoorkeeperHub.token_param]) ||
           raise(ActionController::RoutingError.new('Not Found'))
     end
   end

data/lib/doorkeeper_hub/routes.rb

@@ -5,7 +5,7 @@ module DoorkeeperHub
 
     class Mapper
       def doorkeeper
-        scope '/:d_token' do
+        scope "/:#{DoorkeeperHub.token_param}" do
           yield
         end
       end

data/lib/doorkeeper_hub/version.rb

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

data/lib/doorkeeper_hub.rb

@@ -28,4 +28,8 @@ module DoorkeeperHub
   def self.token_name
     config.doorkeeper_token_name
   end
+
+  def self.token_param
+    :doorkeeper_token
+  end
 end

metadata

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