Fixed codeql issues

AzureAD · Dec 31, 2024 · 1fa8c14 · 1fa8c14
1 parent e9b239c
commit 1fa8c14
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 17 deletions.
diff --git a/extensions/samples/msal-node-extensions/index.js b/extensions/samples/msal-node-extensions/index.js
@@ -63,11 +63,9 @@ PersistenceCreator
         };
 
         pca.acquireTokenByCode(tokenRequest).then((response) => {
-            console.log("\nResponse: \n", response);
             res.sendStatus(200);
         }).catch((error) => {
-            console.error(error.errorMessage);
-            res.status(500).send(error);
+            res.status(500).send(error.errorMessage);
         });
     });
 

diff --git a/samples/e2eTestUtils/jest-puppeteer-utils/serverUtils.js b/samples/e2eTestUtils/jest-puppeteer-utils/serverUtils.js
@@ -45,7 +45,6 @@ async function isServerUp(port, timeout) {
                 host: "localhost",
                 port: port,
                 family: 4,
-                rejectUnauthorized: false,
             };
 
             https

diff --git a/samples/msal-browser-samples/HybridSample/routes/auth.js b/samples/msal-browser-samples/HybridSample/routes/auth.js
@@ -102,7 +102,7 @@ router.post('/server-redirect', (req, res) => {
         })
         .catch((error) => {
             console.timeEnd(timeLabel);
-            res.status(500).send(error);
+            res.status(500).send(error.errorMessage);
         });
 });
 

diff --git a/samples/msal-node-samples/auth-code-distributed-cache/src/middleware.ts b/samples/msal-node-samples/auth-code-distributed-cache/src/middleware.ts
@@ -37,6 +37,8 @@ export const auth = (options: AuthOptions): Router => {
             );
         }
 
+        res.locals.originalUrl = req.originalUrl;
+
         next();
     });
 
@@ -58,10 +60,7 @@ export const auth = (options: AuthOptions): Router => {
                 req.session.isAuthenticated = true;
                 req.session.account = tokenResponse?.account!; // account won't be null in this grant type
 
-                const { redirectTo } = JSON.parse(
-                    Buffer.from(req.body.state, "base64").toString("utf8")
-                );
-                res.redirect(redirectTo); // redirect back to original route
+                res.redirect(res.locals.originalUrl); // redirect back to original route
             } catch (error) {
                 next(error);
             }

diff --git a/samples/msal-node-samples/auth-code-key-vault/index.js b/samples/msal-node-samples/auth-code-key-vault/index.js
@@ -79,7 +79,7 @@ function msalApp(thumbprint, privateKey) {
         cca.acquireTokenByCode(tokenRequest).then((response) => {
             res.status(200).send('Congratulations! You have signed in successfully');
         }).catch((error) => {
-            res.status(500).send(error);
+            res.status(500).send(error.errorMessage);
         });
     });
 

diff --git a/samples/msal-node-samples/auth-code-pkce/src/index.ts b/samples/msal-node-samples/auth-code-pkce/src/index.ts
@@ -121,11 +121,11 @@ app.get("/redirect", (req: RequestWithPKCE, res) => {
     };
 
     pca.acquireTokenByCode(tokenRequest)
-        .then((response) => {
+        .then(() => {
             res.sendStatus(200);
         })
         .catch((error) => {
-            res.status(500).send(error);
+            res.status(500).send(error.errorMessage);
         });
 });
 

diff --git a/samples/msal-node-samples/auth-code-with-certs/index.js b/samples/msal-node-samples/auth-code-with-certs/index.js
@@ -88,7 +88,7 @@ app.post('/redirect', (req, res) => {
     cca.acquireTokenByCode(tokenRequest).then((response) => {
         res.status(200).send('Congratulations! You have signed in successfully');
     }).catch((error) => {
-        res.status(500).send(error);
+        res.status(500).send(error.errorMessage);
     });
 });
 

diff --git a/samples/msal-node-samples/auth-code/index.js b/samples/msal-node-samples/auth-code/index.js
@@ -143,7 +143,7 @@ const getTokenAuthCode = function (scenarioConfig, clientApplication, port) {
             console.log("Successfully acquired token using Authorization Code.");
             res.sendStatus(200);
         }).catch((error) => {
-            res.status(500).send(error);
+            res.status(500).send(error.errorMessage);
         });
     });
 

diff --git a/samples/msal-node-samples/on-behalf-of/web-api/index.js b/samples/msal-node-samples/on-behalf-of/web-api/index.js
@@ -72,7 +72,7 @@ const acquireTokenObo = (cca, webApiPort, clientId, authority, discoveryKeysEndp
                 res.status(200).send(graphResponse);
             });
         }).catch((error) => {
-            res.status(500).send(error);
+            res.status(500).send(error.errorMessage);
         });
     });
 
@@ -91,7 +91,7 @@ const acquireTokenObo = (cca, webApiPort, clientId, authority, discoveryKeysEndp
             });
         });
         req.on("error", (error) => {
-            console.error(error);
+            console.error(error.errorMessage);
         });
         req.end();
     }

diff --git a/samples/msal-node-samples/on-behalf-of/web-app/index.js b/samples/msal-node-samples/on-behalf-of/web-app/index.js
@@ -52,7 +52,7 @@ const acquireTokenByCode = (cca, webAppPort, webApiPort, redirectUri, webApiScop
                 res.status(200).send(oboResponse);
             });
         }).catch((error) => {
-            res.status(500).send(error);
+            res.status(500).send(error.errorMessage);
         });
     });