devise-tokens 1.0.3 → 1.0.4

data/app/controllers/{devise_tokens → devise_token_auth}/registrations_controller.rb

@@ -1,5 +1,7 @@
-module DeviseTokens
-  class RegistrationsController < DeviseTokens::ApplicationController
+# frozen_string_literal: true
+
+module DeviseTokenAuth
+  class RegistrationsController < DeviseTokenAuth::ApplicationController
     before_action :set_user_by_token, only: [:destroy, :update]
     before_action :validate_sign_up_params, only: :create
     before_action :validate_account_update_params, only: :update
@@ -9,7 +11,7 @@ module DeviseTokens
       build_resource
 
       unless @resource.present?
-        raise DeviseTokens::Errors::NoResourceDefinedError,
+        raise DeviseTokenAuth::Errors::NoResourceDefinedError,
               "#{self.class.name} #build_resource does not define @resource,"\
               ' execution stopped.'
       end
@@ -17,7 +19,7 @@ module DeviseTokens
       # give redirect value from params priority
       @redirect_url = params.fetch(
         :confirm_success_url,
-        DeviseTokens.default_confirm_success_url
+        DeviseTokenAuth.default_confirm_success_url
       )
 
       # success redirect url is required
@@ -113,7 +115,7 @@ module DeviseTokens
         status: 'error',
         data:   resource_data
       }
-      message = I18n.t('devise_tokens.registrations.missing_confirm_success_url')
+      message = I18n.t('devise_token_auth.registrations.missing_confirm_success_url')
       render_error(422, message, response)
     end
 
@@ -122,7 +124,7 @@ module DeviseTokens
         status: 'error',
         data:   resource_data
       }
-      message = I18n.t('devise_tokens.registrations.redirect_url_not_allowed', redirect_url: @redirect_url)
+      message = I18n.t('devise_token_auth.registrations.redirect_url_not_allowed', redirect_url: @redirect_url)
       render_error(422, message, response)
     end
 
@@ -156,26 +158,26 @@ module DeviseTokens
     end
 
     def render_update_error_user_not_found
-      render_error(404, I18n.t('devise_tokens.registrations.user_not_found'), status: 'error')
+      render_error(404, I18n.t('devise_token_auth.registrations.user_not_found'), status: 'error')
     end
 
     def render_destroy_success
       render json: {
         status: 'success',
-        message: I18n.t('devise_tokens.registrations.account_with_uid_destroyed', uid: @resource.uid)
+        message: I18n.t('devise_token_auth.registrations.account_with_uid_destroyed', uid: @resource.uid)
       }
     end
 
     def render_destroy_error
-      render_error(404, I18n.t('devise_tokens.registrations.account_to_destroy_not_found'), status: 'error')
+      render_error(404, I18n.t('devise_token_auth.registrations.account_to_destroy_not_found'), status: 'error')
     end
 
     private
 
     def resource_update_method
-      if DeviseTokens.check_current_password_before_update == :attributes
+      if DeviseTokenAuth.check_current_password_before_update == :attributes
         'update_with_password'
-      elsif DeviseTokens.check_current_password_before_update == :password && account_update_params.key?(:password)
+      elsif DeviseTokenAuth.check_current_password_before_update == :password && account_update_params.key?(:password)
         'update_with_password'
       elsif account_update_params.key?(:current_password)
         'update_with_password'

data/app/controllers/{devise_tokens → devise_token_auth}/sessions_controller.rb

@@ -1,5 +1,8 @@
-module DeviseTokens
-  class SessionsController < DeviseTokens::ApplicationController
+# frozen_string_literal: true
+
+# see http://www.emilsoman.com/blog/2013/05/18/building-a-tested/
+module DeviseTokenAuth
+  class SessionsController < DeviseTokenAuth::ApplicationController
     before_action :set_user_by_token, only: [:destroy]
     after_action :reset_session, only: [:destroy]
 
@@ -88,7 +91,7 @@ module DeviseTokens
     end
 
     def render_new_error
