magic-link 0.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d9cdcff5bac8ba5789ac41f1b297408a4fba83f063d3afbb3bd585549996be9
-  data.tar.gz: 6e7cf401d907dcdb65421a2fac94084b1749b3bd84e5d0e0ac334e82738ef96d
+  metadata.gz: 4702207f1e6738652b3afb874370dedda68060c8d9c8ae9eb083eba8acec3912
+  data.tar.gz: 7c4e9bf8c79ef5fd2bb426b8c6f5bcbbc8e5f31db27345f81719d7819388928f
 SHA512:
-  metadata.gz: 58db75b1fed54635bdc015e83a7f170c5c3193b054d94a35270a58f269045925c5a26004edc7ce5f9218057a72bec54d4d3095bf66aab19fce6b9ff1801a55df
-  data.tar.gz: b06b4740c460825a17e969ff4cc0d9272463c028dd6b855f49d2dff8767a6e62277601065416cc6a3d55d1b9512172d99b3d1cb6517198a1a6d987c49a028b38
+  metadata.gz: 1a7f9f1c88d957ff6e8b1975c6734af4fa42aff3d8b2700c0086353f3045364aa1c7d219db4b2cdb84a97e9d981966126277b28b65341e5ba9e9e8478ea53158
+  data.tar.gz: 689167a5bc00421dc3929edb49b447c8957467b0adb448e1c86ab736e628b9a5bb5de53b0422ae055d654da7df8aeb1c0b7af29885ace08a5032d673abd4217e

data/README.md

