chore: update generated route and swagger

Prototype/server/src/routes.ts

@@ -68,11 +68,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('/cabinet',
+            authenticateMiddleware([{"bearerAuth":[]}]),
             ...(fetchMiddlewares<RequestHandler>(CabinetController)),
             ...(fetchMiddlewares<RequestHandler>(CabinetController.prototype.createCabinet)),
 
             function CabinetController_createCabinet(request: any, response: any, next: any) {
             const args = {
+                    request: {"in":"request","name":"request","required":true,"dataType":"object"},
                     body: {"in":"body","name":"body","required":true,"dataType":"nestedObjectLiteral","nestedProperties":{"name":{"dataType":"string","required":true}}},
             };
 
@@ -93,6 +95,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('/cabinet/:cabinetName',
+            authenticateMiddleware([{"bearerAuth":[]}]),
             ...(fetchMiddlewares<RequestHandler>(CabinetController)),
             ...(fetchMiddlewares<RequestHandler>(CabinetController.prototype.editCabinet)),
 
@@ -119,6 +122,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('/cabinet/:cabinetName',
+            authenticateMiddleware([{"bearerAuth":[]}]),
             ...(fetchMiddlewares<RequestHandler>(CabinetController)),
             ...(fetchMiddlewares<RequestHandler>(CabinetController.prototype.deleteCabinet)),
 
@@ -169,11 +173,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('/cabinet/:cabinetName/drawer',
+            authenticateMiddleware([{"bearerAuth":[]}]),
             ...(fetchMiddlewares<RequestHandler>(DrawerController)),
             ...(fetchMiddlewares<RequestHandler>(DrawerController.prototype.createDrawer)),
 
             function DrawerController_createDrawer(request: any, response: any, next: any) {
             const args = {
+                    request: {"in":"request","name":"request","required":true,"dataType":"object"},
                     cabinetName: {"in":"path","name":"cabinetName","required":true,"dataType":"string"},
                     body: {"in":"body","name":"body","required":true,"dataType":"nestedObjectLiteral","nestedProperties":{"name":{"dataType":"string","required":true}}},
             };
@@ -195,6 +201,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('/cabinet/:cabinetName/drawer/:drawerName',
+            authenticateMiddleware([{"bearerAuth":[]}]),
             ...(fetchMiddlewares<RequestHandler>(DrawerController)),
             ...(fetchMiddlewares<RequestHandler>(DrawerController.prototype.editDrawer)),
 
@@ -222,6 +229,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('/cabinet/:cabinetName/drawer/:drawerName',
+            authenticateMiddleware([{"bearerAuth":[]}]),
             ...(fetchMiddlewares<RequestHandler>(DrawerController)),
             ...(fetchMiddlewares<RequestHandler>(DrawerController.prototype.deleteDrawer)),
 
@@ -254,8 +262,12 @@ export function RegisterRoutes(app: Router) {
 
             function FileController_uploadFile(request: any, response: any, next: any) {
             const args = {
+                    request: {"in":"request","name":"request","required":true,"dataType":"object"},
                     file: {"in":"formData","name":"file","required":true,"dataType":"file"},
-                    desc: {"in":"formData","name":"desc","required":true,"dataType":"string"},
+                    title: {"in":"formData","name":"title","required":true,"dataType":"string"},
+                    description: {"in":"formData","name":"description","required":true,"dataType":"string"},
+                    keywords: {"in":"formData","name":"keywords","required":true,"dataType":"string"},
+                    categories: {"in":"formData","name":"categories","required":true,"dataType":"string"},
                     cabinetName: {"in":"path","name":"cabinetName","required":true,"dataType":"string"},
                     drawerName: {"in":"path","name":"drawerName","required":true,"dataType":"string"},
                     folderName: {"in":"path","name":"folderName","required":true,"dataType":"string"},
@@ -304,11 +316,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('/cabinet/:cabinetName/drawer/:drawerName/folder',
+            authenticateMiddleware([{"bearerAuth":[]}]),
             ...(fetchMiddlewares<RequestHandler>(FolderController)),
             ...(fetchMiddlewares<RequestHandler>(FolderController.prototype.createFolder)),
 
             function FolderController_createFolder(request: any, response: any, next: any) {
             const args = {
+                    request: {"in":"request","name":"request","required":true,"dataType":"object"},
                     body: {"in":"body","name":"body","required":true,"dataType":"nestedObjectLiteral","nestedProperties":{"name":{"dataType":"string","required":true}}},
                     cabinetName: {"in":"path","name":"cabinetName","required":true,"dataType":"string"},
                     drawerName: {"in":"path","name":"drawerName","required":true,"dataType":"string"},
@@ -331,6 +345,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('/cabinet/:cabinetName/drawer/:drawerName/folder/:folderName',
+            authenticateMiddleware([{"bearerAuth":[]}]),
             ...(fetchMiddlewares<RequestHandler>(FolderController)),
             ...(fetchMiddlewares<RequestHandler>(FolderController.prototype.editFolder)),
 
@@ -359,6 +374,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('/cabinet/:cabinetName/drawer/:drawerName/folder/:folderName',
+            authenticateMiddleware([{"bearerAuth":[]}]),
             ...(fetchMiddlewares<RequestHandler>(FolderController)),
             ...(fetchMiddlewares<RequestHandler>(FolderController.prototype.deleteFolder)),
 
@@ -386,6 +402,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.get('/cabinet/:cabinetName/drawer/:drawerName/folder/:folderName/subfolder',
+            authenticateMiddleware([{"bearerAuth":[]}]),
             ...(fetchMiddlewares<RequestHandler>(SubFolderController)),
             ...(fetchMiddlewares<RequestHandler>(SubFolderController.prototype.listFolder)),
 
@@ -413,11 +430,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('/cabinet/:cabinetName/drawer/:drawerName/folder/:folderName/subfolder',
+            authenticateMiddleware([{"bearerAuth":[]}]),
             ...(fetchMiddlewares<RequestHandler>(SubFolderController)),
             ...(fetchMiddlewares<RequestHandler>(SubFolderController.prototype.createFolder)),
 
             function SubFolderController_createFolder(request: any, response: any, next: any) {
             const args = {
+                    request: {"in":"request","name":"request","required":true,"dataType":"object"},
                     body: {"in":"body","name":"body","required":true,"dataType":"nestedObjectLiteral","nestedProperties":{"name":{"dataType":"string","required":true}}},
                     cabinetName: {"in":"path","name":"cabinetName","required":true,"dataType":"string"},
                     drawerName: {"in":"path","name":"drawerName","required":true,"dataType":"string"},
@@ -441,6 +460,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('/cabinet/:cabinetName/drawer/:drawerName/folder/:folderName/subfolder/:subFolderName',
+            authenticateMiddleware([{"bearerAuth":[]}]),
             ...(fetchMiddlewares<RequestHandler>(SubFolderController)),
             ...(fetchMiddlewares<RequestHandler>(SubFolderController.prototype.editFolder)),
 
@@ -470,6 +490,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('/cabinet/:cabinetName/drawer/:drawerName/folder/:folderName/subfolder/:subFolderName',
+            authenticateMiddleware([{"bearerAuth":[]}]),
             ...(fetchMiddlewares<RequestHandler>(SubFolderController)),
             ...(fetchMiddlewares<RequestHandler>(SubFolderController.prototype.deleteFolder)),
 
@@ -501,6 +522,65 @@ 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
 
 
+    // 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
+
+    function authenticateMiddleware(security: TsoaRoute.Security[] = []) {
+        return async function runAuthenticationMiddleware(request: any, _response: any, next: any) {
+
+            // 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
+
+            // keep track of failed auth attempts so we can hand back the most
+            // recent one.  This behavior was previously existing so preserving it
+            // here
+            const failedAttempts: any[] = [];
+            const pushAndRethrow = (error: any) => {
+                failedAttempts.push(error);
+                throw error;
+            };
+
+            const secMethodOrPromises: Promise<any>[] = [];
+            for (const secMethod of security) {
+                if (Object.keys(secMethod).length > 1) {
+                    const secMethodAndPromises: Promise<any>[] = [];
+
+                    for (const name in secMethod) {
+                        secMethodAndPromises.push(
+                            expressAuthentication(request, name, secMethod[name])
+                                .catch(pushAndRethrow)
+                        );
+                    }
+
+                    // 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
+
+                    secMethodOrPromises.push(Promise.all(secMethodAndPromises)
+                        .then(users => { return users[0]; }));
+                } else {
+                    for (const name in secMethod) {
+                        secMethodOrPromises.push(
+                            expressAuthentication(request, name, secMethod[name])
+                                .catch(pushAndRethrow)
+                        );
+                    }
+                }
+            }
+
+            // 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
+
+            try {
+                request['user'] = await promiseAny.call(Promise, secMethodOrPromises);
+                next();
+            }
+            catch(err) {
+                // Show most recent error as response
+                const error = failedAttempts.pop();
+                error.status = error.status || 401;
+                next(error);
+            }
+
+            // 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
+        }
+    }
+
     // 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
 
     function isController(object: any): object is Controller {

Prototype/server/src/swagger.json

@@ -101,7 +101,11 @@
 				"tags": [
 					"Cabinet"
 				],
-				"security": [],
+				"security": [
+					{
+						"bearerAuth": []
+					}
+				],
 				"parameters": [],
 				"requestBody": {
 					"required": true,
@@ -134,7 +138,11 @@
 				"tags": [
 					"Cabinet"
 				],
-				"security": [],
+				"security": [
+					{
+						"bearerAuth": []
+					}
+				],
 				"parameters": [
 					{
 						"in": "path",
@@ -179,7 +187,11 @@
 				"tags": [
 					"Cabinet"
 				],
-				"security": [],
+				"security": [
+					{
+						"bearerAuth": []
+					}
+				],
 				"parameters": [
 					{
 						"in": "path",
@@ -235,7 +247,11 @@
 				"tags": [
 					"Drawer"
 				],
-				"security": [],
+				"security": [
+					{
+						"bearerAuth": []
+					}
+				],
 				"parameters": [
 					{
 						"in": "path",
@@ -277,7 +293,11 @@
 				"tags": [
 					"Drawer"
 				],
-				"security": [],
+				"security": [
+					{
+						"bearerAuth": []
+					}
+				],
 				"parameters": [
 					{
 						"in": "path",
@@ -330,7 +350,11 @@
 				"tags": [
 					"Drawer"
 				],
-				"security": [],
+				"security": [
+					{
+						"bearerAuth": []
+					}
+				],
 				"parameters": [
 					{
 						"in": "path",
@@ -400,13 +424,25 @@
 										"type": "string",
 										"format": "binary"
 									},
-									"desc": {
+									"title": {
+										"type": "string"
+									},
+									"description": {
+										"type": "string"
+									},
+									"keywords": {
+										"type": "string"
+									},
+									"categories": {
 										"type": "string"
 									}
 								},
 								"required": [
 									"file",
-									"desc"
+									"title",
+									"description",
+									"keywords",
+									"categories"
 								]
 							}
 						}
@@ -428,7 +464,11 @@
 				"tags": [
 					"Folder"
 				],
-				"security": [],
+				"security": [
+					{
+						"bearerAuth": []
+					}
+				],
 				"parameters": [
 					{
 						"in": "query",
@@ -489,7 +529,11 @@
 				"tags": [
 					"Folder"
 				],
-				"security": [],
+				"security": [
+					{
+						"bearerAuth": []
+					}
+				],
 				"parameters": [
 					{
 						"in": "path",
@@ -569,7 +613,11 @@
 				"tags": [
 					"Folder"
 				],
-				"security": [],
+				"security": [
+					{
+						"bearerAuth": []
+					}
+				],
 				"parameters": [
 					{
 						"in": "path",
@@ -629,7 +677,11 @@
 				"tags": [
 					"SubFolder"
 				],
-				"security": [],
+				"security": [
+					{
+						"bearerAuth": []
+					}
+				],
 				"parameters": [
 					{
 						"in": "path",
@@ -667,7 +719,11 @@
 				"tags": [
 					"SubFolder"
 				],
-				"security": [],
+				"security": [
+					{
+						"bearerAuth": []
+					}
+				],
 				"parameters": [
 					{
 						"in": "path",
@@ -730,7 +786,11 @@
 				"tags": [
 					"SubFolder"
 				],
-				"security": [],
+				"security": [
+					{
+						"bearerAuth": []
+					}
+				],
 				"parameters": [
 					{
 						"in": "query",
@@ -799,7 +859,11 @@
 				"tags": [
 					"SubFolder"
 				],
-				"security": [],
+				"security": [
+					{
+						"bearerAuth": []
+					}
+				],
 				"parameters": [
 					{
 						"in": "path",