Merge pull request #96 from gjsjohnmurray/fix-95

fix #95 Apply pathPrefix correctly

Author: gjsjohnmurray

src/api/getServerSpec.ts

@@ -33,6 +33,7 @@ export async function getServerSpec(name: string, scope?: vscode.ConfigurationSc
     server.name = name;
     server.description = server.description || '';
     server.webServer.scheme = server.webServer.scheme || 'http';
+    server.webServer.port = server.webServer.port || server.webServer.scheme === 'https' ? 443 : 80;
     server.webServer.pathPrefix = server.webServer.pathPrefix || '';
 
     if (noCredentials) {

src/api/getServerSummary.ts

@@ -10,5 +10,5 @@ export function getServerSummary(name: string, scope?: vscode.ConfigurationScope
 }
 
 export function serverDetail(connSpec: ServerSpec): string {
-    return `${connSpec.webServer.scheme || 'http'}://${connSpec.webServer.host}:${connSpec.webServer.port}/${connSpec.webServer.pathPrefix || ''}`;
+    return `${connSpec.webServer.scheme || 'http'}://${connSpec.webServer.host}:${connSpec.webServer.port}${connSpec.webServer.pathPrefix || ''}/`;
 }

src/extension.ts

@@ -228,7 +228,7 @@ export function activate(context: vscode.ExtensionContext) {
                         return;
                     }
 
-                    const uri = vscode.Uri.parse(`isfs${readonly ? "-readonly" : ""}://${serverName}:${namespace}/${serverSpec.webServer.pathPrefix || ''}${csp ? '?csp' : ''}`);
+                    const uri = vscode.Uri.parse(`isfs${readonly ? "-readonly" : ""}://${serverName}:${namespace}${serverSpec.webServer.pathPrefix || ''}/${csp ? '?csp' : ''}`);
                     if ((vscode.workspace.workspaceFolders || []).filter((workspaceFolder) => workspaceFolder.uri.toString() === uri.toString()).length === 0) {                       
                         const label = `${serverName}:${namespace}${csp ? ' webfiles' : ''}${readonly ? " (read-only)" : ""}`;
                         const added = vscode.workspace.updateWorkspaceFolders(

src/makeRESTRequest.ts

@@ -32,7 +32,7 @@ export interface AtelierRESTEndpoint {
 	var url = server.webServer.scheme + "://" + server.webServer.host + ":" + String(server.webServer.port);
     const pathPrefix = server.webServer.pathPrefix;
 	if (pathPrefix && pathPrefix !== "") {
-		url = url.concat("/",pathPrefix)
+		url += pathPrefix;
 	}
     url += "/api/atelier/";
     if (endpoint) {