From b6b1a5b6bffa3f92bcc6484be83d2fb5c23e257a Mon Sep 17 00:00:00 2001
From: oat <oatkub402@gmail.com>
Date: Wed, 13 Dec 2023 16:42:32 +0700
Subject: [PATCH 1/6] fix: error when push

---
 Services/client/src/components/FileForm.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Services/client/src/components/FileForm.vue b/Services/client/src/components/FileForm.vue
index 7c60608..4e211d0 100644
--- a/Services/client/src/components/FileForm.vue
+++ b/Services/client/src/components/FileForm.vue
@@ -165,6 +165,7 @@ const file = ref<File | undefined>()
                 : ''
           "
           id="inputFile"
+          :rules="[(v) => v != undefined || 'โปรดอัพโหลดไฟล์']"
         >
           <template v-slot:prepend>
             <q-icon name="attach_file" />
@@ -180,7 +181,7 @@ const file = ref<File | undefined>()
           class="q-my-sm"
           placeholder="กรอกชื่อเรื่อง"
           :model-value="title"
-          :rules="[(v) => v.length > 3 || 'ชื่อต้องยาวกว่า 3 ตัวอักษร']"
+          :rules="[(v) => (v != undefined && v.length > 3) || 'ชื่อต้องยาวกว่า 3 ตัวอักษร']"
           @update:model-value="(v) => $emit('update:title', v)"
           id="inputTitle"
         />

From d91b41022905fe9c30703b3abb26cdad19b4515e Mon Sep 17 00:00:00 2001
From: oat <oatkub402@gmail.com>
Date: Wed, 13 Dec 2023 16:58:44 +0700
Subject: [PATCH 2/6] chore: change a little bit name

---
 Services/client/src/components/FileForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Services/client/src/components/FileForm.vue b/Services/client/src/components/FileForm.vue
index 4e211d0..7fd1f10 100644
--- a/Services/client/src/components/FileForm.vue
+++ b/Services/client/src/components/FileForm.vue
@@ -165,7 +165,7 @@ const file = ref<File | undefined>()
                 : ''
           "
           id="inputFile"
-          :rules="[(v) => v != undefined || 'โปรดอัพโหลดไฟล์']"
+          :rules="[(v) => v != undefined || 'โปรดอัปโหลดไฟล์']"
         >
           <template v-slot:prepend>
             <q-icon name="attach_file" />

From 66e2237b810ba9be2fc20171f987cfde95901341 Mon Sep 17 00:00:00 2001
From: oat <oatkub402@gmail.com>
Date: Wed, 13 Dec 2023 17:33:57 +0700
Subject: [PATCH 3/6] fix: can't submit when edit file info

---
 Services/client/src/components/FileForm.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Services/client/src/components/FileForm.vue b/Services/client/src/components/FileForm.vue
index 7fd1f10..9b678b9 100644
--- a/Services/client/src/components/FileForm.vue
+++ b/Services/client/src/components/FileForm.vue
@@ -165,7 +165,7 @@ const file = ref<File | undefined>()
                 : ''
           "
           id="inputFile"
-          :rules="[(v) => v != undefined || 'โปรดอัปโหลดไฟล์']"
+          :rules="[(v) => (v !== undefined || mode === 'edit' ) || ('โปรดอัปโหลดไฟล์')]"
         >
           <template v-slot:prepend>
             <q-icon name="attach_file" />
@@ -258,6 +258,9 @@ const file = ref<File | undefined>()
           color="primary"
           :disable="error.fileName2Long"
           id="submitFile"
+          @click="()=> {
+            console.log(file?.name)
+          }"
         />
         <q-btn
           label="ยกเลิก"

From b16fd3e4b42e1a57f3f61e6e09c88b1805300c5a Mon Sep 17 00:00:00 2001
From: oat <oatkub402@gmail.com>
Date: Wed, 13 Dec 2023 17:35:24 +0700
Subject: [PATCH 4/6] chore: delete console.log

---
 Services/client/src/components/FileForm.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Services/client/src/components/FileForm.vue b/Services/client/src/components/FileForm.vue
index 9b678b9..6a34273 100644
--- a/Services/client/src/components/FileForm.vue
+++ b/Services/client/src/components/FileForm.vue
@@ -258,9 +258,6 @@ const file = ref<File | undefined>()
           color="primary"
           :disable="error.fileName2Long"
           id="submitFile"
-          @click="()=> {
-            console.log(file?.name)
-          }"
         />
         <q-btn
           label="ยกเลิก"

