Merge pull request #71 from nakazawakan/oyakologin

親子のログイン可能ようになるため

backend/app/Http/Controllers/Api/AuthorizationTrait.php

@@ -6,16 +6,13 @@ use App\Http\Controllers\Controller, Session;
 use Illuminate\Http\Request;
 
 trait AuthorizationTrait {
-    // XXX そもそもこのメソッド、使いますか？
-    // 認可の処理はMiddlewareでやっているはずなので(このクラスがMiddlewareでcallされている、なら、ギリギリありですが)
     public function checkLogin () {
-        // セッションがあれば、管理者のトップページに移転する。なければ、ログイン画面となる。
+        $viewpath = str_replace('-', '_', request()->route()->action['prefix']);
+
         if (Session::has($this->getGuard())) {
-            // XXX リダイレクト先ですが「常に request()->route()->action['prefix'].'/meeting' 」固定ですか？
-            // XXX そうでない場合は、これも「メソッドの戻り値にする」やり方のほうが自由度があると思います
-            return redirect(request()->route()->action['prefix'].'/meeting');
+            return redirect($viewpath.'/meeting');
         }
 
-        return view(request()->route()->action['prefix'].'/login');
+        return view($viewpath.'/login');
     }
 }

backend/routes/api.php

@@ -16,7 +16,7 @@ use Illuminate\Support\Facades\Route;
 
 Route::group(['prefix' => 'admin'], function () {
     // AdminController
-    Route::post('/login', '\App\Http\Controllers\Api\AdminController@login')->name('adminslogin');
+    Route::post('/login', '\App\Http\Controllers\Api\AdminController@login');
 
     Route::group(['middleware' => 'auth:admins'], function () {
         // AdminController
@@ -75,9 +75,9 @@ Route::post('/contacts/register', '\App\Http\Controllers\Api\ContactsController@
 
 Route::group(['prefix' => 'fathers'], function () {
     // FathersController
-    Route::post('/registerMain', '\App\Http\Controllers\Api\FathersController@registerMain')->name('fathersregistermain');
-    Route::post('/requestPassword', '\App\Http\Controllers\Api\FathersController@requestPassword')->name('fathersrequestpassword');
-    Route::post('/login', '\App\Http\Controllers\Api\FathersController@login')->name('fatherslogin');
+    Route::post('/registerMain', '\App\Http\Controllers\Api\FathersController@registerMain');
+    Route::post('/requestPassword', '\App\Http\Controllers\Api\FathersController@requestPassword');
+    Route::post('/login', '\App\Http\Controllers\Api\FathersController@login');
 
     Route::group(['middleware' => 'auth:fathers'], function () {
         Route::put('/updateImage/{father_id}', '\App\Http\Controllers\Api\FathersController@updateImage');
@@ -137,10 +137,10 @@ Route::group(['prefix' => 'fathers'], function () {
 
 // ChildrenController
 Route::group(['prefix' => 'children'], function () {
-    Route::post('/registerTemporary', '\App\Http\Controllers\Api\ChildrenController@registerTemporary')->name('childrenregistertemporary');
-    Route::post('/registerMain', '\App\Http\Controllers\Api\ChildrenController@registerMain')->name('childrenregistermain');
-    Route::post('/requestPassword', '\App\Http\Controllers\Api\ChildrenController@requestPassword')->name('childrenrequestpassword');
-    Route::post('/login', '\App\Http\Controllers\Api\ChildrenController@login')->name('childrenlogin');
+    Route::post('/registerTemporary', '\App\Http\Controllers\Api\ChildrenController@registerTemporary');
+    Route::post('/registerMain', '\App\Http\Controllers\Api\ChildrenController@registerMain');
+    Route::post('/requestPassword', '\App\Http\Controllers\Api\ChildrenController@requestPassword');
+    Route::post('/login', '\App\Http\Controllers\Api\ChildrenController@login');
 
     Route::group(['middleware' => 'auth:children'], function () {
         Route::get('/detail/{child_id}', '\App\Http\Controllers\Api\ChildrenController@detail');

backend/routes/web.php

@@ -20,6 +20,8 @@ Route::get('/', function () {
 // ---------------------------------------- Father Account ------------------------------------------ //
 Route::group(['prefix' => 'p-account'],                 function () {
     Route::get('/',                                     function () { return view('p_account.index'); });
+    Route::get('/login',                                '\App\Http\Controllers\Api\FathersController@checkLogin')->name('fatherslogin');
+    Route::get('/logout',                               '\App\Http\Controllers\Api\FathersController@logout');
 
     Route::group(['middleware' => 'auth:fathers'],      function () {
         Route::group(['prefix' => 'meeting'],           function () {
@@ -59,7 +61,9 @@ Route::get('/unknown-error ',                           function () { return vie
 // ---------------------------------------- Child Account ------------------------------------------- //
 Route::group(['prefix' => 'c-account'],                 function () {
     Route::get('/register-temporary',                   function () { return view('c_account.auth'); });
-    Route::get('/login',                                function () { return view('c_account.auth'); })->name('childrenlogin');
+    Route::get('/login',                                '\App\Http\Controllers\Api\ChildrenController@checkLogin')->name('childrenlogin');
+    Route::get('/logout',                               '\App\Http\Controllers\Api\ChildrenController@logout');
+
     Route::group(['prefix' => 'register'],              function () {
         Route::get('/',                                 function () { return view('c_account.auth'); });
         Route::get('/complete',                         function () { return view('c_account.auth'); });