Fixed bad redirection after successful admin login in subdirectory multisite [#1487]

CHANGELOG.md

@@ -5,6 +5,7 @@
     * Made all the `onAdmin*` CRUD events to pass `object` (and backwards compatible `page`) to make them easier to use
 1. [](#bugfix)
     * Fixed issue with File field being used in Theme/Plugins
+    * Fixed bad redirection after successful admin login in subdirectory multisite [#1487](https://github.com/getgrav/grav-plugin-admin/issues/1487)
 
 # v1.10.0-rc.15
 ## 07/22/2020

classes/plugin/Admin.php

@@ -609,7 +609,9 @@ class Admin
             $this->setMessage(static::translate($message), $event->getMessageType());
         }
 
-        $redirect = $event->getRedirect();
+        /** @var Pages $pages */
+        $pages = $this->grav['pages'];
+        $redirect = $pages->baseRoute() . $event->getRedirect();
 
         $this->grav->redirect($redirect, $event->getRedirectCode());
     }
@@ -619,6 +621,10 @@ class Admin
      */
     public function twoFa($data, $post)
     {
+        /** @var Pages $pages */
+        $pages = $this->grav['pages'];
+        $baseRoute = $pages->baseRoute();
+
         /** @var Login $login */
         $login = $this->grav['login'];
 
@@ -635,14 +641,16 @@ class Admin
 
             $this->grav['session']->setFlashCookieObject(Admin::TMP_COOKIE_NAME, ['message' => $this->translate('PLUGIN_ADMIN.2FA_FAILED'), 'status' => 'error']);
 
-            $this->grav->redirect($this->uri->route(), 303);
+            $this->grav->redirect($baseRoute . $this->uri->route(), 303);
         }
 
         $this->setMessage($this->translate('PLUGIN_ADMIN.LOGIN_LOGGED_IN'), 'info');
 
         $user->authorized = true;
 
-        $this->grav->redirect($post['redirect']);
+        $redirect = $baseRoute . $post['redirect'];
+
+        $this->grav->redirect($redirect);
     }
 
     /**