From 0f694ea7773f32089fbc216d353037bbdce8c1ac Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Wed, 13 Dec 2023 18:01:32 +0700
Subject: [PATCH 5/6] fix: wording and small adjustment

---
 .../src/controllers/storageController.ts      | 11 +++-
 Services/server/src/routes.ts                 | 12 +++-
 Services/server/src/swagger.json              | 62 ++++++++++++++++---
 Services/server/src/utils/auth.ts             |  4 +-
 4 files changed, 75 insertions(+), 14 deletions(-)

diff --git a/Services/server/src/controllers/storageController.ts b/Services/server/src/controllers/storageController.ts
index f1e8ecb..7aa1aea 100644
--- a/Services/server/src/controllers/storageController.ts
+++ b/Services/server/src/controllers/storageController.ts
@@ -108,7 +108,10 @@ async function listFolder(path: string[]) {
   const list = await new Promise<{ pathname: string; name: string }[]>((resolve, reject) => {
     const item: { pathname: string; name: string }[] = [];
 
-    const stream = minioClient.listObjectsV2(DEFAULT_BUCKET, path.join("/") + "/");
+    const stream = minioClient.listObjectsV2(
+      DEFAULT_BUCKET,
+      path.length === 0 ? "" : path.join("/") + "/",
+    );
     stream.on("data", (v) => {
       if (v && v.prefix)
         item.push({
@@ -388,7 +391,7 @@ export class StorageController extends Controller {
   @Post("file")
   @Tags("Storage File")
   @Security("bearerAuth", ["management-role", "admin"])
-  @SuccessResponse(HttpStatusCode.NO_CONTENT, "สำเร็จ")
+  @SuccessResponse(HttpStatusCode.OK, "สำเร็จ")
   public async postFile(
     @Request() request: { user: { preferred_username: string } },
     @Body() body: FileBody,
@@ -441,7 +444,7 @@ export class StorageController extends Controller {
     }
 
     await esClient.index({
-      index: DEFAULT_INDEX!,
+      index: DEFAULT_INDEX,
       document: metadata,
       refresh: "wait_for", // Must have or else it doesn't wait for updated index resulted in data not found on fetch
     });
@@ -450,6 +453,8 @@ export class StorageController extends Controller {
 
     const presignedUrl = await minioClient.presignedPutObject(DEFAULT_BUCKET, metadata.pathname);
 
+    console.log(presignedUrl);
+
     return { ...metadata, uploadUrl: presignedUrl };
   }
 
diff --git a/Services/server/src/routes.ts b/Services/server/src/routes.ts
index 90cab3b..639dcb0 100644
--- a/Services/server/src/routes.ts
+++ b/Services/server/src/routes.ts
@@ -730,6 +730,7 @@ export function RegisterRoutes(app: Router) {
         });
         // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
         app.post('/storage/list',
+            authenticateMiddleware([{"bearerAuth":[]}]),
             ...(fetchMiddlewares<RequestHandler>(StorageController)),
             ...(fetchMiddlewares<RequestHandler>(StorageController.prototype.getList)),
 
@@ -755,11 +756,13 @@ export function RegisterRoutes(app: Router) {
         });
         // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
         app.post('/storage/folder',
+            authenticateMiddleware([{"bearerAuth":["management-role","admin"]}]),
             ...(fetchMiddlewares<RequestHandler>(StorageController)),
             ...(fetchMiddlewares<RequestHandler>(StorageController.prototype.postFolder)),
 
             function StorageController_postFolder(request: any, response: any, next: any) {
             const args = {
+                    request: {"in":"request","name":"request","required":true,"dataType":"object"},
                     body: {"in":"body","name":"body","required":true,"ref":"FolderBody"},
             };
 
@@ -780,6 +783,7 @@ export function RegisterRoutes(app: Router) {
         });
         // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
         app.put('/storage/folder',
+            authenticateMiddleware([{"bearerAuth":["management-role","admin"]}]),
             ...(fetchMiddlewares<RequestHandler>(StorageController)),
             ...(fetchMiddlewares<RequestHandler>(StorageController.prototype.moveFolder)),
 
@@ -805,6 +809,7 @@ export function RegisterRoutes(app: Router) {
         });
         // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
         app.delete('/storage/folder',
+            authenticateMiddleware([{"bearerAuth":["management-role","admin"]}]),
             ...(fetchMiddlewares<RequestHandler>(StorageController)),
             ...(fetchMiddlewares<RequestHandler>(StorageController.prototype.deleteStorage)),
 
@@ -830,11 +835,13 @@ export function RegisterRoutes(app: Router) {
         });
         // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
         app.post('/storage/file',
+            authenticateMiddleware([{"bearerAuth":["management-role","admin"]}]),
             ...(fetchMiddlewares<RequestHandler>(StorageController)),
             ...(fetchMiddlewares<RequestHandler>(StorageController.prototype.postFile)),
 
             function StorageController_postFile(request: any, response: any, next: any) {
             const args = {
+                    request: {"in":"request","name":"request","required":true,"dataType":"object"},
                     body: {"in":"body","name":"body","required":true,"ref":"FileBody"},
             };
 
@@ -848,18 +855,20 @@ export function RegisterRoutes(app: Router) {
 
 
               const promise = controller.postFile.apply(controller, validatedArgs as any);
-              promiseHandler(controller, promise, response, 204, next);
+              promiseHandler(controller, promise, response, 200, next);
             } catch (err) {
                 return next(err);
             }
         });
         // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
         app.put('/storage/file',
+            authenticateMiddleware([{"bearerAuth":["management-role","admin"]}]),
             ...(fetchMiddlewares<RequestHandler>(StorageController)),
             ...(fetchMiddlewares<RequestHandler>(StorageController.prototype.moveFile)),
 
             function StorageController_moveFile(request: any, response: any, next: any) {
             const args = {
+                    request: {"in":"request","name":"request","required":true,"dataType":"object"},
                     body: {"in":"body","name":"body","required":true,"ref":"PutFileBody"},
             };
 
@@ -880,6 +889,7 @@ export function RegisterRoutes(app: Router) {
         });
         // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
         app.delete('/storage/file',
+            authenticateMiddleware([{"bearerAuth":["management-role","admin"]}]),
             ...(fetchMiddlewares<RequestHandler>(StorageController)),
             ...(fetchMiddlewares<RequestHandler>(StorageController.prototype.deleteFile)),
 
diff --git a/Services/server/src/swagger.json b/Services/server/src/swagger.json
index 75665c8..48a105f 100644
--- a/Services/server/src/swagger.json
+++ b/Services/server/src/swagger.json
@@ -2032,7 +2032,11 @@
 					"Storage Folder",
 					"Storage File"
 				],
-				"security": [],
+				"security": [
+					{
+						"bearerAuth": []
+					}
+				],
 				"parameters": [],
 				"requestBody": {
 					"required": true,
@@ -2057,7 +2061,14 @@
 				"tags": [
 					"Storage Folder"
 				],
-				"security": [],
+				"security": [
+					{
+						"bearerAuth": [
+							"management-role",
+							"admin"
+						]
+					}
+				],
 				"parameters": [],
 				"requestBody": {
 					"required": true,
@@ -2081,7 +2092,14 @@
 				"tags": [
 					"Storage Folder"
 				],
-				"security": [],
+				"security": [
+					{
+						"bearerAuth": [
+							"management-role",
+							"admin"
+						]
+					}
+				],
 				"parameters": [],
 				"requestBody": {
 					"required": true,
@@ -2105,7 +2123,14 @@
 				"tags": [
 					"Storage Folder"
 				],
-				"security": [],
+				"security": [
+					{
+						"bearerAuth": [
+							"management-role",
+							"admin"
+						]
+					}
+				],
 				"parameters": [],
 				"requestBody": {
 					"required": true,
@@ -2123,7 +2148,7 @@
 			"post": {
 				"operationId": "PostFile",
 				"responses": {
-					"204": {
+					"200": {
 						"description": "สำเร็จ",
 						"content": {
 							"application/json": {
@@ -2225,7 +2250,14 @@
 				"tags": [
 					"Storage File"
 				],
-				"security": [],
+				"security": [
+					{
+						"bearerAuth": [
+							"management-role",
+							"admin"
+						]
+					}
+				],
 				"parameters": [],
 				"requestBody": {
 					"required": true,
@@ -2268,7 +2300,14 @@
 				"tags": [
 					"Storage File"
 				],
-				"security": [],
+				"security": [
+					{
+						"bearerAuth": [
+							"management-role",
+							"admin"
+						]
+					}
+				],
 				"parameters": [],
 				"requestBody": {
 					"required": true,
@@ -2291,7 +2330,14 @@
 				"tags": [
 					"Storage File"
 				],
-				"security": [],
+				"security": [
+					{
+						"bearerAuth": [
+							"management-role",
+							"admin"
+						]
+					}
+				],
 				"parameters": [],
 				"requestBody": {
 					"required": true,
diff --git a/Services/server/src/utils/auth.ts b/Services/server/src/utils/auth.ts
index 0f56597..8e66e04 100644
--- a/Services/server/src/utils/auth.ts
+++ b/Services/server/src/utils/auth.ts
@@ -38,7 +38,7 @@ export async function expressAuthentication(
     ? request.headers["authorization"].split(" ")[1]
     : null;
 
-  if (!token) throw new HttpError(HttpStatusCode.UNAUTHORIZED, "ไม่พบข้อมูลสำหัรบบืนบันตัวตน");
+  if (!token) throw new HttpError(HttpStatusCode.UNAUTHORIZED, "ไม่พบข้อมูลสำหรับยินยันตัวตน");
 
   let payload: JwtPayload = {};
 
@@ -60,7 +60,7 @@ export async function expressAuthentication(
     scopes.length > 0 &&
     scopes
       .map((v) => (v === "management-role" ? process.env.MANAGEMENT_ROLE : v))
-      .every((v) => !payload.resource_access[payload.azp].roles.includes(v))
+      .every((v) => !payload.role.includes(v))
   ) {
     throw new HttpError(HttpStatusCode.FORBIDDEN, "คุณไม่มีสิทธิในเข้าถึงข้อมูลนี้");
   }

From e6d33873b09106fb80cd41f299a8d1df714a7db2 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Wed, 13 Dec 2023 18:03:32 +0700
Subject: [PATCH 6/6] fix: typo

---
 Services/server/src/controllers/fileController.ts          | 4 ++--
 Services/server/src/controllers/subFolderFileController.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Services/server/src/controllers/fileController.ts b/Services/server/src/controllers/fileController.ts
index 2e2be9f..94bd207 100644
--- a/Services/server/src/controllers/fileController.ts
+++ b/Services/server/src/controllers/fileController.ts
@@ -146,7 +146,7 @@ export class FileController extends Controller {
     @Path() folderName: string,
   ) {
     if (body.file.length > 85) {
-      throw new HttpError(HttpStatusCode.BAD_REQUEST, "ชื่อไฟล์ยาวเิกนกำหนด");
+      throw new HttpError(HttpStatusCode.BAD_REQUEST, "ชื่อไฟล์ยาวเกินกำหนด");
     }
 
     const basePath = `${cabinetName}/${drawerName}/${folderName}/`;
@@ -257,7 +257,7 @@ export class FileController extends Controller {
     },
   ): Promise<void | { upload: string }> {
     if (body.file && body.file.length > 85) {
-      throw new HttpError(HttpStatusCode.BAD_REQUEST, "ชื่อไฟล์ยาวเิกนกำหนด");
+      throw new HttpError(HttpStatusCode.BAD_REQUEST, "ชื่อไฟล์ยาวเกินกำหนด");
     }
 
     const basePath = `${cabinetName}/${drawerName}/${folderName}/`;
diff --git a/Services/server/src/controllers/subFolderFileController.ts b/Services/server/src/controllers/subFolderFileController.ts
index 6d109b4..acbf655 100644
--- a/Services/server/src/controllers/subFolderFileController.ts
+++ b/Services/server/src/controllers/subFolderFileController.ts
@@ -152,7 +152,7 @@ export class SubFolderFileController extends Controller {
     @Path() subFolderName: string,
   ) {
     if (body.file && body.file.length > 85) {
-      throw new HttpError(HttpStatusCode.BAD_REQUEST, "ชื่อไฟล์ยาวเิกนกำหนด");
+      throw new HttpError(HttpStatusCode.BAD_REQUEST, "ชื่อไฟล์ยาวเกินกำหนด");
     }
 
     const basePath = `${cabinetName}/${drawerName}/${folderName}/${subFolderName}/`;
@@ -264,7 +264,7 @@ export class SubFolderFileController extends Controller {
     },
   ) {
     if (body.file && body.file.length > 85) {
-      throw new HttpError(HttpStatusCode.BAD_REQUEST, "ชื่อไฟล์ยาวเิกนกำหนด");
+      throw new HttpError(HttpStatusCode.BAD_REQUEST, "ชื่อไฟล์ยาวเกินกำหนด");
     }
 
     const basePath = `${cabinetName}/${drawerName}/${folderName}/${subFolderName}/`;