Skip to content

Commit 30a0b4e

Browse files
committed
fix #95 Apply pathPrefix correctly
1 parent 6005809 commit 30a0b4e

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/api/getServerSummary.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ export function getServerSummary(name: string, scope?: vscode.ConfigurationScope
1010
}
1111

1212
export function serverDetail(connSpec: ServerSpec): string {
13-
return `${connSpec.webServer.scheme || 'http'}://${connSpec.webServer.host}:${connSpec.webServer.port}/${connSpec.webServer.pathPrefix || ''}`;
13+
return `${connSpec.webServer.scheme || 'http'}://${connSpec.webServer.host}:${connSpec.webServer.port}${connSpec.webServer.pathPrefix || ''}/`;
1414
}

src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ export function activate(context: vscode.ExtensionContext) {
228228
return;
229229
}
230230

231-
const uri = vscode.Uri.parse(`isfs${readonly ? "-readonly" : ""}://${serverName}:${namespace}/${serverSpec.webServer.pathPrefix || ''}${csp ? '?csp' : ''}`);
231+
const uri = vscode.Uri.parse(`isfs${readonly ? "-readonly" : ""}://${serverName}:${namespace}${serverSpec.webServer.pathPrefix || ''}/${csp ? '?csp' : ''}`);
232232
if ((vscode.workspace.workspaceFolders || []).filter((workspaceFolder) => workspaceFolder.uri.toString() === uri.toString()).length === 0) {
233233
const label = `${serverName}:${namespace}${csp ? ' webfiles' : ''}${readonly ? " (read-only)" : ""}`;
234234
const added = vscode.workspace.updateWorkspaceFolders(

src/makeRESTRequest.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export interface AtelierRESTEndpoint {
3232
var url = server.webServer.scheme + "://" + server.webServer.host + ":" + String(server.webServer.port);
3333
const pathPrefix = server.webServer.pathPrefix;
3434
if (pathPrefix && pathPrefix !== "") {
35-
url = url.concat("/",pathPrefix)
35+
url += pathPrefix;
3636
}
3737
url += "/api/atelier/";
3838
if (endpoint) {

0 commit comments

Comments
 (0)