omniauth-frontrush 1.0.7 → 1.0.9

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTFkMDJlN2E5ZTQzMjcxZmQ5OWE2ZjViN2E0N2VlMDhlNzM4MTcwYQ==
-  data.tar.gz: !binary |-
-    N2UyMTI3YmMyYWQ0ZWE1ZGJhYWQxZTk2Njk1MzRiNDgwMjBiOGNiOQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NDFmMDUxZTI5ZWIwODg0YTVlYWRjMjhlNjUwMmI5OTE3MjUyNDcxOTg3NmZh
-    NzBlMzg1YTAzZWRhNWQ5YTAxMzU4MTExYjJmNTc0NTMzNmYwMzQ5NzQwY2E4
-    ZGMxOTRlZjM4YWNlY2E3MmJjM2MwMWZkNTQ5ZDJmMWNkNDhjYzA=
-  data.tar.gz: !binary |-
-    ZjAyYzMxZWU4ODZkZDU2ODlmNWExYTM4N2FkOWI2NWRiZmVlYjIyZTEwNmQ0
-    NjA1YjNkOTlhNjVlZGI0OTJiZTk2ZjRhYzA4M2Q0Yzk3ZTNmYzhiYTFhYWQ5
-    MDYxMTc2YmE1ZDhmM2EwYjc0ZTBhMTFkNzQyMGM3NDc4ODQwZTc=
+SHA1:
+  metadata.gz: 33fb3d7fec7ab946caeab704c5de1a83d232d9af
+  data.tar.gz: 314c6aec1bad83ff518a862fa5fa51a5319bef28
+SHA512:
+  metadata.gz: c2c2ae88f8b4e5bf25ccc0c3316d2344aaf77568c871df4c6bdcc1b166d56c99dfc3053b40529a2ed6e3ad3fd6b441c8b36778aebd3c094c8c1cfd7bd6ae8142
+  data.tar.gz: 2b05578ba4b086c552891a7b1b53ae316315c762ec0a54426bd97474f11e01bb17c5d2f2d02ffbe543d516e7f80896739b44ae46d3ed94c81419116ebf4d2f8b

data/lib/omniauth-frontrush.rb

@@ -1,2 +1,2 @@
-#the main file of this gem
+# the main file of this gem
 require 'omniauth/frontrush'

data/lib/omniauth/frontrush.rb

@@ -1 +1 @@
-require 'omniauth/strategies/frontrush'
+require 'omniauth/strategies/frontrush'

data/lib/omniauth/frontrush/version.rb

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

data/lib/omniauth/strategies/frontrush.rb

@@ -1,6 +1,5 @@
 require 'oauth2'
 require 'omniauth'
-require 'oauthrequest'
 module OmniAuth
   module Strategies
     class Frontrush
@@ -9,66 +8,61 @@ module OmniAuth
         @raw_json['data']['Email']
       end
       credentials do
-        {:oauth_token => @raw_json['data']['Token'],:oauth_token_secret => @raw_json['data']['TokenSecret']}
+        { oauth_token: @raw_json['data']['Token'], oauth_token_secret: @raw_json['data']['TokenSecret'] }
       end
       extra do
         @raw_json['data']
       end
-      info do
-        {:raw => @raw_json_string}
-      end
       def request_phase
-          response = get_request_token(options)
-          if !(response.code.start_with?("4"))
-            request_token = set_request_token(response)
-            redirect get_redirect_url(callback_url,request_token)
-          end
+        redirect get_redirect_url(callback_url + '?device=web', options)
       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
+        optionshash = { consumer_key: options[:consumer_key], consumer_secret: options[:consumer_secret], token: nil, token_secret: nil }
+        response = get_access_token(request, options, optionshash)
+        super if get_json_from_response(response)
       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)
+
+      def get_access_token(request, options, optionshash)
+        url = set_request_url(request, options)
+        uri = URI.parse(url)
+        request = Net::HTTP::Get.new(URI.parse(url))
+        response = Net::HTTP.start(uri.host, uri.port) do|http|
+          http.request(request)
+        end
       end
-      def get_redirect_url(callback_url,request_token)
-        options[:frontrush_url]+"/login.aspx?&consumer_key=key&callback="+callback_url+"&request_code="+request_token
+
+      def get_redirect_url(callback_url, options)
+        options[:frontrush_url] + '/login.aspx?&consumer_key=' + options[:consumer_key] + '&callback=' + callback_url
       end
+
       def set_request_token(response)
-        request_token = URI.encode(response.body)
-        request_token = request_token.gsub("\"","")
+        request_token = URI.escape(response.body)
+        request_token = request_token.gsub("\"", '')
         env['rack.session'][:oauth_request_token] = request_token
-        return request_token
+        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)
+        @raw_json_string = response.body.slice(1, response.body.length - 2)
+        @raw_json_string = @raw_json_string.gsub("\\\"", '"')
+        begin
+          @raw_json = JSON.parse(@raw_json_string)
+        rescue Exception => e
+          @raw_json = e.to_json
+          return false
+        end
+        true
       end
