rails_auth 1.0.5 → 1.0.6

data/app/controllers/concerns/rails_auth_controller.rb

@@ -9,14 +9,16 @@ module RailsAuthController
     @current_user ||= login_from_session
   end
 
-  def logout
-    session.delete(:user_id)
-    @current_user = nil
-  end
-
-  def require_login_from_session
+  def require_login_from_session(js_template: RailsAuth::Engine.root + 'app/views/auth/login/new.js.erb')
     return if login_from_session
 
+    if request.xhr?
+      @local = false
+      render file: js_template and return
+    else
+      @local = true
+    end
+
     store_location
     if params[:form_id]
       redirect_to login_url(form_id: params[:form_id], login: params[:login])
@@ -29,18 +31,32 @@ module RailsAuthController
     @current_user ||= User.find_by(id: session[:user_id]) if session[:user_id]
   end
 
+  def login_as(user)
+    session[:user_id] = user.id
+    user.update(last_login_at: Time.now)
+
+    logger.debug "Login as User #{user.id}"
+
+    @current_user = user
+  end
+
+  def logout
+    session.delete(:user_id)
+    @current_user = nil
+  end
+
   def store_location(path = nil)
     path = path || request.fullpath
-    if ['rails_auth_web/login', 'rails_auth_web/password'].include? request.params['controller']
-      session[:return_to] = root_url
+    if RailsAuth.config.ignore_return_paths.include? controller_path
+      session[:return_to] = RailsAuth.config.default_return_path
     else
       session[:return_to] = path
     end
   end
 
-  def redirect_back_or_default(default = root_url)
-    redirect_to session[:return_to] || default
+  def redirect_back_or_default(default = RailsAuth.config.default_return_path, **options)
+    redirect_to session[:return_to] || default, **options
     session[:return_to] = nil
   end
 
-end
+end

data/app/mailers/user_mailer.rb

@@ -2,14 +2,16 @@ class UserMailer < ApplicationMailer
 
   def password_reset(user_id)
     @user = User.find(user_id)
-    @user.get_reset_token
     mail(to: @user.email, subject: 'Reset Your Password')
   end
 
-  def email_confirm(user_id)
-    @user = User.find(user_id)
-    @user.get_confirm_token
-    mail(to: @user.email, subject: 'Check Your Email')
+  def email_confirm(email)
+    mail(to: email, subject: 'Check Your Email')
+  end
+
+  def email_token(email, token)
+    @token = token
+    mail(to: email, subject: 'Check Your Email')
   end
 
-end
+end

data/app/models/concerns/jwt_helper.rb

@@ -0,0 +1,32 @@
+require 'jwt'
+module JwtHelper
+  extend self
+
+  # 模型需要定义属性
+  # iss(issuer) 比如鉴权唯一标识 id,  AppID
+  # key 比如 password_digest, AppSecret
+  # sub: 'auth'
+  # exp: auth_token_expired_at, should be int
+  # algorithm: 默认HS256
+  def generate_jwt_token(iss, key, options = {})
+    payload = {
+      iss: iss,
+    }
+
+    payload.merge! options
+
+    JWT.encode(payload, key.to_s)
+  end
+
+  def decode_without_verification(token)
+    begin
+      payload, _ = JWT.decode(token, nil, false, verify_expiration: false)
+      payload
+    rescue => e
+      puts nil, e.full_message(highlight: true, order: :top)
+    end
+  end
+
+end
+
+

data/app/models/concerns/rails_auth_user.rb

