diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index e2d6788f96..8e5b606619 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -55,8 +55,8 @@ use Utopia\Validator\Text; use Utopia\Validator\URL; use Utopia\Validator\WhiteList; -$oauthDefaultSuccess = '/auth/oauth2/success'; -$oauthDefaultFailure = '/auth/oauth2/failure'; +$oauthDefaultSuccess = '/console/auth/oauth2/success'; +$oauthDefaultFailure = '/console/auth/oauth2/failure'; function sendSessionAlert(Locale $locale, Document $user, Document $project, Document $session, Mail $queueForMails) { @@ -1874,7 +1874,7 @@ App::post('/v1/account/tokens/magic-url') $dbForProject->purgeCachedDocument('users', $user->getId()); if (empty($url)) { - $url = $request->getProtocol() . '://' . $request->getHostname() . '/auth/magic-url'; + $url = $request->getProtocol() . '://' . $request->getHostname() . '/console/auth/magic-url'; } $url = Template::parseURL($url); diff --git a/app/controllers/api/vcs.php b/app/controllers/api/vcs.php index cc5504753e..299e2836f7 100644 --- a/app/controllers/api/vcs.php +++ b/app/controllers/api/vcs.php @@ -96,7 +96,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId $commentStatus = $isAuthorized ? 'waiting' : 'failed'; - $authorizeUrl = $request->getProtocol() . '://' . $request->getHostname() . "/git/authorize-contributor?projectId={$projectId}&installationId={$installationId}&repositoryId={$repositoryId}&providerPullRequestId={$providerPullRequestId}"; + $authorizeUrl = $request->getProtocol() . '://' . $request->getHostname() . "/console/git/authorize-contributor?projectId={$projectId}&installationId={$installationId}&repositoryId={$repositoryId}&providerPullRequestId={$providerPullRequestId}"; $action = $isAuthorized ? ['type' => 'logs'] : ['type' => 'authorize', 'url' => $authorizeUrl]; diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index c266a76f53..348d23a2e7 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -166,7 +166,7 @@ $image = $this->getParam('image', ''); appwrite-console: <<: *x-logging container_name: appwrite-console - image: /console:appwrite/console:5.0.0-rc.11 + image: /console:appwrite/console:5.0.0-rc14 restart: unless-stopped networks: - appwrite diff --git a/docker-compose.yml b/docker-compose.yml index 53f6509161..a448d05c03 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -195,7 +195,7 @@ services: appwrite-console: <<: *x-logging container_name: appwrite-console - image: appwrite/console:5.0.0-rc.11 + image: appwrite/console:5.0.0-rc14 restart: unless-stopped networks: - appwrite