Default login redirect to admin url

config/twill.php

@@ -172,7 +172,7 @@
     |--------------------------------------------------------------------------
     |
      */
-    'auth_login_redirect_path' => '/',
+    'auth_login_redirect_path' => null,
 
     'templates_on_frontend_domain' => false,
 

src/Http/Controllers/Admin/LoginController.php

@@ -2,8 +2,8 @@
 
 namespace A17\Twill\Http\Controllers\Admin;
 
+use A17\Twill\Facades\TwillRoutes;
 use A17\Twill\Http\Requests\Admin\OauthRequest;
-use A17\Twill\Models\User;
 use A17\Twill\Repositories\UserRepository;
 use Carbon\Carbon;
 use Illuminate\Auth\AuthManager;
@@ -81,7 +81,7 @@ public function __construct(
         $this->config = $config;
 
         $this->middleware('twill_guest', ['except' => 'logout']);
-        $this->redirectTo = $config->get('twill.auth_login_redirect_path', '/');
+        $this->redirectTo = TwillRoutes::getAuthRedirectPath();
     }
 
     /**

src/Http/Controllers/Admin/ResetPasswordController.php

@@ -2,6 +2,7 @@
 
 namespace A17\Twill\Http\Controllers\Admin;
 
+use A17\Twill\Facades\TwillRoutes;
 use Illuminate\Config\Repository as Config;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 use Illuminate\Http\Request;
@@ -59,7 +60,7 @@ public function __construct(Config $config, Redirector $redirector, ViewFactory
         $this->viewFactory = $viewFactory;
         $this->config = $config;
 
-        $this->redirectTo = $this->config->get('twill.auth_login_redirect_path', '/');
+        $this->redirectTo = TwillRoutes::getAuthRedirectPath();
         $this->middleware('twill_guest');
     }
 

src/Http/Middleware/RedirectIfAuthenticated.php

@@ -2,6 +2,7 @@
 
 namespace A17\Twill\Http\Middleware;
 
+use A17\Twill\Facades\TwillRoutes;
 use Closure;
 use Illuminate\Config\Repository as Config;
 use Illuminate\Contracts\Auth\Factory as AuthFactory;
@@ -40,7 +41,7 @@ public function __construct(AuthFactory $authFactory, Redirector $redirector, Co
     public function handle($request, Closure $next, $guard = 'twill_users')
     {
         if ($this->authFactory->guard($guard)->check()) {
-            return $this->redirector->to($this->config->get('twill.auth_login_redirect_path', '/'));
+            return $this->redirector->to(TwillRoutes::getAuthRedirectPath());
         }
 
         return $next($request);

src/TwillRoutes.php

@@ -395,4 +395,11 @@ public function moduleShowWithPreview(
             )
             ->middleware(['web', 'twill_auth:twill_users', 'can:list']);
     }
+
+
+    public function getAuthRedirectPath(): string
+    {
+        return config('twill.auth_login_redirect_path')
+            ?? rtrim(config('twill.admin_app_url') ?: '', '/') . '/' . ltrim(config('twill.admin_app_path') ?? 'admin', '/');
+    }
 }

tests/unit/Helpers/RouteHelpersTest.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace A17\Twill\Tests\Unit\Helpers;
+
+use A17\Twill\Facades\TwillRoutes;
+use A17\Twill\Tests\Unit\TestCase;
+
+class RouteHelpersTest extends TestCase
+{
+    public function testGetAuthRedirectPath()
+    {
+        config(['twill.auth_login_redirect_path' => null, 'twill.admin_app_url' => null, 'twill.admin_app_path' => null]);
+
+        $this->assertEquals('/admin', TwillRoutes::getAuthRedirectPath());
+
+        config(['twill.admin_app_path' => 'twill']);
+
+        $this->assertEquals('/twill', TwillRoutes::getAuthRedirectPath());
+
+        config(['twill.admin_app_url' => 'https://admin.example.com/']);
+
+        $this->assertEquals('https://admin.example.com/twill', TwillRoutes::getAuthRedirectPath());
+
+        config(['twill.auth_login_redirect_path' => '/redirect']);
+
+        $this->assertEquals('/redirect', TwillRoutes::getAuthRedirectPath());
+    }
+}