Fallback to admin auth if user permissions throw

Author: cicnavi

src/Admin/Authorization.php

@@ -56,13 +56,13 @@ public function requireAdminOrUserWithPermission(string $permission): void
 
         try {
             $this->authContextService->requirePermission($permission);
-        } catch (Exception $exception) {
-            throw new AuthorizationException(
-                Translate::noop('User not authorized.'),
-                $exception->getCode(),
-                $exception,
-            );
+        } catch (\Exception) {
+            // TODO mivanci v7 log this exception
         }
+
+        // If we get here, the user does not have the required permission, or permissions are not enabled.
+        // Fallback to admin authentication.
+        $this->requireAdmin(true);
     }
 
     public function getUserId(): string

tests/unit/src/Admin/AuthorizationTest.php

@@ -95,7 +95,12 @@ public function testRequireAdminOrUserWithPermissionReturnsIfAdmin(): void
 
     public function testRequireAdminOrUserWithPermissionReturnsIfUser(): void
     {
-        $this->sspBridgeUtilsAuthMock->expects($this->once())->method('isAdmin')->willReturn(false);
+        $this->sspBridgeUtilsAuthMock->expects($this->atLeastOnce())->method('isAdmin')
+            ->willReturnOnConsecutiveCalls(
+                false,
+                true, // After requireAdmin called, isAdmin will return true
+            );
+        $this->sspBridgeUtilsAuthMock->expects($this->once())->method('requireAdmin');
         $this->authContextServiceMock->expects($this->once())->method('requirePermission');
 
         $this->sut()->requireAdminOrUserWithPermission('permission');
@@ -104,9 +109,9 @@ public function testRequireAdminOrUserWithPermissionReturnsIfUser(): void
     public function testRequireUserWithPermissionThrowsIfUserNotAuthorized(): void
     {
         $this->expectException(AuthorizationException::class);
-        $this->expectExceptionMessage('not authorized');
+        $this->expectExceptionMessage('access required');
 
-        $this->sspBridgeUtilsAuthMock->expects($this->once())->method('isAdmin')->willReturn(false);
+        $this->sspBridgeUtilsAuthMock->expects($this->atLeastOnce())->method('isAdmin')->willReturn(false);
         $this->authContextServiceMock->expects($this->once())->method('requirePermission')
             ->willThrowException(new Exception('error'));