From b24cbc21ff113d658d9d1c0cc3d0cdc22030f2da Mon Sep 17 00:00:00 2001 From: Yuqiu Wang Date: Wed, 13 Sep 2023 10:19:52 -0500 Subject: [PATCH] improve getCrypto function --- server/index.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/server/index.js b/server/index.js index 08da204..9deaf2d 100644 --- a/server/index.js +++ b/server/index.js @@ -6,7 +6,13 @@ const k8s = require('@kubernetes/client-node'); const {createProxyMiddleware} = require('http-proxy-middleware'); const toString = require('stream-to-string'); const {Issuer} = require('openid-client'); -const crypto = require('crypto').webcrypto; +const getCrypto = () => + typeof globalThis.crypto?.getRandomValues === 'function' + ? globalThis.crypto + : // eslint-disable-next-line @typescript-eslint/no-var-requires + require('crypto').webcrypto; + +const crypto = getCrypto(); const NODE_ENV = process.env.NODE_ENV; const DEBUG_VERBOSE = !!process.env.DEBUG_VERBOSE; @@ -69,6 +75,7 @@ const codeVerifier = generateCodeVerifier() console.log('OIDC_URL: ', OIDC_URL || 'None'); +console.log('codeVerifier: ', codeVerifier || 'None'); process.on('uncaughtException', err => console.error('Uncaught exception', err)); @@ -187,6 +194,7 @@ async function getOidcEndpoint() { } if (OIDC_USE_PKCE) { const codeChallenge = await generateCodeChallengeFromVerifier(codeVerifier) + console.log(codeChallenge) authParams = { ...authParams, code_challenge: codeChallenge,