mirror of
https://github.com/spacebarchat/server.git
synced 2024-11-11 05:02:37 +01:00
Update: Update fosscord-server-util to latest and fix issues with NULL and undefined
This commit is contained in:
parent
dc32c39af3
commit
55cf3b4b02
14
package-lock.json
generated
14
package-lock.json
generated
@ -9,7 +9,7 @@
|
||||
"version": "1.0.0",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"@fosscord/server-util": "^1.2.8",
|
||||
"@fosscord/server-util": "^1.3.0",
|
||||
"@types/jest": "^26.0.22",
|
||||
"@types/json-schema": "^7.0.7",
|
||||
"ajv": "^8.4.0",
|
||||
@ -498,9 +498,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@fosscord/server-util": {
|
||||
"version": "1.2.8",
|
||||
"resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.2.8.tgz",
|
||||
"integrity": "sha512-akw6J6E+XxMn+diBRQbXn49QDkE3okgX5qEr0UjzRjaw/eE5+OieE/y9f9v8VhBQYYkNWFrdRt23QBRREQuqUg==",
|
||||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.3.0.tgz",
|
||||
"integrity": "sha512-GBU1XLAQKylr76Vb5kGEkYInj0qPkz/D9oAVSPISMIWbYeo6RIfARVneg6FdreWC+WK7UNcpGr+JFJpvMfSeOA==",
|
||||
"dependencies": {
|
||||
"@types/jsonwebtoken": "^8.5.0",
|
||||
"@types/mongoose-autopopulate": "^0.10.1",
|
||||
@ -12664,9 +12664,9 @@
|
||||
}
|
||||
},
|
||||
"@fosscord/server-util": {
|
||||
"version": "1.2.8",
|
||||
"resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.2.8.tgz",
|
||||
"integrity": "sha512-akw6J6E+XxMn+diBRQbXn49QDkE3okgX5qEr0UjzRjaw/eE5+OieE/y9f9v8VhBQYYkNWFrdRt23QBRREQuqUg==",
|
||||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.3.0.tgz",
|
||||
"integrity": "sha512-GBU1XLAQKylr76Vb5kGEkYInj0qPkz/D9oAVSPISMIWbYeo6RIfARVneg6FdreWC+WK7UNcpGr+JFJpvMfSeOA==",
|
||||
"requires": {
|
||||
"@types/jsonwebtoken": "^8.5.0",
|
||||
"@types/mongoose-autopopulate": "^0.10.1",
|
||||
|
@ -29,7 +29,7 @@
|
||||
},
|
||||
"homepage": "https://github.com/fosscord/fosscord-api#readme",
|
||||
"dependencies": {
|
||||
"@fosscord/server-util": "^1.2.8",
|
||||
"@fosscord/server-util": "^1.3.0",
|
||||
"@types/jest": "^26.0.22",
|
||||
"@types/json-schema": "^7.0.7",
|
||||
"ajv": "^8.4.0",
|
||||
|
@ -40,7 +40,7 @@ router.post(
|
||||
// TODO: check password strength
|
||||
|
||||
// adjusted_email will be slightly modified version of the user supplied email -> e.g. protection against GMail Trick
|
||||
let adjusted_email: string | undefined = adjustEmail(email);
|
||||
let adjusted_email: string | null = adjustEmail(email);
|
||||
|
||||
// adjusted_password will be the hash of the password
|
||||
let adjusted_password: string = "";
|
||||
@ -181,7 +181,7 @@ router.post(
|
||||
mobile: false,
|
||||
premium: false,
|
||||
premium_type: 0,
|
||||
phone: undefined,
|
||||
phone: null,
|
||||
mfa_enabled: false,
|
||||
verified: false,
|
||||
presence: {
|
||||
@ -253,7 +253,7 @@ router.post(
|
||||
}
|
||||
);
|
||||
|
||||
export function adjustEmail(email: string): string | undefined {
|
||||
export function adjustEmail(email: string): string | null {
|
||||
// body parser already checked if it is a valid email
|
||||
const parts = <RegExpMatchArray>email.match(EMAIL_REGEX);
|
||||
// @ts-ignore
|
||||
|
Loading…
Reference in New Issue
Block a user