ibrain-auth 0.2.9 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f763692f6d5b704c1b30c50a104d61283df33633e4009f6cb39ec4d25113f893
-  data.tar.gz: 475275e8117238e9ff17b84917a8611a55d58e2da974d49d9dee0f24316a2d2c
+  metadata.gz: 206a4714c39ab84c1250cf3468ab4337548dc77691ae0a2d080e4ab6cbe5037d
+  data.tar.gz: 0aa8cbb121f80422c166cc8f3a6374b2f7b7c669d5b5bfc008de0aa47b5f2650
 SHA512:
-  metadata.gz: df00d71b19ba24ad523dbb7af3c29b63ac634376892b2ae3f098fbc1cd5b3924d6efcd8e992f91c5c83c7ce555e69ad3e54fba698360f5d0aaf38d522a744049
-  data.tar.gz: 19f4f1662d54348a57d9525cd3d03a757e82f467b2556e59cb7752df81e88a48fb638872f4b0a1dbff6579546b6e13f300e0e9619fb37854acd824a4787a417c
+  metadata.gz: c7aecfa2c1f02b07d341b16ce230816515be57bc0f542ace841c3df0719a29824de51854f205f229903b7a4bf0e49a9e1ad940fbd5f41cc63ace4d05ba2e099f
+  data.tar.gz: 923f20470aab2a1291d727d7d7dea26de9f78d494e1e72f516dfdc4593fd9affcac15f8559501bb8ce92fe795a6c5e7fcd28694062da0e8e0baf425b087106c1

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

@@ -14,6 +14,12 @@ class Ibrain::Auth::SessionsController < Devise::SessionsController
     super { |resource| @resource = resource }
   end
 
+  def callback
+    user = line_repo.find_or_initialize!
+
+    render_json_ok(user, nil)
+  end
+
   # GET /resource/sign_in
   # def new
   #   super
@@ -42,14 +48,6 @@ class Ibrain::Auth::SessionsController < Devise::SessionsController
     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

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

@@ -32,4 +32,4 @@ module Ibrain::Auth::Mutations
       )
     end
   end
-end
+end

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

@@ -10,4 +10,4 @@ module Ibrain
       end
     end
   end
-end
+end

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

@@ -11,6 +11,7 @@ module Ibrain
           argument :phone, String, required: false
           argument :job_id, ID, required: false
           argument :address, String, required: false
+          argument :password, String, required: false
         end
       end
     end

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

@@ -9,10 +9,14 @@ module Ibrain
 
       self.table_name = Ibrain::Auth::Config.user_table_name
 
-      devise :database_authenticatable, :registerable,
+      devise :database_authenticatable, :registerable, :confirmable,
              :recoverable, :validatable, :timeoutable,
              :jwt_authenticatable, jwt_revocation_strategy: self
 
+      scope :find_by_line, ->(uid) {
+        find_by(uid: uid, provider: 'line')
+      }
+
       def jwt_payload
         # for hasura
         hasura_keys = {
@@ -47,6 +51,14 @@ module Ibrain
 
           create!(params)
         end
+
+        def create_with_line!(params)
+          created!({
+            uid: params['uid'],
+            provider: 'line',
+            remote_avatar_url: params['info']['image']
+          })
+        end
       end
     end
   end

data/app/repositories/auth_repository.rb

@@ -11,9 +11,9 @@ class AuthRepository < Ibrain::BaseRepository
   end
 
   def create
-    user = is_social? ? firebase_verify : collection.ibrain_find(manual_params, available_columns)
+    user = collection.new(provider: 'manual')
     user.assign_attributes(normalize_params.except(:id_token))
-    user.save
+    user.save!
 
     user
   end
@@ -86,7 +86,7 @@ class AuthRepository < Ibrain::BaseRepository
   end
 
   def permitted_attributes
-    Ibrain.user_class.permitted_attributes.reject { |k| permintted_columns.include?(k) }.map(&:to_sym).concat([:id_token])
+    Ibrain.user_class.permitted_attributes.reject { |k| permintted_columns.include?(k) }.map(&:to_sym).concat([:id_token]).concat([:password])
   end
 
   def permintted_columns

data/app/repositories/firebase_repository.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 class FirebaseRepository < Ibrain::BaseRepository
-  def initialize(record, _params)
+  def initialize(record, params)
     super(nil, record)
 
     @private_key_json = File.open(Ibrain::Auth::Config.firebase_private_key_path).read
     @firebase_owner_email = Ibrain::Auth::Config.firebase_owner_email
+    @params = params
   end
 
   def generate_custom_token!
@@ -14,7 +15,7 @@ class FirebaseRepository < Ibrain::BaseRepository
     payload = {
       iss: firebase_owner_email,
       sub: firebase_owner_email,
-      aud: Ibrain::Auth::Config.firebase_aud_url,
+      aud: Ibrain::Auth::Config.firebase_auth_url,
       iat: now,
       exp: now + 3600,
       uid: params[:uid],
@@ -26,10 +27,7 @@ class FirebaseRepository < Ibrain::BaseRepository
 
   private
 
-  attr_reader :private_key_json, :firebase_owner_email
-
-  def method_name
-  end
+  attr_reader :private_key_json, :firebase_owner_email, :params
 
   def json_firebase
     JSON.parse(private_key_json, symbolize_names: true)
@@ -38,4 +36,4 @@ class FirebaseRepository < Ibrain::BaseRepository
   def private_key
     OpenSSL::PKey::RSA.new json_firebase[:private_key]
   end
-end
+end

data/app/repositories/line_repository.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class LineRepository < Ibrain::BaseRepository
+  def initialize(record, params)
+    super(nil, record)
+
+    @params = params
+    @collection = Ibrain.user_class
+  end
+
+  def find_or_initialize!
+    user = @collection.find_by_line(uid: params['uid'])
+
+    return user if user.present?
+
+    @collection.create_with_line!
+  end
+end

data/lib/ibrain/auth/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibrain-auth
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.2
 platform: ruby
 authors:
 - Tai Nguyen Van
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise-encryptable
@@ -203,10 +203,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/firebase_repository.rb
-- app/repositories/twitter_repository.rb
+- app/repositories/line_repository.rb
 - config/initializers/devise.rb
 - config/locales/en.yml
 - config/locales/jp.yml

data/app/repositories/apple_repository.rb

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

data/app/repositories/twitter_repository.rb

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