rails_jwt_auth 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3f935bf415eb61e8c8d04a0ee5701e35225a1f68
-  data.tar.gz: 5f97e07f1f1ff4de288872d717f6b632a6132417
+SHA256:
+  metadata.gz: 762f53596609290e2f1ac7d6091796fd55167d96e5bb77ba7566336b5fea3dd4
+  data.tar.gz: caa5365c0300a1adf1b9ec6e3f0ac9354487171ef9c7813717439d126a39bed5
 SHA512:
-  metadata.gz: 0a8976264bfcf1fae83bf32d8c3f2930141b162614a0af7b9782ca90725ba4af8173508eb7c1fa7c8094624e0f477faad6337ca6a2e99376bbc84c7be5b75594
-  data.tar.gz: 297a00da37aff4ece4ba9580e0e2d59bd1351f9dfe234373e00ac8de9f917094b814de50ca501305465eaf1551158a0129102d59fd25f62ef80e72c87721d59f
+  metadata.gz: dd76e94ecc84e8cb1f0ff57754fec3eb21202ed0560b3b1d3d16488d982510169d8f37e4b66348b78386a0d70fd2f098c99ca6d02aa9e3da359ef8b15ec77c7a
+  data.tar.gz: 846793af29ba968cc33e81762b93e28030efc48045086b5a661c603fcdfa25577f4c84e7675237951b215e9df1f87fe61ade6e776c893c1f03feaa33366ade50

data/README.md

@@ -51,7 +51,7 @@ You can edit configuration options into `config/initializers/auth_token_auth.rb`
 | set_password_url               | password_path     | Url used to create email link with set password token                 |
 | deliver_later                  | false             | Uses `deliver_later` method to send emails                            |
 | invitation_expiration_time     | 2.days            | Time an invitation is valid and can be accepted                       |
-| invitation_url                 | invitation_path   | URL used to create email link with invitation token                   |
+| accept_invitation_url          | invitations_path  | URL used to create email link with invitation token                   |
 
 ## Authenticatable
 
@@ -118,7 +118,7 @@ change_table :users do |t|
   t.string :unconfirmed_email
   t.string :confirmation_token
   t.datetime :confirmation_sent_at
