token_authenticate_me 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acd64a495fdc9e206c3ae27f49b0dc6886f9085d
-  data.tar.gz: 5b1cb379dd26241a1cf626a88cdc2e46ae8e5ad0
+  metadata.gz: 1179658e1f3af9a1c58e9efa48cd22d09ec7ce0e
+  data.tar.gz: 0158eb3611283336d1bf41199fd1a006e6f98bc7
 SHA512:
-  metadata.gz: 2e094a61e62bff61586fec854175a17b0a71debcff1c9d717bf13a1a406fa4a9275e997c311560d96ac65a7704f2d36d1e4f76b4b7d359a3a63e21fa78fe6077
-  data.tar.gz: 9a6a433e85da4e5d0eb9a7d4c1f5875e2a97748f5a92e2a92c4cbcdafb197d02fd042ab230de91538b410f04e0b1c86a4861e65c6c02b00075b7dc5cbb5e6406
+  metadata.gz: 4fbd92b0823c33cb55de9dd3950e56ddf2001470a0122db892b4aeb28fa75fa3bb862384ba91482321f74718fbd42da7401c90566496d3ed3b7942701b500339
+  data.tar.gz: 887601bc335ab5602eb1c6f9cd34be8697a7dc9e69891d048cbc32119e2fe538719c3351e95d747f82307394608cb97b931ac8738a3ae844a5b76e94700026ae

data/db/migrate/20180123184510_downcase_username_email.rb

@@ -0,0 +1,12 @@
+class DowncaseUsernameEmail < ActiveRecord::Migration
+  class TokenAuthenticateMe::User < ActiveRecord::Base
+  end
+
+  def change
+    TokenAuthenticateMe::User.find_each do |user|
+      user.username = user.username.downcase
+      user.email = user.email.downcase
+      user.save!(validate: false)
+    end
+  end
+end

data/lib/token_authenticate_me/concerns/controllers/sessionable.rb

@@ -20,8 +20,12 @@ module TokenAuthenticateMe
             Session.create!(user_id: authenticated_resource.id)
           end
 
+          def username
+            session_params[:username].blank? ? '' : session_params[:username].downcase
+          end
+
           def resource
-            @resource ||= User.where('username=? OR email=?', session_params[:username], session_params[:username]).first
+            @resource ||= User.where('lower(username)=? OR lower(email)=?', username, username).first
           end
 
           def authenticate_resource

data/lib/token_authenticate_me/concerns/models/authenticatable.rb

@@ -6,13 +6,15 @@ module TokenAuthenticateMe
     module Models
       module Authenticatable
         extend ActiveSupport::Concern
-          include TokenAuthenticateMe::Concerns::Models::Passwordable
+        include TokenAuthenticateMe::Concerns::Models::Passwordable
 
         included do
 
           has_many :sessions, dependent: :destroy
           has_many :invites, inverse_of: 'creator', foreign_key: 'creator_id'
 
+          before_save :downcase_email_and_username
+
           validates(
             :email,
             presence: true,
@@ -43,6 +45,13 @@ module TokenAuthenticateMe
           def as_json(options = nil)
             { user: super(options) }
           end
+
+          protected
+
+          def downcase_email_and_username
+            self.email = email.downcase
+            self.username = username.downcase
+          end
         end
       end
     end

data/lib/token_authenticate_me/version.rb

@@ -1,3 +1,3 @@
 module TokenAuthenticateMe
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.8.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: token_authenticate_me
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Sam Clopton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -106,6 +106,7 @@ files:
 - db/migrate/20160621211347_create_token_authenticate_me_users.rb
 - db/migrate/20160622203801_create_token_authenticate_me_sessions.rb
 - db/migrate/20170629224206_add_index_to_users.rb
+- db/migrate/20180123184510_downcase_username_email.rb
 - lib/generators/token_authenticate_me/controllers/controllers_generator.rb
 - lib/generators/token_authenticate_me/install/install_generator.rb
 - lib/generators/token_authenticate_me/models/models_generator.rb