@@ -0,0 +1,174 @@
+##
+# include this module to your User model
+#   class User < ApplicationRecord
+#     include RailsAuthUser
+#   end
+module RailsAuthUser
+  extend ActiveSupport::Concern
+
+  included do
+    include ActiveModel::SecurePassword
+    has_secure_password validations: false
+
+    validates :email, uniqueness: true, if: -> { email.present? && email_changed? }
+    validates :email, presence: true, if: -> { mobile.blank? }
+    validates :mobile, uniqueness: true, if: -> { mobile.present? && mobile_changed? }
+    validates :mobile, presence: true, if: -> { email.blank? }
+    validates :password, confirmation: true, length: { in: 6..72 }, allow_blank: true
+
+    has_one  :unlock_token, -> { valid }
+    has_many :unlock_tokens, dependent: :delete_all
+
+    has_one  :reset_token, -> { valid }
+    has_many :reset_tokens, dependent: :delete_all
+
+    has_one  :mobile_token, -> { valid }
+    has_many :mobile_tokens, dependent: :delete_all
+
+    has_one  :email_token, -> { valid }
+    has_many :email_tokens, dependent: :delete_all
+
+    has_one  :access_token, -> { valid }
+    has_many :access_tokens, dependent: :delete_all
+
+    has_many :verify_tokens, autosave: true, dependent: :delete_all
+    has_many :oauth_users, dependent: :nullify
+
+    has_one_attached :avatar
+
+    before_save :invalid_access_token, if: -> { password_digest_changed? }
+  end
+
+  def access_token
+    if super
+      super
+    else
+      VerifyToken.transaction do
+        self.access_tokens.delete_all
+        create_access_token
+      end
+    end
+  end
+
+  def auth_token
+    access_token.token
+  end
+
+  def reset_token
+    if super
+      super
+    else
+      VerifyToken.transaction do
+        self.reset_tokens.delete_all
+        create_reset_token
+      end
+    end
+  end
+
+  def unlock_token
+    if super
+      super
+    else
+      VerifyToken.transaction do
+        self.unlock_tokens.delete_all
+        create_unlock_token
+      end
+    end
+  end
+
+  def mobile_token
+    if super
+      super
+    else
+      VerifyToken.transaction do
+        self.mobile_tokens.delete_all
+        create_mobile_token
+      end
+    end
+  end
+
+  def email_token
+    if super
+      super
+    else
+      VerifyToken.transaction do
+        self.email_tokens.delete_all
+        create_email_token
+      end
+    end
+  end
+
+  def join(params = {})
+    self.assign_attributes params.slice(
+      :name,
+      :email,
+      :mobile,
+      :password,
+      :password_confirmation
+    )
+    save
+  end
+
+  ##
+  # pass login params to this method;
+  def can_login?(params)
+    if verified_status?
+      return false
+    end
+
+    if password_digest? && params[:password].present?
+      if authenticate(params[:password])
+        self
+      else
+        errors.add :base, :wrong_name_or_password
+        return false
+      end
+    elsif params[:token].present?
+      if authenticate_by_token(params[:token])
+        self
+      else
+        errors.add :base, :wrong_token
+        return false
+      end
+    else
+      errors.add :base, :token_blank
+      false
+    end
+  end
+
+  def verified_status?
+    if self.disabled?
+      errors.add :base, :account_disable
+      true
+    else
+      false
+    end
+  end
+
+  def authenticate_by_token(token)
+    mobile_token = self.mobile_tokens.valid.find_by(token: token)
+    if mobile_token
+      self.update(mobile_confirmed: true)
+    else
+      false
+    end
+  end
+
+  def avatar_url
+    avatar.service_url if avatar.attachment.present?
+  end
+
+  def oauth_providers
+    OauthUser.options_i18n(:provider).values.map(&:to_s) - oauth_users.pluck(:provider).compact
+  end
+
+  def invalid_access_token
+    self.access_tokens.delete_all
+  end
+
+  def generate_auth_token(**options)
+    JwtHelper.generate_jwt_token(id, password_digest, options)
+  end
+
+end
+

data/app/models/concerns/verify_helper.rb

@@ -0,0 +1,35 @@
+# extend self::
+#   this module extended self
+#
+module VerifyHelper
+  extend self
+
+  def mobile_user(params = {})
+    @user = User.find_or_initialize_by(mobile: params[:mobile])
+    if @user.persisted?
+      @mobile_token = @user.mobile_tokens.valid.find_by(token: params[:token])
+    else
+      @mobile_token = MobileToken.valid.find_by(token: params[:token], account: params[:mobile])
+      @user = @mobile_token.build_user(mobile: params[:mobile]) if @mobile_token
+    end
+
+    if @mobile_token
+      @user.mobile_confirm = true
+      @mobile_token.increment! :access_counter
+    end
+    @user
+  end
+
+  def mobile_reset_user(params = {})
+    @user = User.find_by(mobile: params[:mobile])
+    if @user
+      @mobile_token = @user.mobile_tokens.valid.find_by(token: params[:token])
+      return true if @mobile_token
+    else
+      false
+    end
+  end
+
+end
+
+

