Merge branch 'main' of github.com:wintercms/wn-user-plugin

wintercms · May 11, 2021 · a60045b · a60045b
2 parents c314947 + c43eae6
commit a60045b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/classes/AuthManager.php b/classes/AuthManager.php
@@ -1,10 +1,10 @@
 <?php namespace Winter\User\Classes;
 
-use Winter\Storm\Auth\Manager as RainAuthManager;
+use Winter\Storm\Auth\Manager as StormAuthManager;
 use Winter\User\Models\Settings as UserSettings;
 use Winter\User\Models\UserGroup as UserGroupModel;
 
-class AuthManager extends RainAuthManager
+class AuthManager extends StormAuthManager
 {
     protected static $instance;
 

diff --git a/classes/UserRedirector.php b/classes/UserRedirector.php
@@ -16,8 +16,7 @@ class UserRedirector extends Redirector
      */
     public function guest($path, $status = 302, $headers = [], $secure = null)
     {
-        $sessionKey = App::runningInBackend() ? 'url.intended' : 'url.frontend.intended';
-        $this->session->put($sessionKey, $this->generator->full());
+        $this->session->put($this->getItendedSessionKey(), $this->generator->full());
 
         return $this->to($path, $status, $headers, $secure);
     }
@@ -33,9 +32,29 @@ public function guest($path, $status = 302, $headers = [], $secure = null)
      */
     public function intended($default = '/', $status = 302, $headers = [], $secure = null)
     {
-        $sessionKey = App::runningInBackend() ? 'url.intended' : 'url.frontend.intended';
-        $path = $this->session->pull($sessionKey, $default);
+        $path = $this->session->pull($this->getItendedSessionKey(), $default);
 
         return $this->to($path, $status, $headers, $secure);
     }
+
+    /**
+     * Set the intended url.
+     *
+     * @param  string  $url
+     * @return void
+     */
+    public function setIntendedUrl($url)
+    {
+        $this->session->put($this->getItendedSessionKey(), $url);
+    }
+
+    /**
+     * Get the session key for the intended redirect
+     *
+     * @return string
+     */
+    protected function getItendedSessionKey()
+    {
+        return App::runningInBackend() ? 'url.intended' : 'url.frontend.intended';
+    }
 }