Skip to content

EspoCRM – Open Source CRM Application

Ref

Yurii802cf56d8f09
diff --git a/application/Espo/Tools/OAuthServer/AuthorizationService.php b/application/Espo/Tools/OAuthServer/AuthorizationService.php
index 88be6abd61..0972f457f0 100644
--- a/application/Espo/Tools/OAuthServer/AuthorizationService.php
+++ b/application/Espo/Tools/OAuthServer/AuthorizationService.php
@@ -161,11 +161,7 @@ class AuthorizationService
return;
}
- $redirectUri = $authorizationRequest->getRedirectUri();
-
- if ($redirectUri && $authorizationRequest->getState()) {
- $redirectUri = UriUtil::makeRedirectUri($redirectUri, $authorizationRequest->getState());
- }
+ $redirectUri = $this->prepareRedirectUri($authorizationRequest);
throw OAuthServerException::accessDenied("User is not allowed.", $redirectUri);
}
@@ -209,4 +205,15 @@ class AuthorizationService
}
}
}
+
+ private function prepareRedirectUri(AuthorizationRequest $authorizationRequest): ?string
+ {
+ $redirectUri = $authorizationRequest->getRedirectUri();
+
+ if ($redirectUri && $authorizationRequest->getState()) {
+ $redirectUri = UriUtil::makeRedirectUri($redirectUri, $authorizationRequest->getState());
+ }
+
+ return $redirectUri;
+ }
}