tiny_passport 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a60dc3a5327a71a16196868c24983c92ca86334
-  data.tar.gz: 23ffb623bc434a7520c73097b28471ef8a12d3f1
+  metadata.gz: 414ccb9816b1c775f0c4b1bb9a20b9974c468d76
+  data.tar.gz: 172c23591eb89029e862cd5994c0a6ada1156e81
 SHA512:
-  metadata.gz: b6d331b8096cb4ed17de84e09941256e459441572f78a4af79288ab37c31d584c854ee751613bd61d7a1fa14c23c028510bf124fae3a1d14364db247e0fa53e1
-  data.tar.gz: e062ca5ca0319cbd64d83ce3dc569124db341a4110d66b32c0c7d5a620f949aa165652a942ce0e302d25545d34695d851c712796c0c6fff100ee128966e0069e
+  metadata.gz: 95b24ffef7b24fc5c31b2b2d7f66e87a51dfe0bf491985e21a0ed539633413bb110014a1e5bcfb4af0df0aaec3a6dfce7a6660ad8bdd0ee704e0252195ac54b9
+  data.tar.gz: 39ea06a61fd9352b7c1330fc18066a56e4cf244650b34c39a8c1543a1afbe08daca9b13eb132824d74f3c170efd57dd53d89bf45a61c26a0f9c0b043717b690f

data/app/ables/tiny_passport/account_validate_able.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module TinyPassport
   module AccountValidateAble
     extend  ::ActiveSupport::Concern

data/app/ables/tiny_passport/aggrement_term_able.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module TinyPassport
   module AggrementTermAble
     extend  ::ActiveSupport::Concern

data/app/assets/stylesheets/tiny_passport/application.css.scss

@@ -0,0 +1,20 @@
+/*
+ *= require_self
+ */
+
+.oauth-icon {
+  width: 16px !important;
+  height: 16px !important;
+  display: inline-block;
+  background: url(oauth-icons.png) no-repeat;
+  _background-image: url(oauth-icons.gif);
+}
+
+.oauth-icon-qq_connect {
+  background-position: 0 -192px;
+}
+
+.oauth-icon-github {
+  background-position: 0 -144px;
+}
+

data/app/displays/tiny_passport/account_display.rb

@@ -1,21 +1,19 @@
+# -*- encoding : utf-8 -*-
 module TinyPassport
   class AccountDisplay < ::TinySupport::ActiveRecord::DisplayBase
     def basic
       result = {}
 
-      result[:login_email?] = _origin_record.login_email?
       result[:register_way] = _origin_record.register_way_display
       result[:login_name]   = _origin_record.login_name
       result[:login_records_count]   = _origin_record.login_records_count
       result[:last_login_at]   = _origin_record.last_login_at
       result[:created_at]      = _origin_record.created_at
 
+      result[:login_email?] = _origin_record.login_email?
+
       if result[:login_email?]
-        login_email = _origin_record.login_email
-        result[:login_email] = {
-          :value => login_email.value,
-          :status => login_email.status_display
-        }
+        result[:login_email] = _origin_record.login_email.display.basic
       end
 
       result

data/app/displays/tiny_passport/login_email_display.rb

@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+module TinyPassport
+  class LoginEmailDisplay < ::TinySupport::ActiveRecord::DisplayBase
+    def basic
+      {
+        :value          => _origin_record.value,
+        :status         => _origin_record.status_display,
+        :status_desc    => _origin_record.status_desc,
+        :await_confirm? => _origin_record.await_confirm?
+      }
+    end
+
+    def value_starred
+      return @value_starred if defined?(@value_starred)
+      value_parts = _origin_record.value.split('@')
+      @value_starred = "***#{value_parts[0].to_s[-3..-1]}@#{value_parts[1].to_s}" 
+    end
+  end
+end

data/app/displays/tiny_passport/oauth_login_display.rb

