Merge pull request #18 from mitydigital/fix/referer-message

Fix redirect message on login

src/Concerns/GetsReferrerUrl.php

@@ -2,12 +2,21 @@
 
 namespace MityDigital\StatamicTwoFactor\Concerns;
 
+use Illuminate\Http\Request;
 use Route;
 
 trait GetsReferrerUrl
 {
-    protected function getReferrerUrl()
+    protected function getReferrerUrl(Request $request)
     {
+        $sessionReferer = session()->get('two_factor_referer', null);
+
+        session()->put('two_factor_referer', null);
+
+        if ($sessionReferer) {
+            return $sessionReferer;
+        }
+
         $url = url()->previous();
 
         $route = collect(Route::getRoutes())->first(function (\Illuminate\Routing\Route $route) use ($url) {

src/Http/Controllers/TwoFactorChallengeController.php

@@ -30,8 +30,8 @@ public function index(Request $request)
         }
 
         // if we have a referrer URL, set it
-        if ($referrer = $this->getReferrerUrl()) {
-            // if we are not null, let's set it (this way it won't overwrite on failed attemts)
+        if ($referrer = $this->getReferrerUrl($request)) {
+            // if we are not null, let's set it (this way it won't overwrite on failed attempts)
             if ($referrer) {
                 $request->session()->put('statamic_two_factor_referrer', $referrer);
             }

src/Http/Middleware/EnforceTwoFactor.php

@@ -48,13 +48,13 @@ public function handle(Request $request, Closure $next)
                         // if we have no challenge token, it has expired
                         if (! $lastChallenge || Carbon::parse($lastChallenge)->addMinutes(config('statamic-two-factor.validity'))->isPast()) {
                             // not yet challenged, or expired, so yes, let's challenge
-                            return redirect(cp_route('statamic-two-factor.challenge'));
+                            return redirect(cp_route('statamic-two-factor.challenge'))->with('two_factor_referer', $request->getRequestUri());
                         }
                     }
                 } else {
                     // we don't care about expiry dates - we just need to know if we have been challenged at all
                     if (! $lastChallenge) {
-                        return redirect(cp_route('statamic-two-factor.challenge'));
+                        return redirect(cp_route('statamic-two-factor.challenge'))->with('two_factor_referer', $request->getRequestUri());
                     }
                 }
             }

tests/Concerns/GetsReferralUrlTest.php

@@ -35,10 +35,10 @@ function createRequestWithReferrer($referrer)
 
     foreach ($packageRoutes as $referrer => $params) {
         // create a request with the referrer set
-        createRequestWithReferrer(cp_route($referrer, $params));
+        $request = createRequestWithReferrer(cp_route($referrer, $params));
 
         // expect null returned
-        expect($this->getReferrerUrl())
+        expect($this->getReferrerUrl($request))
             ->toBeNull();
     }
 });
@@ -48,9 +48,23 @@ function createRequestWithReferrer($referrer)
     $route = cp_route('dashboard');
 
     // create a request with the referrer set
-    createRequestWithReferrer($route);
+    $request = createRequestWithReferrer($route);
 
     // expect null returned
-    expect($this->getReferrerUrl())
+    expect($this->getReferrerUrl($request))
         ->toBe($route);
 });
+
+it('returns the two factor session referrer when present', function () {
+    // create the route
+    $route = cp_route('dashboard');
+
+    // create a request with the referrer set
+    $request = createRequestWithReferrer($route);
+
+    session()->put('two_factor_referer', '/cp/collections');
+
+    // expect null returned
+    expect($this->getReferrerUrl($request))
+        ->toBe('/cp/collections');
+});