passwordless 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 307e6e1f46ccc9341e5ca07755b8c60cf5df9dfe7ce0827c2ff73e3b830d199b
-  data.tar.gz: eced1cc3a2b2abdce1194beb887f217bce6752a131152e1a8020987126030a49
+  metadata.gz: d79c41fb0ddc3797af28166832ab336c3c3c2347c9336be03e04441554347772
+  data.tar.gz: 0f24f481eff8e766e7546e21c53fa196fa61421037a6543c58c7bca81e78899e
 SHA512:
-  metadata.gz: 3c91e2385d7bfed3c083f3434426241052e0d0ca9566442c46d52e07ab107cb8dd70b5d81e5199ab56fb8ebba3dde6d47345a293be3dff40590f94b7290615d8
-  data.tar.gz: e43f2ec499c6b9df234956f0560bcad613489ee8e2175f5cb3f9fbba3d6583f842afb703ec8ca3138b651fb41f226ca20ca52ddbf805167c51995e0bfc74ed76
+  metadata.gz: c3a7038ffd29a1cb8218905fb974fd3d59b45b11190e3df9e125e8fc5c200638d7f7cf1c954d3a17b256594c4429a144fcd5259a210fa3fed5b13a05551af6c4
+  data.tar.gz: 3a1506b2dfba720a3ca82df7ce992fb74d450691dd31e8b250d961a7c882680fda2fb36674a6d474fa7114dc922839448547ade16b6c1c57348c08b1c9c8de25

data/README.md

@@ -19,6 +19,7 @@ Add authentication to your Rails app without all the icky-ness of passwords.
      * [Registering new users](#registering-new-users)
      * [Generating tokens](#generating-tokens)
      * [Redirecting back after sign-in](#redirecting-back-after-sign-in)
+     * [URLs and links](#urls-and-links)
 * [License](#license)
 
 ## Installation
@@ -172,6 +173,20 @@ end
 
 This can be turned off with `Passwordless.redirect_back_after_sign_in = false` but if you just don't save the previous destination, you'll be fine.
 
+### URLs and links
+
+By default, Passwordless uses the resource name given to `passwordless_for` to generate its routes and helpers.
+
+```ruby
+passwordless_for :users
+  # <%= users.sign_in_path %> # => /users/sign_in
+  
+passwordless_for :users, at: '/', as: :auth
+  # <%= auth.sign_in_path %> # => /sign_in
+```
+
+Also be sure to [specify ActionMailer's `default_url_options.host`](http://guides.rubyonrails.org/action_mailer_basics.html#generating-urls-in-action-mailer-views).
+
 # License
 
 MIT

data/app/controllers/passwordless/sessions_controller.rb

@@ -5,6 +5,9 @@ require 'bcrypt'
 module Passwordless
   # Controller for managing Passwordless sessions
   class SessionsController < ApplicationController
+    # Raise this exception when a session is expired.
+    class ExpiredSessionError < StandardError; end
+
     include ControllerHelpers
 
     helper_method :authenticatable_resource
@@ -31,6 +34,8 @@ module Passwordless
       render
     end
 
+    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+
     # get '/sign_in/:token'
     #   Looks up session record by provided token. Signs in user if a match
     #   is found. Redirects to either the user's original destination
@@ -42,6 +47,8 @@ module Passwordless
       BCrypt::Password.create(params[:token])
 
       session = find_session
+      raise ExpiredSessionError if session.expired?
+
       sign_in session.authenticatable
 
       redirect_enabled = Passwordless.redirect_back_after_sign_in
@@ -52,7 +59,11 @@ module Passwordless
       else
         redirect_to main_app.root_path
       end
+    rescue ExpiredSessionError
+      flash[:error] = I18n.t('.passwordless.sessions.create.session_expired')
+      redirect_to main_app.root_path
     end
+    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
     # match '/sign_out', via: %i[get delete].
     #   Signs user out. Redirects to root_path

data/app/mailers/passwordless/mailer.rb

@@ -18,7 +18,7 @@ module Passwordless
       email_field = @session.authenticatable.class.passwordless_email_field
       mail(
         to: @session.authenticatable.send(email_field),
-        subject: 'Your magic link ✨'
+        subject: I18n.t('passwordless.mailer.subject')
       )
     end
   end

data/app/models/passwordless/session.rb

@@ -18,9 +18,13 @@ module Passwordless
     before_validation :set_defaults
 
     scope :valid, lambda {
-      where('timeout_at > ? AND expires_at > ?', Time.current, Time.current)
+      where('timeout_at > ?', Time.current)
     }
 
+    def expired?
+      expires_at <= Time.current
+    end
+
     private
 
     def set_defaults

data/app/views/passwordless/mailer/magic_link.text.erb

@@ -1,2 +1 @@
-Here's your link:
-<%= @magic_link %>
+<%= I18n.t('passwordless.mailer.magic_link', link: @magic_link) %>

data/app/views/passwordless/sessions/create.html.erb

@@ -1 +1 @@
-<p>If we found you in the system, we've sent you an email.</p>
+<p><%= I18n.t('passwordless.sessions.success.email_sent_if_record_found') %></p>

data/app/views/passwordless/sessions/new.html.erb

@@ -1,5 +1,5 @@
 <%= form_for @session, url: send(authenticatable_resource).sign_in_path do |f| %>
   <% email_field_name = :"passwordless[#{@email_field}]" %>
   <%= text_field_tag email_field_name, params.fetch(email_field_name, nil) %>
-  <%= f.submit 'Send magic link' %>
+  <%= f.submit I18n.t('passwordless.sessions.new.submit') %>
 <% end %>

data/config/locales/en.yml

@@ -0,0 +1,12 @@
+---
+en:
+  passwordless:
+    sessions:
+      create:
+        session_expired: 'Your session has expired, please sign in again.'
+        email_sent_if_record_found: "If we found you in the system, we've sent you an email."
+      new:
+        submit: 'Send magic link'
+    mailer:
+      subject: "Your magic link ✨'"
+      magic_link: "Here's your link: %{link}"

data/lib/passwordless/engine.rb

@@ -12,5 +12,10 @@ module Passwordless
       ActiveRecord::Base.extend ModelHelpers
       require 'passwordless/controller_helpers'
     end
+
+    config.before_initialize do |app|
+      app.config.i18n.load_path +=
+        Dir[Engine.root.join('config', 'locales', '*.yml')]
+    end
   end
 end

data/lib/passwordless/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Passwordless
-  VERSION = '0.4.4' # :nodoc:
+  VERSION = '0.5.0' # :nodoc:
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passwordless
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -98,6 +98,7 @@ files:
 - app/views/passwordless/mailer/magic_link.text.erb
 - app/views/passwordless/sessions/create.html.erb
 - app/views/passwordless/sessions/new.html.erb
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/20171104221735_create_passwordless_sessions.rb
 - lib/passwordless.rb