Refactor a little bit...

Author: duncanmcclean

src/Auth/User.php

@@ -358,6 +358,11 @@ public function getCpSearchResultBadge(): string
         return __('User');
     }
 
+    public function getElevatedSessionMethod(): string
+    {
+        return $this->password() ? 'password_confirmation' : 'verification_code';
+    }
+
     protected function getComputedCallbacks()
     {
         return Facades\User::getComputedCallbacks();

src/Http/Controllers/CP/Auth/ElevatedSessionController.php

@@ -18,16 +18,11 @@ public function status(Request $request)
         $response = [
             'elevated' => $request->hasElevatedSession(),
             'expiry' => $request->getElevatedSessionExpiry(),
-            'method' => $user->password() ? 'password_confirmation' : 'verification_code',
+            'method' => $user->getElevatedSessionMethod(),
         ];
 
-        if (! $request->hasElevatedSession() && $response['method'] === 'verification_code') {
-            session()->put(
-                key: 'statamic_elevated_session_verification_code',
-                value: $verificationCode = Str::random(20)
-            );
-
-            $user->notify(new ElevatedSessionVerificationCode($verificationCode));
+        if (! $request->hasElevatedSession() && $user->getElevatedSessionMethod() === 'verification_code') {
+            session()->sendElevatedSessionVerificationCode();
         }
 
         return $response;
@@ -36,19 +31,13 @@ public function status(Request $request)
     public function showForm()
     {
         $user = User::current();
-        $method = $user->password() ? 'password_confirmation' : 'verification_code';
-
-        if ($method === 'verification_code') {
-            session()->put(
-                key: 'statamic_elevated_session_verification_code',
-                value: $verificationCode = Str::random(20)
-            );
 
-            $user->notify(new ElevatedSessionVerificationCode($verificationCode));
+        if ($user->getElevatedSessionMethod() === 'verification_code') {
+            session()->sendElevatedSessionVerificationCode();
         }
 
         return view('statamic::auth.confirm-password', [
-            'method' => $method,
+            'method' => $user->getElevatedSessionMethod(),
         ]);
     }
 
@@ -61,15 +50,13 @@ public function confirm(Request $request)
             'verification_code' => 'required_without:password',
         ]);
 
-        $method = $request->password ? 'password_confirmation' : 'verification_code';
-
         if ($request->password && ! Hash::check($request->password, $user->password())) {
             throw ValidationException::withMessages([
                 'password' => [__('statamic::validation.current_password')],
             ]);
         }
 
-        if ($request->verification_code && $request->verification_code !== $request->session()->get('statamic_elevated_session_verification_code')) {
+        if ($request->verification_code && $request->verification_code !== $request->getElevatedSessionVerificationCode()) {
             throw ValidationException::withMessages([
                 'verification_code' => [__('statamic::validation.elevated_session_verification_code')],
             ]);
@@ -79,6 +66,6 @@ public function confirm(Request $request)
 
         return $request->wantsJson()
             ? $this->status($request)
-            : redirect()->intended(cp_route('index'))->with('success', $method === 'password_confirmation' ? __('Password confirmed') : __('Code verified'));
+            : redirect()->intended(cp_route('index'))->with('success', $user->getElevatedSessionMethod() === 'password_confirmation' ? __('Password confirmed') : __('Code verified'));
     }
 }

src/Providers/CpServiceProvider.php

@@ -9,6 +9,7 @@
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Str;
 use Statamic\CP\Utilities\UtilityRepository;
 use Statamic\Extensions\Translation\Loader;
 use Statamic\Extensions\Translation\Translator;
@@ -22,6 +23,7 @@
 use Statamic\Http\View\Composers\SessionExpiryComposer;
 use Statamic\Licensing\LicenseManager;
 use Statamic\Licensing\Outpost;
+use Statamic\Notifications\ElevatedSessionVerificationCode;
 
 class CpServiceProvider extends ServiceProvider
 {
@@ -127,8 +129,21 @@ private function registerElevatedSessionMacros()
                 ->timestamp;
         });
 
+        Request::macro('getElevatedSessionVerificationCode', function () {
+            return session()->get('statamic_elevated_session_verification_code');
+        });
+
         Session::macro('elevate', function () {
             $this->put('statamic_elevated_session', now()->timestamp);
         });
+
+        Session::macro('sendElevatedSessionVerificationCode', function () {
+            session()->put(
+                key: 'statamic_elevated_session_verification_code',
+                value: $verificationCode = Str::random(20)
+            );
+
+            User::current()->notify(new ElevatedSessionVerificationCode($verificationCode));
+        });
     }
 }