Perms: Fixed some issues made when adding transactions

[bookstack] / app / Api / UserApiTokenController.php

diff --git a/app/Api/UserApiTokenController.php b/app/Api/UserApiTokenController.php
index 7455be4ff6948c07e7722e5eaa7d2cbbe7dad4d8..3606e82609437d922c4e0ede22a1b4a5ae8cf85a 100644 (file)
--- a/app/Api/UserApiTokenController.php
+++ b/app/Api/UserApiTokenController.php
@@ -22,6 +22,8 @@ class UserApiTokenController extends Controller
 
         $user = User::query()->findOrFail($userId);
 
 
         $user = User::query()->findOrFail($userId);
 

+        $this->setPageTitle(trans('settings.user_api_token_create'));
+

         return view('users.api-tokens.create', [
             'user' => $user,
             'back' => $this->getRedirectPath($user),
         return view('users.api-tokens.create', [
             'user' => $user,
             'back' => $this->getRedirectPath($user),


@@ -74,6 +76,8 @@ class UserApiTokenController extends Controller
         [$user, $token] = $this->checkPermissionAndFetchUserToken($userId, $tokenId);
         $secret = session()->pull('api-token-secret:' . $token->id, null);
 
         [$user, $token] = $this->checkPermissionAndFetchUserToken($userId, $tokenId);
         $secret = session()->pull('api-token-secret:' . $token->id, null);
 

+        $this->setPageTitle(trans('settings.user_api_token'));
+

         return view('users.api-tokens.edit', [
             'user'   => $user,
             'token'  => $token,
         return view('users.api-tokens.edit', [
             'user'   => $user,
             'token'  => $token,


@@ -111,6 +115,8 @@ class UserApiTokenController extends Controller
     {
         [$user, $token] = $this->checkPermissionAndFetchUserToken($userId, $tokenId);
 
     {
         [$user, $token] = $this->checkPermissionAndFetchUserToken($userId, $tokenId);
 

+        $this->setPageTitle(trans('settings.user_api_token_delete'));
+

         return view('users.api-tokens.delete', [
             'user'  => $user,
             'token' => $token,
         return view('users.api-tokens.delete', [
             'user'  => $user,
             'token' => $token,


@@ -166,7 +172,7 @@ class UserApiTokenController extends Controller
     protected function getRedirectPath(User $relatedUser): string
     {
         $context = session()->get('api-token-context');
     protected function getRedirectPath(User $relatedUser): string
     {
         $context = session()->get('api-token-context');

-        if ($context === 'settings') {
+        if ($context === 'settings' || user()->id !== $relatedUser->id) {

             return $relatedUser->getEditUrl('#api_tokens');
         }
 
             return $relatedUser->getEditUrl('#api_tokens');
         }