selfhosted
/
padloc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #448 from padloc/fix/double-slashes-in-url 

Remove trailing slash from config URLs
This commit is contained in:
Martin Kleinschrodt 2022-05-16 16:34:28 +02:00 committed by GitHub
parent 71f79c4052 8b52a27e6e
commit 923de631f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/core/src/server.ts
View File

@ -52,7 +52,7 @@ import {
} from "./messenger";
import { Server as SRPServer, SRPSession } from "./srp";
import { DeviceInfo, getCryptoProvider } from "./platform";
import { getIdFromEmail, uuid } from "./util";
import { getIdFromEmail, uuid, removeTrailingSlash } from "./util";
import { loadLanguage } from "@padloc/locale/src/translate";
import { Logger, VoidLogger } from "./logging";
import { PBES2Container } from "./container";
@ -1099,7 +1099,9 @@ export class Controller extends API {
new messageClass({
orgName: invite.org.name,
invitedBy: invite.invitedBy!.name || invite.invitedBy!.email,
acceptInviteUrl: `${this.config.clientUrl}${path}?${params.toString()}`,
acceptInviteUrl: `${removeTrailingSlash(
this.config.clientUrl
)}${path}?${params.toString()}`,
})
);
} catch (e) {}
@ -1163,7 +1165,7 @@ export class Controller extends API {
member.email,
new JoinOrgInviteCompletedMessage({
orgName: org.name,
openAppUrl: `${this.config.clientUrl}/org/${org.id}`,
openAppUrl: `${removeTrailingSlash(this.config.clientUrl)}/org/${org.id}`,
})
);
} catch (e) {}
@ -1460,7 +1462,7 @@ export class Controller extends API {
new JoinOrgInviteAcceptedMessage({
orgName: org.name,
invitee: invite.invitee.name || invite.invitee.email,
confirmMemberUrl: `${this.config.clientUrl}/invite/${org.id}/${invite.id}`,
confirmMemberUrl: `${removeTrailingSlash(this.config.clientUrl)}/invite/${org.id}/${invite.id}`,
})
);
} catch (e) {}

4
packages/core/src/util.ts
View File

@ -213,3 +213,7 @@ export function stripPropertiesRecursive(obj: object, properties: string[]) {
}
return obj;
}
export function removeTrailingSlash(url: string) {
return url.replace(/(\/*)$/, "");
}