ibrain-auth 0.1.8 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15dfe6736f21d1568b1c1f3b53403c996c6cc8682eddbf16fca744add91c18a0
-  data.tar.gz: 97e95785738830c2517ac34431a85d6dd8d70ca706fcdb8b4dc38e1ebedde3b3
+  metadata.gz: d25f3bfd1d29801c8b5673f6103149f6202d21d522a1b65175ebf9f59334fb58
+  data.tar.gz: 0a8f9c8c3cd38bcb6a72a329f421e5c291f0d7db7cf020b253928c9427ca9c81
 SHA512:
-  metadata.gz: ee792f65779bdf83b8a681d41295d2df04c5618195c57a0b9410373769504cb407f8d6c7a3c1452fbe95da729b0956659746ec42c876cab886f6769335a0cc4f
-  data.tar.gz: 5888a9f6b84227b8189f4157569128ea56a6d5e209f88c123849f3516024cdb6a0e3777a565b7262020290252b4778eb9a5a9e76a340b9ff84689c578e5e9780
+  metadata.gz: 7dac3e301b88e1e368e2f346e79fb10a74f15fd36170172a2324f14181c981a67faa6205363271dcd5146049d63b1d8eef36e640523cfb7ee397e8c2f88c21a9
+  data.tar.gz: 40a6744264df1133f5ce8efdd0f16f39938f9c22aa7a28e6cbed35ed6a713d9d55620a416fadbd41a4dbc287a0776ca60b28fb607f1583c67584868723eff5f3

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

@@ -6,8 +6,8 @@ module Ibrain::Auth::Mutations
     field :token, String, null: true
     field :result, Boolean, null: true
 
-    argument :username, String, description: 'Username', required: true
-    argument :password, String, description: 'Password', required: true
+    argument :auth, Ibrain::Auth::Config.sign_in_input, required: true
+    argument :device_token, String, description: 'Device token for notification', required: false
 
     def resolve(args)
       # TODO: define logic inside repository
@@ -25,6 +25,12 @@ module Ibrain::Auth::Mutations
       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(

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

@@ -8,6 +8,8 @@ module Ibrain::Auth::Mutations
       current_user.jti = nil
       sign_out if current_user.save
 
+      current_user.device_tokens.delete_all unless user_signed_in?
+
       OpenStruct.new(result: !user_signed_in?)
     end
   end

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Ibrain::Auth::Mutations
+  class SignUpMutation < BaseMutation
+    field :user, Types::Objects::UserType, null: true
+    field :token, String, null: true
+    field :result, Boolean, null: 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({ auth: args })
+    end
+
+    def auth_options
+      { scope: resource_name }
+    end
+  end
+end

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

@@ -5,15 +5,17 @@ module Ibrain::Auth::Mutations
     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 :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_in
 
-      raise ActionController::InvalidAuthenticityToken, I18n.t('ibrain.errors.account.incorrect') if user.blank?
+      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)
@@ -24,12 +26,19 @@ module Ibrain::Auth::Mutations
       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?
+        result: user_signed_in?,
+        is_verified: true
       )
     end
 

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

@@ -0,0 +1,55 @@
+# 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({ auth: args })
+    end
+
+    def auth_options
+      { scope: resource_name }
+    end
+  end
+end

data/app/graphql/ibrain/auth/types/input/sign_in_input.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Ibrain
+  module Auth
+    module Types
+      module Input
+        class SignInInput < Ibrain::Types::BaseInputObject
+          argument :username, String, required: true
+          argument :password, String, required: true
+        end
+      end
+    end
+  end
+end

data/app/graphql/ibrain/auth/types/input/sign_up_input.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Ibrain
+  module Auth
+    module Types
+      module Input
+        class SignUpInput < Ibrain::Types::BaseInputObject
+          argument :first_name, String, required: false
+          argument :last_name, String, required: false
+          argument :email, String, required: false
+          argument :phone, String, required: false
+          argument :job_id, ID, required: false
+          argument :address, String, required: false
+        end
+      end
+    end
+  end
+end

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