-      def set_request_url(request,options)
+
+      def set_request_url(request, options)
+        oauth_consumer_key = options[:consumer_key]
         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 = '/oauth/access_token?oauth_verifier=' + oauth_verifier.to_s + '&oauth_consumer_key=' + oauth_consumer_key
+        options[:frontrush_url] + request_path
       end
     end
   end
-end
+end

data/test/test_omniauth-fr.rb

@@ -1,14 +1,6 @@
-#test
+# test
 require 'test/unit'
 require 'omniauth-frontrush'
 class OmniauthfrontrushTest < Test::Unit::TestCase
-	def test_english_hello
-		 assert_equal "hello world",OmniauthYelp.hi("english")
-	end	
-	def test_any_hello
-		assert_equal "hello world",OmniauthYelp.hi("ruby")
-	end	
-	def test_spanish_hello
-		assert_equal "hola mundo",OmniauthYelp.hi("spanish")
-	end	
-end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-frontrush
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.9
 platform: ruby
 authors:
 - Dhanesh Neela Mana
@@ -14,98 +14,98 @@ dependencies:
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple  omniauth gem for frontrush
@@ -114,11 +114,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/oauthrequest.rb
 - lib/omniauth-frontrush.rb
 - lib/omniauth/frontrush.rb
-- lib/omniauth/strategies/frontrush.rb
 - lib/omniauth/frontrush/version.rb
+- lib/omniauth/strategies/frontrush.rb
 - test/test_omniauth-fr.rb
 homepage: https://github.com/FrontRush/omniauth-frontrush
 licenses:
@@ -130,17 +129,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: omniauth-frontrush!

data/lib/oauthrequest.rb

@@ -1,89 +0,0 @@
-require 'cgi'
-require 'uri'
-require 'timeout'
-require 'openssl'
-require 'base64'
-require 'net/http'
-
-module OmniAuth
-  module Strategies
-    class OAuthRequest
-          @options = nil
-          def request url,httpmethod,optionshash,data
-              @options = optionshash
-              return_data = nil
-              parsed_url = URI.parse( url )
-              Net::HTTP.start( parsed_url.host,parsed_url.port) { | http |
-                params = sign(parsed_url,httpmethod)
-                signed_req = get_query_string(params)
-                request =""
-                if(httpmethod.downcase == "post")
-                  request = Net::HTTP::Post.new("#{ parsed_url.path }?#{ signed_req }")
-                  request.set_form_data(data)
-                else
-                  request = Net::HTTP::Get.new "#{ parsed_url.path }?#{ signed_req }"
-                end
-                response = http.request(request)
-                return_data = response
-              }
-            return_data
-          end
-          def percent_encode( string )
-            if string.nil?
-              return ""
-            else
-              return URI.escape( string, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]") ).gsub('*', '%2A')
-            end
-          end
-          def signature base_str
-              key_string = percent_encode(@options[:consumer_secret])
-              if( @options[:token_secret] )
-                key_string += '&'+percent_encode(@options[:token_secret])
-              end
-              # key_sha = Digest::SHA1.digest(key_string)
-              # digest = OpenSSL::Digest::Digest.new("sha1")
-              hmac = OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), key_string.encode("ASCII"), base_str.encode("ASCII"))
-              # hmac = OpenSSL::HMAC.digest( digest, key_sha, base_str )
-              puts Base64.strict_encode64( hmac.to_s )
-              Base64.strict_encode64( hmac.to_s ).chomp.gsub( /\n/, '' )
-          end
-          def get_query_string params
-              pairs = []
-              params.sort.each { | key, val |
-                if(val.class != [].class)
-                  pairs.push( "#{ percent_encode( key ) }=#{ percent_encode( val.to_s ) }" )
-                else
-                  pairs.push( "#{ percent_encode( key ) }=#{ percent_encode( val[0].to_s ) }" )
-                end
-              }
-              pairs.join '&'
-          end
-          def sign( parsed_url ,req_method)
-              params = {
-                'oauth_consumer_key' => @options[:consumer_key],
-                'oauth_nonce' => Array.new( 5 ) { rand(256) }.pack('C*').unpack('H*').first,
-                'oauth_signature_method' => 'HMAC-SHA1',
-                'oauth_timestamp' => Time.now.to_i.to_s,
-                'oauth_version' =>'1.0'
-              }
-              if @options[:token]
-                params['oauth_token'] = @options[:token]
-              end
-              req_url = parsed_url.to_s.split("?")[0]
-              base_str = [
-                req_method,
-                percent_encode( req_url ),
-                percent_encode( get_query_string(params) )
-
-              ].join( '&' )
-              params[ 'oauth_signature' ] = signature(base_str)
-              if parsed_url.query
-                params.merge! CGI.parse( parsed_url.query )
-              end
-              return params
-          end
-    end
-  end
-end
-
-