ibrain-auth 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d25f3bfd1d29801c8b5673f6103149f6202d21d522a1b65175ebf9f59334fb58
-  data.tar.gz: 0a8f9c8c3cd38bcb6a72a329f421e5c291f0d7db7cf020b253928c9427ca9c81
+  metadata.gz: fbd79a8f9a3704ee91db11e78b78894991b517d86956a8787b1b494ed8b0c21b
+  data.tar.gz: a781b4afeda9073308eff768fa8fe9401dd14670c019a8b7ee5fc5ba36b796b5
 SHA512:
-  metadata.gz: 7dac3e301b88e1e368e2f346e79fb10a74f15fd36170172a2324f14181c981a67faa6205363271dcd5146049d63b1d8eef36e640523cfb7ee397e8c2f88c21a9
-  data.tar.gz: 40a6744264df1133f5ce8efdd0f16f39938f9c22aa7a28e6cbed35ed6a713d9d55620a416fadbd41a4dbc287a0776ca60b28fb607f1583c67584868723eff5f3
+  metadata.gz: 87a2246dc66f90bdba08265ca39e2d496c404ddeea69751dcd6a9d8ca30d1bc94938ad427fc5e1ab680b395f8385695fa7d481f1a484364d20f53950037699f5
+  data.tar.gz: eca7f37db46b319ccb3d31857739597b0a4685938197401bb9f272d93dff9d1b14d6b41781d37a89eb20c01bda5347574006169202247910833a9974d5f386f0

data/app/controllers/ibrain/auth/sessions_controller.rb

@@ -41,4 +41,16 @@ class Ibrain::Auth::SessionsController < Devise::SessionsController
   def repo
     AuthRepository.new(resource, params)
   end
+
+  def twitter_repo
+    TwitterRepository.new(resource, request.env['omniauth.auth'])
+  end
+
+  def apple_repo
+    AppleRepository.new(resource, request.env['omniauth.auth'])
+  end
+
+  def line_repo
+    LineRepository.new(resource, request.env['omniauth.auth'])
+  end
 end

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

@@ -11,6 +11,13 @@ module Ibrain::Auth::Mutations
 
     helper_method(*helpers)
 
+    def ready?(args)
+      super(args)
+      
+      @auth_resource = load_resource
+      true
+    end
+
     # Override prefixes to consider the scoped view.
     # Notice we need to check for the request due to a bug in
     # Action Controller tests that forces _prefixes to be
@@ -28,6 +35,8 @@ module Ibrain::Auth::Mutations
 
     protected
 
+    attr_reader :auth_resource
+
     def auth_headers(headers, user, scope: nil, aud: nil)
       scope ||= Devise::Mapping.find_scope!(user)
       aud ||= headers[Warden::JWTAuth.config.aud_header]
@@ -198,6 +207,10 @@ module Ibrain::Auth::Mutations
       params.fetch(resource_name, {})
     end
 
+    def repo; end
+    def load_resource; end
+    def normalize_parameters; end
+
     ActiveSupport.run_load_hooks(:devise_controller, self)
   end
 end

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

@@ -6,48 +6,60 @@ module Ibrain::Auth::Mutations
     field :token, String, null: true
     field :result, Boolean, null: true
 
-    argument :auth, Ibrain::Auth::Config.sign_in_input, required: true
+    argument :attributes, 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
-      repo = ::AuthRepository.new(nil, normalize_params(args))
-      user = repo.sign_in
+    def resolve(_args)
+      raise ActionController::InvalidAuthenticityToken, I18n.t('ibrain.errors.account.incorrect') if auth_resource.blank?
 
-      raise ActionController::InvalidAuthenticityToken, I18n.t('ibrain.errors.account.incorrect') if user.blank?
-
-      sign_in(resource_name, user)
+      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!
 
