we_bridge_rails_engine_users 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a7826139a63c532db7cf3694ab2b9b94e47a1d7
-  data.tar.gz: 2f56b5d88b08c9fef1df7bf640797d00a596376d
+  metadata.gz: 3a1a91fad1e99b7e82b231a7966b470d41cb5d0a
+  data.tar.gz: 469e86a211d4101af4f676105bc7f4cbbe0cf1bd
 SHA512:
-  metadata.gz: 4a682fdb4d648b30ca8377fab74846b99c6f4f699303eb6ddc54274cc6195a28566d9683bc3a23bae5521fd6d78d4f2de395d8e3f5d969f0b9e4eae8e2967615
-  data.tar.gz: ac0e53ef58220b284f13ee3914a67fb532729cd5558bd1cb05ef6a807ea0fe88087732d76440613fdd3fda8501234b26e315e09b4dca1663ad809a88ee883a26
+  metadata.gz: 80d3903fba9c25c4d0f05b815ceb287968eb69826da77ba212794e6d28c4676bc46e52c155970493ba083c9822585e21ab60d4d70bea8d354faf111c134cdfa4
+  data.tar.gz: cf09b15e73136fd07ff0fed2c6a9ff408cafed318cadcf236c2f0d9f277c3b9dc7b10bcfb5031fe7a20ebba4eba9799d094d1e3b8d1d1fa477f6be015250da81

data/app/controllers/sessions_controller.rb

@@ -4,7 +4,7 @@ class SessionsController < ApplicationController
   def login
     @providers = []
     WeBridgeRailsEngineUsers::ProviderSettings.availables do |name|
-      @providers << {url: WeBridgeRailsEngineUsers::ProviderSettings.request_path(name), display: name.to_s.capitalize }
+      @providers << {url: WeBridgeRailsEngineUsers::ProviderSettings.auth_path(name), display: name.to_s.capitalize }
     end
   end
 

data/lib/we_bridge_rails_engine_users/provider_settings.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'rubygems'
+
 module WeBridgeRailsEngineUsers
   class ProviderSettings < Hash
 
@@ -43,20 +44,40 @@ module WeBridgeRailsEngineUsers
       rtn
     end
 
+    # the return value does not include relative_url_root
     def self.request_path(name)
-      File.join("/",Rails.application.config.relative_url_root.to_s,"auth",name.to_s)
+      File.join("/","auth",name.to_s)
     end
 
+    # the return value does not include relative_url_root
     def self.callback_path(name)
-      File.join("/",Rails.application.config.relative_url_root.to_s,"auth",name.to_s,"callback")
+      File.join("/","auth",name.to_s,"callback")
+    end
+
+    def self.auth_as(name)
+      "auth_#{name}"
+    end
+
+    def self.auth_path_method(name)
+      self.auth_as(name) + "_path"
+    end
+
+    # the return value includes relative_url_root
+    def self.auth_path(name)
+      Rails.application.routes.url_helpers.__send__(self.auth_path_method(name))
     end
 
     def self.auth_callback_as(name)
       "auth_callback_#{name}"
     end
 
-    def self.auth_as(name)
-      "auth_#{name}"
+    def self.auth_callback_path_method(name)
+      self.auth_callback_as(name) + "_path"
+    end
+
+    # the return value includes relative_url_root
+    def self.auth_callback_path(name)
+      Rails.application.routes.url_helpers.__send__(self.auth_callback_path_method(name))
     end
 
     def self.set_middleware

data/lib/we_bridge_rails_engine_users/version.rb

@@ -1,3 +1,3 @@
 module WeBridgeRailsEngineUsers
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end