archive/BookStackApp_BookStack
0
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-17 13:52:04 +00:00
Code Issues Projects Releases Wiki Activity

Fixed some empty-expiry conditions of token ui flows

Browse source
This commit is contained in:
Dan Brown 2019-12-29 20:18:37 +00:00
parent 692fc46c7d
commit 2cfa37399c
No known key found for this signature in database
GPG key ID: 46D9F943C24A2EF9
2 changed files with 33 additions and 5 deletions
app/Http/Controllers
UserApiTokenController.php

14
app/Http/Controllers/UserApiTokenController.php
View file

@ -40,7 +40,11 @@ class UserApiTokenController extends Controller
$user = User::query()->findOrFail($userId);
$secret = Str::random(32);
$expiry = $request->get('expires_at', (Carbon::now()->addYears(100))->format('Y-m-d'));
$expiry = $request->get('expires_at', null);
if (empty($expiry)) {
$expiry = Carbon::now()->addYears(100)->format('Y-m-d');
}
$token = (new ApiToken())->forceFill([
'name' => $request->get('name'),
@ -83,14 +87,18 @@ class UserApiTokenController extends Controller
*/
public function update(Request $request, int $userId, int $tokenId)
{
$this->validate($request, [
$requestData = $this->validate($request, [
'name' => 'required|max:250',
'expires_at' => 'date_format:Y-m-d',
]);
[$user, $token] = $this->checkPermissionAndFetchUserToken($userId, $tokenId);
$token->fill($request->all())->save();
if (empty($requestData['expires_at'])) {
$requestData['expires_at'] = Carbon::now()->addYears(100)->format('Y-m-d');
}
$token->fill($requestData)->save();
$this->showSuccessNotification(trans('settings.user_api_token_update_success'));
return redirect($user->getEditUrl('/api-tokens/' . $token->id));
}