cachethq#3102 fix redirects when adding subscribers/verifying them

Naugrimm · Jan 26, 2020 · cb14f44 · cb14f44
1 parent 4e7aaef
commit cb14f44
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/app/Http/Controllers/SubscribeController.php b/app/Http/Controllers/SubscribeController.php
@@ -94,9 +94,8 @@ public function postSubscribe()
         // Send the subscriber a link to manage their subscription.
         $subscription->notify(new ManageSubscriptionNotification());
 
-        return redirect()->back()->withSuccess(
-            sprintf('%s %s', trans('dashboard.notifications.awesome'),
-            trans('cachet.subscriber.email.manage_subscription')));
+        return cachet_redirect('status-page')
+            ->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('cachet.subscriber.email.subscribed')));
     }
 
     /**
@@ -122,8 +121,8 @@ public function getVerify($code = null)
             execute(new VerifySubscriberCommand($subscriber));
         }
 
-        return redirect()->to(URL::signedRoute(cachet_route_generator('subscribe.manage'), ['code' => $code]))
-            ->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('cachet.subscriber.email.subscribed')));
+        return cachet_redirect('subscribe.manage', ['code' => $subscriber->verify_code])
+            ->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('cachet.subscriber.email.verified')));
     }
 
     /**