Merge pull request #77 from UoaWDCC/signup-login-fix-yang

signup/login fix by removing username as req
UoaWDCC · Sep 22, 2024 · ecaec53 · ecaec53
2 parents 3db3e55 + 1653d51
commit ecaec53
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 23 deletions.
diff --git a/api/src/controllers/register.controller.ts b/api/src/controllers/register.controller.ts
@@ -31,14 +31,11 @@ export class RegisterController {
         'application/json': {
           schema: {
             type: 'object',
-            required: ['email', 'username', 'password'],
+            required: ['email', 'password'],
             properties: {
               email: {
                 type: 'string',
               },
-              username: {
-                type: 'string',
-              },
               password: {
                 type: 'string',
               },
@@ -89,14 +86,11 @@ export class RegisterController {
         'application/json': {
           schema: {
             type: 'object',
-            required: ['email', 'username', 'password', 'firstName', 'lastName', 'phoneNumber'],
+            required: ['email', 'password', 'firstName', 'lastName', 'phoneNumber'],
             properties: {
               email: {
                 type: 'string',
               },
-              username: {
-                type: 'string',
-              },
               password: {
                 type: 'string',
               },
@@ -147,28 +141,22 @@ export class RegisterController {
         'application/json': {
           schema: {
             type: 'object',
-            required: ['email', 'username', 'password', 'firstName', 'lastName', 'phoneNumber'],
+            required: ['email', 'password', 'phoneNumber', 'company'],
             properties: {
               email: {
                 type: 'string',
               },
-              username: {
-                type: 'string',
-              },
               password: {
                 type: 'string',
               },
-              firstName: {
-                type: 'string',
-              },
-              lastName: {
-                type: 'string',
-              },
               phoneNumber: {
                 type: 'string',
               },
               desc: {
                 type: 'string',
+              },
+              company: {
+                type: 'string',
               }
             },
           },
@@ -205,14 +193,11 @@ export class RegisterController {
         'application/json': {
           schema: {
             type: 'object',
-            required: ['email', 'username', 'password', 'firstName', 'lastName', 'phoneNumber'],
+            required: ['email', 'username', 'password', 'firstName', 'lastName', 'phoneNumber', 'company'],
             properties: {
               email: {
                 type: 'string',
               },
-              username: {
-                type: 'string',
-              },
               password: {
                 type: 'string',
               },
@@ -227,6 +212,9 @@ export class RegisterController {
               },
               desc: {
                 type: 'string',
+              },
+              company: {
+                type: 'string',
               }
             },
           },

diff --git a/api/src/models/fsae-user.model.ts b/api/src/models/fsae-user.model.ts
@@ -19,7 +19,7 @@ export abstract class FsaeUser extends Entity {
 
   @property({
     type: 'string',
-    required: true,
+    required: false,
   })
   username: string;
 

diff --git a/api/src/models/sponsor.model.ts b/api/src/models/sponsor.model.ts
@@ -40,6 +40,12 @@ export class Sponsor extends FsaeUser {
   })
   industry: string;
 
+  @property({
+    type: 'string',
+    required: false,
+  })
+  company: string;
+
   // Indexer property to allow additional data
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   [prop: string]: any;