api_user_auth 0.0.14 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14ccd567f2514189726a4dd9d4423a00402ec75083d1f1a3c124ba125dfca47b
-  data.tar.gz: 8e9cc6376873cd8cd9a5cb52c53561938ce68e65af33b4bd50693c4b3affe3bf
+  metadata.gz: e03f4578b5a4c4526a3cf16ef4f5153f2b6ba53ac614f2152140188a75ed9511
+  data.tar.gz: fc2c4f7d22cfcf3966ae63b446a1f484c3ca3db6cd7e7f3743e00e8ce402f6c4
 SHA512:
-  metadata.gz: a00f3a899a3ee465711d869b2aa99f3b84b9cc1b8be8d890142f596b809972a50e77423e1d2c72a43deee141160741dc0066d4f3199e5cd5a7ee84cb52a0e8b7
-  data.tar.gz: 92b618e8ac88eb50e651031f2d7dcffbcee7f5afde785e1a1a7998d64469dcb829cf89e55b1c15738ac2c099f2ba2d418cca8f811d44e74e19444da0f4677ec7
+  metadata.gz: c7f7735446438b9825b2626bb747c450cab316438f748f5a8b63fc15b755110a6e8c72a00d86b742e2626b967c6867cfde622765e534ece03bf2a535874b157a
+  data.tar.gz: 3c32189bf9ecd93bfed90fa13e6eb278e77db613f58c6d7ded4c520a4d06db497790e172c5d66ce6b9cd5cba5a3a1edc14b9450ae3b938572350d682dd6a5321

data/app/controllers/api_user_auth/auth_controller.rb

@@ -50,6 +50,21 @@ module ApiUserAuth
       render json: auth_user.to_json
     end
 
+    def add_provider
+      if request.headers['Authorization'].blank?
+        raise Exceptions::Unauthorized,
+              'Header [Authorization] can not be blank!'
+      end
+      token = request.headers['Authorization'].sub(/Bearer\s*=?/, '')
+      auth_user = AuthUser.find_fy_token(token)
+      if auth_user.present?
+        auth_user.add_provider_login(params)
+        render json: {}, status: 200
+      else
+        render json: {}, status: 400
+      end
+    end
+
     private
 
     def base_params

data/app/models/api_user_auth/auth_user.rb

@@ -1,27 +1,16 @@
 module ApiUserAuth
   # Base user auth model
   class AuthUser < ApplicationRecord
+    include AuthUserHelper
+
     after_create :send_welcome
 
+    has_many :provider_tokens,
+             class_name: 'ApiUserAuth::ProviderToken'
+
     attr_accessor :is_new
 
-    def self.create_by_params(params)
-      if params[:email].blank?
-        raise Exceptions::WrongParams, 'Email can not be blank!'
-      end
-      if params[:password].blank?
-        raise Exceptions::WrongParams, 'Password can not be blank!'
-      end
-      auth_user = AuthUser.find_or_initialize_by(email: params[:email])
 
-      if auth_user.new_record?
-        auth_user.is_new = true
-        auth_user.update_password(params[:password])
-      else
-        raise Exceptions::WrongParams, 'User already exists !'
-      end
-      auth_user
-    end
 
     def self.login_by_params(params)
       if params[:email].blank?
@@ -104,14 +93,51 @@ module ApiUserAuth
                               'Wrong provider!'
                       end
 
-      auth_user = AuthUser.find_or_initialize_by(email: provider_data[:email])
-      auth_user.encrypted_password = params[:token]
-      auth_user.generate_token
-      auth_user.is_new = auth_user.new_record?
-      auth_user.user_provider_data = provider_data
-      auth_user.provider = params[:provider]
-      auth_user.save
-      auth_user
+      provider_token = ProviderToken.find_by_data(provider_data)
+
+      if provider_token.blank?
+        auth_user = AuthUser.find_or_initialize_by(email: provider_data[:email])
+        auth_user.encrypted_password = params[:token]
+        auth_user.generate_token
+        auth_user.is_new = auth_user.new_record?
+        auth_user.user_provider_data = provider_data
+        auth_user.provider = params[:provider]
+        auth_user.save
+        auth_user
+      else
+        provider_token.auth_user
+      end
+    end
+
+    def add_provider_login(params)
+      if params[:provider].blank?
+        raise Exceptions::WrongParams, 'Provider can not be blank!'
+      end
+      if params[:token].blank?
+        raise Exceptions::WrongParams, 'Token can not be blank!'
+      end
+
+      provider_data = case params[:provider]
+                      when /facebook/i
+                        Providers::Facebook.get_user(params[:token])
+                      when /google/i
+                        Providers::Google.get_user(params[:token])
+                      when /instagram/i
+                        Providers::Instagram.get_user(params[:token])
+                      else
+                        raise ::ApiUserAuth::Exceptions::ProviderError,
+                              'Wrong provider!'
+                      end
+
+      ProviderToken.create_by_data(provider_data, self)
+
+      # auth_user.encrypted_password = params[:token]
+      # auth_user.generate_token
+      # auth_user.is_new = auth_user.new_record?
+      # auth_user.user_provider_data = provider_data
+      # auth_user.provider = params[:provider]
+      # auth_user.save
+      # auth_user
     end
 
     def self.find_fy_token(token)

data/app/models/api_user_auth/provider_token.rb

