red_token_auth 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ca882c5a5384b2e8610afd2f87e645db9012cd0
-  data.tar.gz: 7b0bd783c3dac1bb81472204cfe9b171c8243d88
+  metadata.gz: ce5a522be2ce9faff1ac0cc0f2843b612ccf05f0
+  data.tar.gz: 290c45a1389aaf3f494937ab9e8c7a11bc3d5820
 SHA512:
-  metadata.gz: 66b21b4b9f5eb419ba9e0ca09bae649298599b7bd135e58f7f5d37347cd373d0bb43d63cd9466ea384c6b908b64a922e421cd818d29dfd6160614618fadb6789
-  data.tar.gz: fd38b9fe4b29b7cd228144fd6b96a94217cecb8c98ea46a1c3ab681b2d3de1682f32102cd96f0e74e9f6093bcb48a43793d191749c23474de1e3d794052eefa0
+  metadata.gz: 4f733db0dc88207cde8c2606894060d0f8d66fc7267fff866ab678596f99ffaf63911e2af6a1d8f8905b4c89e16ab3b3dab9dd370ad9732d90c3ae0b478b2fa2
+  data.tar.gz: d5dc3ff3e970c4e9f2b1773ed4cab317df918bf128202f862a3358581a1cb1d3b3308ebf2a8dbd571ea2a2d9d3b0f7f97e5bac559ac178462c1fcc9ec182c611

data/README.md

@@ -36,6 +36,8 @@ You'll be able to include the module in the model like so.
 class User
   include Mongoid::Document
   include RedTokenAuth
+  # Include this if you intend to use OmniAuth
+  include RedTokenAuth::Omniauthable
 
   # Mandatory fields for this gem.
   field :email,                        type: String
@@ -43,6 +45,10 @@ class User
   field :reset_password_token,         type: String
   field :reset_password_token_sent_at, type: Time
   field :authentication_token,         type: String
+  # You'll need these fields if you are working with Omniauth.
+  field :uid,                          type: String
+  # Default must be "email".
+  field :provider,                     type: String, default: "email"
 end
 ```
 
@@ -125,7 +131,6 @@ By using the `authenticate!(:user)` in your controller, you'll have access to `c
 ```ruby
 RedTokenAuth.configure do |config|
   config.email_regex = /\A[^@\s]+@[^@\s]+\z/
-  config.password_regex = /\A(?=.*?[a-z])(?=.*?[0-9]).{0,}\z/
   config.password_length = 8..20
 end
 ```

data/lib/red_token_auth.rb

@@ -5,9 +5,11 @@ require "red_token_auth/configuration"
 
 require "red_token_auth/authentication"
 require "red_token_auth/sign_in_out"
+require "red_token_auth/omniauthable"
 require "red_token_auth/password"
 require "red_token_auth/validations"
 
+
 require "red_token_auth/controllers/authentication"
 
 module RedTokenAuth

data/lib/red_token_auth/configuration.rb

@@ -1,14 +1,11 @@
 module RedTokenAuth
   class Configuration
     attr_accessor :email_regex
-    attr_accessor :password_regex
     attr_accessor :password_length
 
     def initialize
       # Basically, just make sure there only one "@" in the email.
       @email_regex = /\A[^@\s]+@[^@\s]+\z/
-      # Make sure there is at least one character and one number.
-      @password_regex = /\A(?=.*?[a-z])(?=.*?[0-9]).{0,}\z/
       @password_length = 8..20
     end
   end

data/lib/red_token_auth/omniauthable.rb

@@ -0,0 +1,14 @@
+require_relative "omniauthable/callbacks_and_validations"
+
+module RedTokenAuth
+  module Omniauthable
+    extend ActiveSupport::Concern
+
+    included do
+      include CallbacksAndValidations
+    end
+
+    class_methods do
+    end
+  end
+end

data/lib/red_token_auth/omniauthable/callbacks_and_validations.rb

@@ -0,0 +1,30 @@
+module RedTokenAuth
+  module Omniauthable
+    module CallbacksAndValidations
+      extend ActiveSupport::Concern
+
+      included do
+        validates :email, presence: true, if: Proc.new { |resource| resource.provider == "email" }
+        validates_presence_of :uid, if: Proc.new { |resource| resource.provider != "email" }
+
+        # Only validate unique emails among email registered users.
+        validate :unique_email_user
+
+        # Syncronize UID and email if provider is the user's email.
+        before_save :syncronize_uid
+      end
+
+      protected
+
+      def unique_email_user
+        if provider == "email" && email_changed? && self.class.where(provider: "email", email: email).count > 0
+          errors.add(:email, :taken)
+        end
+      end
+
+      def syncronize_uid
+        self.uid = email if provider == "email"
+      end
+    end
+  end
+end

data/lib/red_token_auth/validations.rb

@@ -8,12 +8,12 @@ module RedTokenAuth
       include ActiveModel::SecurePassword
 
       validates :email,
-        format: RedTokenAuth.configuration.email_regex
+        format: RedTokenAuth.configuration.email_regex,
+        if: Proc.new { |resource| resource.email.present? || resource.provider == "email" }
       validates :password,
-        format: RedTokenAuth.configuration.password_regex,
         length: { in: RedTokenAuth.configuration.password_length },
         confirmation: true,
-        if: Proc.new { |entity| entity.password.present? }
+        if: Proc.new { |resource| resource.password.present? }
     end
   end
 end

data/lib/red_token_auth/version.rb

@@ -1,3 +1,3 @@
 module RedTokenAuth
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: red_token_auth
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Caio Ergos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -155,6 +155,8 @@ files:
 - lib/red_token_auth/configuration.rb
 - lib/red_token_auth/controllers/authentication.rb
 - lib/red_token_auth/engine.rb
+- lib/red_token_auth/omniauthable.rb
+- lib/red_token_auth/omniauthable/callbacks_and_validations.rb
 - lib/red_token_auth/password.rb
 - lib/red_token_auth/sign_in_out.rb
 - lib/red_token_auth/validations.rb
@@ -179,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Simple token based authentication for Mongoid.