@@ -17,7 +17,7 @@ module Ibrain
         # for hasura
         hasura_keys = {
             'https://hasura.io/jwt/claims': {
-            'x-hasura-allowed-roles': User.roles.keys,
+            'x-hasura-allowed-roles': Ibrain.user_class.roles.keys,
             'x-hasura-default-role': role,
             'x-hasura-user-id': id.to_s
           }

data/app/repositories/auth_repository.rb

@@ -12,15 +12,16 @@ class AuthRepository < Ibrain::BaseRepository
 
   def create
     user = is_sso? ? sso_verify : collection.ibrain_find(manual_params, available_columns)
-    user.assign_attributes(normalize_params)
+    user.assign_attributes(normalize_params.except(:id_token))
     user.save
 
     user
   end
 
   def sign_in
-    user = is_sso? ? sso_verify : collection.ibrain_find(manual_params, available_columns)
+    return sso_verify if is_sso?
 
+    user = collection.ibrain_find(manual_params, available_columns)
     return unless user.try(:valid_password?, manual_params[:password])
 
     user
@@ -49,7 +50,7 @@ class AuthRepository < Ibrain::BaseRepository
   end
 
   def normalize_params
-    params.require(:auth).permit(:id_token)
+    params.require(:auth).permit(permitted_attributes)
   end
 
   def manual_params
@@ -57,10 +58,11 @@ class AuthRepository < Ibrain::BaseRepository
   end
 
   def sso_verify
-    response = HTTParty.post(url, headers: base_headers, body: { 'idToken' => normalize_params[:id_token] }.to_json )
-    uid = response.try(:fetch, 'users', []).try(:at, 0).try(:fetch, 'localId', nil)
+    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)
 
-    raise ActiveRecord::NotFound, I18n.t('ibrain.errors.account.not_found') if uid.blank?
+    uid = user_information.try(:fetch, 'localId', nil)
+    raise ActiveRecord::RecordNotFound, I18n.t('ibrain.errors.account.not_found') if uid.blank?
 
     collection.find_by(uid: uid)
   end
@@ -72,4 +74,17 @@ class AuthRepository < Ibrain::BaseRepository
   def is_sso?
     normalize_params[:id_token].present?
   end
+
+  def permitted_attributes
+    Ibrain.user_class.permitted_attributes.reject { |k| permintted_columns.include?(k) }.map(&:to_sym).concat([:id_token])
+  end
+
+  def permintted_columns
+    %w[
+      reset_password_token reset_password_sent_at
+      remember_created_at sign_in_count uid jti
+      current_sign_in_at last_sign_in_at current_sign_in_ip
+      last_sign_in_ip role encrypted_password
+    ]
+  end
 end

data/lib/generators/ibrain/auth/install/templates/config/initializers/ibrain_auth.rb.tt

@@ -10,4 +10,10 @@ Ibrain::Auth.config do |config|
 
   # Set user table name for rails ORM
   config.user_table_name = 'ibrain_users'
+
+  # sign_up graphql input
+  config.sign_up_input = Ibrain::Auth::Types::Input::SignUpInput
+
+  # sign_in graphql input
+  config.sign_up_input = Ibrain::Auth::Types::Input::SignInInput
 end

data/lib/ibrain/auth/version.rb

@@ -4,14 +4,14 @@ module Ibrain
   # frozen_string_literal: true
 
   module Auth
-    VERSION = '0.1.8'
+    VERSION = '0.2.1'
 
     def self.ibrain_auth_version
       VERSION
     end
 
     def self.previous_ibrain_auth_minor_version
-      '0.1.7'
+      '0.1.0'
     end
 
     def self.ibrain_auth_gem_version

data/lib/ibrain/auth_configuration.rb

@@ -11,5 +11,11 @@ module Ibrain
 
     # JWT user table name
     preference :user_table_name, :string, default: 'ibrain_users'
+
+    # sign_up input
+    preference :sign_up_input, :class, default: Ibrain::Auth::Types::Input::SignUpInput
+
+    # sign_in input
+    preference :sign_in_input, :class, default: Ibrain::Auth::Types::Input::SignInInput
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibrain-auth
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.1
 platform: ruby
 authors:
 - Tai Nguyen Van
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2022-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +132,11 @@ files:
 - app/graphql/ibrain/auth/mutations/base_mutation.rb
 - 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/types/input/sign_in_input.rb
+- app/graphql/ibrain/auth/types/input/sign_up_input.rb
 - app/models/ibrain/auth/user.rb
 - app/repositories/auth_repository.rb
 - config/initializers/devise.rb