-      render_error(405, I18n.t('devise_tokens.sessions.not_supported'))
+      render_error(405, I18n.t('devise_token_auth.sessions.not_supported'))
     end
 
     def render_create_success
@@ -98,7 +101,7 @@ module DeviseTokens
     end
 
     def render_create_error_not_confirmed
-      render_error(401, I18n.t('devise_tokens.sessions.not_confirmed', email: @resource.email))
+      render_error(401, I18n.t('devise_token_auth.sessions.not_confirmed', email: @resource.email))
     end
 
     def render_create_error_account_locked
@@ -106,7 +109,7 @@ module DeviseTokens
     end
 
     def render_create_error_bad_credentials
-      render_error(401, I18n.t('devise_tokens.sessions.bad_credentials'))
+      render_error(401, I18n.t('devise_token_auth.sessions.bad_credentials'))
     end
 
     def render_destroy_success
@@ -116,7 +119,7 @@ module DeviseTokens
     end
 
     def render_destroy_error
-      render_error(404, I18n.t('devise_tokens.sessions.user_not_found'))
+      render_error(404, I18n.t('devise_token_auth.sessions.user_not_found'))
     end
 
     private

data/app/controllers/{devise_tokens → devise_token_auth}/token_validations_controller.rb

@@ -1,5 +1,7 @@
-module DeviseTokens
-  class TokenValidationsController < DeviseTokens::ApplicationController
+# frozen_string_literal: true
+
+module DeviseTokenAuth
+  class TokenValidationsController < DeviseTokenAuth::ApplicationController
     skip_before_action :assert_is_devise_resource!, only: [:validate_token]
     before_action :set_user_by_token, only: [:validate_token]
 
@@ -23,7 +25,7 @@ module DeviseTokens
     end
 
     def render_validate_token_error
-      render_error(401, I18n.t('devise_tokens.token_validations.invalid'))
+      render_error(401, I18n.t('devise_token_auth.token_validations.invalid'))
     end
   end
 end

data/app/controllers/{devise_tokens → devise_token_auth}/unlocks_controller.rb

@@ -1,5 +1,7 @@
-module DeviseTokens
-  class UnlocksController < DeviseTokens::ApplicationController
+# frozen_string_literal: true
+
+module DeviseTokenAuth
+  class UnlocksController < DeviseTokenAuth::ApplicationController
     skip_after_action :update_auth_header, only: [:create, :show]
 
     # this action is responsible for generating unlock tokens and
@@ -55,13 +57,13 @@ module DeviseTokens
     end
 
     def render_create_error_missing_email
-      render_error(401, I18n.t('devise_tokens.unlocks.missing_email'))
+      render_error(401, I18n.t('devise_token_auth.unlocks.missing_email'))
     end
 
     def render_create_success
       render json: {
         success: true,
-        message: I18n.t('devise_tokens.unlocks.sended', email: @email)
+        message: I18n.t('devise_token_auth.unlocks.sended', email: @email)
       }
     end
 
@@ -77,7 +79,7 @@ module DeviseTokens
     end
 
     def render_not_found_error
-      render_error(404, I18n.t('devise_tokens.unlocks.user_not_found', email: @email))
+      render_error(404, I18n.t('devise_token_auth.unlocks.user_not_found', email: @email))
     end
 
     def resource_params

data/app/models/{devise_tokens → devise_token_auth}/concerns/active_record_support.rb

@@ -1,10 +1,10 @@
 require_relative 'tokens_serialization'
 
-module DeviseTokens::Concerns::ActiveRecordSupport
+module DeviseTokenAuth::Concerns::ActiveRecordSupport
   extend ActiveSupport::Concern
 
   included do
-    serialize :tokens, DeviseTokens::Concerns::TokensSerialization
+    serialize :tokens, DeviseTokenAuth::Concerns::TokensSerialization
   end
 
   class_methods do

data/app/models/{devise_tokens → devise_token_auth}/concerns/mongoid_support.rb

