jm81auth 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c3c59397d88dbdf28d7e4d648d31add2778816b
-  data.tar.gz: 5f9c327cf43476a2461cb2fbbd2143f60e1e6260
+  metadata.gz: ded0e7698676c978ab0a3118a7bbf259c11e4a26
+  data.tar.gz: d131e493284872c8b0d80c917f59cfef79f30412
 SHA512:
-  metadata.gz: cd400241266aabd44738a03ebb93a7ca7d5b56e618bfad3ea44241acd8a8cf47a0cf621095a05c71c81f372f079a955757012d3fdce58094b12bb7a3dd51c890
-  data.tar.gz: 3032d568c94dffae893cb2d17148f4ba5c7ff29a114ed4cc38b37dcc1637aea071bc5d98af16cc38ff20b4c631926766889672efacd87a5c556346694951b0a5
+  metadata.gz: 495587e42080bf7fa15a71ad5f65a47f43447dd7ae6dc31cd5b3717ce4887e48afec534dbe0b40058523aab1b0509fda5056325afd1b3b38a2c1ff00a23a19e1
+  data.tar.gz: 7838d9e94e26f48e74b1b6659b446c10a556727b4d592c0a89197d93330eb48f95f22b4b9db3493292997770d972bf45ebdb35413eabf08f20008b36be4c2e5c

data/lib/jm81auth/models/auth_method.rb

@@ -15,15 +15,22 @@ module Jm81auth
         end
       end
 
-      # Create AuthToken, setting user and last_used_at
+      # Create AuthToken, setting user and last_used_at, and optionally
+      # access_token from the Oauth provider.
       #
       # @return [AuthToken]
-      def create_token
-        if self.respond_to? :add_auth_token
-          add_auth_token user: user, last_used_at: Time.now.utc
-        else
-          auth_tokens.create! user: user, last_used_at: Time.now.utc
+      def create_token access_token: nil
+        auth_token = ::AuthToken.new
+        auth_token.auth_method = self
+        auth_token.user = user
+        auth_token.last_used_at = Time.now.utc
+
+        if auth_token.respond_to? :access_token=
+          auth_token.access_token = access_token
         end
+
+        auth_token.save
+        auth_token
       end
 
       module ClassMethods

data/lib/jm81auth/models/user.rb

@@ -45,10 +45,7 @@ module Jm81auth
           method = ::AuthMethod.by_provider_data oauth.provider_data
 
           if !method
-            user = find_by_email(oauth.email) || create(
-              email: oauth.email.downcase,
-              display_name: oauth.display_name
-            )
+            user = find_by_email(oauth.email) || create_from_oauth(oauth)
 
             if user.respond_to? :add_auth_method
               method = user.add_auth_method oauth.provider_data
@@ -57,7 +54,20 @@ module Jm81auth
             end
           end
 
-          method.create_token
+          method.create_token access_token: oauth.access_token
+        end
+
+        # Create User based on oauth data.
+        #
+        # @param oauth [OAuth::Base]
+        #   OAuth login object, include #provider_data (Hash with provider_name
+        #   and provider_id), #email and #display_name.
+        # @return [User]
+        def create_from_oauth oauth
+          create(
+            email: oauth.email.downcase,
+            display_name: oauth.display_name
+          )
         end
       end
     end

data/lib/jm81auth/oauth/base.rb

@@ -4,6 +4,8 @@
 module Jm81auth
   module OAuth
     class Base
+      attr_reader :access_token
+
       # Setup @params from params param (Har, har). Also, set @access_token,
       # either from params Hash, or by calling #get_access_token. @params is the
       # expected params needed by #get_access_token.

data/lib/jm81auth/version.rb

@@ -1,3 +1,3 @@
 module Jm81auth
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/spec/jm81auth/models/user_spec.rb

@@ -105,6 +105,7 @@ RSpec.describe User, type: :model do
     context 'existing AuthMethod' do
       before(:each) do
         expect(oauth).to_not receive(:email)
+        expect(oauth).to receive(:access_token)
 
         expect(oauth).to receive(:provider_data) do
           { provider_name: 'github', provider_id: 5 }
@@ -133,6 +134,8 @@ RSpec.describe User, type: :model do
 
     context 'no existing AuthMethod' do
       before(:each) do
+        expect(oauth).to receive(:access_token)
+
         expect(oauth).to receive(:provider_data).twice do
           { provider_name: 'github', provider_id: 10 }
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jm81auth
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jared Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-31 00:00:00.000000000 Z
+date: 2020-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient