tiny_passport 0.0.2 → 0.0.3

data/app/forms/tiny_passport/registration_form.rb

@@ -6,9 +6,11 @@ module TinyPassport
     include ::TinyPassport::AccountValidateAble
     include ::TinyPassport::AggrementTermAble
 
-    delegate :login_name, :login_name=, :created_ip, :created_ip=, :to => :account
-
-    attr_accessor :password, :password_confirmation, :login_email_value
+    attr_reader :password, :password_confirmation, :login_email_value,
+                :auto_login, :user_agent_value,
+                :login_record,
+                :login_name,
+                :created_ip
 
     # 取出用户名与邮箱的前后的空格
     self.support_strip_values!(:login_name, :login_email_value)
@@ -38,17 +40,8 @@ module TinyPassport
       @account ||= ::TinyPassport::Account.new
     end
 
-    def login_record
-      if self.account
-        return @login_record if defined?(@login_record)
-
-        ::ActiveRecord::Base.transaction do
-          @login_record ||= ::TinyPassport::LoginRecord.new
-          @login_record.account = self.account
-          @login_record.save!
-          @login_record
-        end
-      end
+    def auto_login?
+      [1, '1', true, 'true'].include?(self.auto_login)
     end
 
     def login_email
@@ -67,6 +60,7 @@ module TinyPassport
     #     :created_ip             当前的IP
     #     :captcha_key            验证码的KEY
     #     :captcha                验证码的值
+    #     :auto_login             自动登录  true/false  默认false
     #
     # Usage:
     #   form = ::TinyPassport::RegistrationForm.new
@@ -78,11 +72,14 @@ module TinyPassport
       self.submit_valid?(params) do
         if save_objects
           if self.login_email_required?
+            confirmation_token_form = ::TinyPassport::ConfirmationTokenForm.new
+
             # 为login_email发送验证码