@@ -1,4 +1,4 @@
-module DeviseTokens::Concerns::MongoidSupport
+module DeviseTokenAuth::Concerns::MongoidSupport
   extend ActiveSupport::Concern
 
   def as_json(options = {})

data/app/models/{devise_tokens → devise_token_auth}/concerns/tokens_serialization.rb

@@ -1,4 +1,4 @@
-module DeviseTokens::Concerns::TokensSerialization
+module DeviseTokenAuth::Concerns::TokensSerialization
   # Serialization hash to json
   def self.dump(object)
     object.each_value(&:compact!) unless object.nil?

data/app/models/{devise_tokens → devise_token_auth}/concerns/user.rb

@@ -1,13 +1,13 @@
+# frozen_string_literal: true
 
-
-module DeviseTokens::Concerns::User
+module DeviseTokenAuth::Concerns::User
   extend ActiveSupport::Concern
 
   def self.tokens_match?(token_hash, token)
     @token_equality_cache ||= {}
 
     key = "#{token_hash}/#{token}"
-    result = @token_equality_cache[key] ||= DeviseTokens::TokenFactory.token_hash_is_token?(token_hash, token)
+    result = @token_equality_cache[key] ||= DeviseTokenAuth::TokenFactory.token_hash_is_token?(token_hash, token)
     @token_equality_cache = {} if @token_equality_cache.size > 10000
     result
   end
@@ -22,15 +22,15 @@ module DeviseTokens::Concerns::User
     end
 
     if const_defined?('ActiveRecord') && ancestors.include?(ActiveRecord::Base)
-      include DeviseTokens::Concerns::ActiveRecordSupport
+      include DeviseTokenAuth::Concerns::ActiveRecordSupport
     end
 
     if const_defined?('Mongoid') && ancestors.include?(Mongoid::Document)
-      include DeviseTokens::Concerns::MongoidSupport
+      include DeviseTokenAuth::Concerns::MongoidSupport
     end
 
-    if DeviseTokens.default_callbacks
-      include DeviseTokens::Concerns::UserOmniauthCallbacks
+    if DeviseTokenAuth.default_callbacks
+      include DeviseTokenAuth::Concerns::UserOmniauthCallbacks
     end
 
     # get rid of dead tokens
@@ -56,7 +56,7 @@ module DeviseTokens::Concerns::User
       # fall back to "default" config name
       opts[:client_config] ||= 'default'
       opts[:to] = unconfirmed_email if pending_reconfirmation?
-      opts[:redirect_url] ||= DeviseTokens.default_confirm_success_url
+      opts[:redirect_url] ||= DeviseTokenAuth.default_confirm_success_url
 
       send_devise_notification(:confirmation_instructions, @raw_confirmation_token, opts)
     end
@@ -86,7 +86,7 @@ module DeviseTokens::Concerns::User
     end
 
     def create_token(client: nil, lifespan: nil, cost: nil, **token_extras)
-      token = DeviseTokens::TokenFactory.create(client: client, lifespan: lifespan, cost: cost)
+      token = DeviseTokenAuth::TokenFactory.create(client: client, lifespan: lifespan, cost: cost)
 
       tokens[token.client] = {
         token:  token.token_hash,
@@ -125,7 +125,7 @@ module DeviseTokens::Concerns::User
       DateTime.strptime(expiry.to_s, '%s') > Time.zone.now &&
 
       # ensure that the token is valid
-      DeviseTokens::Concerns::User.tokens_match?(token_hash, token)
+      DeviseTokenAuth::Concerns::User.tokens_match?(token_hash, token)
     )
   end
 
@@ -140,10 +140,10 @@ module DeviseTokens::Concerns::User
       updated_at && last_token &&
 
       # ensure that previous token falls within the batch buffer throttle time of the last request
-      updated_at.to_time > Time.zone.now - DeviseTokens.batch_request_buffer_throttle &&
+      updated_at.to_time > Time.zone.now - DeviseTokenAuth.batch_request_buffer_throttle &&
 
       # ensure that the token is valid
