jm81auth 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 39eca33e41c3b1d18fb5e49d47729a07cb5a8f28
-  data.tar.gz: 33275ac7f223777d70718d95c55347f0905f235f
+SHA256:
+  metadata.gz: c5fe75d8315211ad54368bfd0b3ce2147245ca9a8b4f400e2a4e0a500f0fa2f6
+  data.tar.gz: ebc173d360db322cab2f87d8574cd3f6b47831691a46f5ec1814772b9a4afade
 SHA512:
-  metadata.gz: 308debaddd2df7be32a45bd0788522878579ca80f229533bc3c362a800590dd1add53f71916b0bbf9eaae6585b35ebd222527e0a077555a5dc84f5a7d8845885
-  data.tar.gz: f92668a1d726bca77a101a3370e2b8fe5a0dcfa0c98c3469535994b9b85eea718a46bfb8ccb530a005f9b7e0f94d28149c5dcc560e686a662184ac12e064dee0
+  metadata.gz: a7b59ffafb5e770ce82d0601cd64789b8d89dff737d09ce71c866efaad86bea28e01220a978883688d056bb856ec49caf1b3ab0355569abd9d592a8b74f5172d
+  data.tar.gz: 727abd69e14c142df3a1fb0b87d85ee4a4814ed8a258dd21cff995a901a7c98e5feaf5df53c3b02f8d2e68d1109b1f680f03bd38b802bc46a6217dec1171f939

data/lib/jm81auth.rb

@@ -20,5 +20,6 @@ require 'jm81auth/models/user'
 require 'jm81auth/oauth/base'
 require 'jm81auth/oauth/facebook'
 require 'jm81auth/oauth/github'
+require 'jm81auth/oauth/google'
 
 require 'jm81auth/version'

data/lib/jm81auth/models/auth_method.rb

@@ -5,16 +5,32 @@ module Jm81auth
         base.extend ClassMethods
 
         base.class_eval do
-          many_to_one :user
-          one_to_many :auth_tokens
+          if respond_to? :belongs_to
+            belongs_to :user
+            has_many :auth_tokens
+          else
+            many_to_one :user
+            one_to_many :auth_tokens
+          end
         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
-        add_auth_token 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/auth_token.rb

@@ -5,10 +5,15 @@ module Jm81auth
         base.extend ClassMethods
 
         base.class_eval do
-          plugin :timestamps
+          if respond_to? :belongs_to
+            belongs_to :auth_method, required: false
+            belongs_to :user, required: false
+          else
+            plugin :timestamps
 
-          many_to_one :auth_method
-          many_to_one :user
+            many_to_one :auth_method
+            many_to_one :user
+          end
         end
       end
 
@@ -17,7 +22,13 @@ module Jm81auth
 
       # Set #closed_at. Called, for example, when logging out.
       def close!
-        self.update(closed_at: Time.now) unless self.closed_at
+        unless self.closed_at
+          if respond_to? :update_attributes!
+            self.update_attributes! closed_at: Time.now
+          else
+            self.update closed_at: Time.now
+          end
+        end
       end
 
       # @return [String]
@@ -54,7 +65,11 @@ module Jm81auth
             token, config.jwt_secret, config.jwt_algorithm
           ).first
 
-          auth_token = self[payload['auth_token_id']]
+          if self.respond_to? :[]
+            auth_token = self[payload['auth_token_id']]
+          else
+            auth_token = find payload['auth_token_id']
+          end
 
           if payload['auth_token_id'].nil?
             raise DecodeError, "auth_token_id missing: #{payload}"
@@ -84,7 +99,11 @@ module Jm81auth
           auth_token = decode token
 
           if auth_token && !auth_token.expired?
-            auth_token.update(last_used_at: Time.now)
+            if respond_to? :update_attributes!
+              auth_token.update_attributes! last_used_at: Time.now
+            else
+              auth_token.update last_used_at: Time.now
+            end
             auth_token
           else
             nil

data/lib/jm81auth/models/user.rb

@@ -7,8 +7,13 @@ module Jm81auth
         base.extend ClassMethods
 
         base.class_eval do
-          one_to_many :auth_methods
-          one_to_many :auth_tokens
+          if respond_to? :has_many
+            has_many :auth_methods
+            has_many :auth_tokens
+          else
+            one_to_many :auth_methods
+            one_to_many :auth_tokens
+          end
         end
       end
 
@@ -40,15 +45,29 @@ 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)
 
-            method = user.add_auth_method oauth.provider_data
+            if user.respond_to? :add_auth_method
+              method = user.add_auth_method oauth.provider_data
+            else
+              method = user.auth_methods.create! oauth.provider_data
+            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/oauth/google.rb

@@ -0,0 +1,17 @@
+module Jm81auth
+  module OAuth
+    class Google < Base
+      ACCESS_TOKEN_URL = 'https://oauth2.googleapis.com/token'
+      DATA_URL = 'https://www.googleapis.com/oauth2/v3/userinfo'
+
+      def get_access_token
+        response = client.post(
+          ACCESS_TOKEN_URL, @params.merge(grant_type: 'authorization_code')
+        )
+
+        JSON.parse(response.body)['access_token']
+      end
+    end
+  end
+end
+

data/lib/jm81auth/version.rb

@@ -1,3 +1,3 @@
 module Jm81auth
-  VERSION = '0.1.1'
+  VERSION = '0.1.6'
 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.1
+  version: 0.1.6
 platform: ruby
 authors:
 - Jared Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -126,6 +126,7 @@ files:
 - lib/jm81auth/oauth/base.rb
 - lib/jm81auth/oauth/facebook.rb
 - lib/jm81auth/oauth/github.rb
+- lib/jm81auth/oauth/google.rb
 - lib/jm81auth/version.rb
 - spec/factories/auth_methods.rb
 - spec/factories/auth_tokens.rb
@@ -154,17 +155,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: An authentication library for Rails API
 test_files:
-- spec/factories/users.rb
-- spec/factories/auth_tokens.rb
-- spec/factories/auth_methods.rb
+- spec/spec_helper.rb
+- spec/jm81auth/oauth/base_spec.rb
 - spec/jm81auth/models/auth_token_spec.rb
-- spec/jm81auth/models/user_spec.rb
 - spec/jm81auth/models/auth_method_spec.rb
-- spec/jm81auth/oauth/base_spec.rb
-- spec/spec_helper.rb
+- spec/jm81auth/models/user_spec.rb
+- spec/factories/auth_methods.rb
+- spec/factories/users.rb
+- spec/factories/auth_tokens.rb