summaryrefslogtreecommitdiff
path: root/src/server/api/common
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2020-03-31 08:08:22 +0900
committersyuilo <syuilotan@yahoo.co.jp>2020-03-31 08:08:22 +0900
commit10356b4041d50acf1019a49f8b4c35d373315162 (patch)
tree9c9c61797af05c2e2aa681603240e2131b13972d /src/server/api/common
parentAPIの権限設定漏れを修正 (#6202) (diff)
parentFix #6203 (diff)
downloadsharkey-10356b4041d50acf1019a49f8b4c35d373315162.tar.gz
sharkey-10356b4041d50acf1019a49f8b4c35d373315162.tar.bz2
sharkey-10356b4041d50acf1019a49f8b4c35d373315162.zip
Merge branch 'master' into develop
Diffstat (limited to 'src/server/api/common')
-rw-r--r--src/server/api/common/signup.ts6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/api/common/signup.ts b/src/server/api/common/signup.ts
index b6e13b36f1..26a9d03e0f 100644
--- a/src/server/api/common/signup.ts
+++ b/src/server/api/common/signup.ts
@@ -22,8 +22,6 @@ export async function signup(username: User['username'], password: UserProfile['
throw new Error('INVALID_PASSWORD');
}
- const usersCount = await Users.count({});
-
// Generate hash of password
const salt = await bcrypt.genSalt(8);
const hash = await bcrypt.hash(password, salt);
@@ -76,7 +74,9 @@ export async function signup(username: User['username'], password: UserProfile['
usernameLower: username.toLowerCase(),
host: toPunyNullable(host),
token: secret,
- isAdmin: usersCount === 0,
+ isAdmin: (await Users.count({
+ host: null,
+ })) === 0,
}));
await transactionalEntityManager.save(new UserKeypair({