Various enhancements

* Better HTTP handling, nocache, logging

Author: JoshuaTheMiller

package.json

@@ -37,6 +37,7 @@
     "js-yaml": "^4.1.0",
     "ldap-escape": "^2.0.6",
     "ldapjs": "^3.0.1",
+    "nocache": "^4.0.0",
     "octokit": "^2.0.14",
     "openapi-backend": "^5.9.1",
     "swagger-ui-express": "^4.6.2"

src/app.ts

@@ -5,11 +5,13 @@ import fs from "fs";
 import path from "node:path";
 import swaggerUi from "swagger-ui-express";
 import { routes } from "./routes";
-import { Log, SetupLogging } from "./logging";
+import { SetupLogging } from "./logging";
+import nocache from "nocache";
 
 SetupLogging();
 
 const app = express();
+app.use(nocache());
 
 const port = process.env.PORT;
 

src/handlers/getSourceTeam.ts

@@ -7,14 +7,17 @@ export async function getSourceTeamHandler(
     c: Context,
     _req: Request,
     res: Response
-) {    
+) {
     const teamName = _req.query.teamName as string;
 
     Log(`Searching SoT for ${teamName}`)
 
     const result = await SearchAllAsync(teamName)
 
-    Log(`Found in SoT:  ${JSON.stringify(result)}`)    
+    if (result.Succeeded) {
+        Log(`Found in SoT:  ${JSON.stringify(result)}`)
+        return res.status(200).json(result);
+    }
 
-    return res.status(200).json(result);
+    return res.status(500).json(result)
 }

src/openapi.yaml

@@ -100,12 +100,6 @@ paths:
           schema:
             type: string
           required: true
-        - in: query
-          name: cb
-          description: For use in cache busting
-          schema:
-            type: string
-          required: false
       responses:
         "200":
           description: A successful response

src/services/ldapClient.ts

@@ -140,20 +140,19 @@ export async function SearchAllAsync(groupName: string): SearchAllResponse {
     }
 }
 
+// TODO: do not directly use axios.create from within a function like this
+// it will cause a new client to be made per request.
+const httpClient = axios.create();
+axiosRetry(httpClient, { retries: 5 });
+
 async function ForwardSearch(groupName: string) : SearchAllResponse  {
     Log(`Forwarding request to '${process.env.SOURCE_PROXY}'`);
-    
-    // cb is for cache busting.
-    const requestUrl = `${process.env.SOURCE_PROXY}/api/get-source-team?teamName=${groupName}&cb=${Date.now()}`;
+        
+    const requestUrl = `${process.env.SOURCE_PROXY}/api/get-source-team?teamName=${groupName}}`;
 
     Log(`Retrieving group (${groupName}) information from '${requestUrl}'`);
     try{
-        // TODO: do not directly use axios.create from within a function like this
-        // it will cause a new client to be made per request.
-        const client = axios.create();
-        axiosRetry(client, { retries: 5 });
-
-        const result = await client.get(requestUrl);
+        const result = await httpClient.get(requestUrl);
         Log(`Results for ${groupName}: ${result}`);
         return result.data as SearchAllResponse;
     }