From 98ddf1f065ec0a2d04f80cf9c1d5dd2fea310e94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?= Date: Thu, 29 Jul 2021 16:58:18 +0200 Subject: [PATCH] Enforce a redirection on the login page if the account is logued in Use the APP_URL variable to define the base url Bump the package number --- .../app/Http/Controllers/Account/AuthenticateController.php | 4 ++++ flexiapi/app/Providers/AppServiceProvider.php | 4 +++- flexisip-account-manager.spec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/flexiapi/app/Http/Controllers/Account/AuthenticateController.php b/flexiapi/app/Http/Controllers/Account/AuthenticateController.php index 641167c..ccc2a2f 100644 --- a/flexiapi/app/Http/Controllers/Account/AuthenticateController.php +++ b/flexiapi/app/Http/Controllers/Account/AuthenticateController.php @@ -38,6 +38,10 @@ class AuthenticateController extends Controller public function login(Request $request) { + if (auth()->user()) { + return redirect()->route('account.panel'); + } + return view('account.login'); } diff --git a/flexiapi/app/Providers/AppServiceProvider.php b/flexiapi/app/Providers/AppServiceProvider.php index b86200e..0cabe16 100644 --- a/flexiapi/app/Providers/AppServiceProvider.php +++ b/flexiapi/app/Providers/AppServiceProvider.php @@ -13,6 +13,8 @@ class AppServiceProvider extends ServiceProvider public function boot() { - // + // Add following lines to force laravel to use APP_URL as root url for the app. + $strBaseURL = $this->app['url']; + $strBaseURL->forceRootUrl(config('app.url')); } } diff --git a/flexisip-account-manager.spec b/flexisip-account-manager.spec index 9334eec..af72b22 100644 --- a/flexisip-account-manager.spec +++ b/flexisip-account-manager.spec @@ -8,7 +8,7 @@ #%define _datadir %{_datarootdir} #%define _docdir %{_datadir}/doc -%define build_number 91 +%define build_number 92 %define var_dir /var/opt/belledonne-communications %define opt_dir /opt/belledonne-communications/share/flexisip-account-manager