-      DeviseTokens::TokenFactory.valid_token_hash?(last_token)
+      DeviseTokenAuth::TokenFactory.valid_token_hash?(last_token)
     )
   end
 
@@ -166,7 +166,11 @@ module DeviseTokens::Concerns::User
     expiry = tokens[client]['expiry'] || tokens[client][:expiry]
 
     {
-      "Authorization" => "#{uid},#{token},#{client}"
+      DeviseTokenAuth.headers_names[:"access-token"] => token,
+      DeviseTokenAuth.headers_names[:"token-type"]   => 'Bearer',
+      DeviseTokenAuth.headers_names[:"client"]       => client,
+      DeviseTokenAuth.headers_names[:"expiry"]       => expiry.to_s,
+      DeviseTokenAuth.headers_names[:"uid"]          => uid
     }
   end
 
@@ -182,7 +186,7 @@ module DeviseTokens::Concerns::User
     args[:uid]    = uid
     args[:expiry] = tokens[args[:client_id]]['expiry']
 
-    DeviseTokens::Url.generate(base_url, args)
+    DeviseTokenAuth::Url.generate(base_url, args)
   end
 
   def extend_batch_buffer(token, client)
@@ -212,10 +216,10 @@ module DeviseTokens::Concerns::User
   def should_remove_tokens_after_password_reset?
     if Rails::VERSION::MAJOR <= 5
       encrypted_password_changed? &&
-        DeviseTokens.remove_tokens_after_password_reset
+        DeviseTokenAuth.remove_tokens_after_password_reset
     else
       saved_change_to_attribute?(:encrypted_password) &&
-        DeviseTokens.remove_tokens_after_password_reset
+        DeviseTokenAuth.remove_tokens_after_password_reset
     end
   end
 
@@ -229,7 +233,7 @@ module DeviseTokens::Concerns::User
   end
 
   def max_client_tokens_exceeded?
-    tokens.length > DeviseTokens.max_number_of_devices
+    tokens.length > DeviseTokenAuth.max_number_of_devices
   end
 
   def clean_old_tokens

data/app/models/{devise_tokens → devise_token_auth}/concerns/user_omniauth_callbacks.rb

@@ -1,11 +1,11 @@
+# frozen_string_literal: true
 
-
-module DeviseTokens::Concerns::UserOmniauthCallbacks
+module DeviseTokenAuth::Concerns::UserOmniauthCallbacks
   extend ActiveSupport::Concern
 
   included do
     validates :email, presence: true,if: :email_provider?
-    validates :email, :devise_tokens_email => true, allow_nil: true, allow_blank: true, if: :email_provider?
+    validates :email, :devise_token_auth_email => true, allow_nil: true, allow_blank: true, if: :email_provider?
     validates_presence_of :uid, unless: :email_provider?
 
     # only validate unique emails among email registration users

data/app/validators/devise_token_auth_email_validator.rb

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
 
-
-class DeviseTokensEmailValidator < ActiveModel::EachValidator
+class DeviseTokenAuthEmailValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     unless value =~ /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
       record.errors[attribute] << email_invalid_message

data/config/locales/da-DK.yml

@@ -1,5 +1,5 @@
 da-DK:
-  devise_tokens:
+  devise_token_auth:
     sessions:
       not_confirmed: "Der er sendt en bekræftelsesemail til din konto på '%{email}'. Følg venligst instruktionerne i emailen for at aktivere din konto."
       bad_credentials: "Ugyldig kombination af brugernavn og kodeord. Prøv venligst igen."

data/config/locales/de.yml

@@ -1,5 +1,5 @@
 de:
-  devise_tokens:
+  devise_token_auth:
     sessions:
       not_confirmed: "Eine Bestätigungs-E-Mail wurde an Ihre Adresse '%{email}' gesendet. Sie müssen der Anleitung in der E-Mail folgen, um Ihren Account zu aktivieren."
       bad_credentials: "Ungültige Anmeldeinformationen. Bitte versuchen Sie es erneut."