@@ -19,7 +19,7 @@ mount the engine
 mount Magic::Link::Engine, at: '/'
 ```
 
-Now users can visit `/magic_links/new` to enter their email and have a sign in
+Now users can visit `/magic_links/new` (which you can link to with `magic_link.new_magic_link_path`) to enter their email and have a sign in
 link sent to them via email. Tokens are cleared after use and expire after the
 configured number of hours
 

data/app/controllers/magic/link/magic_links_controller.rb

@@ -1,6 +1,7 @@
 module Magic
   module Link
     class MagicLinksController < ::ApplicationController
+      skip_before_action :authenticate_user!, :raise => false
       before_action :check_user, only: :new
 
       def new
@@ -13,6 +14,26 @@ module Magic
         redirect_to main_app.root_path, notice: "Check your email for a sign in link!"
       end
 
+      def authenticate
+        email = params[:email].presence
+        token = params[:sign_in_token].presence
+        user  = email && token && Magic::Link.user_class.find_by(email: email)
+
+        # TODO: Handle a different user trying to sign in
+        if token && send("#{Magic::Link.user_class.name.underscore}_signed_in?")
+          flash[:alert] = "You are already signed in"
+          redirect_to main_app.send(Magic::Link.after_sign_in_path)
+        elsif user && token_matches?(user) && token_not_expired?(user)
+          flash[:notice] = "You have signed in successfully"
+          user.update_columns(sign_in_token: nil, sign_in_token_sent_at: nil)
+          sign_in user
+          redirect_to main_app.send(Magic::Link.after_sign_in_path)
+        elsif email && token
+          flash[:alert] = "Your sign in token is invalid"
+          redirect_to magic_link.new_magic_link_path
+        end
+      end
+
       private
 
         def check_user
@@ -21,6 +42,17 @@ module Magic
           end
         end
 
+        def token_matches?(user)
+          Devise.secure_compare(
+            user.sign_in_token,
+            Devise.token_generator.digest(Magic::Link.user_class, :sign_in_token, params[:sign_in_token])
+          )
+        end
+
+        def token_not_expired?(user)
+          user.sign_in_token_sent_at >= Magic::Link.token_expiration_hours.hours.ago
+        end
+
         def permitted_params
           params.fetch(:magic_link, {}).permit(:email)
         end

data/app/views/magic/link/magic_link_mailer/send_magic_link.html.erb

@@ -1,5 +1,5 @@
 <p>Hey there! Here is your sign in link (you can only use it once):</p>
 
-<p><%= link_to "Sign In", main_app.root_url(email: @email, sign_in_token: @token) %></p>
+<p><%= link_to "Sign In", magic_link.authenticate_url(email: @email, sign_in_token: @token) %></p>
 
 <p>Thanks!</p>

data/app/views/magic/link/magic_link_mailer/send_magic_link.text.erb

@@ -1,5 +1,5 @@
 Hey there! Here is your sign in link (you can only use it once):
 
-<%= main_app.root_url(email: @email, sign_in_token: @token) %>
+<%= magic_link.authenticate_url(email: @email, sign_in_token: @token) %>
 
 Thanks!

data/app/views/magic/link/magic_links/new.html.erb

@@ -1,7 +1,11 @@
 <div class="row">
   <div class="col-md-6 offset-md-3">
-    <%= simple_form_for @magic_link do |f| %>
-      <%= f.input :email, label: "Enter your email", autofocus: true %>
+    <%= form_for @magic_link do |f| %>
+      <div class="field">
+        <%= f.label :email %><br />
+        <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+      </div>
+
       <%= f.submit "Email me a sign in link", class: "btn btn-primary btn-block" %>
     <% end %>
     <br>

data/config/routes.rb

@@ -1,3 +1,4 @@
 Magic::Link::Engine.routes.draw do
   resources :magic_links, only: [:new, :create]
+  get "/magic_links/authenticate", to: "magic_links#authenticate", as: :authenticate
 end

data/lib/magic/link.rb

@@ -1,5 +1,4 @@
 require "magic/link/engine"
-require "magic/link/controller_extensions"
 require "magic/link/railtie"
 
 module Magic
@@ -13,6 +12,9 @@ module Magic
     mattr_accessor :token_expiration_hours
     @@token_expiration_hours = 6
 
+    mattr_accessor :after_sign_in_path
+    @@after_sign_in_path = "root_path"
+
     class << self
       def configure
         yield self

data/lib/magic/link/railtie.rb

@@ -2,9 +2,7 @@ module Magic
   module Link
     class Railtie < ::Rails::Railtie
       config.to_prepare do
-        ::ApplicationController.send(:include, Magic::Link::ControllerExtensions)
         ::ApplicationController.send(:helper, Magic::Link::ApplicationHelper)
-        ::ApplicationController.send(:before_action, :authenticate_user_from_token!)
       end
     end
   end

data/lib/magic/link/version.rb

@@ -1,5 +1,5 @@
 module Magic
   module Link
-    VERSION = '0.1.0'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic-link
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - David Van Der Beek
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 5.2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 5.2.2.1
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 4.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 4.7.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -77,7 +77,6 @@ files:
 - app/views/magic/link/magic_links/new.html.erb
 - config/routes.rb
 - lib/magic/link.rb
-- lib/magic/link/controller_extensions.rb
 - lib/magic/link/engine.rb
 - lib/magic/link/railtie.rb
 - lib/magic/link/version.rb
@@ -86,7 +85,7 @@ homepage: https://github.com/dvanderbeek/magic-link
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Devise magic sign in links
 test_files: []

data/lib/magic/link/controller_extensions.rb

@@ -1,39 +0,0 @@
-module Magic
-  module Link
-    module ControllerExtensions
-      def self.included(base)
-        base.send(:include, InstanceMethods)
-      end
-
-      module InstanceMethods
-        def authenticate_user_from_token!
-          email = params[:email].presence
-          token = params[:sign_in_token].presence
-          user  = email && token && Magic::Link.user_class.find_by(email: email)
-
-          if token && send("#{Magic::Link.user_class.name.underscore}_signed_in?")
-            flash.now[:alert] = "You are already signed in"
-          elsif user && token_matches?(user) && token_not_expired?(user)
-            flash[:notice] = "You have signed in successfully"
-            user.update_columns(sign_in_token: nil, sign_in_token_sent_at: nil)
-            sign_in user
-          elsif email && token
-            flash[:alert] = "Your sign in token is invalid"
-            redirect_to main_app.root_path
-          end
-        end
-
-        def token_matches?(user)
-          Devise.secure_compare(
-            user.sign_in_token,
-            Devise.token_generator.digest(Magic::Link.user_class, :sign_in_token, params[:sign_in_token])
-          )
-        end
-
-        def token_not_expired?(user)
-          user.sign_in_token_sent_at >= Magic::Link.token_expiration_hours.hours.ago
-        end
-      end
-    end
-  end
-end