@@ -1,9 +1,11 @@
+# -*- encoding : utf-8 -*-
 module TinyPassport
   class OauthLoginDisplay < ::TinySupport::ActiveRecord::DisplayBase
     def basic
       result = {}
 
       result.merge!(
+        :id            => _origin_record.id,
         :crated_at     => _origin_record.created_at,
         :updated_at    => _origin_record.updated_at,
         :status        => _origin_record.status_display,

data/app/displays/tiny_passport/oauth_token_display.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module TinyPassport
   class OauthTokenDisplay < ::TinySupport::ActiveRecord::DisplayBase
     def basic
@@ -9,6 +10,7 @@ module TinyPassport
         :access_token   => _origin_record.access_token,
         :access_secret  => _origin_record.access_secret,
         :expires_at     => _origin_record.expires_at,
+        :expires_at?    => _origin_record.expires_at?,
         :strategy => {
           :type => _origin_record.strategy_type_display,
           :id   =>   _origin_record.strategy_id,

data/app/forms/tiny_passport/account_active_form.rb

@@ -6,9 +6,10 @@ module TinyPassport
     attr_reader :active_way,   # 激活方式
     :confirmation_token,       # 激活码
     :value,                    # account的值
-    :ip                        # 当前IP
+    :ip,                       # 当前IP
+    :user_agent_value
 
-    attr_reader :account, :login_record
+    attr_reader :account, :login_record, :auto_login
 
     validates_presence_of :confirmation_token
     validates_presence_of :value
@@ -20,12 +21,17 @@ module TinyPassport
       !!@login_record
     end
 
+    def auto_login?
+      [1, '1', true, 'true'].include?(self.auto_login)
+    end
+
     def submit params={}
       @active_way         = params[:active_way]
       @confirmation_token = params[:confirmation_token]
       @value              = params[:value]
       @ip                 = params[:ip]
       @auto_login         = params[:auto_login]
+      @user_agent_value   = params[:user_agent_value].to_s
 
       if self.valid? && self.success?
         case self.active_way
@@ -50,13 +56,14 @@ module TinyPassport
                     if _login_email.status_active_verify!
                       @account = _login_email.account
 
-                      if @auto_login
+                      if self.auto_login?
                         @login_record = ::TinyPassport::LoginRecord.new
-                        @login_record.ip   = self.ip
+                        @login_record.ip                  = self.ip
                         @login_record.last_remembered_ip  = self.ip
-                        @login_record.remembered = true
-                        @login_record.account = @account
-                        @login_record.way_key = 'after_login_email_actived'
+                        @login_record.remembered          = true
+                        @login_record.account             = @account
+                        @login_record.user_agent_value    = self.user_agent_value
+                        @login_record.way_key             = 'after_login_email_actived'
                         @login_record.save!
                       end
 

data/app/forms/tiny_passport/confirmation_token_form.rb

@@ -8,15 +8,22 @@ module TinyPassport
     attr_accessor :active_way   # 激活方式
 
     validates_inclusion_of :active_way, :in => ['login_email']
+
     self.email_validates_of :login_email_value, :if => :login_email_required?
 
+    # 验证频率！
+    validate :verify_frequency
+
+    # 取出用户名与邮箱的前后的空格
+    self.support_strip_values!(:login_email_value)
+
     # 是否需要邮箱
     def login_email_required?
       self.active_way == 'login_email'
     end
 
     def login_email
-      @login_email ||= ::TinyPassport::LoginEmail.where(:value => self.login_email_value).first
+      @login_email ||= ::TinyPassport::LoginEmail.tiny_cache_find_by(:value => self.login_email_value)
     end
 
     def submit params={}
@@ -35,13 +42,7 @@ module TinyPassport
             when 'deleted'
               self.errors.add :login_email_value, :already_deleted # 已经被注销
             else
-              self.login_email.generate_encrypted_confirmation_token
-              self.login_email.confirmation_send_at = ::Time.now
-
-              if self.login_email.save!
-                # 发送邮件
-                !!(::TinyPassport::RegistrationMailer.send_confirmation_token(self.login_email).deliver) and return true
-              end
+              self.login_email.save_with_send_confirmation_token! and return true
             end
           else
             self.errors.add :login_email_value, :not_found     # 没有找到
@@ -54,5 +55,13 @@ module TinyPassport
       false
     end
 
+    #　验证发送频率
+    def verify_frequency
+      if self.login_email && self.login_email.confirmation_send_at
+        if ::Time.now - self.login_email.confirmation_send_at < 2.minutes
+          self.errors.add :base, :too_often   # 太频繁了！
+        end
+      end
+    end
   end
 end

data/app/forms/tiny_passport/oauth/bind_connect_form.rb

@@ -5,7 +5,7 @@ module TinyPassport
     class BindConnectForm
       include ::TinyPassport::Formable
 
-      attr_reader :account_id, :oauth_token_id
+      attr_reader :account, :oauth_token_id
       attr_reader :oauth_login
 
       validate :verify_params
@@ -14,7 +14,7 @@ module TinyPassport
 
       # 提交
       def submit params={}
-        @account_id     = params[:account_id]
+        @account        = params[:account]
         @oauth_token_id = params[:oauth_token_id]
 
         if self.valid? && self.success?
@@ -26,15 +26,11 @@ module TinyPassport
         end
       end
 
-      def account
-        @account ||= ::TinyPassport::Account.find_by_id(@account_id)
-      end
-
       # 不唯一
       def oauth_bind
         @oauth_bind ||= ::TinyPassport::OauthBind.where(
           :oauth_token_id => self.oauth_token_id,
-          :account_id     => self.account_id
+          :account_id     => self.account.id
         ).first_or_initialize
       end
 
@@ -46,7 +42,7 @@ module TinyPassport
       def verify_params
         if self.account
         else
-          self.errors.add :account_id, :not_found
+          self.errors.add :account, :not_found
         end
 
         if self.oauth_token

data/app/forms/tiny_passport/oauth/bind_disconnect_form.rb

@@ -1,11 +1,10 @@
 # -*- encoding : utf-8 -*-
 module TinyPassport
   module Oauth
-    # Oauth 分享的绑定的断开
     class BindDisconnectForm
       include ::TinyPassport::Formable
 
-      attr_reader :oauth_bind_id
+      attr_reader :oauth_bind_id, :account
 
       validate :verify_params
 
@@ -14,6 +13,7 @@ module TinyPassport
       # 提交
       def submit params={}
         @oauth_bind_id = params[:oauth_bind_id]
+        @account        = params[:account]
 
         if self.valid? && self.success?
           ::ActiveRecord::Base.transaction do
@@ -24,7 +24,6 @@ module TinyPassport
         end
       end
 
-      # 不唯一
       def oauth_bind
         @oauth_bind ||= ::TinyPassport::OauthBind.where(:id => self.oauth_bind_id).first
       end
@@ -32,9 +31,18 @@ module TinyPassport
       # 校验参数
       def verify_params
         if self.oauth_bind
+          if self.account
+            if self.account.id != self.oauth_bind.account_id
+              self.errors.add :oauth_bind_id, :wrong
+            end
+          end
         else
           self.errors.add :oauth_bind_id, :not_found
         end
+
+        unless self.account
+          self.errors.add :account, :required
+        end
       end
     end
   end

data/app/forms/tiny_passport/oauth/callback_form.rb

@@ -9,14 +9,17 @@ module TinyPassport
       attr_reader :result_status
       attr_reader :login_record
       attr_reader :ip
+      attr_reader :user_agent_value
+      attr_reader :login_account
 
       validates_inclusion_of :usage, :in => ['login', 'bind']
       validate :verify_info_params
 
       def submit usage, options={}, info_params={}
-        @usage       ||= usage
-        @info_params ||= (info_params || {})
+        @usage       = usage
+        @info_params = (info_params || {})
         @ip          = options[:ip]
+        @user_agent_value = options[:user_agent_value]
 
         if self.valid? && self.success?
           case self.usage
@@ -28,7 +31,6 @@ module TinyPassport
 
           true
         else
-
           false
         end
       end
@@ -40,12 +42,13 @@ module TinyPassport
             @login_account = self.oauth_token.login_account
 
             # 有绑定的账户
-            @login_record = ::TinyPassport::LoginRecord.new
-            @login_record.ip   = self.ip
+            @login_record                     = ::TinyPassport::LoginRecord.new
+            @login_record.ip                  = self.ip
             @login_record.last_remembered_ip  = self.ip
-            @login_record.remembered = true
-            @login_record.account = @login_account
-            @login_record.way_key = 'oauth_qq_connect'
+            @login_record.remembered          = true
+            @login_record.account             = self.login_account
+            @login_record.user_agent_value    = self.user_agent_value
+            @login_record.way_key             = 'oauth_qq_connect'
             @login_record.save!
 
             @result_status = 'already'

data/app/forms/tiny_passport/oauth/login_connect_form.rb

@@ -5,15 +5,14 @@ module TinyPassport
     class LoginConnectForm
       include ::TinyPassport::Formable
 
-      attr_accessor :account_id, :oauth_token_id
-      attr_reader :oauth_login
+      attr_accessor :oauth_token_id
+      attr_reader :oauth_login, :account
 
-      validates_presence_of :account_id, :oauth_token_id
       validate :verify_params
 
       # 提交
       def submit params={}
-        @account_id     = params[:account_id]
+        @account        = params[:account]
         @oauth_token_id = params[:oauth_token_id]
 
         if self.valid? && self.success?
@@ -31,11 +30,6 @@ module TinyPassport
         end
       end
 
-      def account
-        return @account if defined?(@account)
-        @account ||= ::TinyPassport::Account.find_by_id(self.account_id)
-      end
-
       def oauth_token
         return @oauth_token if defined?(@oauth_token)
         @oauth_token ||= ::TinyPassport::OauthToken.find_by_id(self.oauth_token_id)
@@ -43,9 +37,8 @@ module TinyPassport
 
       # 校验参数
       def verify_params
-        if self.account
-        else
-          self.errors.add :account_id, :not_found
+        unless self.account
+          self.errors.add :account, :required
         end
 
         if self.oauth_token

data/app/forms/tiny_passport/oauth/login_disconnect_form.rb

@@ -0,0 +1,50 @@
+# -*- encoding : utf-8 -*-
+module TinyPassport
+  module Oauth
+    class LoginDisconnectForm
+      include ::TinyPassport::Formable
+
+      attr_reader :oauth_login_id, :account
+
+      validate :verify_params
+
+      validates_presence_of :oauth_login_id
+
+      # 提交
+      def submit params={}
+        @oauth_login_id = params[:oauth_login_id]
+        @account        = params[:account]
+
+        if self.valid? && self.success?
+          ::ActiveRecord::Base.transaction do
+            self.oauth_login.destroy!
+          end
+        else
+          false
+        end
+      end
+
+      def oauth_login
+        @oauth_login ||= ::TinyPassport::OauthLogin.where(:id => self.oauth_login_id).first
+      end
+
+      # 校验参数
+      def verify_params
+        if self.oauth_login
+          if self.account
+            if self.account.id != self.oauth_login.account_id
+              self.errors.add :oauth_login_id, :wrong
+            end
+          end
+        else
+          self.errors.add :oauth_login_id, :not_found
+        end
+
+        unless self.account
+          self.errors.add :account, :required
+        end
+      end
+    end
+  end
+end
+