Fixed failing test after drawio default url change

[bookstack] / app / Http / Controllers / UserApiTokenController.php

diff --git a/app/Http/Controllers/UserApiTokenController.php b/app/Http/Controllers/UserApiTokenController.php
index ab0e9069e7c2db27fd310308d39c2be6bc14d537..b1a043cd3c9b27bf26df2655693907fa0e96f046 100644 (file)
--- a/app/Http/Controllers/UserApiTokenController.php
+++ b/app/Http/Controllers/UserApiTokenController.php
@@ -1,4 +1,6 @@
-<?php namespace BookStack\Http\Controllers;
+<?php
+
+namespace BookStack\Http\Controllers;

 
 use BookStack\Actions\ActivityType;
 use BookStack\Api\ApiToken;
 
 use BookStack\Actions\ActivityType;
 use BookStack\Api\ApiToken;


@@ -9,7 +11,6 @@ use Illuminate\Support\Str;
 
 class UserApiTokenController extends Controller
 {
 
 class UserApiTokenController extends Controller
 {

-

     /**
      * Show the form to create a new API token.
      */
     /**
      * Show the form to create a new API token.
      */


@@ -20,6 +21,7 @@ class UserApiTokenController extends Controller
         $this->checkPermissionOrCurrentUser('users-manage', $userId);
 
         $user = User::query()->findOrFail($userId);
         $this->checkPermissionOrCurrentUser('users-manage', $userId);
 
         $user = User::query()->findOrFail($userId);

+

         return view('users.api-tokens.create', [
             'user' => $user,
         ]);
         return view('users.api-tokens.create', [
             'user' => $user,
         ]);


@@ -34,18 +36,18 @@ class UserApiTokenController extends Controller
         $this->checkPermissionOrCurrentUser('users-manage', $userId);
 
         $this->validate($request, [
         $this->checkPermissionOrCurrentUser('users-manage', $userId);
 
         $this->validate($request, [

-            'name' => 'required|max:250',
-            'expires_at' => 'date_format:Y-m-d',
+            'name'       => ['required', 'max:250'],
+            'expires_at' => ['date_format:Y-m-d'],

         ]);
 
         $user = User::query()->findOrFail($userId);
         $secret = Str::random(32);
 
         $token = (new ApiToken())->forceFill([
         ]);
 
         $user = User::query()->findOrFail($userId);
         $secret = Str::random(32);
 
         $token = (new ApiToken())->forceFill([

-            'name' => $request->get('name'),
-            'token_id' => Str::random(32),
-            'secret' => Hash::make($secret),
-            'user_id' => $user->id,
+            'name'       => $request->get('name'),
+            'token_id'   => Str::random(32),
+            'secret'     => Hash::make($secret),
+            'user_id'    => $user->id,

             'expires_at' => $request->get('expires_at') ?: ApiToken::defaultExpiry(),
         ]);
 
             'expires_at' => $request->get('expires_at') ?: ApiToken::defaultExpiry(),
         ]);
 


@@ -71,9 +73,9 @@ class UserApiTokenController extends Controller
         $secret = session()->pull('api-token-secret:' . $token->id, null);
 
         return view('users.api-tokens.edit', [
         $secret = session()->pull('api-token-secret:' . $token->id, null);
 
         return view('users.api-tokens.edit', [

-            'user' => $user,
-            'token' => $token,
-            'model' => $token,
+            'user'   => $user,
+            'token'  => $token,
+            'model'  => $token,

             'secret' => $secret,
         ]);
     }
             'secret' => $secret,
         ]);
     }


@@ -84,18 +86,19 @@ class UserApiTokenController extends Controller
     public function update(Request $request, int $userId, int $tokenId)
     {
         $this->validate($request, [
     public function update(Request $request, int $userId, int $tokenId)
     {
         $this->validate($request, [

-            'name' => 'required|max:250',
-            'expires_at' => 'date_format:Y-m-d',
+            'name'       => ['required', 'max:250'],
+            'expires_at' => ['date_format:Y-m-d'],

         ]);
 
         [$user, $token] = $this->checkPermissionAndFetchUserToken($userId, $tokenId);
         $token->fill([
         ]);
 
         [$user, $token] = $this->checkPermissionAndFetchUserToken($userId, $tokenId);
         $token->fill([

-            'name' => $request->get('name'),
+            'name'       => $request->get('name'),

             'expires_at' => $request->get('expires_at') ?: ApiToken::defaultExpiry(),
         ])->save();
 
         $this->showSuccessNotification(trans('settings.user_api_token_update_success'));
         $this->logActivity(ActivityType::API_TOKEN_UPDATE, $token);
             'expires_at' => $request->get('expires_at') ?: ApiToken::defaultExpiry(),
         ])->save();
 
         $this->showSuccessNotification(trans('settings.user_api_token_update_success'));
         $this->logActivity(ActivityType::API_TOKEN_UPDATE, $token);

+

         return redirect($user->getEditUrl('/api-tokens/' . $token->id));
     }
 
         return redirect($user->getEditUrl('/api-tokens/' . $token->id));
     }
 


@@ -105,8 +108,9 @@ class UserApiTokenController extends Controller
     public function delete(int $userId, int $tokenId)
     {
         [$user, $token] = $this->checkPermissionAndFetchUserToken($userId, $tokenId);
     public function delete(int $userId, int $tokenId)
     {
         [$user, $token] = $this->checkPermissionAndFetchUserToken($userId, $tokenId);

+

         return view('users.api-tokens.delete', [
         return view('users.api-tokens.delete', [

-            'user' => $user,
+            'user'  => $user,

             'token' => $token,
         ]);
     }
             'token' => $token,
         ]);
     }


@@ -138,7 +142,7 @@ class UserApiTokenController extends Controller
 
         $user = User::query()->findOrFail($userId);
         $token = ApiToken::query()->where('user_id', '=', $user->id)->where('id', '=', $tokenId)->firstOrFail();
 
         $user = User::query()->findOrFail($userId);
         $token = ApiToken::query()->where('user_id', '=', $user->id)->where('id', '=', $tokenId)->firstOrFail();

+

         return [$user, $token];
     }
         return [$user, $token];
     }

-

 }
 }