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

Remove explicit group and user urls from scim settings

This commit is contained in:
Martin Kleinschrodt 2022-05-16 16:18:22 +02:00
parent 55aa35ea14
commit c212dc6669
4 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/app/src/elements/org-settings.ts
View File

@ -226,8 +226,6 @@ export class OrgSettingsView extends Routing(StateMixin(LitElement)) {
const syncEnabled = org.directory.syncProvider !== "none";
const scimUrl = (syncEnabled && org.directory.scim?.url) || "";
const scimSecretToken = (syncEnabled && org.directory.scim?.secretToken) || "";
const scimGroupsUrl = (syncEnabled && org.directory.scim?.groupsUrl) || "";
const scimUsersUrl = (syncEnabled && org.directory.scim?.usersUrl) || "";
return html`
<div class="vertical spacing layout fill-horizontally">
@ -269,30 +267,6 @@ export class OrgSettingsView extends Routing(StateMixin(LitElement)) {
</div>
</div>
</div>
<div
class="padded border-top click hover"
@click=${() => setClipboard(scimGroupsUrl, $l("SCIM Groups Url"))}
>
<div class="half-padded">
<div class="tiny blue highlighted">${$l("Groups URL")}</div>
<div class="small">
<code>${scimGroupsUrl}</code>
</div>
</div>
</div>
<div
class="padded border-top click hover"
@click=${() => setClipboard(scimUsersUrl, $l("SCIM Users Url"))}
>
<div class="half-padded">
<div class="tiny blue highlighted">${$l("Users URL")}</div>
<div class="small">
<code>${scimUsersUrl}</code>
</div>
</div>
</div>
</pl-drawer>
</section>
</div>

2
packages/core/src/org.ts
View File

@ -173,8 +173,6 @@ export class ScimSettings extends Serializable {
secretToken: string = "";
url: string = "";
groupsUrl: string = "";
usersUrl: string = "";
}
export class OrgDirectorySettings extends Serializable {

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

@ -1042,8 +1042,6 @@ export class Controller extends API {
const scimSecret = bytesToBase64(org.directory.scim.secret, true);
org.directory.scim.secretToken = scimSecret;
org.directory.scim.url = `${this.config.scimServerUrl}/${org.id}`;
org.directory.scim.groupsUrl = `${this.config.scimServerUrl}/${org.id}/Groups?token=${scimSecret}`;
org.directory.scim.usersUrl = `${this.config.scimServerUrl}/${org.id}/Users?token=${scimSecret}`;
}
} else if (org.directory.syncProvider === "none") {
org.directory.scim = undefined;

4
packages/server/src/scim.ts
View File

@ -824,11 +824,11 @@ export class ScimServer implements DirectoryProvider {
}
private _getUserRef(org: Org, user: ScimUser) {
return org.directory.scim!.usersUrl.replace("/Users", `/Users/${user.id}`);
return `${org.directory.scim!.url}/Users/${user.id}`;
}
private _getGroupRef(org: Org, group: ScimGroup) {
return org.directory.scim!.groupsUrl.replace("/Groups", `/Groups/${group.id}`);
return `${org.directory.scim!.url}/Groups/${group.id}`;
}
private _updateGroupAtPath(