ibrain-auth 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c08fcfe12771e9c3cdde0a63bc0250d51cd5c7f27f9b082d0d835867a8d52b6
-  data.tar.gz: a876783c23b3109877d3f4f9d8e88d004e053996ae3ea710910c37d00cda6b9b
+  metadata.gz: 131a35d1f5296b7ea35e0b3981136e836c2f0a7ad0fea72c9c2f3da8d0b7dc2a
+  data.tar.gz: cd4eb62df7abd2ed22446dea6c45560f0aeb3c7ae19275698e8b874203fa4a32
 SHA512:
-  metadata.gz: 141d5cc986c569da43a09c1621c3b17aba77d5906eb794c8edcb837f0796b7f678cd62c35dd2d87ba701808536c717949e8e313e770ca9658d1dc8d8d39d9756
-  data.tar.gz: 104b92ead3c2452fe1e891567712883c5832978c1dce0d931ad291b33289a579f56e9df67172d410c58a91799d0bb551d1d83032b0fbfc7842e598460fd203c6
+  metadata.gz: bf1cd065dcc63b70d4b78dbb1f6f7f0c780cfda32879cc71cadc158eabb27db19f60e6d9c9e7c88adb5666df0381d03b06700ab1715e666619a10f5409e47537
+  data.tar.gz: c31acc36e489945bc95028da8887cc7199a0c4b12caf22b3d8edbb1174a4de3962ec65e72d8a82a61f39b8c24541db2fe57ca609a44b29c2aff2c566772d9809

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

@@ -12,6 +12,11 @@ module Ibrain::Auth::Mutations
     def resolve(_args)
       raise ActionController::InvalidAuthenticityToken, I18n.t('ibrain.errors.account.incorrect') if auth_resource.blank?
 
+      if !auth_resource.try(:can_skip_confirmation?) && !auth_resource.try(:confirmed?)
+        raise ActionController::InvalidAuthenticityToken, I18n.t('ibrain.errors.account.not_verified')
+      end
+
+      auth_resource.skip_confirmation! unless auth_resource.try(:confirmed?)
       sign_in(resource_name, auth_resource)
       @current_user = warden.authenticate!(auth_options)
 

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

@@ -11,18 +11,14 @@ module Ibrain::Auth::Mutations
     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
+      return OpenStruct.new({ user: nil, token: nil, result: false, is_verified: false }) if auth_resource.blank?
 
-      return OpenStruct.new({ user: nil, token: nil, result: false, is_verified: false }) if user.blank?
-
-      sign_in(resource_name, user)
+      auth_resource.skip_confirmation! unless auth_resource.try(:confirmed?)
+      sign_in(resource_name, auth_resource)
       @current_user = warden.authenticate!(auth_options)
 
       warden.set_user(current_user)
-      current_user.jwt_token, jti = auth_headers(request, user)
-
+      current_user.jwt_token, jti = auth_headers(request, auth_resource)
       current_user.jti = jti
       current_user.save!
 
@@ -44,7 +40,7 @@ module Ibrain::Auth::Mutations
 
     private
 
-    def normalize_params(args)
+    def normalize_parameters(args)
       ActionController::Parameters.new(args.as_json)
     rescue StandardError
       ActionController::Parameters.new({})
@@ -53,5 +49,13 @@ module Ibrain::Auth::Mutations
     def auth_options
       { scope: resource_name }
     end
+
+    def repo
+      ::AuthRepository.new(nil, normalize_parameters)
+    end
+
+    def load_resource
+      repo.sign_in
+    end
   end
 end

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

@@ -6,7 +6,8 @@ module Ibrain
       attr_accessor :jwt_token
 
       include Devise::JWT::RevocationStrategies::JTIMatcher
-
+      
+      self.abstract_class = true
       self.table_name = Ibrain::Auth::Config.user_table_name
 
       devise :database_authenticatable, :registerable, :confirmable,
@@ -30,6 +31,10 @@ module Ibrain
         super.merge({ 'role' => role }, hasura_keys)
       end
 
+      def can_skip_confirmation?
+        try(:is_admin?) || email.blank?
+      end
+
       class << self
         def ibrain_find(params, available_columns)
           matched_value = params[:username] || params[:email]
@@ -53,11 +58,14 @@ module Ibrain
         end
 
         def create_with_line!(params)
-          created!({
+          user = created!({
             uid: params['uid'],
             provider: 'line',
             remote_avatar_url: params['info']['image']
           })
+
+          user.skip_confirmation! unless user&.confirmed?
+          user
         end
       end
     end

data/config/locales/en.yml

@@ -10,4 +10,5 @@ en:
         expired_session: The login session has expired.
       account:
         not_found: Account not found
-        incorrect: Username or Password is incorrect!
+        incorrect: Username or Password is incorrect!
+        not_verified: Please verify your account before login

data/config/locales/{jp.yml → ja.yml}

@@ -1,4 +1,4 @@
-jp:
+ja:
   ibrain:
     system:
       message:
@@ -10,4 +10,5 @@ jp:
         expired_session: ログインセッションが期限切れになりました。
       account:
         not_found: アカウントが見つかりません
-        incorrect: ユーザー名またはパスワードが正しくありません！
+        incorrect: ユーザー名またはパスワードが正しくありません！
+        not_verified: ログインする前にアカウントを確認してください

data/config/locales/vi.yml

@@ -10,4 +10,5 @@ vi:
         expired_session: Phiên đăng nhập đã hết hạn.
       account:
         not_found: Không tìm thấy tài khoản
-        incorrect: Tài khoản hoặc mật khẩu không chính xác!
+        incorrect: Tài khoản hoặc mật khẩu không chính xác!
+        not_verified: Vui lòng xác minh tài khoản của bạn trước khi đăng nhập

data/config/routes.rb

@@ -8,5 +8,5 @@ Ibrain::Auth::Engine.routes.draw do
     path: "api/#{Ibrain::Config.api_version}/users",
     defaults: { format: :json }
 
-  get "api/#{Ibrain::Config.api_version}/users/callback" => 'sessions#callback'
+  match "api/#{Ibrain::Config.api_version}/users/callback", to: 'sessions#callback', via: 'get'
 end

data/lib/ibrain/auth/version.rb

@@ -4,16 +4,12 @@ module Ibrain
   # frozen_string_literal: true
 
   module Auth
-    VERSION = '0.3.3'
+    VERSION = '0.3.5'
 
     def self.ibrain_auth_version
       VERSION
     end
 
-    def self.previous_ibrain_auth_minor_version
-      '0.3.2'
-    end
-
     def self.ibrain_auth_gem_version
       Gem::Version.new(ibrain_auth_version)
     end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ibrain-auth
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Tai Nguyen Van
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-17 00:00:00.000000000 Z
+date: 2022-11-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: devise-encryptable
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +222,7 @@ files:
 - app/repositories/line_repository.rb
 - config/initializers/devise.rb
 - config/locales/en.yml
-- config/locales/jp.yml
+- config/locales/ja.yml
 - config/locales/vi.yml
 - config/routes.rb
 - lib/generators/ibrain/auth/install/install_generator.rb