-  t.datetime :confimed_at
+  t.datetime :confirmed_at
 end
 ```
 
@@ -420,7 +420,7 @@ Invitations api is provided by RailsJwtAuth::InvitationsController.
 
 ```js
 {
-  url: host/invitation,
+  url: host/invitations,
   method: POST,
   data: {
     invitation: {
@@ -435,14 +435,12 @@ Invitations api is provided by RailsJwtAuth::InvitationsController.
 
 ```js
 {
-  url: host/invitation,
+  url: host/invitations/:invitation_token,
   method: PUT,
   data: {
-    accept_invitation: {
-      invitation_token: "token",
+    invitation: {
       password: '1234',
-      password_confirmation: '1234',
-      // More fields of your user...
+      password_confirmation: '1234'
     }
   }
 }

data/app/controllers/concerns/rails_jwt_auth/params_helper.rb

@@ -29,9 +29,7 @@ module RailsJwtAuth
     end
 
     def invitation_update_params
-      params.require(:accept_invitation).permit(:invitation_token,
-                                                :password,
-                                                :password_confirmation)
+      params.require(:invitation).permit(:password, :password_confirmation)
     end
   end
 end

data/app/controllers/rails_jwt_auth/invitations_controller.rb

@@ -11,8 +11,7 @@ module RailsJwtAuth
 
     def update
       attr_hash = invitation_update_params
-      token = attr_hash.delete(:invitation_token)
-      user = RailsJwtAuth.model.where(invitation_token: token).first
+      user = RailsJwtAuth.model.where(invitation_token: params[:id]).first
       user.assign_attributes attr_hash
       user.accept_invitation!
 

data/app/mailers/rails_jwt_auth/mailer.rb

@@ -56,13 +56,13 @@ if defined?(ActionMailer)
     def send_invitation(user)
       @user = user
 
-      if RailsJwtAuth.invitation_url
-        url, params = RailsJwtAuth.invitation_url.split '?'
+      if RailsJwtAuth.accept_invitation_url
+        url, params = RailsJwtAuth.accept_invitation_url.split '?'
         params = params ? params.split('&') : []
         params.push("invitation_token=#{@user.invitation_token}")
         @accept_invitation_url = "#{url}?#{params.join('&')}"
       else
-        @accept_invitation_url = invitation_url(invitation_token: @user.invitation_token)
+        @accept_invitation_url = invitations_url(invitation_token: @user.invitation_token)
       end
 
       subject = I18n.t('rails_jwt_auth.mailer.send_invitation.subject')

data/app/models/concerns/rails_jwt_auth/invitable.rb

@@ -14,8 +14,6 @@ module RailsJwtAuth
           field :invitation_sent_at,       type: Time
           field :invitation_accepted_at,   type: Time
           field :invitation_created_at,    type: Time
-
-          index({invitation_token: 1}, {unique: true})
         end
       end
     end
@@ -33,7 +31,6 @@ module RailsJwtAuth
       #
       # @return [user] The user created or found by email.
 
-      # rubocop:disable Metrics/AbcSize
       def invite!(attributes={})
         attrs = ActiveSupport::HashWithIndifferentAccess.new(attributes.to_h)
         auth_field = RailsJwtAuth.auth_field_name
@@ -43,30 +40,10 @@ module RailsJwtAuth
 
         record = RailsJwtAuth.model.find_or_initialize_by(auth_field => auth_attribute)
         record.assign_attributes(attrs)
-        record.invitation_created_at = Time.now.utc if record.new_record?
-
-        unless record.password || record.password_digest
-          password = SecureRandom.base58(16)
-          record.password = password
-          record.password_confirmation = password
-        end
-
-        record.valid?
-
-        # Users that are registered and were not invited are not reinvitable
-        if !record.new_record? && !record.invited?
-          record.errors.add(RailsJwtAuth.auth_field_name, :taken)
-        end
-
-        # Users that have already accepted an invitation are not reinvitable
-        if !record.new_record? && record.invited? && record.invitation_accepted_at.present?
-          record.errors.add(RailsJwtAuth.auth_field_name, :taken)
-        end
 
-        record.invite! if record.errors.empty?
+        record.invite!
         record
       end
-      # rubocop:enable Metrics/AbcSize
     end
 
     # Accept an invitation by clearing token and setting invitation_accepted_at
@@ -85,12 +62,37 @@ module RailsJwtAuth
       end
     end
 
+    # rubocop:disable Metrics/AbcSize
     def invite!
+      self.invitation_created_at = Time.now.utc if new_record?
+
+      unless password || password_digest
+        passw = SecureRandom.base58(16)
+        self.password = passw
+        self.password_confirmation = passw
+      end
+
+      valid?
+
+      # Users that are registered and were not invited are not reinvitable
+      if !new_record? && !invited?
+        errors.add(RailsJwtAuth.auth_field_name, :taken)
+      end
+
+      # Users that have already accepted an invitation are not reinvitable
+      if !new_record? && invited? && invitation_accepted_at.present?
+        errors.add(RailsJwtAuth.auth_field_name, :taken)
+      end
+
+      return self unless errors.empty?
+
       generate_invitation_token if invitation_token.nil?
       self.invitation_sent_at = Time.now.utc
 
       send_invitation_mail if save(validate: false)
+      self
     end
+    # rubocop:enable Metrics/AbcSize
 
     def invited?
       (persisted? && invitation_token.present?)
@@ -104,6 +106,10 @@ module RailsJwtAuth
       invited? && invitation_period_valid?
     end
 
+    def accepted_invitation?
+      invitation_token.nil? && invitation_accepted_at.present?
+    end
+
     protected
 
     def generate_invitation_token

data/lib/generators/rails_jwt_auth/install_generator.rb

@@ -2,7 +2,7 @@ class RailsJwtAuth::InstallGenerator < Rails::Generators::Base
   source_root File.expand_path('../../templates', __FILE__)
 
   def create_initializer_file
-    copy_file "initializer.rb", "config/initializers/rails_jwt_auth.rb"
+    copy_file 'initializer.rb', 'config/initializers/rails_jwt_auth.rb'
   end
 
   def create_routes
@@ -12,6 +12,6 @@ class RailsJwtAuth::InstallGenerator < Rails::Generators::Base
     route "resource :confirmation, controller: 'rails_jwt_auth/confirmations', only: [:create, :update]"
     route "resource :password, controller: 'rails_jwt_auth/passwords', only: [:create, :update]"
 
-    route "resource :invitation, controller: 'rails_jwt_auth/invitations', only: [:create, :update]"
+    route "resource :invitations, controller: 'rails_jwt_auth/invitations', only: [:create, :update]"
   end
 end

data/lib/generators/templates/initializer.rb

@@ -18,7 +18,7 @@ RailsJwtAuth.setup do |config|
   #config.jwt_issuer = 'RailsJwtAuth'
 
   # number of simultaneously sessions for an user
-  #config.simultaneously_sessions = 2
+  #config.simultaneous_sessions = 2
 
   # mailer sender
   #config.mailer_sender = 'initialize-mailer_sender@example.com'
@@ -33,6 +33,7 @@ RailsJwtAuth.setup do |config|
   #config.reset_password_url = 'http://frontend.com/reset_password'
 
   # url used to create email link with set password token
+  # by set_and_send_password_instructions method
   #config.set_password_url = 'http://frontend.com/set_password'
 
   # expiration time for reset password tokens
@@ -41,11 +42,9 @@ RailsJwtAuth.setup do |config|
   # uses deliver_later to send emails instead of deliver method
   #config.deliver_later = false
 
-  # Invitable configuration
-  # 
-  # Time an invitation is valid after sent
+  # time an invitation is valid after sent
   # config.invitation_expiration_time = 2.days
-  #
-  # URL used to create email link to activate invitation
+
+  # url used to create email link with activation token parameter to accept invitation
   # config.accept_invitation_url = 'http://frontend.com/accept_invitation'
 end

data/lib/rails_jwt_auth.rb

@@ -1,59 +1,59 @@
-require "warden"
-require "bcrypt"
+require 'warden'
+require 'bcrypt'
 
-require "rails_jwt_auth/engine"
+require 'rails_jwt_auth/engine'
 
 module RailsJwtAuth
   mattr_accessor :model_name
-  @@model_name = 'User'
+  self.model_name = 'User'
 
   mattr_accessor :auth_field_name
-  @@auth_field_name = 'email'
+  self.auth_field_name = 'email'
 
   mattr_accessor :auth_field_email
-  @@auth_field_email = true
+  self.auth_field_email = true
 
   mattr_accessor :email_regex
-  @@email_regex = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
+  self.email_regex = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
 
   mattr_accessor :jwt_expiration_time
-  @@jwt_expiration_time = 7.days
+  self.jwt_expiration_time = 7.days
 
   mattr_accessor :jwt_issuer
-  @@jwt_issuer = 'RailsJwtAuth'
+  self.jwt_issuer = 'RailsJwtAuth'
 
   mattr_accessor :simultaneous_sessions
-  @@simultaneous_sessions = 2
+  self.simultaneous_sessions = 2
 
   mattr_accessor :mailer_sender
-  @@mailer_sender = 'initialize-mailer_sender@example.com'
+  self.mailer_sender = 'initialize-mailer_sender@example.com'
 
   mattr_accessor :confirmation_url
-  @@confirmation_url = nil
+  self.confirmation_url = nil
 
   mattr_accessor :confirmation_expiration_time
-  @@confirmation_expiration_time = 1.day
+  self.confirmation_expiration_time = 1.day
 
   mattr_accessor :reset_password_url
-  @@reset_password_url = nil
+  self.reset_password_url = nil
 
   mattr_accessor :set_password_url
-  @@set_password_url = nil
+  self.set_password_url = nil
 
   mattr_accessor :reset_password_expiration_time
-  @@reset_password_expiration_time = 1.day
+  self.reset_password_expiration_time = 1.day
 
   mattr_accessor :deliver_later
-  @@deliver_later = false
+  self.deliver_later = false
 
   mattr_accessor :invitation_expiration_time
-  @@invitation_expiration_time = 2.days
+  self.invitation_expiration_time = 2.days
 
-  mattr_accessor :invitation_url
-  @@invitation_url = nil
+  mattr_accessor :accept_invitation_url
+  self.accept_invitation_url = nil
 
   def self.model
-    @@model_name.constantize
+    model_name.constantize
   end
 
   def self.setup

data/lib/rails_jwt_auth/version.rb

@@ -1,3 +1,3 @@
 module RailsJwtAuth
-  VERSION = '0.18.1'
+  VERSION = '0.19.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_jwt_auth
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - rjurado
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2018-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Rails jwt authentication.