@@ -0,0 +1,30 @@
+module ApiUserAuth
+  # Model for social provider registration
+  class ProviderToken < ApplicationRecord
+    belongs_to :auth_user,
+               class_name: 'ApiUserAuth::AuthUser'
+
+    enum provider: %I[facebook google instagram]
+
+    def self.find_by_data(data)
+      find_by(
+        provider: data[:provider],
+        user_id: data[:id]
+      )
+    end
+
+    def self.create_by_data(data, auth_user)
+      auth_user ||= create_auth_user(data)
+      auth_user.provider_tokens.create(
+        provider: data[:provider],
+        user_id: data[:id],
+        user_data: data
+      )
+    end
+
+    def self.create_auth_user(data)
+      email = data[:id] + '@' + data[:provider] + '.com'
+      AuthUser.create(email: email, password: SecureRandom.uuid)
+    end
+  end
+end

data/app/models/concerns/api_user_auth/auth_user_helper.rb

@@ -0,0 +1,39 @@
+module ApiUserAuth
+  # Auth user helper
+  module AuthUserHelper
+    extend ActiveSupport::Concern
+
+    # Class methods
+    module ClassMethods
+      def create_by_params(params)
+        email_exception if params[:email].blank?
+        password_exception if params[:password].blank?
+
+        auth_user = AuthUser.find_or_initialize_by(email: params[:email])
+
+        if auth_user.new_record?
+          auth_user.is_new = true
+          auth_user.update_password(params[:password])
+        else
+          user_exist_exception
+        end
+        auth_user
+      end
+
+      private
+
+      def email_exception
+        raise Exceptions::WrongParams, I18n.t('api_user_auth.errors.email')
+      end
+
+      def password_exception
+        raise Exceptions::WrongParams, I18n.t('api_user_auth.errors.password')
+      end
+
+      def user_exist_exception
+        raise Exceptions::WrongParams, I18n.t('api_user_auth.errors.user_exist')
+      end
+
+    end
+  end
+end

data/app/models/concerns/api_user_auth/providers_helper.rb

@@ -0,0 +1,10 @@
+module ApiUserAuth
+  # Registration by provider
+  module ProvidersHelper
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+
+    end
+  end
+end

data/config/locales/api_user_auth.en.yml

@@ -0,0 +1,6 @@
+en:
+  api_user_auth:
+    errors:
+      email: Email can not be blank!
+      password: Password can not be blank!
+      user_exist: User already exists !

data/config/locales/api_user_auth.ru.yml

@@ -0,0 +1,6 @@
+ru:
+  api_user_auth:
+    errors:
+      email: Email can not be blank!
+      password: Password can not be blank!
+      user_exist: User already exists !

data/config/routes.rb

@@ -3,6 +3,7 @@ ApiUserAuth::Engine.routes.draw do
     collection do
       post 'login', action: :login
       post 'provider', action: :provider
+      post 'add_provider', action: :add_provider
       patch 'forgot_password', action: :forgot_password
       patch 'password', action: :password
       post 'login', action: :login

data/db/migrate/20180726140712_create_api_user_auth_provider_tokens.rb

@@ -0,0 +1,12 @@
+class CreateApiUserAuthProviderTokens < ActiveRecord::Migration[5.2]
+  def change
+    create_table :api_user_auth_provider_tokens do |t|
+      t.references :auth_user, index: true
+      t.integer :provider
+      t.string :user_id, null: false
+      t.jsonb :user_data, default: {}
+
+      t.timestamps
+    end
+  end
+end

data/lib/api_user_auth/providers/facebook.rb

@@ -29,6 +29,7 @@ module ApiUserAuth
       def user_data
         {
           id: @data[:id], name: @data[:name], email: @data[:email],
+          provider: 'facebook',
           img_url: (@data[:picture] || {}).try(:[], :data).try(:[], :url),
           info: {
             birthday: @data[:birthday],

data/lib/api_user_auth/providers/google.rb

@@ -26,7 +26,7 @@ module ApiUserAuth
       def user_data
         {
           id: @data[:id], name: @data[:displayName],
-          email: @data[:emails].first.try(:[], :value),
+          email: @data[:emails].first.try(:[], :value), provider: 'google',
           img_url: (@data[:image] || {}).try(:[], :url),
           info: {
             birthday: @data[:birthday],

data/lib/api_user_auth/providers/instagram.rb

@@ -25,6 +25,7 @@ module ApiUserAuth
         {
           id: @data[:id], name: @data[:full_name],
           email: "#{@data[:username]}@instagram.com",
+          provider: 'instagram',
           img_url: @data[:profile_picture],
           info: {}
         }

data/lib/api_user_auth/version.rb

@@ -1,3 +1,3 @@
 module ApiUserAuth
-  VERSION = '0.0.14'.freeze
+  VERSION = '0.1.0'.freeze
 end

data/spec/controllers/api_user_auth/auth_controller_spec.rb

@@ -340,5 +340,7 @@ module ApiUserAuth
       end
 
     end
+
+    context
   end
 end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_07_03_111608) do
+ActiveRecord::Schema.define(version: 2018_07_26_140712) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
@@ -28,4 +28,14 @@ ActiveRecord::Schema.define(version: 2018_07_03_111608) do
     t.index ["email"], name: "index_api_user_auth_auth_users_on_email", unique: true
   end
 
+  create_table "api_user_auth_provider_tokens", force: :cascade do |t|
+    t.bigint "auth_user_id"
+    t.integer "provider"
+    t.string "user_id", null: false
+    t.jsonb "user_data", default: {}
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["auth_user_id"], name: "index_api_user_auth_provider_tokens_on_auth_user_id"
+  end
+
 end