ibrain-auth 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 206a4714c39ab84c1250cf3468ab4337548dc77691ae0a2d080e4ab6cbe5037d
-  data.tar.gz: 0aa8cbb121f80422c166cc8f3a6374b2f7b7c669d5b5bfc008de0aa47b5f2650
+  metadata.gz: 2c770305135ae26248db7449d6aaa479a77e15c3935888096eb50eff4baf8284
+  data.tar.gz: d3193ce7139a9325aa51f3a4da3af93bee63ae057553a5b4dbb6eb940f2863e0
 SHA512:
-  metadata.gz: c7aecfa2c1f02b07d341b16ce230816515be57bc0f542ace841c3df0719a29824de51854f205f229903b7a4bf0e49a9e1ad940fbd5f41cc63ace4d05ba2e099f
-  data.tar.gz: 923f20470aab2a1291d727d7d7dea26de9f78d494e1e72f516dfdc4593fd9affcac15f8559501bb8ce92fe795a6c5e7fcd28694062da0e8e0baf425b087106c1
+  metadata.gz: 4f5861b311f1f4dd0e97d652b8f444215a28eac88445c3d0400140b15b1f83387061eee91031c42f1b2dc061360e914c2270debe237d85753b880cadddd4f384
+  data.tar.gz: 2391871bbe3b6bdfdefabd14b09f97e167fa1928818afa8ddfc3024e178d842529cade266f883b2dc7dae7c20a4270af588f9e189b885ee2559d43d26795917a

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

@@ -17,12 +17,12 @@ module Ibrain::Auth::Mutations
 
       return OpenStruct.new({ user: nil, token: nil, result: false, is_verified: false }) if user.blank?
 
+      auth_resource.skip_confirmation! unless auth_resource.try(:confirmed?)
       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!
 

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

@@ -30,6 +30,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 +57,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

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
-Ibrain::Core::Engine.routes.draw do
+Ibrain::Auth::Engine.routes.draw do
   devise_for :users, controllers: {
     sessions: "ibrain/auth/sessions",
     registrations: "ibrain/auth/registrations",
-    callback: "ibrain/auth/sessions/callback"
     },
     path: "api/#{Ibrain::Config.api_version}/users",
     defaults: { format: :json }
+
+  get "api/#{Ibrain::Config.api_version}/users/callback" => 'sessions#callback'
 end

data/lib/ibrain/auth/version.rb

@@ -4,14 +4,14 @@ module Ibrain
   # frozen_string_literal: true
 
   module Auth
-    VERSION = '0.3.2'
+    VERSION = '0.3.4'
 
     def self.ibrain_auth_version
       VERSION
     end
 
     def self.previous_ibrain_auth_minor_version
-      '0.3.1'
+      '0.3.2'
     end
 
     def self.ibrain_auth_gem_version

data/lib/ibrain/auth.rb

@@ -4,6 +4,10 @@ require 'devise'
 require 'devise-encryptable'
 require 'devise/jwt'
 require 'omniauth'
+require 'omniauth-facebook'
+require 'omniauth-google-oauth2'
+require 'omniauth-line'
+require 'omniauth-apple'
 require 'omniauth-twitter'
 require 'ibrain_core'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ibrain-auth
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Tai Nguyen Van
@@ -208,7 +208,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