omniauth-frontrush 1.0.5 → 1.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmJkN2FhZTFiZDZjNjk0YjRkNTU5NzgzNDc2OGIxY2Q3NjVkM2ZiMg==
+    NDEzNmQyZGExNTZhNDY3ODVhMzk2ZTYxYWIwNzhiZjVkYzQ2YzBlNw==
   data.tar.gz: !binary |-
-    NTZhYTZiYmFjMTAxMmNhYWY1YzA5M2Y2ZGNmNzI3MTI3NGE5NGM0Ng==
+    ZDhiNWQxNjNmZTNmYjNkNWJlZDQ5NWY5NDkyNjIwOWEyNDBjY2MyZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGEyNDFlZjliZjU1ZDZkYmUzODZlZjdhOTZlYjQ3ZTk5OTg5MWQ2NGM3Yjcz
-    ZWMzNzUzZGY0YzQ3Y2JiYzlkNGY3ODZmM2MzZGM4MGFhNmU3ODYzODgxMmQ1
-    MWZjNDcxODcwNDY4YTFlMmQzNGFkNTFlYjJhMjkwYWJjODJkMjE=
+    YjA3ODI1MDllZGI1ZTdiMTAyN2U3NWJhNjgwYzUzYzgyYTE5MmE1OTA4NzM4
+    OGMwZTcwNjA5MDIwMTg0YjczYmQ2ZjBhNGY0OTE1MDUzMzZlMGIyNzI2ZDc4
+    ZWI5N2Q5YmZjMGEyYjk5MGVlMzNiZDdkMGJjODZmZTE2MjVkMmQ=
   data.tar.gz: !binary |-
-    MzNlMGEzMzNmNmNlNTBmZDYzOGFjNDg1ZWJkZWFjYTE3MjVhNmViZjBhZTYw
-    NGMxOTgxYTg3ZGY1NTZjYzA4ZGQ5MTc5YTM0YjcyNTI5MjBiOTY3OGZjMWI1
-    YjExMzNiNzVlYTY4MmYzMmI4MjlhNTA2MGY1NzYzOTY5YmViYjE=
+    YWNlMmM4YjAwZGY1Y2UzZTVlZTBkZjE5ODhhNTY1ZjcwNjIzY2M2NzY5NmMy
+    ODMzMWI1OTU1YzlkZjI2MWU3YjM2NWQ4ODA5Zjc2YzM4Zjk3NmQxNjQyNWI5
+    OTBiZGE2ZDEyNDM0ZjIwZWMxMTgzZDI3NWQ0YWFiY2QwOGRkMTk=

data/lib/omniauth/frontrush/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module frontrushontrush
-    VERSION = "1.0.5"
+    VERSION = "1.0.6"
   end
 end

data/lib/omniauth/strategies/frontrush.rb

@@ -15,41 +15,59 @@ module OmniAuth
         @raw_json['data']
       end
       info do
-        @raw_json
+        @raw_json_string
       end
       def request_phase
-          request_path = "/token/request_token"
-          optionshash = {:consumer_key => options[:consumer_key],:consumer_secret => options[:consumer_secret],:token => nil,:token_secret=>nil}
-          oauth = OAuthRequest.new
-          url = options[:frontrush_url] +request_path #"http://192.168.1.108:62639/token/request_token"
-          response = oauth.request(url,"GET",optionshash,nil)
+          response = get_request_token(options)
           if !(response.code.start_with?("4"))
-            request_token = URI.encode(response.body)
-            request_token = request_token.gsub("\"","")
-            env['rack.session'][:oauth_request_token] = request_token
-            re_url = options[:frontrush_url]+"/login.aspx?&consumer_key=key&callback="+callback_url+"&request_code="+request_token
-            redirect re_url
+            request_token = set_request_token(response)
+            redirect get_redirect_url(callback_url,request_token)
           end
       end
+
       def callback_phase
+        optionshash = {:consumer_key => options[:consumer_key],:consumer_secret => options[:consumer_secret],:token => nil,:token_secret=>nil}
+        url = set_request_url(request,options)
+        response = OAuthRequest.new.request(url,"GET",optionshash,nil)
+        @raw_json= get_json_from_response(response)
+        super
+      end
+      private
+      def get_request_token(options)
+        request_path = "/token/request_token"
+        optionshash = {:consumer_key => options[:consumer_key],:consumer_secret => options[:consumer_secret],:token => nil,:token_secret=>nil}
+        url = options[:frontrush_url] +request_path
+        OAuthRequest.new.request(url,"GET",optionshash,nil)
+      end
+      def get_redirect_url(callback_url,request_token)
+        options[:frontrush_url]+"/login.aspx?&consumer_key=key&callback="+callback_url+"&request_code="+request_token
+      end
+      def set_request_token(response)
+        request_token = URI.encode(response.body)
+        request_token = request_token.gsub("\"","")
+        env['rack.session'][:oauth_request_token] = request_token
+        return request_token
+      end
+      def get_json_from_response(response)
+        @raw_json_string = response.body.slice(1,response.body.length-2)
+        @raw_json_string = @raw_json_string.gsub("\\\"",'"')
+        raw_json= JSON.parse(@raw_json_string)
+      end
+      def set_request_url(request,options)
         oauth_verifier = URI.escape(request.params['oauth_verifier'])
+        request_token = process_request_token(request)
+        request_path = "/token/access_token?oauth_verifier="+oauth_verifier.to_s+"&oauth_request_token="+request_token
+        url = options[:frontrush_url] +request_path
+      end
+      def process_request_token(request)
         if request.params['oauth_request_token'].nil?
           request_token = env['rack.session'][:oauth_request_token]
         else
           request_token = request.params['oauth_request_token']
         end
+        env['rack.session'][:oauth_request_token] = nil
         request_token = request_token.gsub("\"","")
         request_token = URI.encode(request_token)
-        request_path = "/token/access_token?oauth_verifier="+oauth_verifier.to_s+"&oauth_request_token="+request_token
-        env['rack.session'][:oauth_request_token] = nil
-        optionshash = {:consumer_key => options[:consumer_key],:consumer_secret => options[:consumer_secret],:token => nil,:token_secret=>nil}
-        url = options[:frontrush_url] +request_path
-        oauth = OAuthRequest.new
-        response = oauth.request(url,"GET",optionshash,nil)
-        raw_json_string = response.body.slice(1,response.body.length-2)
-        raw_json_string = raw_json_string.gsub("\\\"",'"')
-        @raw_json= JSON.parse(raw_json_string)
-        super
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-frontrush
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Dhanesh Neela Mana