authinator 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bab186640c9c1e8c020d88808cea1d05389e743
-  data.tar.gz: fd3636d7972b4bda346d1c9b641d633f2e655053
+  metadata.gz: acaccc767c48cd514add3e18e616718f04d3a023
+  data.tar.gz: d3309ca0fb8b6d79ba307894cc4c05ddf866a3e7
 SHA512:
-  metadata.gz: 84848419144e543347fac7faa7fe32e13b10da1ea8e282a9c32f0977dfad44e161313c310dd3114b85c65667d5764bf9c569fd843448074c67cf7635c1d55cb5
-  data.tar.gz: db8e6561e4032b1b6f7f71648d1f48219ff2b94d260a55fae5f0f237997a7d746904fe5a27e95de0ed9f5846ac60b37444d5763ff3f2d85b1baace23c608826d
+  metadata.gz: 57960a2ddfffe2722a030f19dbac1f1a70f069f70587572a5b1147342a8be3a83e370449143335680db888859a8012a26eeede6263c8b0a3b015c666b2cd1104
+  data.tar.gz: 0a42070c92fac997b6aac313a0149e598aaea4486596634b959111382ff267805d546739a102054fbc5fabb36f85c804f646118c7a14b74dd45b219f6aaf1089

data/lib/authinator/auth_code_exchanger.rb

@@ -23,15 +23,16 @@ module Authinator
       @provider.site + @provider.token_url
     end
 
-    def exchange(auth_code)
+    def exchange(auth_code, redirect_uri)
       # auth_code = params[:code]
-      return if auth_code.nil? || auth_code.empty?
+      fail 'Cannot Exchange Auth Code (auth_code missing)' if auth_code.nil? || auth_code.empty?
+      fail 'Cannot Exchange Auth Code (redirect_uri missing)' if redirect_uri.nil? || redirect_uri.empty?
 
       case @provider.name
       when :google
-        exchange_with_google(auth_code)
+        exchange_with_google(auth_code, redirect_uri)
       when :stub
-        exchange_with_stub(auth_code)
+        exchange_with_stub(auth_code, redirect_uri)
       end
     end
 
@@ -43,10 +44,10 @@ module Authinator
     #   @provider_hash[:client_secret] = client_options.delete(:client_secret) if client_options[:client_secret]
     # end
 
-    def exchange_with_google(code)
+    def exchange_with_google(code, redirect_uri)
       @client = OAuth2::Client.new(@provider.client_id, @provider.client_secret, @provider.to_hash)
 
-      token = @client.auth_code.get_token(code, redirect_uri: 'http://localhost:4200')
+      token = @client.auth_code.get_token(code, redirect_uri: redirect_uri)
 
       # response = token.get('/api/resource', :params => { 'query_foo' => 'bar' })
       # response.class.name
@@ -55,7 +56,7 @@ module Authinator
       token
     end
 
-    def exchange_with_stub(_code)
+    def exchange_with_stub(_code, _redirect_uri)
       @client = OAuth2::Client.new(
           @provider.client_id,
           @provider.client_secret,

data/lib/authinator/client_token_issuer.rb

@@ -24,6 +24,7 @@ module Authinator
       @provider = Authinator.configuration.provider_for(provider_name)
 
       @auth_code = (options.delete :auth_code if options[:auth_code]) || @params['code']
+      @redirect_uri = (options.delete :redirect_uri if options[:redirect_uri]) || @params['redirect_uri']
       @app_name = (options.delete :app_name if options[:app_name]) || application_name
       @valid_applications = (options.delete :valid_applications if options[:valid_applications]) || Authinator.configuration.valid_applications
     end
@@ -54,7 +55,7 @@ module Authinator
     def handle(options = {})
       application = Doorkeeper::Application.where(name: @app_name)
       token_issuer = AuthCodeExchanger.new @provider
-      provider_access_token = token_issuer.exchange @auth_code
+      provider_access_token = token_issuer.exchange @auth_code, @redirect_uri
 
       begin
         info = load_info(provider_access_token)
@@ -72,6 +73,7 @@ module Authinator
         resource_owner_id: user.id,
         expires_in: expires_in,
         use_refresh_token: true,
+        scopes: :user,
       )
 
       token_data = {

data/lib/authinator/version.rb

@@ -1,3 +1,3 @@
 module Authinator
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/spec/authinator/auth_code_exchanger_spec.rb

@@ -19,12 +19,12 @@ describe Authinator::AuthCodeExchanger do
       client_secret: 'cl_sec',
       code: '4/code',
       grant_type: 'authorization_code',
+      redirect_uri: 'http://localhost:4200',
     }
 
     @req_headers = {
       accept: '*/*',
       content_type: 'application/x-www-form-urlencoded',
-      user_agent: 'Faraday v0.9.0',
     }
 
     @req_response = {
@@ -60,7 +60,7 @@ describe Authinator::AuthCodeExchanger do
            headers: @req_headers).
       to_return(@req_response)
 
-    result = ace.exchange(@test_env[:code])
+    result = ace.exchange(@test_env[:code], @test_env[:redirect_uri])
 
     expect(result.token).to eq @token_hash[:access_token]
     expect(result.refresh_token).to eq @token_hash[:refresh_token]
@@ -78,7 +78,7 @@ describe Authinator::AuthCodeExchanger do
              headers: @req_headers).
         to_return(@req_response)
 
-      expect(ace.exchange(@test_env[:code])).to be_a klass
+      expect(ace.exchange(@test_env[:code], @test_env[:redirect_uri])).to be_a klass
     end
   end
 
@@ -89,7 +89,7 @@ describe Authinator::AuthCodeExchanger do
            headers: @req_headers).
       to_return(@req_response)
 
-    result = ace.exchange(@test_env[:code])
+    result = ace.exchange(@test_env[:code], @test_env[:redirect_uri])
 
     expect(result.token).to eq @token_hash[:access_token]
     expect(result.refresh_token).to eq @token_hash[:refresh_token]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authinator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Alexander Bradner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2