ibrain-auth 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbd79a8f9a3704ee91db11e78b78894991b517d86956a8787b1b494ed8b0c21b
-  data.tar.gz: a781b4afeda9073308eff768fa8fe9401dd14670c019a8b7ee5fc5ba36b796b5
+  metadata.gz: 6f6effd595af545581f20acbc9fd7c50c8758fdf471075a001c96cc2d6741490
+  data.tar.gz: 7171e0aa32520f98085c44baad66941dc5a74efecf28275dc52be6aadb2c8b01
 SHA512:
-  metadata.gz: 87a2246dc66f90bdba08265ca39e2d496c404ddeea69751dcd6a9d8ca30d1bc94938ad427fc5e1ab680b395f8385695fa7d481f1a484364d20f53950037699f5
-  data.tar.gz: eca7f37db46b319ccb3d31857739597b0a4685938197401bb9f272d93dff9d1b14d6b41781d37a89eb20c01bda5347574006169202247910833a9974d5f386f0
+  metadata.gz: 838a3e121f20c914e33118a04e68017f4927a4107d7863d7b9b69e817bab43352742ccc98ed4fb22e0ee72a5282ae38243c4349aa986e11ad0bb62f33cc8394a
+  data.tar.gz: 39e411cf62805c44c6376bcc8152ec26121a03601e94ac444f4370059e77f7a4213965c1d3c754e83a7c9b69617b1b83030f6c269ae57350f7c0698a038483e2

data/app/graphql/ibrain/auth/mutations/base_mutation.rb

@@ -12,8 +12,10 @@ module Ibrain::Auth::Mutations
     helper_method(*helpers)
 
     def ready?(args)
-      super(args)
-      
+      @params = ActionController::Parameters.new(
+        args.to_h.with_indifferent_access.transform_keys(&:underscore)
+      )
+
       @auth_resource = load_resource
       true
     end

data/app/graphql/ibrain/auth/mutations/{sso_sign_in_mutation.rb → social_sign_in_mutation.rb}

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 module Ibrain::Auth::Mutations
-  class SsoSignInMutation < BaseMutation
+  class SocialSignInMutation < BaseMutation
     field :user, Types::Objects::UserType, null: true
     field :token, String, null: true
     field :result, Boolean, null: true
     field :is_verified, Boolean, null: true
 
-    argument :id_token, String, description: 'Id Token from SSO', required: true
+    argument :id_token, String, description: 'Id Token from firebase', required: true
     argument :device_token, String, description: 'Device token for notificaiton', required: false
 
     def resolve(args)

data/app/models/ibrain/auth/user.rb

@@ -3,10 +3,10 @@
 module Ibrain
   module Auth
     class User < Ibrain::Base
-      include Devise::JWT::RevocationStrategies::JTIMatcher
-
       attr_accessor :jwt_token
 
+      include Devise::JWT::RevocationStrategies::JTIMatcher
+
       self.table_name = Ibrain::Auth::Config.user_table_name
 
       devise :database_authenticatable, :registerable,
@@ -40,6 +40,13 @@ module Ibrain
             where(query).first
           end
         end
+
+        def social_find_or_initialize(params)
+          user = find_by(provider: params[:provider], uid: params[:uid])
+          return user if user.present?
+
+          create!(params)
+        end
       end
     end
   end

data/app/repositories/apple_repository.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AppleRepository < Ibrain::BaseRepository
   def initialize(record, params)
     super(nil, record)
@@ -5,4 +7,4 @@ class AppleRepository < Ibrain::BaseRepository
     @params = params
     @collection = Ibrain.user_class
   end
-end
+end

data/app/repositories/auth_repository.rb

@@ -11,7 +11,7 @@ class AuthRepository < Ibrain::BaseRepository
   end
 
   def create
-    user = is_sso? ? sso_verify : collection.ibrain_find(manual_params, available_columns)
+    user = is_social? ? firebase_verify : collection.ibrain_find(manual_params, available_columns)
     user.assign_attributes(normalize_params.except(:id_token))
     user.save
 
@@ -19,7 +19,7 @@ class AuthRepository < Ibrain::BaseRepository
   end
 
   def sign_in
-    return sso_verify if is_sso?
+    return firebase_verify if is_social?
 
     user = collection.ibrain_find(manual_params, available_columns)
     return unless user.try(:valid_password?, manual_params[:password])
@@ -57,21 +57,31 @@ class AuthRepository < Ibrain::BaseRepository
     params.permit(:username, :password)
   end
 
-  def sso_verify
+  def firebase_verify
     response = HTTParty.post(firebase_url, headers: base_headers, body: { 'idToken' => normalize_params[:id_token] }.to_json )
     user_information = response.try(:fetch, 'users', []).try(:at, 0)
 
     uid = user_information.try(:fetch, 'localId', nil)
+    provider = user_information.
+      try(:fetch, 'providerUserInfo', []).
+      try(:at, 0).try(:fetch, 'providerId', '').
+      try(:gsub, '.com', '')
     raise ActiveRecord::RecordNotFound, I18n.t('ibrain.errors.account.not_found') if uid.blank?
 
