Collaboration: Fix resolving of auth endpoint paths for server urls with Path

Signed-off-by: Jonah Iden <jonah.iden@typefox.io>

Author: jonah-iden

packages/collaboration/src/browser/collaboration-frontend-contribution.ts

@@ -29,6 +29,7 @@ import { CollaborationWorkspaceService } from './collaboration-workspace-service
 import { StatusBar, StatusBarAlignment, StatusBarEntry } from '@theia/core/lib/browser/status-bar';
 import { codiconArray } from '@theia/core/lib/browser/widgets/widget';
 import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
+import path = require('path');
 
 initializeProtocol({
     cryptoModule: window.crypto
@@ -168,8 +169,7 @@ export class CollaborationFrontendContribution implements CommandContribution {
                 return false;
             }
         }
-
-        const endpointUrl = new URI(serverUrl).withPath(provider.endpoint);
+        const endpointUrl = new URI(serverUrl).resolve(provider.endpoint);
         const response = await fetch(endpointUrl.toString(true), {
             method: 'POST',
             body: JSON.stringify(values),
@@ -186,7 +186,7 @@ export class CollaborationFrontendContribution implements CommandContribution {
     }
 
     protected async handleWebAuth(serverUrl: string, token: string, provider: WebAuthProvider): Promise<boolean> {
-        const uri = new URI(serverUrl).withPath(provider.endpoint).withQuery('token=' + token);
+        const uri = new URI(serverUrl).resolve(provider.endpoint).withQuery('token=' + token);
         this.windowService.openNewWindow(uri.toString(true), { external: true });
         return true;
     }