[server] Update more GitLab integration settings URLs (#4705)

gitpod-io · Jul 5, 2021 · 9628909 · 9628909
1 parent fed96e4
commit 9628909
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/chart/values.yaml b/chart/values.yaml
@@ -93,7 +93,7 @@ authProviders: []
 #     clientId: "CLIENT_ID"
 #     clientSecret: "SECRET"
 #     callBackUrl: "https://gitpod.io/auth/gitlab/callback"
-#     settingsUrl: "https://gitlab.com/profile/applications"
+#     settingsUrl: "https://gitlab.com/-/profile/applications"
 #   description: ""
 #   icon: ""
 branding:

diff --git a/components/dashboard/src/service/service-mock.ts b/components/dashboard/src/service/service-mock.ts
@@ -57,7 +57,7 @@ const gitpodServiceMock = createServiceMock({
             "oauth": {
               "authorizationUrl": "https://testing.doptig.com/gitlab/oauth/authorize",
               "tokenUrl": "https://testing.doptig.com/gitlab/oauth/token",
-              "settingsUrl": "https://testing.doptig.com/gitlab/profile/applications",
+              "settingsUrl": "https://testing.doptig.com/gitlab/-/profile/applications",
               "callBackUrl": "https://gitpod-staging.com/auth/testing.doptig.com/gitlab/callback",
               "clientId": "clientid-123",
               "clientSecret": "redacted"

diff --git a/components/server/src/gitlab/gitlab-urls.ts b/components/server/src/gitlab/gitlab-urls.ts
@@ -9,6 +9,6 @@ export function oauthUrls(host: string) {
     return {
         authorizationUrl: `https://${host}/oauth/authorize`,
         tokenUrl: `https://${host}/oauth/token`,
-        settingsUrl: `https://${host}/profile/applications`,
+        settingsUrl: `https://${host}/-/profile/applications`,
     }
 }
diff --git a/dev/manual-tests/testsuite.yaml b/dev/manual-tests/testsuite.yaml
@@ -189,13 +189,13 @@ case:
   description: ""
   steps: |-
     Test1)
-    - Delete GitpodStaging entry from https://gitlab.com/profile/applications if present.
+    - Delete GitpodStaging entry from https://gitlab.com/-/profile/applications if present.
     - open a new private browser
     - open https://gitpod-staging.com/#https://gitlab.com/AlexTugarev/gp-test
     - ensure the onboarding flow works nicely.
 
     Test2)
-    - Delete GitpodStaging entry from https://gitlab.com/profile/applications if present.
+    - Delete GitpodStaging entry from https://gitlab.com/-/profile/applications if present.
     - open a new private browser
     - login to https://gitpod-staging.com/login/ using GitHub Auth
     - open https://gitpod-staging.com/#https://gitlab.com/AlexTugarev/gp-test

diff --git a/install/docker/examples/gitpod-gitlab/values/auth-providers.yaml b/install/docker/examples/gitpod-gitlab/values/auth-providers.yaml
@@ -7,4 +7,4 @@ authProviders:
     clientId: "2ce8bfb95d9a1e0ed305427f35e10a6bdd1eef090b1890c68e5f8370782d05ee"
     clientSecret: "a5447d23643f7e71353d9fc3ad1c15464c983c47f6eb2e80dd37de28152de05e"
     callBackUrl: "https://gitpod.$BASEDOMAIN/auth/gitlab/callback"
-    settingsUrl: "gitlab.$BASEDOMAIN/profile/applications"
+    settingsUrl: "gitlab.$BASEDOMAIN/-/profile/applications"