-            self.email_send_service.send_confirmation_token_for_active(
+            confirmation_token_form.submit(
               :login_email_value => self.login_email.value,
-              :active_way => 'login_email'
+              :active_way        => 'login_email'
             )
+
           end
 
           @result = {
@@ -98,12 +95,14 @@ module TinyPassport
     end
 
     def submit_valid?(params={}, &block)
-      self.agreement_terms       = params[:agreement_terms]
-      self.login_name            = params[:login_name]
-      self.login_email_value     = params[:login_email_value]
-      self.password              = params[:password]
-      self.password_confirmation = params[:password_confirmation]
-      self.created_ip            = params[:created_ip]
+      @agreement_terms       = params[:agreement_terms]
+      @login_name            = params[:login_name]
+      @login_email_value     = params[:login_email_value]
+      @password              = params[:password]
+      @password_confirmation = params[:password_confirmation]
+      @created_ip            = params[:created_ip]
+      @user_agent_value      = params[:user_agent_value]
+      @auto_login            = params[:auto_login]
 
       # 验证码
       self.captcha_key = params[:captcha_key]
@@ -144,24 +143,36 @@ module TinyPassport
       end
     end
 
-    def email_send_service
-      @email_send_service ||= ::TinyPassport::EmailSendService.new
-    end
-
     private
 
     # 保存对象
     def save_objects
      ::ActiveRecord::Base.transaction do
-        self.account.register_way_key = 'basic'
-
-        if self.login_email_required?
-          self.login_email.account = self.account
-          self.login_email.save!
-        end
-
-        self.account.login_email = self.login_email
-        self.account.save!
+       self.account.register_way_key = 'basic'
+       self.account.login_name       = self.login_name
+       self.account.created_ip       = self.created_ip
+
+       if self.login_email_required?
+         self.login_email.account = self.account
+         self.login_email.save!
+       end
+
+       self.account.login_email = self.login_email
+       self.account.save!
+
+       if self.auto_login?
+         @login_record ||= ::TinyPassport::LoginRecord.new
+         @login_record.ip                  = self.created_ip
+         @login_record.last_remembered_ip  = self.created_ip
+         @login_record.remembered          = true
+         @login_record.user_agent_value    = self.user_agent_value
+         @login_record.way_key             = 'after_login_email_actived'
+         @login_record.account             = self.account
+
+         @login_record.save!
+       end
+
+       true
      end
     rescue
       self.errors.add :base, :service_error

data/app/forms/tiny_passport/remember_token_auth_form.rb

@@ -4,7 +4,7 @@ module TinyPassport
     include ::TinyPassport::Formable
 
     attr_reader :login_record
-    attr_accessor :remember_token
+    attr_reader :remember_token
 
     validates_presence_of :remember_token
 
@@ -12,7 +12,7 @@ module TinyPassport
       @remember_token = params[:remember_token]
 
       if self.valid? && self.success?
-        @login_record = ::TinyPassport::LoginRecord.authenticate_from_remember_token(remember_token)
+        @login_record = ::TinyPassport::LoginRecord.authenticate_from_remember_token(self.remember_token)
 
         if self.login_record && self.login_record.available? && self.login_record.account
           self.login_record.last_remembered_ip = params[:last_remembered_ip].to_s

data/app/forms/tiny_passport/reset_password_form.rb

@@ -73,10 +73,10 @@ module TinyPassport
     #   - reset_password_token
     #
     def submit_valid? params={}, &block
-      @password              ||= params[:password]
-      @password_confirmation ||= params[:password_confirmation]
-      @reset_password_token  ||= params[:reset_password_token]
-      @reset_way             ||= params[:reset_way]
+      @password              = params[:password]
+      @password_confirmation = params[:password_confirmation]
+      @reset_password_token  = params[:reset_password_token]
+      @reset_way             = params[:reset_way]
 
       # 基本验证
       if self.valid? && self.success?

data/app/forms/tiny_passport/session_form.rb

@@ -3,7 +3,7 @@ module TinyPassport
   class SessionForm
     include ::TinyPassport::Formable
 
-    attr_accessor :input_value, :password, :remembered, :ip
+    attr_reader :input_value, :password, :remembered, :ip, :user_agent_value, :login_record
 
     validates_presence_of :input_value
     validates_presence_of :password
@@ -14,10 +14,6 @@ module TinyPassport
       @remembered = true
     end
 
-    def login_record
-      @login_record ||= ::TinyPassport::LoginRecord.new
-    end
-
     def remembered?
       [true, 'true', '1'].include?(self.remembered)
     end
@@ -30,15 +26,20 @@ module TinyPassport
     #   :remembered
     #
     def submit params={}
-      self.input_value = params[:input_value]
-      self.password    = params[:password]
-      self.ip          = params[:ip].to_s
-      self.remembered  = params[:remembered]
+      @input_value = params[:input_value]
+      @password    = params[:password]
+      @ip          = params[:ip].to_s
+      @remembered  = params[:remembered]
+      @user_agent_value = params[:user_agent_value].to_s
+
+
+      @login_record = ::TinyPassport::LoginRecord.new
 
       #######
-      self.login_record.ip   = self.ip
+      self.login_record.ip                  = self.ip
       self.login_record.last_remembered_ip  = self.ip
-      self.login_record.remembered = self.remembered?
+      self.login_record.user_agent_value    = self.user_agent_value
+      self.login_record.remembered          = self.remembered?
 
       if self.valid?
         if self.success?

data/app/forms/tiny_passport/update_login_email_form.rb

@@ -0,0 +1,68 @@
+# -*- encoding : utf-8 -*-
+module TinyPassport
+  # 登录邮箱表单
+  class UpdateLoginEmailForm
+    include ::TinyPassport::Formable
+
+    attr_reader :current_password, :account, :login_email_value
+
+    validates_presence_of :current_password
+
+    self.support_strip_values!(:login_email_value)
+
+    self.email_validates_of :login_email_value
+
+    validate :verify_uniques
+
+    # 如果两者都为不为空，则判断, 是否一致
+    def password_confirmation_required?
+      self.password.present? || self.password_confirmation.present?
+    end
+
+    def login_email
+      @login_email = self.account.login_email || ::TinyPassport::LoginEmail.new(:account => self.account)
+    end
+
+    def submit params={}
+      @current_password       = params[:current_password]
+      @account                = params[:account]
+      @login_email_value      = params[:login_email_value]
+
+      if self.valid? && self.success?
+        if self.account
+          if self.account.valid_password?(self.current_password)
+            save_objects and return true
+          else
+            self.errors.add :current_password, :wrong  # 密码错误
+          end
+        else
+          self.errors.add :account, :required  # 密码错误
+        end
+      end
+
+      false
+    end
+
+    private
+
+    def verify_uniques
+      if self.login_email_value.present?
+        if self.login_email_value == self.login_email.value
+          self.errors.add :login_email_value, :not_changed
+        end
+
+        if ::TinyPassport::LoginEmail.exists?(:value => self.login_email_value)
+          self.errors.add :login_email_value, :taken
+        end
+      end
+    end
+
+    def save_objects
+      ::ActiveRecord::Base.transaction do
+        self.login_email.value   = self.login_email_value
+        self.login_email.account = self.account
+        self.login_email.save_with_send_confirmation_token!(true)
+      end
+    end
+  end
+end

data/app/forms/tiny_passport/update_password_form.rb

@@ -3,7 +3,7 @@ module TinyPassport
   class UpdatePasswordForm
     include ::TinyPassport::Formable
 
-    attr_accessor :password, :password_confirmation, :current_password, :account
+    attr_reader :password, :password_confirmation, :current_password, :account
 
     validates_presence_of     :password
     validates_presence_of     :current_password

data/app/mailers/tiny_passport/registration_mailer.rb

@@ -13,7 +13,7 @@ module TinyPassport
 
     def send_confirmation_token(login_email)
       @login_email = login_email
-      @account = login_email.account
+      @account     = login_email.account
 
       mail(:to => @account.login_email_value_to, :subject => "Welcome Confirm To TinyPassport") do |format|
         format.html

data/app/models/concerns/tiny_passport/basic_status_able.rb

@@ -0,0 +1,28 @@
+# -*- encoding : utf-8 -*-
+module Concerns
+  module TinyPassport
+    module BasicStatusAble
+      extend ::ActiveSupport::Concern
+
+      included do
+        include ::TinySupport::Configable
+
+        # 邮箱的激活情况
+        self.tiny_support_config :status, [
+            {:key => 'default', :value => 0}, # 初始状态
+            {:key => 'pending', :value => 1}, # 需激活状态
+            {:key => 'active',  :value => 2}, # 激活状态
+            {:key => 'lock',    :value => 3}, # 已经锁定，需要邮箱激活
+            {:key => 'block',   :value => 4}, # 已经被屏蔽
+            {:key => 'deleted', :value => -1}  # 已经删除
+        ]
+      end
+
+      def status_desc
+        I18n.t("tiny_passport.basic_status.#{self.status_key}")
+      end
+
+    end
+  end
+end
+

data/app/models/tiny_passport/account.rb

@@ -36,6 +36,5 @@ module TinyPassport
     def login_email_value_to
       "#{self.login_name} <#{self.login_email.value}>"
     end
-
   end
 end

data/app/models/tiny_passport/login_email.rb

@@ -1,19 +1,9 @@
 # -*- encoding : utf-8 -*-
 module TinyPassport
   class LoginEmail < ActiveRecord::Base
-    include ::TinySupport::Configable
+    self.tiny_support_display
 
-    self.acts_as_tiny_cached :version => 1
-
-    # 邮箱的激活情况
-    self.tiny_support_config :status, [
-      {:key => 'default', :value => 0}, # 初始状态
-      {:key => 'pending', :value => 1}, # 需要验证
-      {:key => 'active',  :value => 2}, # 激活状态
-      {:key => 'lock',    :value => 3}, # 已经锁定，需要邮箱激活
-      {:key => 'block',   :value => 4}, # 已经被屏蔽
-      {:key => 'deleted', :value => -1}  # 已经删除
-    ]
+    include ::Concerns::TinyPassport::BasicStatusAble
 
     belongs_to :account, :class_name => "TinyPassport::Account"
 
@@ -50,14 +40,34 @@ module TinyPassport
 
     # 邮箱状态激活
     def status_active_verify!
-      self.confirmation_token = nil
-      self.confirmed_at = Time.now
-      self.confirmation_send_at = nil
-      self.status_key = 'active'
+      self.confirmation_token           = nil
+      self.confirmed_at                 = Time.now
+      self.confirmation_send_at         = nil
+      self.status_key                   = 'active'
       self.encrypted_confirmation_token = ''
       self.save!
     end
 
+    # 发送邮件
+    def save_with_send_confirmation_token!(token_refresh=false)
+      # 如果验证码已经过期了
+      if self.confirmation_token_expires? || token_refresh
+        self.generate_encrypted_confirmation_token
+      end
+
+      self.confirmation_send_at = ::Time.now
+      self.status_key           = 'default'
+
+      if self.save!
+        # TODO
+        ::TinyPassport::RegistrationMailer.send_confirmation_token(self).deliver
+      end
+    end
+
+    def await_confirm?
+      ['default', 'pending'].include?(self.status_key)
+    end
+
     # reset_password_token ----------------------------------------------
     def generate_encrypted_reset_password_token
       self.reset_password_token = ::SecureRandom.base64

data/app/models/tiny_passport/oauth_login.rb

@@ -1,24 +1,13 @@
 # -*- encoding : utf-8 -*-
 module TinyPassport
   class OauthLogin < ActiveRecord::Base
-    include ::TinySupport::Configable
+    include ::Concerns::TinyPassport::BasicStatusAble
 
-    self.acts_as_tiny_cached :version => 1
     self.tiny_support_display
 
     belongs_to :account,     :class_name => "TinyPassport::Account"
     belongs_to :oauth_token, :class_name => "TinyPassport::OauthToken"
 
-    # 邮箱的激活情况
-    self.tiny_support_config :status, [
-      {:key => 'default', :value => 0  }, # 初始状态
-      {:key => 'pending', :value => 1  }, # 需要验证
-      {:key => 'active',  :value => 2  }, # 激活状态
-      {:key => 'lock',    :value => 3  }, # 已经锁定，需要邮箱激活
-      {:key => 'block',   :value => 4  }, # 已经被屏蔽
-      {:key => 'deleted', :value => -1 }  # 已经删除
-    ]
-
     attr_accessible :account, :oauth_token
 
     def oauth_token?

data/app/models/tiny_passport/oauth_token.rb

@@ -5,7 +5,6 @@ module TinyPassport
     # 用于登录的
     has_one  :oauth_login, :class_name => "TinyPassport::OauthLogin"
 
-    self.acts_as_tiny_cached :version => 1
     self.tiny_support_display
 
     # 长字段信息
@@ -16,7 +15,10 @@ module TinyPassport
     has_many :bind_accounts, :class_name => "TinyPassport::Account", :through => :oauth_binds, :source => :account
 
     self.tiny_support_config :strategy_type, [
-      {:key => 'qq_connect', :value => 1}
+      {:key => 'qq_connect', :value => 1},
+      {:key => 'github',     :value => 2},
+      {:key => 'google',     :value => 3},
+      {:key => 'weibo',      :value => 4}
     ]
 
     attr_accessible :strategy_type_value,
@@ -32,6 +34,10 @@ module TinyPassport
       I18n.t("tiny_passport.oauth.providers.#{self.strategy_type_key}.name")
     end
 
+    def expires_at?
+      self.expires_at.present?
+    end
+
     # 已经绑定登录帐号了
     def login_account?
       !!(self.login_account)