Merge pull request #1202 from DEVTomatoCake/fix/password-mfacode-schemas

Fixes for password, mfa code & email validation schemas

assets/openapi.json

@@ -102,6 +102,8 @@
                         "type": "string"
                     },
                     "code": {
+                        "minLength": 6,
+                        "maxLength": 6,
                         "type": "string"
                     }
                 },
@@ -174,6 +176,8 @@
                 "type": "object",
                 "properties": {
                     "password": {
+                        "minLength": 1,
+                        "maxLength": 72,
                         "type": "string"
                     }
                 },
@@ -5606,6 +5610,8 @@
                         "type": "string"
                     },
                     "password": {
+                        "minLength": 1,
+                        "maxLength": 72,
                         "type": "string"
                     },
                     "undelete": {
@@ -5986,6 +5992,8 @@
                 "type": "object",
                 "properties": {
                     "password": {
+                        "minLength": 1,
+                        "maxLength": 72,
                         "type": "string"
                     },
                     "regenerate": {
@@ -6022,6 +6030,8 @@
                 "type": "object",
                 "properties": {
                     "password": {
+                        "minLength": 1,
+                        "maxLength": 72,
                         "type": "string"
                     },
                     "token": {
@@ -6359,6 +6369,8 @@
                 "type": "object",
                 "properties": {
                     "code": {
+                        "minLength": 6,
+                        "maxLength": 6,
                         "type": "string"
                     }
                 },
@@ -6370,9 +6382,13 @@
                 "type": "object",
                 "properties": {
                     "password": {
+                        "minLength": 1,
+                        "maxLength": 72,
                         "type": "string"
                     },
                     "code": {
+                        "minLength": 6,
+                        "maxLength": 6,
                         "type": "string"
                     },
                     "secret": {
@@ -6497,15 +6513,22 @@
                         "nullable": true
                     },
                     "password": {
+                        "minLength": 1,
+                        "maxLength": 72,
                         "type": "string"
                     },
                     "new_password": {
+                        "minLength": 1,
+                        "maxLength": 72,
                         "type": "string"
                     },
                     "code": {
+                        "minLength": 6,
+                        "maxLength": 6,
                         "type": "string"
                     },
                     "email": {
+                        "format": "email",
                         "type": "string"
                     },
                     "discriminator": {
@@ -10945,6 +10968,12 @@
                 },
                 "tags": [
                     "scheduled-maintenances"
+                ],
+                "x-badges": [
+                    {
+                        "label": "Spacebar-only",
+                        "color": "red"
+                    }
                 ]
             }
         },

assets/schemas.json

@@ -75,6 +75,8 @@
                 "type": "string"
             },
             "code": {
+                "minLength": 6,
+                "maxLength": 6,
                 "type": "string"
             }
         },
@@ -155,6 +157,8 @@
         "type": "object",
         "properties": {
             "password": {
+                "minLength": 1,
+                "maxLength": 72,
                 "type": "string"
             }
         },
@@ -87935,6 +87939,8 @@
                 "type": "string"
             },
             "password": {
+                "minLength": 1,
+                "maxLength": 72,
                 "type": "string"
             },
             "undelete": {
@@ -122124,6 +122130,8 @@
         "type": "object",
         "properties": {
             "password": {
+                "minLength": 1,
+                "maxLength": 72,
                 "type": "string"
             },
             "regenerate": {
@@ -131818,6 +131826,8 @@
         "type": "object",
         "properties": {
             "password": {
+                "minLength": 1,
+                "maxLength": 72,
                 "type": "string"
             },
             "token": {
@@ -190102,6 +190112,8 @@
         "type": "object",
         "properties": {
             "code": {
+                "minLength": 6,
+                "maxLength": 6,
                 "type": "string"
             }
         },
@@ -194942,9 +194954,13 @@
         "type": "object",
         "properties": {
             "password": {
+                "minLength": 1,
+                "maxLength": 72,
                 "type": "string"
             },
             "code": {
+                "minLength": 6,
+                "maxLength": 6,
                 "type": "string"
             },
             "secret": {
@@ -214395,15 +214411,22 @@
                 ]
             },
             "password": {
+                "minLength": 1,
+                "maxLength": 72,
                 "type": "string"
             },
             "new_password": {
+                "minLength": 1,
+                "maxLength": 72,
                 "type": "string"
             },
             "code": {
+                "minLength": 6,
+                "maxLength": 6,
                 "type": "string"
             },
             "email": {
+                "format": "email",
                 "type": "string"
             },
             "discriminator": {

src/util/schemas/ApplicationAuthorizeSchema.ts

@@ -1,17 +1,17 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -21,5 +21,9 @@ export interface ApplicationAuthorizeSchema {
 	guild_id: string;
 	permissions: string;
 	captcha_key?: string;
+	/**
+	 * @minLength 6
+	 * @maxLength 6
+	 */
 	code?: string; // 2fa code
 }

src/util/schemas/BackupCodesChallengeSchema.ts

@@ -1,21 +1,25 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 export interface BackupCodesChallengeSchema {
+	/**
+	 * @minLength 1
+	 * @maxLength 72
+	 */
 	password: string;
 }

src/util/schemas/LoginSchema.ts

@@ -1,23 +1,27 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 export interface LoginSchema {
 	login: string;
+	/**
+	 * @minLength 1
+	 * @maxLength 72
+	 */
 	password: string;
 	undelete?: boolean;
 	captcha_key?: string;

src/util/schemas/MfaCodesSchema.ts

@@ -1,22 +1,26 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 export interface MfaCodesSchema {
+	/**
+	 * @minLength 1
+	 * @maxLength 72
+	 */
 	password: string;
 	regenerate?: boolean;
 }

src/util/schemas/PasswordResetSchema.ts

@@ -1,22 +1,26 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 export interface PasswordResetSchema {
+	/**
+	 * @minLength 1
+	 * @maxLength 72
+	 */
 	password: string;
 	token: string;
 }

src/util/schemas/TotpDisableSchema.ts

@@ -1,21 +1,25 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 export interface TotpDisableSchema {
+	/**
+	 * @minLength 6
+	 * @maxLength 6
+	 */
 	code: string;
 }

src/util/schemas/TotpEnableSchema.ts

@@ -1,23 +1,31 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 export interface TotpEnableSchema {
+	/**
+	 * @minLength 1
+	 * @maxLength 72
+	 */
 	password: string;
+	/**
+	 * @minLength 6
+	 * @maxLength 6
+	 */
 	code?: string;
 	secret?: string;
 }

src/util/schemas/UserModifySchema.ts

@@ -25,9 +25,24 @@ export interface UserModifySchema {
 	bio?: string;
 	accent_color?: number;
 	banner?: string | null;
+	/**
+	 * @minLength 1
+	 * @maxLength 72
+	 */
 	password?: string;
+	/**
+	 * @minLength 1
+	 * @maxLength 72
+	 */
 	new_password?: string;
+	/**
+	 * @minLength 6
+	 * @maxLength 6
+	 */
 	code?: string;
+	/**
+	 * @TJS-format email
+	 */
 	email?: string;
 	/**
 	 * @minLength 4