Feature/standardize ui display

app/Http/Controllers/API/v1/Admin/Impersonate/LeaveController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\API\v1\Admin\Impersonate;
 
 use App\Http\Controllers\Controller;
+use App\Support\ApiTokenLifetime;
 use App\User;
 use Illuminate\Http\Request;
 
@@ -72,12 +73,12 @@ class LeaveController extends Controller
             ])
             ->log("admin leave impersonation: {$impersonator->email}");
 
-        return response()->json([
+        return response()->json(array_merge([
             'status' => 'success',
             'message' => 'Berjaya kembali ke akaun asal.',
             'user' => $impersonator,
             'token' => $accessToken,
-        ]);
+        ], ApiTokenLifetime::loginMeta('admin')));
     }
 }
 

app/Http/Controllers/API/v1/Admin/Impersonate/StartController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\API\v1\Admin\Impersonate;
 
 use App\Http\Controllers\Controller;
+use App\Support\ApiTokenLifetime;
 use App\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -70,13 +71,13 @@ class StartController extends Controller
             ])
             ->log("admin impersonate: {$impersonator->email} -> {$target->email}");
 
-        return response()->json([
+        return response()->json(array_merge([
             'status' => 'success',
             'message' => 'Impersonate berjaya.',
             'user' => $target,
             'impersonator' => $impersonator,
             'token' => $accessToken,
-        ]);
+        ], ApiTokenLifetime::loginMeta('admin')));
     }
 }
 

app/Http/Controllers/API/v1/Admin/LoginController.php

@@ -6,6 +6,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\Util;
+use App\Support\ApiTokenLifetime;
 use App\User;
 
 class LoginController extends Controller
@@ -21,11 +22,13 @@ class LoginController extends Controller
 
     	if ($this->checkLogin($request)) {
     		$user = Auth::user();
+            ApiTokenLifetime::revokeActiveTokens($user);
     		$result['status'] = 'success';
     		$result['message'] = 'Login Successfully';
             $result['user'] = $user;
             $result['election_status'] = Util::getElectionStatus();
     		$result['token'] = $user->createToken('My app', ['admin'])->accessToken;
+            $result = array_merge($result, ApiTokenLifetime::loginMeta('admin'));
 
             activity()
                 ->performedOn($user)