-    collection.find_by(uid: uid)
+    collection.social_find_or_initialize({
+      uid: uid,
+      provider: provider,
+      remote_avatar_url: user_information.try(:fetch, 'photoUrl', nil),
+      email: user_information.try(:fetch, 'email', nil),
+      password: 'Eco@123456'
+    })
   end
 
   def available_columns
     collection.column_names.select { |f| ACCOUNT_COUMNS.include?(f) }
   end
 
-  def is_sso?
+  def is_social?
     normalize_params[:id_token].present?
   end
 

data/app/repositories/twitter_repository.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TwitterRepository < Ibrain::BaseRepository
   def initialize(record, params)
     super(nil, record)
@@ -5,4 +7,4 @@ class TwitterRepository < Ibrain::BaseRepository
     @params = params
     @collection = Ibrain.user_class
   end
-end
+end

data/lib/generators/ibrain/auth/install/install_generator.rb

@@ -18,7 +18,7 @@ module Ibrain
         template 'config/initializers/devise.rb.tt', 'config/initializers/devise.rb', { skip: true }
         template 'config/initializers/ibrain_auth.rb.tt', 'config/initializers/ibrain_auth.rb', { skip: true }
         template 'config/initializers/ibrain_jwt.rb.tt', 'config/initializers/ibrain_jwt.rb', { skip: true }
-        
+
         if options[:with_social]
           template 'config/initializers/omniauth.rb.tt', 'config/initializers/omniauth.rb', { skip: true }
         end

data/lib/ibrain/auth/version.rb

@@ -4,14 +4,14 @@ module Ibrain
   # frozen_string_literal: true
 
   module Auth
-    VERSION = '0.2.4'
+    VERSION = '0.2.6'
 
     def self.ibrain_auth_version
       VERSION
     end
 
     def self.previous_ibrain_auth_minor_version
-      '0.2.3'
+      '0.2.5'
     end
 
     def self.ibrain_auth_gem_version

data/lib/ibrain/auth_configuration.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../../app/graphql/ibrain/auth/types/input/sign_in_input.rb'
-require_relative '../../app/graphql/ibrain/auth/types/input/sign_up_input.rb'
-
 module Ibrain
   class AuthConfiguration < Preferences::Configuration
     preference :api_version, :string, default: 'v1'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: ibrain-auth
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Tai Nguyen Van
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-05 00:00:00.000000000 Z
+date: 2022-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: devise-encryptable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: devise-encryptable
+  name: devise-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: devise-i18n
+  name: devise-jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: devise-jwt
+  name: ibrain-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ibrain-core
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: warden-jwt_auth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-twitter
+  name: omniauth-apple
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-line
+  name: omniauth-facebook
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-facebook
+  name: omniauth-google-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-google-oauth2
+  name: omniauth-line
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-apple
+  name: omniauth-twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -197,8 +197,7 @@ files:
 - app/graphql/ibrain/auth/mutations/sign_in_mutation.rb
 - app/graphql/ibrain/auth/mutations/sign_out_mutation.rb
 - app/graphql/ibrain/auth/mutations/sign_up_mutation.rb
-- app/graphql/ibrain/auth/mutations/sso_sign_in_mutation.rb
-- app/graphql/ibrain/auth/mutations/sso_sign_up_mutation.rb
+- app/graphql/ibrain/auth/mutations/social_sign_in_mutation.rb
 - app/graphql/ibrain/auth/types/input/sign_in_input.rb
 - app/graphql/ibrain/auth/types/input/sign_up_input.rb
 - app/models/ibrain/auth/user.rb
@@ -246,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.20
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Its Auth is an sso authen gem for Ruby on Rails.

data/app/graphql/ibrain/auth/mutations/sso_sign_up_mutation.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-module Ibrain::Auth::Mutations
-  class SsoSignUpMutation < BaseMutation
-    field :user, Types::Objects::UserType, null: true
-    field :token, String, null: true
-    field :result, Boolean, null: true
-
-    argument :id_token, String, description: 'Id Token from SSO', required: true
-    argument :user, Ibrain::Auth::Config.sign_up_input, required: true
-    argument :device_token, String, description: 'Device token for notificaiton', required: false
-
-    def resolve(args)
-      # TODO: define logic inside repository
-      repo = ::AuthRepository.new(nil, normalize_params(args))
-      user = repo.sign_up
-
-      return OpenStruct.new({ user: nil, token: nil, result: false, is_verified: false }) if user.blank?
-
-      sign_in(resource_name, user)
-      @current_user = warden.authenticate!(auth_options)
-
-      warden.set_user(current_user)
-      current_user.jwt_token, jti = auth_headers(request, user)
-
-      current_user.jti = jti
-      current_user.save!
-
-      if args[:device_token].present?
-        device_token = current_user.device_tokens.find_by(token: args[:device_token])
-
-        current_user.device_tokens.create!({ token: args[:device_token] }) if device_token.blank?
-      end
-
-      context[:current_user] = current_user
-
-      OpenStruct.new(
-        user: user_signed_in? ? current_user : nil,
-        token: current_user.try(:jwt_token),
-        result: user_signed_in?,
-        is_verified: true
-      )
-    end
-
-    private
-
-    def normalize_params(args)
-      ActionController::Parameters.new(args.as_json)
-    rescue StandardError
-      ActionController::Parameters.new({})
-    end
-
-    def auth_options
-      { scope: resource_name }
-    end
-  end
-end