-      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?
+      if params[:device_token].present?
+        device_token = current_user.device_tokens.find_by(token: params[:device_token])
+        current_user.device_tokens.create!({ token: params[: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?
+      graphql_returning(
+        user_signed_in?,
+        user_signed_in? ? current_user : nil,
+        current_user.try(:jwt_token)
       )
     end
 
     private
 
-    def normalize_params(args)
-      ActionController::Parameters.new({ auth: args })
+    def load_resource
+      repo.sign_in
+    end
+
+    def repo
+      ::AuthRepository.new(nil, normalize_parameters)
+    end
+
+    def normalize_parameters
+      attribute_params
+    rescue StandardError
+      ActionController::Parameters.new({})
     end
 
     def auth_options
       { scope: resource_name }
     end
+
+    def graphql_returning(result, user = nil, token = nil)
+      OpenStruct.new(
+        user: user,
+        token: token,
+        result: result
+      )
+    end
   end
 end

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

@@ -6,21 +6,18 @@ module Ibrain::Auth::Mutations
     field :token, String, null: true
     field :result, Boolean, null: true
 
-    argument :user, Ibrain::Auth::Config.sign_up_input, required: true
+    argument :attributes, 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 graphql_returning(false, 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)
+      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!
@@ -33,22 +30,41 @@ module Ibrain::Auth::Mutations
 
       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
+      graphql_returning(
+        user_signed_in?,
+        true,
+        user_signed_in? ? current_user : nil,
+        current_user.try(:jwt_token),
       )
     end
 
     private
 
-    def normalize_params(args)
-      ActionController::Parameters.new({ auth: args })
+    def load_resource
+      repo.sign_up
+    end
+
+    def repo
+      ::AuthRepository.new(nil, normalize_parameters)
+    end
+
+    def normalize_parameters
+      attribute_params
+    rescue StandardError
+      ActionController::Parameters.new({})
     end
 
     def auth_options
       { scope: resource_name }
     end
+
+    def graphql_returning(result, is_verified, user = nil, token = nil)
+      OpenStruct.new(
+        user: user,
+        token: token,
+        result: result,
+        is_verified: is_verified
+      )
+    end
   end
 end

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

@@ -45,7 +45,9 @@ module Ibrain::Auth::Mutations
     private
 
     def normalize_params(args)
-      ActionController::Parameters.new({ auth: args })
+      ActionController::Parameters.new(args.as_json)
+    rescue StandardError
+      ActionController::Parameters.new({})
     end
 
     def auth_options

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

@@ -45,7 +45,9 @@ module Ibrain::Auth::Mutations
     private
 
     def normalize_params(args)
-      ActionController::Parameters.new({ auth: args })
+      ActionController::Parameters.new(args.as_json)
+    rescue StandardError
+      ActionController::Parameters.new({})
     end
 
     def auth_options

data/app/repositories/apple_repository.rb

@@ -0,0 +1,8 @@
+class AppleRepository < Ibrain::BaseRepository
+  def initialize(record, params)
+    super(nil, record)
+
+    @params = params
+    @collection = Ibrain.user_class
+  end
+end

data/app/repositories/auth_repository.rb

@@ -50,11 +50,11 @@ class AuthRepository < Ibrain::BaseRepository
   end
 
   def normalize_params
-    params.require(:auth).permit(permitted_attributes)
+    params.permit(permitted_attributes)
   end
 
   def manual_params
-    params.require(:auth).permit(:username, :password)
+    params.permit(:username, :password)
   end
 
   def sso_verify
@@ -84,7 +84,7 @@ class AuthRepository < Ibrain::BaseRepository
       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
+      last_sign_in_ip role encrypted_password id_token
     ]
   end
 end

data/app/repositories/twitter_repository.rb

@@ -0,0 +1,8 @@
+class TwitterRepository < Ibrain::BaseRepository
+  def initialize(record, params)
+    super(nil, record)
+
+    @params = params
+    @collection = Ibrain.user_class
+  end
+end

data/config/routes.rb

@@ -3,7 +3,8 @@
 Ibrain::Core::Engine.routes.draw do
   devise_for :users, controllers: {
     sessions: "ibrain/auth/sessions",
-    registrations: "ibrain/auth/registrations"
+    registrations: "ibrain/auth/registrations",
+    callback: "ibrain/auth/sessions/callback"
     },
     path: "api/#{Ibrain::Config.api_version}/users",
     defaults: { format: :json }

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

@@ -6,6 +6,7 @@ module Ibrain
   module Auth
     class InstallGenerator < Rails::Generators::Base
       class_option :with_ridgepole, type: :boolean, default: true
+      class_option :with_social, type: :boolean, default: false
 
       def self.source_paths
         paths = superclass.source_paths
@@ -17,6 +18,10 @@ 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
 
         if options[:with_ridgepole]
           template 'db/schemas/users_schema.erb', 'db/schemas/users.schema', { skip: true }

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+Rails.application.config.middleware.use OmniAuth::Builder do
+  # For twitter authenticate
+  # provider :twitter, ENV['TWITTER_CLIENT_ID'], ENV['TWITTER_CLIENT_SECRET']
+
+  # For line authenticate
+  # provider :line, ENV['LINE_CLIENT_ID'], ENV['LINE_CLIENT_SECRET']
+
+  # For apple authenticate
+  # provider :apple, ENV['APPLE_CLIENT_ID'], ENV['APPLE_CLIENT_SECRET']
+end

data/lib/ibrain/auth/version.rb

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

data/lib/ibrain/auth.rb

@@ -3,6 +3,8 @@
 require 'devise'
 require 'devise-encryptable'
 require 'devise/jwt'
+require 'omniauth'
+require 'omniauth-twitter'
 require 'ibrain_core'
 
 require 'ibrain/auth/devise'

data/lib/ibrain/auth_configuration.rb

@@ -1,5 +1,8 @@
 # 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,119 +1,183 @@
 --- !ruby/object:Gem::Specification
 name: ibrain-auth
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.4
 platform: ruby
 authors:
 - Tai Nguyen Van
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-31 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: devise-encryptable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: devise-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: devise-jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ibrain-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   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: 6.1.4
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: omniauth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.4.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: omniauth-twitter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.4.1
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth
+  name: omniauth-line
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: omniauth-facebook
+  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: omniauth-google-oauth2
+  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: omniauth-apple
+  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: 2.0.4
+        version: '0'
 description: Its Auth is an sso authen gem for Ruby on Rails.
 email:
 - john@techfox.io
@@ -138,7 +202,9 @@ files:
 - 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/apple_repository.rb
 - app/repositories/auth_repository.rb
+- app/repositories/twitter_repository.rb
 - config/initializers/devise.rb
 - config/locales/en.yml
 - config/locales/jp.yml
@@ -148,6 +214,7 @@ files:
 - lib/generators/ibrain/auth/install/templates/config/initializers/devise.rb.tt
 - lib/generators/ibrain/auth/install/templates/config/initializers/ibrain_auth.rb.tt
 - lib/generators/ibrain/auth/install/templates/config/initializers/ibrain_jwt.rb.tt
+- lib/generators/ibrain/auth/install/templates/config/initializers/omniauth.rb.tt
 - lib/generators/ibrain/auth/install/templates/db/schemas/users_migrate.erb
 - lib/generators/ibrain/auth/install/templates/db/schemas/users_schema.erb
 - lib/ibrain/auth.rb
@@ -179,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.20
 signing_key:
 specification_version: 4
 summary: Its Auth is an sso authen gem for Ruby on Rails.