magic-link 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 700ad70db490a9105bc1e0a8df8f95524ee2a6407abcde3b1344acb077454ceb
-  data.tar.gz: d184b396e2f106174502ebd8881ddab8393071d4dab29d2e348c537c7f7bec52
+  metadata.gz: 549ae2f89461444bd190d9eb79237df57a13414c45a228b0ea0519fd34f779d3
+  data.tar.gz: 3a2886647663207bc1244fb83b62e18684175548df6387a28c80b630b64b2e0a
 SHA512:
-  metadata.gz: bf724fbf943fa48ac5674ab6cab73e9b6478305036faa90eff3bb8eb46659c76f6404e029e3674a51d0bb8e4142d197f83afac0ed335a03b22817fd2cc4997b4
-  data.tar.gz: c938533daf23c5b908e1671ac29faca01643e221d4e41cdafb76ee0e8ed859e920021de6ee6dd3d7f1438e0555f7da1df74b689e41d3d8ac358275eae50441e5
+  metadata.gz: 97c19cc64c7b472f2daca7c194cf20d3567e1b748a585bf4c399a95be8f4aac03a86bc89266fb7188baf63863abbbef7f5570a188b2d8c56c8b38f6db1638d2d
+  data.tar.gz: 37c5512f629233c4a577f3226caec72ee595c2d1516f30b9af9a5ca9adfabcc1d94c1a5b27a31b5dde7ed7b85f922efb0e1c6f9c58d466d061581c31cf1f22e3

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

@@ -13,6 +13,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 +41,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/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.3.0'
+    VERSION = '1.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic-link
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - David Van Der Beek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -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

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