feat: id_token -> access_token refactor (#231)

openziti · Nov 1, 2024 · 9c99f5d · 9c99f5d
1 parent a54b469
commit 9c99f5d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 26 deletions.
diff --git a/package.json b/package.json
@@ -83,7 +83,7 @@
     ]
   },
   "dependencies": {
-    "@openziti/ziti-browzer-core": "^0.50.0",
+    "@openziti/ziti-browzer-core": "^0.51.0",
     "async-mutex": "^0.5.0",
     "cheerio": "^1.0.0-rc.12",
     "jwt-decode": "^3.1.2",

diff --git a/src/ZitiFirstStrategy.ts b/src/ZitiFirstStrategy.ts
@@ -198,12 +198,6 @@ class ZitiFirstStrategy extends CacheFirst /* NetworkFirst */ {
     if (origCSP['script-src']) {
       origCSP['script-src'].push(`${this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.idp.host}`.replace('https://',''));
       origCSP['script-src'].push(`canny.io`);
-      if (isEqual(this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.idp.type, 'keycloak')) {
-        origCSP['script-src'].push(`${keycloakJs}`);
-      }
-      if (this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.eruda) {
-        origCSP['script-src'].push(`${erudaJs}`);
-      }
       if (!origCSP['script-src'].includes("'unsafe-eval'")) {
         origCSP['script-src'].push("'unsafe-eval'");
       }
@@ -443,6 +437,7 @@ class ZitiFirstStrategy extends CacheFirst /* NetworkFirst */ {
               sdkBranch:      buildInfo.sdkBranch,
               sdkRevision:    buildInfo.sdkRevision,
               token_type:     this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.token_type,
+              id_token:       this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.id_token,
               access_token:   this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.access_token,
               bootstrapperTargetService: this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.browzer.bootstrapper.target.service,
             });
@@ -1178,13 +1173,6 @@ class ZitiFirstStrategy extends CacheFirst /* NetworkFirst */ {
 
                     let kcElement = $('<meta name="author" content="OpenZiti BrowZer" />')
 
-                    if (isEqual(self._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.idp.type, 'keycloak')) {
-                      kcElement = $('<script></script> ')
-                        .attr('id', 'ziti-browzer-kc')
-                        .attr('type', 'text/javascript')
-                        .attr('src', `${keycloakJs}`);
-                    }
-
                     // Locate the CSP
                     let cspElement = $('meta[http-equiv="content-security-policy"]');
 
@@ -1204,10 +1192,6 @@ class ZitiFirstStrategy extends CacheFirst /* NetworkFirst */ {
                       cspElement.after(ppElement);
                       cspElement.after(otElement);
 
-                      if (isEqual(self._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.idp.type, 'keycloak')) {
-                        cspElement.after(kcElement);
-                      }
-
                       let otEl = $('meta[id="ziti-browzer-origin-trial"]');
                       // Inject the ZBR immediately after the origin trial meta
                       otEl.after(zbrElement);
@@ -1231,10 +1215,6 @@ class ZitiFirstStrategy extends CacheFirst /* NetworkFirst */ {
                       headElement.prepend(ppCss1Element);
                       headElement.prepend(otElement);
 
-                      if (isEqual(self._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.idp.type, 'keycloak')) {
-                        headElement.prepend(kcElement);
-                      }
-
                       buffer += $.html();
                     }
                   } else {

diff --git a/yarn.lock b/yarn.lock
@@ -974,10 +974,10 @@
     "@types/emscripten" "^1.39.6"
     "@wasmer/wasi" "^1.0.2"
 
-"@openziti/ziti-browzer-core@^0.50.0":
-  version "0.50.0"
-  resolved "https://registry.yarnpkg.com/@openziti/ziti-browzer-core/-/ziti-browzer-core-0.50.0.tgz#9de686babba6200ba7e8262acd06b90e09764e9c"
-  integrity sha512-CfdVexI7ibsFKe0kx1z2Eo3t1N6Xp7Td59UuF7k7eBzIGCC27pVrAz+qjQ0/PV4dGrOBGxqaultgNFn/BUhosw==
+"@openziti/ziti-browzer-core@^0.51.0":
+  version "0.51.0"
+  resolved "https://registry.yarnpkg.com/@openziti/ziti-browzer-core/-/ziti-browzer-core-0.51.0.tgz#7b9979bd80cf5a306aaef29af73a8426f63557b7"
+  integrity sha512-z3+/7S7etxDhfoyULXYn7X6k6WB+KtNxdFaZS79DOA1NNxaz/AYl4zzQ80D3lFOD3ZjSUZJW+VshyFMOowhenQ==
   dependencies:
     "@openziti/libcrypto-js" "^0.24.0"
     "@openziti/ziti-browzer-edge-client" "^0.7.0"