Feature/standardize ui display
This commit is contained in:
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\API\v1\Voter;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Controllers\Util;
|
||||
use App\Support\ApiTokenLifetime;
|
||||
use App\UserOTP;
|
||||
use App\Voter;
|
||||
use Carbon\Carbon;
|
||||
@@ -219,6 +220,7 @@ class LoginController extends Controller
|
||||
|
||||
if (Auth::guard('voter')->attempt(['no_kp' => $request->no_kp, 'password' => 'admin', 'election_id' => Util::getCurrentElection()])) {
|
||||
$user = Auth::guard('voter')->user();
|
||||
ApiTokenLifetime::revokeActiveTokens($user);
|
||||
activity()
|
||||
->performedOn($user)
|
||||
->withProperties([
|
||||
@@ -231,13 +233,13 @@ class LoginController extends Controller
|
||||
])
|
||||
->log("voter login: {$user->name}");
|
||||
|
||||
return response()->json([
|
||||
return response()->json(array_merge([
|
||||
'status' => 'success',
|
||||
'message' => 'Login successfully.',
|
||||
'user' => Auth::guard('voter')->user(),
|
||||
'election_status' => Util::getElectionStatus(),
|
||||
'token' => Auth::guard('voter')->user()->createToken('My Token', ['vote'])->accessToken,
|
||||
]);
|
||||
], ApiTokenLifetime::loginMeta('voter')));
|
||||
}
|
||||
|
||||
activity()
|
||||
|
||||
Reference in New Issue
Block a user