Merge branch 'main' into view-form-instance

sandboxnu · Mar 22, 2024 · 4e4b54c · 4e4b54c
2 parents 3c0a655 + abadbd3
commit 4e4b54c
Show file tree

Hide file tree

Showing 34 changed files with 709 additions and 248 deletions.
diff --git a/apps/proxy.ts b/apps/proxy.ts
@@ -10,7 +10,8 @@ const app = express();
 const proxy = createProxyMiddleware({
   target: "http://localhost:3000", // all requests to be routed to frontend running on port 3000
   router: {
-    "/api": "http://localhost:8080", // all requests prefixed with "/api" to be routed to backend running on port 3001
+    "/api/auth": "http://localhost:3000",
+    "/api/v1": "http://localhost:8080", // all requests prefixed with "/api" to be routed to backend running on port 3001
   },
   ws: true,
   logLevel: "warn",

diff --git a/apps/server/.env.example b/apps/server/.env.example
@@ -3,9 +3,9 @@ BACKEND_PORT=8080
 SALT_ROUNDS=10
 
 # Prisma
-DATABASE_URL=
+DATABASE_URL= 
 
-JWT_SECRET=
+JWT_SECRET= 
 JWT_REFRESH_SECRET=
 JWT_VALID_DURATION=600
 JWT_REFRESH_VALID_DURATION=604800
diff --git a/apps/server/package.json b/apps/server/package.json
@@ -38,6 +38,7 @@
     "cookie-parser": "^1.4.6",
     "jwt-decode": "^4.0.0",
     "nestjs-config": "^1.4.11",
+    "next-auth": "^4.24.6",
     "passport": "^0.6.0",
     "passport-jwt": "^4.0.1",
     "passport-local": "^1.0.0",

diff --git a/apps/server/prisma/seed.ts b/apps/server/prisma/seed.ts
@@ -231,28 +231,28 @@ async function main() {
       id: '777c1974-3104-4744-ae31-7a9296e7784a',
       firstName: 'Helen',
       lastName: 'Miao',
-      email: 'email1@gmail.com',
+      email: 'email1@kaiyangzhenggmail.onmicrosoft.com',
       positionId: CHIEF_OF_STAFF_UUID,
     },
     {
       id: '339cf78e-d13f-4069-b1f7-dee0c64afb31',
       firstName: 'Kai',
       lastName: 'Zheng',
-      email: 'email2@gmail.com',
+      email: 'email2@kaiyangzhenggmail.onmicrosoft.com',
       positionId: CHIEF_FIN_OFFICER_UUID,
     },
     {
       id: 'c6de4017-cb1f-44f1-a707-0f38239e0bca',
       firstName: 'Iris',
       lastName: 'Zhang',
-      email: 'email3@gmail.com',
+      email: 'email3@kaiyangzhenggmail.onmicrosoft.com',
       positionId: AGG_DIR_UUID,
     },
     {
       id: 'b386ef53-d2d1-4bfd-a44c-55b1750a874e',
       firstName: 'Anshul',
       lastName: 'Shirude',
-      email: 'email4@gmail.com',
+      email: 'email4@kaiyangzhenggmail.onmicrosoft.com',
       positionId: CHIEF_LEARNING_ENGAGEMENT_UUID,
     },
   ];

diff --git a/apps/server/src/app.controller.ts b/apps/server/src/app.controller.ts
@@ -43,7 +43,7 @@ export class AppController {
   }
 
   @UseGuards(LocalAuthGuard)
-  @Post('auth/login')
+  @Post('/auth/login')
   @ApiOkResponse({ type: JwtEntity })
   @ApiForbiddenResponse({ description: AppErrorMessage.FORBIDDEN })
   @ApiUnprocessableEntityResponse({
@@ -76,7 +76,7 @@ export class AppController {
   }
 
   @UseGuards(JwtRefreshAuthGuard)
-  @Get('auth/refresh')
+  @Get('/auth/refresh')
   @ApiBearerAuth()
   @ApiOkResponse({ type: JwtEntity })
   @ApiForbiddenResponse({ description: AppErrorMessage.FORBIDDEN })

diff --git a/apps/server/src/main.ts b/apps/server/src/main.ts
@@ -22,7 +22,7 @@ async function bootstrap() {
     });
   }
 
-  app.setGlobalPrefix('api');
+  app.setGlobalPrefix('api/v1');
 
   const config = new DocumentBuilder()
     .setTitle('MFA Form Automator API')

diff --git a/apps/web/package.json b/apps/web/package.json
@@ -11,6 +11,8 @@
     "gen-client": "openapi --input http://localhost:4000/api-json --output ./src/client --client axios"
   },
   "dependencies": {
+    "@azure/identity": "^4.0.1",
+    "@azure/storage-blob": "^12.17.0",
     "@chakra-ui/icons": "^2.1.1",
     "@chakra-ui/react": "^2.4.9",
     "@emotion/react": "^11.10.5",

diff --git a/apps/web/src/client/services/DefaultService.ts b/apps/web/src/client/services/DefaultService.ts
@@ -17,7 +17,7 @@ export class DefaultService {
     public static appControllerGetHello(): CancelablePromise<string> {
         return __request(OpenAPI, {
             method: 'GET',
-            url: '/api',
+            url: '/api/v1',
         });
     }
 
@@ -32,7 +32,7 @@ export class DefaultService {
     ): CancelablePromise<JwtEntity | any> {
         return __request(OpenAPI, {
             method: 'POST',
-            url: '/api/auth/login',
+            url: '/api/v1/auth/login',
             body: requestBody,
             mediaType: 'application/json',
             errors: {
@@ -50,7 +50,7 @@ export class DefaultService {
     public static appControllerRefresh(): CancelablePromise<JwtEntity> {
         return __request(OpenAPI, {
             method: 'GET',
-            url: '/api/auth/refresh',
+            url: '/api/v1/auth/refresh',
             errors: {
                 400: `Bad Request`,
                 403: `Unauthorized Request`,
@@ -66,7 +66,7 @@ export class DefaultService {
     public static appControllerLogout(): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'GET',
-            url: '/api/auth/logout',
+            url: '/api/v1/auth/logout',
         });
     }
 

diff --git a/apps/web/src/client/services/DepartmentsService.ts b/apps/web/src/client/services/DepartmentsService.ts
@@ -22,7 +22,7 @@ export class DepartmentsService {
     ): CancelablePromise<DepartmentEntity> {
         return __request(OpenAPI, {
             method: 'POST',
-            url: '/api/departments',
+            url: '/api/v1/departments',
             body: requestBody,
             mediaType: 'application/json',
             errors: {
@@ -43,7 +43,7 @@ export class DepartmentsService {
     ): CancelablePromise<Array<DepartmentEntity>> {
         return __request(OpenAPI, {
             method: 'GET',
-            url: '/api/departments',
+            url: '/api/v1/departments',
             query: {
                 'limit': limit,
             },
@@ -64,7 +64,7 @@ export class DepartmentsService {
     ): CancelablePromise<DepartmentEntity> {
         return __request(OpenAPI, {
             method: 'GET',
-            url: '/api/departments/{id}',
+            url: '/api/v1/departments/{id}',
             path: {
                 'id': id,
             },
@@ -88,7 +88,7 @@ export class DepartmentsService {
     ): CancelablePromise<DepartmentEntity> {
         return __request(OpenAPI, {
             method: 'PATCH',
-            url: '/api/departments/{id}',
+            url: '/api/v1/departments/{id}',
             path: {
                 'id': id,
             },
@@ -113,7 +113,7 @@ export class DepartmentsService {
     ): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'DELETE',
-            url: '/api/departments/{id}',
+            url: '/api/v1/departments/{id}',
             path: {
                 'id': id,
             },

diff --git a/apps/web/src/client/services/EmployeesService.ts b/apps/web/src/client/services/EmployeesService.ts
@@ -22,7 +22,7 @@ export class EmployeesService {
     ): CancelablePromise<EmployeeEntity> {
         return __request(OpenAPI, {
             method: 'POST',
-            url: '/api/employees',
+            url: '/api/v1/employees',
             body: requestBody,
             mediaType: 'application/json',
             errors: {
@@ -43,7 +43,7 @@ export class EmployeesService {
     ): CancelablePromise<Array<EmployeeEntity>> {
         return __request(OpenAPI, {
             method: 'GET',
-            url: '/api/employees',
+            url: '/api/v1/employees',
             query: {
                 'limit': limit,
             },
@@ -61,7 +61,7 @@ export class EmployeesService {
     public static employeesControllerFindMe(): CancelablePromise<EmployeeEntity> {
         return __request(OpenAPI, {
             method: 'GET',
-            url: '/api/employees/me',
+            url: '/api/v1/employees/me',
             errors: {
                 400: `Bad Request`,
                 403: `Unauthorized Request`,
@@ -79,7 +79,7 @@ export class EmployeesService {
     ): CancelablePromise<EmployeeEntity> {
         return __request(OpenAPI, {
             method: 'GET',
-            url: '/api/employees/{id}',
+            url: '/api/v1/employees/{id}',
             path: {
                 'id': id,
             },
@@ -103,7 +103,7 @@ export class EmployeesService {
     ): CancelablePromise<EmployeeEntity> {
         return __request(OpenAPI, {
             method: 'PATCH',
-            url: '/api/employees/{id}',
+            url: '/api/v1/employees/{id}',
             path: {
                 'id': id,
             },
@@ -128,7 +128,7 @@ export class EmployeesService {
     ): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'DELETE',
-            url: '/api/employees/{id}',
+            url: '/api/v1/employees/{id}',
             path: {
                 'id': id,
             },

diff --git a/apps/web/src/client/services/FormInstancesService.ts b/apps/web/src/client/services/FormInstancesService.ts
@@ -22,7 +22,7 @@ export class FormInstancesService {
     ): CancelablePromise<FormInstanceEntity> {
         return __request(OpenAPI, {
             method: 'POST',
-            url: '/api/form-instances',
+            url: '/api/v1/form-instances',
             body: requestBody,
             mediaType: 'application/json',
             errors: {
@@ -42,7 +42,7 @@ export class FormInstancesService {
     ): CancelablePromise<Array<FormInstanceEntity>> {
         return __request(OpenAPI, {
             method: 'GET',
-            url: '/api/form-instances',
+            url: '/api/v1/form-instances',
             query: {
                 'limit': limit,
             },
@@ -60,7 +60,7 @@ export class FormInstancesService {
     public static formInstancesControllerFindAllAssignedToCurrentEmployee(): CancelablePromise<Array<FormInstanceEntity>> {
         return __request(OpenAPI, {
             method: 'GET',
-            url: '/api/form-instances/me',
+            url: '/api/v1/form-instances/me',
             errors: {
                 400: `Bad Request`,
                 403: `Unauthorized Request`,
@@ -75,7 +75,7 @@ export class FormInstancesService {
     public static formInstancesControllerFindAllCreatedByCurrentEmployee(): CancelablePromise<Array<FormInstanceEntity>> {
         return __request(OpenAPI, {
             method: 'GET',
-            url: '/api/form-instances/created/me',
+            url: '/api/v1/form-instances/created/me',
             errors: {
                 400: `Bad Request`,
                 403: `Unauthorized Request`,
@@ -93,7 +93,7 @@ export class FormInstancesService {
     ): CancelablePromise<FormInstanceEntity> {
         return __request(OpenAPI, {
             method: 'GET',
-            url: '/api/form-instances/{id}',
+            url: '/api/v1/form-instances/{id}',
             path: {
                 'id': id,
             },
@@ -117,7 +117,7 @@ export class FormInstancesService {
     ): CancelablePromise<FormInstanceEntity> {
         return __request(OpenAPI, {
             method: 'PATCH',
-            url: '/api/form-instances/{id}',
+            url: '/api/v1/form-instances/{id}',
             path: {
                 'id': id,
             },
@@ -142,7 +142,7 @@ export class FormInstancesService {
     ): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'DELETE',
-            url: '/api/form-instances/{id}',
+            url: '/api/v1/form-instances/{id}',
             path: {
                 'id': id,
             },
@@ -166,7 +166,7 @@ export class FormInstancesService {
     ): CancelablePromise<FormInstanceEntity> {
         return __request(OpenAPI, {
             method: 'PATCH',
-            url: '/api/form-instances/{formInstanceId}/sign/{signatureId}',
+            url: '/api/v1/form-instances/{formInstanceId}/sign/{signatureId}',
             path: {
                 'formInstanceId': formInstanceId,
                 'signatureId': signatureId,
@@ -189,7 +189,7 @@ export class FormInstancesService {
     ): CancelablePromise<FormInstanceEntity> {
         return __request(OpenAPI, {
             method: 'PATCH',
-            url: '/api/form-instances/{formInstanceId}/complete',
+            url: '/api/v1/form-instances/{formInstanceId}/complete',
             path: {
                 'formInstanceId': formInstanceId,
             },

diff --git a/apps/web/src/client/services/FormTemplatesService.ts b/apps/web/src/client/services/FormTemplatesService.ts
@@ -22,7 +22,7 @@ export class FormTemplatesService {
     ): CancelablePromise<FormTemplateEntity> {
         return __request(OpenAPI, {
             method: 'POST',
-            url: '/api/form-templates',
+            url: '/api/v1/form-templates',
             body: requestBody,
             mediaType: 'application/json',
             errors: {
@@ -42,7 +42,7 @@ export class FormTemplatesService {
     ): CancelablePromise<Array<FormTemplateEntity>> {
         return __request(OpenAPI, {
             method: 'GET',
-            url: '/api/form-templates',
+            url: '/api/v1/form-templates',
             query: {
                 'limit': limit,
             },
@@ -63,7 +63,7 @@ export class FormTemplatesService {
     ): CancelablePromise<FormTemplateEntity> {
         return __request(OpenAPI, {
             method: 'GET',
-            url: '/api/form-templates/{id}',
+            url: '/api/v1/form-templates/{id}',
             path: {
                 'id': id,
             },
@@ -87,7 +87,7 @@ export class FormTemplatesService {
     ): CancelablePromise<FormTemplateEntity> {
         return __request(OpenAPI, {
             method: 'PATCH',
-            url: '/api/form-templates/{id}',
+            url: '/api/v1/form-templates/{id}',
             path: {
                 'id': id,
             },
@@ -112,7 +112,7 @@ export class FormTemplatesService {
     ): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'DELETE',
-            url: '/api/form-templates/{id}',
+            url: '/api/v1/form-templates/{id}',
             path: {
                 'id': id,
             },