data/app/models/rails_auth/oauth_user.rb

@@ -1,15 +1,10 @@
 class OauthUser < ApplicationRecord
   attribute :refresh_token, :string
-  belongs_to :user, autosave: true
+  belongs_to :user, autosave: true, optional: true
   validates :provider, presence: true
   validates :uid, presence: true, uniqueness: { scope: :provider }
-
-  def init_user
-    unless user
-      _user = self.build_user
-      _user.name = self.name
-    end
-  end
+  has_one :same_user, -> (o){ where.not(id: o.id, unionid: nil) }, class_name: self.name, foreign_key: :unionid, primary_key: :unionid
+  has_many :same_users, -> (o){ where.not(id: o.id, unionid: nil) }, class_name: self.name, foreign_key: :unionid, primary_key: :unionid
 
   def save_info(info_params)
   end
@@ -24,4 +19,4 @@ class OauthUser < ApplicationRecord
     token.refresh!
   end
 
-end
+end unless RailsAuth.config.disabled_models.include?('OauthUser')

data/app/models/rails_auth/oauth_users/developer_user.rb

@@ -0,0 +1,8 @@
+class DeveloperUser < OauthUser
+  attribute :provider, :string, default: 'developer'
+
+  def save_info(oauth_params)
+
+  end
+
+end unless RailsAuth.config.disabled_models.include?('DeveloperUser')

data/app/models/rails_auth/verify_token.rb

@@ -1,7 +1,11 @@
+# Deal with token
+#
+# 用于处理Token
 class VerifyToken < ApplicationRecord
   belongs_to :user, optional: true
 
   scope :valid, -> { where('expired_at >= ?', Time.now).order(access_counter: :asc) }
+  validates :token, uniqueness: { scope: :account }
 
   def update_token
     self.token = SecureRandom.uuid
@@ -18,8 +22,4 @@ class VerifyToken < ApplicationRecord
     true
   end
 
-  def clear_token!
-    self.destroy
-  end
-
-end
+end unless RailsAuth.config.disabled_models.include?('OauthUser')

data/app/models/rails_auth/verify_tokens/access_token.rb

@@ -1,3 +1,9 @@
+##
+# Usually used for access api request
+#--
+# this not docs
+#++
+# test
 class AccessToken < VerifyToken
   before_create :update_token
 
@@ -6,4 +12,4 @@ class AccessToken < VerifyToken
     self.token = user.generate_auth_token(sub: 'auth', exp: expired_at.to_i)
   end
 
-end
+end unless RailsAuth.config.disabled_models.include?('AccessToken')

data/app/models/rails_auth/verify_tokens/email_token.rb

@@ -1,4 +1,11 @@
 class EmailToken < VerifyToken
+  validates :account, presence: true
+
+  after_initialize do
+    if self.user
+      self.account = self.user.email
+    end
+  end
   before_create :update_token
 
   def update_token
@@ -6,17 +13,17 @@ class EmailToken < VerifyToken
     self.expired_at = 10.minutes.since
   end
 
-  def auth_code_message
-    str = "验证码：#{auth_code}，请完成验证（如非本人操作，请忽略本短信）"
-    URI.encode(str)
-  end
-
   def verify_token?
     user.update(email_confirm: true)
   end
 
+  def send_email
+    UserMailer.email_token(self.account, self.token).deliver_later
+  end
+
   def save_with_send
     save
+    send_email
   end
 
-end
+end unless RailsAuth.config.disabled_models.include?('EmailToken')

data/app/models/rails_auth/verify_tokens/mobile_token.rb

@@ -13,17 +13,17 @@ class MobileToken < VerifyToken
     self.expired_at = 10.minutes.since
   end
 
-  def auth_code_message
-    str = "验证码：#{auth_code}，请完成验证（如非本人操作，请忽略本短信）"
-    URI.encode(str)
-  end
-
   def verify_token?
     user.update(mobile_confirm: true)
   end
 
+  def send_sms
+    puts 'sends sms here'
+  end
+
   def save_with_send
     save
+    send_sms
   end
 
-end
+end unless RailsAuth.config.disabled_models.include?('MobileToken')