Merge branch 'master' of github.com:codedge/statamic-magiclink

Holger Lösken · Holger Lösken · commit 913f39a1acda · 2020-09-21T10:12:38.000+02:00
diff --git a/resources/lang/de/cp.php b/resources/lang/de/cp.php
@@ -1,18 +1,20 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 return [
     'settings' => [
-        'headline' => 'MagicLink',
-        'configure_your_needs' => 'Passe MagicLink nach deinen Wünschen an',
-        'ml_enabled' => 'MagicLink aktivieren?',
-        'ml_enabled_instructions' => 'Aktiviere oder deaktiviere die Nutzung von MagicLinks',
-        'ml_expire_time' => 'Ablaufzeit',
+        'headline'                    => 'MagicLink',
+        'configure_your_needs'        => 'Passe MagicLink nach deinen Wünschen an',
+        'ml_enabled'                  => 'MagicLink aktivieren?',
+        'ml_enabled_instructions'     => 'Aktiviere oder deaktiviere die Nutzung von MagicLinks',
+        'ml_expire_time'              => 'Ablaufzeit',
         'ml_expire_time_instructions' => 'Laufzeit des Links, nachdem er verfällt. Standart sind 30 Minuten.',
-        'updated_successfully' => 'Einstellungen erfolgreich aktualisiert.',
+        'updated_successfully'        => 'Einstellungen erfolgreich aktualisiert.',
     ],
     'permissions' => [
-        'settings' => 'MagicLink Einstellung',
-        'view_settings' => 'Einstellungen ansehen',
+        'settings'                  => 'MagicLink Einstellung',
+        'view_settings'             => 'Einstellungen ansehen',
         'view_settings_description' => 'Zugriff, um Einstellungen anzusehen.',
     ],
     'email' => [
diff --git a/resources/lang/de/web.php b/resources/lang/de/web.php
@@ -1,10 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 return [
-    'address_exists_then_email' => 'Wenn die E-Mail-Adresse bei uns registriert ist, solltest du eine E-Mail bekommen haben.',
-    'back_to_classic_login' => 'Zurück zum klassischen Login?',
-    'email_address' => 'E-Mail-Adresse',
-    'login_magic_link' => 'Magic Link senden',
+    'address_exists_then_email'    => 'Wenn die E-Mail-Adresse bei uns registriert ist, solltest du eine E-Mail bekommen haben.',
+    'back_to_classic_login'        => 'Zurück zum klassischen Login?',
+    'email_address'                => 'E-Mail-Adresse',
+    'login_magic_link'             => 'Magic Link senden',
     'magic_link_signature_invalid' => 'Der Magic Link ist ungültig. Bitte fordere einen neuen Link an.',
-    'unable_to_send' => 'Senden des Links nicht möglich.'
+    'unable_to_send'               => 'Senden des Links nicht möglich.',
 ];
diff --git a/resources/lang/en/cp.php b/resources/lang/en/cp.php
@@ -1,18 +1,20 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 return [
     'settings' => [
-        'headline' => 'MagicLink',
-        'configure_your_needs' => 'Configure MagicLink after your needs.',
-        'ml_enabled' => 'MagicLink enabled?',
-        'ml_enabled_instructions' => 'Activate or deactivate the usage of magic links.',
-        'ml_expire_time' => 'Expire time',
+        'headline'                    => 'MagicLink',
+        'configure_your_needs'        => 'Configure MagicLink after your needs.',
+        'ml_enabled'                  => 'MagicLink enabled?',
+        'ml_enabled_instructions'     => 'Activate or deactivate the usage of magic links.',
+        'ml_expire_time'              => 'Expire time',
         'ml_expire_time_instructions' => 'Time the login link is valid. Default is 30 minutes.',
-        'updated_successfully' => 'Settings updated successfully.',
+        'updated_successfully'        => 'Settings updated successfully.',
     ],
     'permissions' => [
-        'settings' => 'MagicLink Settings',
-        'view_settings' => 'View settings',
+        'settings'                  => 'MagicLink Settings',
+        'view_settings'             => 'View settings',
         'view_settings_description' => 'Grants access to see settings',
     ],
     'email' => [
diff --git a/resources/lang/en/web.php b/resources/lang/en/web.php
@@ -1,10 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 return [
-    'address_exists_then_email' => 'If there exists an account with this email address, you should have received a message.',
-    'back_to_classic_login' => 'Back to classic login page?',
-    'email_address' => 'Email',
-    'login_magic_link' => 'Send Magic Link',
+    'address_exists_then_email'    => 'If there exists an account with this email address, you should have received a message.',
+    'back_to_classic_login'        => 'Back to classic login page?',
+    'email_address'                => 'Email',
+    'login_magic_link'             => 'Send Magic Link',
     'magic_link_signature_invalid' => 'Your MagicLink signature seems invalid. Please request a new link.',
-    'unable_to_send' => 'Unable to send link.'
+    'unable_to_send'               => 'Unable to send link.',
 ];
diff --git a/routes/web.php b/routes/web.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 use Codedge\MagicLink\Http\Controllers\Cp\Auth\MagicLinkLoginController;
 use Codedge\MagicLink\Http\Controllers\MagicLinkController;
@@ -8,5 +10,5 @@
     Route::get('/send-link', [MagicLinkController::class, 'showSendLinkForm'])->name('show-send-link-form');
     Route::post('/send-link', [MagicLinkController::class, 'sendLink'])->name('send-link');
 
-    Route::get( 'login/{hash}', [MagicLinkLoginController::class, 'login'])->name('login');
+    Route::get('login/{hash}', [MagicLinkLoginController::class, 'login'])->name('login');
 });
diff --git a/src/Events/LinkCreated.php b/src/Events/LinkCreated.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Codedge\MagicLink\Events;
 
diff --git a/src/Http/Controllers/BaseWebController.php b/src/Http/Controllers/BaseWebController.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Codedge\MagicLink\Http\Controllers;
 
diff --git a/src/Http/Controllers/Cp/Auth/LoginController.php b/src/Http/Controllers/Cp/Auth/LoginController.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Codedge\MagicLink\Http\Controllers\Cp\Auth;
 
@@ -20,16 +22,16 @@ public function __construct(SettingsRepository $settingsRepository)
 
     public function showLoginForm(Request $request)
     {
-        if(!$this->settingsRepository->isEnabled()) {
+        if (!$this->settingsRepository->isEnabled()) {
             return parent::showLoginForm($request);
         }
 
         $data = [
-            'title' => __('Log in'),
-            'oauth' => $enabled = OAuth::enabled(),
+            'title'     => __('Log in'),
+            'oauth'     => $enabled = OAuth::enabled(),
             'providers' => $enabled ? OAuth::providers() : [],
-            'referer' => $this->getReferrer(),
-            'hasError' => $this->hasError(),
+            'referer'   => $this->getReferrer(),
+            'hasError'  => $this->hasError(),
         ];
 
         $view = view('magiclink::auth.login', $data);
@@ -44,11 +46,11 @@ public function showLoginForm(Request $request)
     private function hasError()
     {
         return function ($field) {
-            if (! $error = optional(session('errors'))->first($field)) {
+            if (!$error = optional(session('errors'))->first($field)) {
                 return false;
             }
 
-            return ! in_array($error, [
+            return !in_array($error, [
                 __('auth.failed'),
                 __('statamic::validation.required'),
             ]);
diff --git a/src/Http/Controllers/Cp/Auth/MagicLinkLoginController.php b/src/Http/Controllers/Cp/Auth/MagicLinkLoginController.php
@@ -1,12 +1,14 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Codedge\MagicLink\Http\Controllers\Cp\Auth;
 
 use Codedge\MagicLink\Http\Controllers\Cp\BaseCpController;
 use Codedge\MagicLink\MagicLinkManager;
 use Illuminate\Http\Request;
-use Statamic\Facades\User;
 use Illuminate\Support\Facades\Auth;
+use Statamic\Facades\User;
 
 class MagicLinkLoginController extends BaseCpController
 {
diff --git a/src/Http/Controllers/Cp/BaseCpController.php b/src/Http/Controllers/Cp/BaseCpController.php
@@ -1,10 +1,11 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Codedge\MagicLink\Http\Controllers\Cp;
 
 use Statamic\Http\Controllers\CP\CpController;
 
 class BaseCpController extends CpController
 {
-
 }
diff --git a/src/Http/Controllers/Cp/SettingsController.php b/src/Http/Controllers/Cp/SettingsController.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Codedge\MagicLink\Http\Controllers\Cp;
 
@@ -28,7 +30,7 @@ public function update(Request $request)
         $this->authorize('view settings');
 
         $request->validate([
-            'enabled' => ['required', 'boolean'],
+            'enabled'    => ['required', 'boolean'],
             'expireTime' => ['required', 'numeric'],
         ]);
 
@@ -37,7 +39,7 @@ public function update(Request $request)
         session()->flash('success', __('magiclink::cp.settings.updated_successfully'));
 
         return [
-            'redirect' => cp_route('magiclink.index')
+            'redirect' => cp_route('magiclink.index'),
         ];
     }
 }
diff --git a/src/Http/Controllers/MagicLinkController.php b/src/Http/Controllers/MagicLinkController.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Codedge\MagicLink\Http\Controllers;
 
@@ -25,20 +27,20 @@ public function showSendLinkForm()
     public function sendLink(Request $request)
     {
         $request->validate([
-           'email' => ['required', 'email']
+            'email' => ['required', 'email'],
         ]);
 
         $user = User::findByEmail($request->email);
 
-        if($user !== null) {
-            $link = $this->magicLinkRepository->createForUser($user)->generate();
-            event(new LinkCreated($link, $user));
+        if ($user !== null) {
+             $link = $this->magicLinkRepository->createForUser($user)->generate();
+             event(new LinkCreated($link, $user));
         }
 
         session()->flash('success', __('magiclink::web.address_exists_then_email'));
 
         return [
-            'redirect' => cp_route('login')
+            'redirect' => cp_route('login'),
         ];
     }
 }
diff --git a/src/Listeners/SendLinkNotification.php b/src/Listeners/SendLinkNotification.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Codedge\MagicLink\Listeners;
 
diff --git a/src/MagicLink.php b/src/MagicLink.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Codedge\MagicLink;
 
@@ -18,7 +20,7 @@ final class MagicLink
     public function __construct(User $user)
     {
         $this->expireTime = now()->addMinutes(config('statamic-magiclink.expire_time'));
-        $this->path = config('statamic-magiclink.url.path') . '/login';
+        $this->path = config('statamic-magiclink.url.path').'/login';
         $this->redirectTo = config('statamic-magiclink.url.redirect_on_success');
         $this->user = $user;
     }
@@ -65,7 +67,7 @@ public function generate(): self
             'magiclink.login',
             $this->expireTime,
             [
-                'hash' => $this->generateHash(),
+                'hash'       => $this->generateHash(),
                 'user_email' => $this->user->email(),
             ]
         );
diff --git a/src/MagicLinkManager.php b/src/MagicLinkManager.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Codedge\MagicLink;
 
@@ -48,7 +50,7 @@ public function generate(): MagicLink
 
         $payload[$this->user->email()] = [
             'expire_time' => $this->magicLink->getExpireTime(),
-            'hash' => $link->getHash(),
+            'hash'        => $link->getHash(),
         ];
 
         $this->save(collect($payload));
@@ -58,7 +60,7 @@ public function generate(): MagicLink
 
     private function get(): Collection
     {
-        if (! $this->files->exists($this->path)) {
+        if (!$this->files->exists($this->path)) {
             return collect();
         }
 
@@ -67,7 +69,7 @@ private function get(): Collection
 
     private function save(Collection $content)
     {
-        if (! $this->files->isDirectory($dir = dirname($this->path))) {
+        if (!$this->files->isDirectory($dir = dirname($this->path))) {
             $this->files->makeDirectory($dir);
         }
 
@@ -78,6 +80,4 @@ private function save(Collection $content)
 
         return $this->files->put($this->path, YAML::dump($merged->all()));
     }
-
-
 }
diff --git a/src/Mail/MagicLink/LinkInformation.php b/src/Mail/MagicLink/LinkInformation.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Codedge\MagicLink\Mail\MagicLink;
 
@@ -12,17 +14,17 @@ final class LinkInformation extends Mailable implements ShouldQueue
     protected MagicLink $magicLink;
     protected User $user;
 
-    public function __construct (MagicLink $magicLink, User $user)
+    public function __construct(MagicLink $magicLink, User $user)
     {
         $this->magicLink = $magicLink;
         $this->user = $user;
     }
 
     public function build()
     {
-        return $this->subject(config('app.name') . ' - ' .  __('magiclink::cp.email.new_link_subject'))
+        return $this->subject(config('app.name').' - '.__('magiclink::cp.email.new_link_subject'))
                     ->markdown('magiclink::emails.new-login-link', [
-                        'userName' => $this->user->name,
+                        'userName'  => $this->user->name,
                         'magicLink' => $this->magicLink->getLink(),
                     ]);
     }
diff --git a/src/Policies/SettingsPolicy.php b/src/Policies/SettingsPolicy.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Codedge\MagicLink\Policies;
 
diff --git a/src/Repositories/SettingsRepository.php b/src/Repositories/SettingsRepository.php
diff --git a/src/Responses/InvalidResponse.php b/src/Responses/InvalidResponse.php
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
diff --git a/tests/Auth/LoginTest.php b/tests/Auth/LoginTest.php
diff --git a/tests/CP/Settings/SettingsTest.php b/tests/CP/Settings/SettingsTest.php
diff --git a/tests/MagicLink/MagicLinkFormTest.php b/tests/MagicLink/MagicLinkFormTest.php
diff --git a/tests/TestCase.php b/tests/TestCase.php

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,11 @@`
`1`		`-<?php declare(strict_types=1);`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+declare(strict_types=1);`
`2`	`4`
`3`	`5`	`namespace Codedge\MagicLink\Http\Controllers\Cp;`
`4`	`6`
`5`	`7`	`use Statamic\Http\Controllers\CP\CpController;`
`6`	`8`
`7`	`9`	`class BaseCpController extends CpController`
`8`	`10`	`{`
`9`		`-`
`10`	`11`	`}`