返回提交历史
Modified
src/services/loginService.ts
+1
-1
Modified
src/services/wsService.ts
+9
-17
XFEstudio/XFESpaceNinjaServer
fix: getUsernameFromEmail returning wrong value (#2538)
Closes #2537 Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/2538 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
a2a441ec
代码差异
2 个文件
+10
-18
@@ -32,7 +32,7 @@ export const getUsernameFromEmail = async (email: string): Promise<string> => {
32
32
name = nameFromEmail + suffix;
33
33
} while (await isNameTaken(name));
34
34
}
35
return nameFromEmail;
35
return name;
36
36
};
37
37
38
38
export const createAccount = async (accountData: IDatabaseAccountRequiredFields): Promise<IDatabaseAccountJson> => {
@@ -2,13 +2,7 @@ import http from "http";
2
2
import https from "https";
3
3
import ws from "ws";
4
4
import { Account } from "@/src/models/loginModel";
5
import {
6
createAccount,
7
createNonce,
8
getUsernameFromEmail,
9
isCorrectPassword,
10
isNameTaken
11
} from "@/src/services/loginService";
5
import { createAccount, createNonce, getUsernameFromEmail, isCorrectPassword } from "@/src/services/loginService";
12
6
import { IDatabaseAccountJson } from "@/src/types/loginTypes";
13
7
import { HydratedDocument } from "mongoose";
14
8
import { logError } from "@/src/utils/logger";
@@ -111,16 +105,14 @@ const wsOnConnect = (ws: ws, req: http.IncomingMessage): void => {
111
105
}
112
106
} else if (data.auth.isRegister) {
113
107
const name = await getUsernameFromEmail(data.auth.email);
114
if (!(await isNameTaken(name))) {
115
account = await createAccount({
116
email: data.auth.email,
117
password: data.auth.password,
118
ClientType: "webui",
119
LastLogin: new Date(),
120
DisplayName: name,
121
Nonce: createNonce()
122
});
123
}
108
account = await createAccount({
109
email: data.auth.email,
110
password: data.auth.password,
111
ClientType: "webui",
112
LastLogin: new Date(),
113
DisplayName: name,
114
Nonce: createNonce()
115
});
124
116
}
125
117
if (account) {
126
118
(ws as IWsCustomData).accountId = account.id;