From c7d2d2b243e9c283e028627d3797fe71c8dded87 Mon Sep 17 00:00:00 2001
From: claire bontempo <68122737+hellobontempo@users.noreply.github.com>
Date: Fri, 26 Aug 2022 11:44:01 -0700
Subject: [PATCH] additional param checks (#16910)

---
 ui/app/routes/vault/cluster/oidc-callback.js             | 5 ++++-
 ui/tests/unit/routes/vault/cluster/oidc-callback-test.js | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ui/app/routes/vault/cluster/oidc-callback.js b/ui/app/routes/vault/cluster/oidc-callback.js
index 7cd43bdb82..2e9e752974 100644
--- a/ui/app/routes/vault/cluster/oidc-callback.js
+++ b/ui/app/routes/vault/cluster/oidc-callback.js
@@ -14,7 +14,10 @@ export default Route.extend({
     }
     path = window.decodeURIComponent(path);
     const source = 'oidc-callback'; // required by event listener in auth-jwt component
-    let queryParams = { source, namespace, path, code, state };
+    let queryParams = { source, path: path || '', code: code || '', state: state || '' };
+    if (namespace) {
+      queryParams.namespace = namespace;
+    }
     window.opener.postMessage(queryParams, window.origin);
   },
   setupController(controller) {
diff --git a/ui/tests/unit/routes/vault/cluster/oidc-callback-test.js b/ui/tests/unit/routes/vault/cluster/oidc-callback-test.js
index 5e4e680c07..31603ce703 100644
--- a/ui/tests/unit/routes/vault/cluster/oidc-callback-test.js
+++ b/ui/tests/unit/routes/vault/cluster/oidc-callback-test.js
@@ -152,11 +152,11 @@ module('Unit | Route | vault/cluster/oidc-callback', function (hooks) {
     assert.propContains(
       this.windowStub.lastCall.args[0],
       {
-        code: undefined,
+        code: '',
         path: 'oidc',
-        state: undefined,
+        state: '',
       },
-      'model hook returns non-existent state param'
+      'model hook returns empty string when state param nonexistent'
     );
   });