mirror of
https://github.com/docmost/docmost.git
synced 2025-11-14 05:21:14 +10:00
Compare commits
3 Commits
commentedi
...
c6bca6a602
| Author | SHA1 | Date | |
|---|---|---|---|
| c6bca6a602 | |||
| 55d1a2c932 | |||
| bc3cb2d63f |
@ -15,7 +15,7 @@ export default function EnforceSso() {
|
|||||||
<Text size="md">{t("Enforce SSO")}</Text>
|
<Text size="md">{t("Enforce SSO")}</Text>
|
||||||
<Text size="sm" c="dimmed">
|
<Text size="sm" c="dimmed">
|
||||||
{t(
|
{t(
|
||||||
"Once enforced, members will not able to login with email and password.",
|
"Once enforced, members will not be able to login with email and password.",
|
||||||
)}
|
)}
|
||||||
</Text>
|
</Text>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -387,14 +387,14 @@ export class WorkspaceService {
|
|||||||
.replace(/[^a-z0-9]/g, '')
|
.replace(/[^a-z0-9]/g, '')
|
||||||
.substring(0, 20);
|
.substring(0, 20);
|
||||||
// Ensure we leave room for a random suffix.
|
// Ensure we leave room for a random suffix.
|
||||||
const maxSuffixLength = 3;
|
const maxSuffixLength = 6;
|
||||||
|
|
||||||
if (subdomain.length < 4) {
|
if (subdomain.length < 4) {
|
||||||
subdomain = `${subdomain}-${generateRandomSuffix(maxSuffixLength)}`;
|
subdomain = `${subdomain}-${generateRandomSuffix(maxSuffixLength)}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (DISALLOWED_HOSTNAMES.includes(subdomain)) {
|
if (DISALLOWED_HOSTNAMES.includes(subdomain)) {
|
||||||
subdomain = `myworkspace-${generateRandomSuffix(maxSuffixLength)}`;
|
subdomain = `workspace-${generateRandomSuffix(maxSuffixLength)}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
let uniqueHostname = subdomain;
|
let uniqueHostname = subdomain;
|
||||||
|
|||||||
@ -70,7 +70,7 @@ export class UserTokenRepo {
|
|||||||
.where('userId', '=', userId)
|
.where('userId', '=', userId)
|
||||||
.where('workspaceId', '=', workspaceId)
|
.where('workspaceId', '=', workspaceId)
|
||||||
.where('type', '=', tokenType)
|
.where('type', '=', tokenType)
|
||||||
.orderBy('expiresAt desc')
|
.orderBy('expiresAt', 'desc')
|
||||||
.execute();
|
.execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -70,7 +70,7 @@ export class WorkspaceRepo {
|
|||||||
return await this.db
|
return await this.db
|
||||||
.selectFrom('workspaces')
|
.selectFrom('workspaces')
|
||||||
.selectAll()
|
.selectAll()
|
||||||
.orderBy('createdAt asc')
|
.orderBy('createdAt', 'asc')
|
||||||
.limit(1)
|
.limit(1)
|
||||||
.executeTakeFirst();
|
.executeTakeFirst();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user