data/config/locales/en.yml

@@ -1,5 +1,5 @@
 en:
-  devise_tokens:
+  devise_token_auth:
     sessions:
       not_confirmed: "A confirmation email was sent to your account at '%{email}'. You must follow the instructions in the email before your account can be activated"
       bad_credentials: "Invalid login credentials. Please try again."

data/config/locales/es.yml

@@ -1,5 +1,5 @@
 es:
-  devise_tokens:
+  devise_token_auth:
     sessions:
       not_confirmed: "Un correo electrónico de confirmación de su cuenta ha sido enviado a '%{email}'. Por favor, siga las instrucciones para validar su cuenta"
       bad_credentials: "Identidad o contraseña no válida."

data/config/locales/fr.yml

@@ -1,5 +1,5 @@
 fr:
-  devise_tokens:
+  devise_token_auth:
     sessions:
       not_confirmed: "Un e-mail de confirmation de votre compte a été envoyé à '%{email}'. Merci de suivre les instructions afin de valider votre compte"
       bad_credentials: "Mot de passe ou identifiant invalide."

data/config/locales/he.yml

@@ -1,5 +1,5 @@
 he:
-  devise_tokens:
+  devise_token_auth:
     sessions:
       not_confirmed: "הודעת אישור נשלחה לחשבון שלך בכתובת '%{email}'. עליך לפעול לפי ההנחיות שבדוא\"ל לפני הפעלת החשבון שלך"
       bad_credentials: "נתוני כניסה שגויים. בבקשה נסה שוב."

data/config/locales/it.yml

@@ -1,5 +1,5 @@
 it:
-  devise_tokens:
+  devise_token_auth:
     sessions:
       not_confirmed: "Un'email di conferma è stata mandata al tuo account '%{email}'. Segui le istruzioni nell'email per attivare il tuo account."
       bad_credentials: "Credenziali di login non valide. Riprova."

data/config/locales/ja.yml

@@ -1,5 +1,5 @@
 ja:
-  devise_tokens:
+  devise_token_auth:
     sessions:
       not_confirmed: "'%{email}' に確認用のメールを送信しました。メール内の説明を読み、アカウントの有効化をしてください。"
       bad_credentials: "ログイン用の認証情報が正しくありません。再度お試しください。"

data/config/locales/nl.yml

@@ -1,5 +1,5 @@
 nl:
-  devise_tokens:
+  devise_token_auth:
     sessions:
       not_confirmed: "Een bevestingsmail is verzonden naar het adres '%{email}'. Volg de instructies in de mail om uw account te activeren."
       bad_credentials: 'Ongeldige logingegevens.'

data/config/locales/pl.yml

@@ -1,5 +1,5 @@
 pl:
-  devise_tokens:
+  devise_token_auth:
     sessions:
       not_confirmed: "Wiadomość z potwierdzeniem Twojego konta została wysłana na '%{email}'. Proszę postępować zgodnie z wskazówkami znajdującymi się w wiadomości celem aktywacji konta."
       bad_credentials: "Nieprawidłowe dane logowania. Proszę spróbować ponownie."

data/config/locales/pt-BR.yml

@@ -1,5 +1,5 @@
 pt-BR:
-  devise_tokens:
+  devise_token_auth:
     sessions:
       not_confirmed: "Uma mensagem com um link de confirmação foi enviado para seu endereço de e-mail. Você precisa confirmar sua conta antes de continuar."
       bad_credentials: "E-mail ou senha inválidos."

data/config/locales/pt.yml

@@ -1,5 +1,5 @@
 pt:
-  devise_tokens:
+  devise_token_auth:
     sessions:
       not_confirmed: "Uma mensagem com um link de confirmação foi enviado para seu endereço de e-mail. Você precisa confirmar sua conta antes de continuar."
       bad_credentials: "E-mail ou senha inválidos."