From 3c0fa9a629501dba2b44dc09c2ef2a9e2900b488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Thu, 4 Nov 2021 16:01:38 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E3=82=82=E3=81=86=E8=89=AF=E3=81=84?= =?UTF-8?q?=E3=82=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/Http/Controllers/Api/AuthorizationTrait.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/backend/app/Http/Controllers/Api/AuthorizationTrait.php b/backend/app/Http/Controllers/Api/AuthorizationTrait.php index 836df6d7..1d0af325 100644 --- a/backend/app/Http/Controllers/Api/AuthorizationTrait.php +++ b/backend/app/Http/Controllers/Api/AuthorizationTrait.php @@ -13,6 +13,10 @@ trait AuthorizationTrait { return redirect($viewpath.'/meeting'); } - return view($viewpath.'/login'); + if ($this->getGuard() == 'admins') { + return view($viewpath.'/login'); + } + + return view($viewpath.'/auth'); } } \ No newline at end of file From 6bec5c0100e6c4e009125d1dbcfa1cfe0066ebfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Thu, 4 Nov 2021 16:03:31 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/Http/Controllers/Api/AuthorizationTrait.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/backend/app/Http/Controllers/Api/AuthorizationTrait.php b/backend/app/Http/Controllers/Api/AuthorizationTrait.php index 1d0af325..743b6b4d 100644 --- a/backend/app/Http/Controllers/Api/AuthorizationTrait.php +++ b/backend/app/Http/Controllers/Api/AuthorizationTrait.php @@ -8,15 +8,12 @@ use Illuminate\Http\Request; trait AuthorizationTrait { public function checkLogin () { $viewpath = str_replace('-', '_', request()->route()->action['prefix']); + $loginpage = $this->getGuard() == 'admins' ? $viewpath.'/login' : $viewpath.'/auth'; if (Session::has($this->getGuard())) { return redirect($viewpath.'/meeting'); } - if ($this->getGuard() == 'admins') { - return view($viewpath.'/login'); - } - - return view($viewpath.'/auth'); + return view($loginpage); } } \ No newline at end of file From 5a66127e7f819c3e062f819ccccb24a9afeb264d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Thu, 4 Nov 2021 16:04:46 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/Http/Controllers/Api/AuthorizationTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/app/Http/Controllers/Api/AuthorizationTrait.php b/backend/app/Http/Controllers/Api/AuthorizationTrait.php index 743b6b4d..862f0f85 100644 --- a/backend/app/Http/Controllers/Api/AuthorizationTrait.php +++ b/backend/app/Http/Controllers/Api/AuthorizationTrait.php @@ -8,7 +8,7 @@ use Illuminate\Http\Request; trait AuthorizationTrait { public function checkLogin () { $viewpath = str_replace('-', '_', request()->route()->action['prefix']); - $loginpage = $this->getGuard() == 'admins' ? $viewpath.'/login' : $viewpath.'/auth'; + $loginpage = $viewpath.'/'.($this->getGuard() == 'admins' ? 'login' : 'auth'); if (Session::has($this->getGuard())) { return redirect($viewpath.'/meeting');