Use with protected content

Author: Holger Lösken

DOCUMENTATION.md

@@ -1,3 +1,12 @@
+## Protecting content
+
+You can use magic links with Statamics [Protecting Content](https://statamic.dev/protecting-content) feature.
+When [defining a password form](https://statamic.dev/protecting-content#password-form) just use one of these tags to
+show a magic link login below the normal password login form:
+
+*  `{{ magiclink:login-link }}`: Displays a completely rendered `a` tag. For customizing the html, see [Customization](#Customization).
+*  `{{ magiclink:login-route }}`: Return the route to the magic link form. Use this with your own markup. 
+
 ## Permissions
 
 The access to settings of MagicLink can be restricted to certain users. When navigation to _Permissions_ inside the

composer.lock

@@ -64,14 +64,7 @@
                 {{ __('Forgot password?') }}
             </a>
         </div>
-        <div class="w-full text-center mt-2">
-            <a href="{{ route('magiclink.show-send-link-form')}}" class="forgot-password-link text-sm opacity-75 hover:opacity-100">
-                <svg class="w-4 h-4 align-middle" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 3v4M3 5h4M6 17v4m-2-2h4m5-16l2.286 6.857L21 12l-5.714 2.143L13 21l-2.286-6.857L5 12l5.714-2.143L13 3z"></path>
-                </svg>
-                {{ __('magiclink::web.login_magic_link') }}
-            </a>
-        </div>
+        @include('magiclink::partials.login-link')
     @endif
 
 @endsection

resources/views/auth/login.blade.php

@@ -17,7 +17,7 @@
     </div>
 
     <div class="w-full text-center mt-2">
-        <a class="text-white text-sm opacity-75 hover:opacity-100" href="{{ cp_route('login') }}">
+        <a class="text-white text-sm opacity-75 hover:opacity-100" href="{{ $referer }}">
             <svg class="w-4 h-4 align-middle" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12.066 11.2a1 1 0 000 1.6l5.334 4A1 1 0 0019 16V8a1 1 0 00-1.6-.8l-5.333 4zM4.066 11.2a1 1 0 000 1.6l5.334 4A1 1 0 0011 16V8a1 1 0 00-1.6-.8l-5.334 4z"></path>
             </svg>

resources/views/magiclink/send-link-form.blade.php

@@ -0,0 +1,8 @@
+<div class="w-full text-center mt-2">
+    <a href="{{ route('magiclink.show-send-link-form')}}" class="forgot-password-link text-sm opacity-75 hover:opacity-100">
+        <svg class="w-4 h-4 align-middle" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 3v4M3 5h4M6 17v4m-2-2h4m5-16l2.286 6.857L21 12l-5.714 2.143L13 21l-2.286-6.857L5 12l5.714-2.143L13 3z"></path>
+        </svg>
+        {{ __('magiclink::web.login_magic_link') }}
+    </a>
+</div>

resources/views/partials/login-link.blade.php

@@ -7,10 +7,13 @@
 use Codedge\MagicLink\Events\LinkCreated;
 use Codedge\MagicLink\MagicLinkManager;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Session;
 use Statamic\Facades\User;
 
 final class MagicLinkController extends BaseWebController
 {
+    private const LOGIN_FORM_REFERER_SESSION_KEY = 'login-form-referer';
+
     protected MagicLinkManager $magicLinkRepository;
     protected User $user;
 
@@ -21,7 +24,11 @@ public function __construct(MagicLinkManager $magicLinkRepository)
 
     public function showSendLinkForm()
     {
-        return view('magiclink::magiclink.send-link-form');
+        Session::put(self::LOGIN_FORM_REFERER_SESSION_KEY, \request()->headers->get('referer'));
+
+        return view('magiclink::magiclink.send-link-form', [
+            'referer' => Session::get('login-form-referer'),
+        ]);
     }
 
     public function sendLink(Request $request)
@@ -40,7 +47,7 @@ public function sendLink(Request $request)
         session()->flash('success', __('magiclink::web.address_exists_then_email'));
 
         return [
-            'redirect' => cp_route('login'),
+            'redirect' => Session::get(self::LOGIN_FORM_REFERER_SESSION_KEY),
         ];
     }
 }

src/Http/Controllers/MagicLinkController.php

@@ -29,6 +29,10 @@ final class ServiceProvider extends AddonServiceProvider
         __DIR__.'/../public/js/statamic-magiclink.js',
     ];
 
+    protected $tags = [
+        \Codedge\MagicLink\Tags\Magiclink::class,
+    ];
+
     protected $listen = [
         LinkCreated::class => [
             SendLinkNotification::class,

src/ServiceProvider.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Codedge\MagicLink\Tags;
+
+use Codedge\MagicLink\Repositories\SettingsRepository;
+use Statamic\Tags\Tags;
+
+class Magiclink extends Tags
+{
+    protected SettingsRepository $settingsRepository;
+
+    public function __construct(SettingsRepository $settingsRepository)
+    {
+        $this->settingsRepository = $settingsRepository;
+    }
+
+    public function loginLink()
+    {
+        return ($this->settingsRepository->isEnabled() ? view('magiclink::partials.login-link') : '');
+    }
+
+    public function loginRoute(): string
+    {
+        return ($this->settingsRepository->isEnabled() ? route('magiclink.show-send-link-form') : '');
+    }
+}