diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2024-11-01 18:00:33 +0000 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2024-11-01 18:00:33 +0000 |
| commit | bcc845cdb1a2a34f547aa000abfe1d0382e2e24b (patch) | |
| tree | 8cd116c7e175668f57b2cecae1c0df17935599b6 /packages/backend/src/core/SignupService.ts | |
| parent | merge: Hide Following Feed from guest users/logged out users and also don't s... (diff) | |
| parent | check token permissions in admin/accounts/create.ts (diff) | |
| download | sharkey-bcc845cdb1a2a34f547aa000abfe1d0382e2e24b.tar.gz sharkey-bcc845cdb1a2a34f547aa000abfe1d0382e2e24b.tar.bz2 sharkey-bcc845cdb1a2a34f547aa000abfe1d0382e2e24b.zip | |
merge: Allow admins to create users (resolves #764) (!719)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/719
Closes #764
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
Diffstat (limited to 'packages/backend/src/core/SignupService.ts')
| -rw-r--r-- | packages/backend/src/core/SignupService.ts | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/packages/backend/src/core/SignupService.ts b/packages/backend/src/core/SignupService.ts index 7250d1c24d..1b0b1e5bbd 100644 --- a/packages/backend/src/core/SignupService.ts +++ b/packages/backend/src/core/SignupService.ts @@ -55,6 +55,7 @@ export class SignupService { host?: string | null; reason?: string | null; ignorePreservedUsernames?: boolean; + approved?: boolean; }) { const { username, password, passwordHash, host, reason } = opts; let hash = passwordHash; @@ -115,9 +116,6 @@ export class SignupService { )); let account!: MiUser; - let defaultApproval = false; - - if (!this.meta.approvalRequiredForSignup) defaultApproval = true; // Start transaction await this.db.transaction(async transactionalEntityManager => { @@ -135,7 +133,7 @@ export class SignupService { host: this.utilityService.toPunyNullable(host), token: secret, isRoot: isTheFirstUser, - approved: defaultApproval, + approved: isTheFirstUser || (opts.approved ?? !this.meta.approvalRequiredForSignup), signupReason: reason, })); |