Merge branch 'main' into issue-3911issue-3911

4 files changed, 7 insertions, 7 deletions

diff --git a/app/controllers/api/oauth2/applications.php b/app/controllers/api/oauth2/applications.php
index d08ec1e..fd6a1bb 100644
--- a/app/controllers/api/oauth2/applications.php
+++ b/app/controllers/api/oauth2/applications.php
@@ -31,7 +31,7 @@ class Api_Oauth2_ApplicationsController extends AuthenticatedController
         $this->application = $this->formatApplication($accessToken);
 
         if (!$this->application) {
-            throw new Trails_Exception(500, 'Error finding client.');
+            throw new Trails\Exception(500, 'Error finding client.');
         }
     }
 
@@ -42,7 +42,7 @@ class Api_Oauth2_ApplicationsController extends AuthenticatedController
         $user = User::findCurrent();
         $accessToken = AccessToken::find(Request::option('application'));
         if (!$accessToken) {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
         if ($accessToken['user_id'] !== $user->id) {
             throw new AccessDeniedException();
diff --git a/app/controllers/api/oauth2/authorize.php b/app/controllers/api/oauth2/authorize.php
index 5628d49..6387937 100644
--- a/app/controllers/api/oauth2/authorize.php
+++ b/app/controllers/api/oauth2/authorize.php
@@ -13,7 +13,7 @@ class Api_Oauth2_AuthorizeController extends OAuth2Controller
         parent::before_filter($action, $args);
 
         if ('index' !== $action) {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
 
         $action = $this->determineAction();
@@ -55,7 +55,7 @@ class Api_Oauth2_AuthorizeController extends OAuth2Controller
         if ('nobody' === $GLOBALS['user']->id && 'Standard' !== $authPlugin && !Request::option('sso')) {
             $queryParams = $psrRequest->getQueryParams();
             $queryParams['sso'] = strtolower($authPlugin);
-            $this->redirect($this->authorizeURL($queryParams));
+            $this->redirect($this->url_for('api/oauth2/authorize', $queryParams));
 
             return;
         } else {
diff --git a/app/controllers/api/oauth2/oauth2_controller.php b/app/controllers/api/oauth2/oauth2_controller.php
index fd02ea9..6b3dacd 100644
--- a/app/controllers/api/oauth2/oauth2_controller.php
+++ b/app/controllers/api/oauth2/oauth2_controller.php
@@ -42,7 +42,7 @@ abstract class OAuth2Controller extends StudipController
             return $this->convertPsrResponse($psrResponse);
         }
 
-        return new Trails_Response($exception->getMessage(), [], 500);
+        return new Trails\Response($exception->getMessage(), [], 500);
     }
 
     protected function getAuthorizationServer(): AuthorizationServer
diff --git a/app/controllers/api/oauth2/token.php b/app/controllers/api/oauth2/token.php
index 0ae7ffb..755d6b7 100644
--- a/app/controllers/api/oauth2/token.php
+++ b/app/controllers/api/oauth2/token.php
@@ -8,11 +8,11 @@ class Api_Oauth2_TokenController extends OAuth2Controller
         parent::before_filter($action, $args);
 
         if ('index' !== $action) {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
 
         if (!Request::isPost()) {
-            throw new Trails_Exception(405);
+            throw new Trails\Exception(405);
         }
 
         $action = 'issue_token';