Pulling in jquery from npm modules rather http GET. Added ability to …

…collapse all of the forms on debugger2 page.
rcbj · Dec 30, 2024 · 858662a · 858662a
1 parent f82f26e
commit 858662a
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 34 deletions.
diff --git a/client/package.json b/client/package.json
@@ -18,6 +18,7 @@
     "@peculiar/asn1-pkcs8": "latest",
     "envify": "latest",
     "bunyan": "latest",
-    "dompurify": "latest"
+    "dompurify": "latest",
+    "jquery": "latest"
   }
 }
diff --git a/client/public/debugger.html b/client/public/debugger.html
@@ -31,8 +31,6 @@
 
     <div class="container">
 
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js" type="text/javascript">
-</script>
 <script type="text/javascript" src="/js/debugger.js">
 </script>
 <p>This is a simple Client to use with any <a href="https://medium.com/@robert.broeckelmann/saml2-vs-jwt-understanding-oauth2-4abde9e7ec8b">OAuth2</a> or <a href="https://medium.com/@robert.broeckelmann/understanding-openid-connect-series-37c93d25e92b">OpenID Connect</a> compliant identity provider..

diff --git a/client/public/debugger2.html b/client/public/debugger2.html
@@ -31,8 +31,6 @@
 
 <div class="container">
 
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js" type="text/javascript">
-</script>
 <script type="text/javascript" src="/js/debugger2.js"></script>
 
 <p>This is a simple Client to use with any <a href="https://medium.com/@robert.broeckelmann/saml2-vs-jwt-understanding-oauth2-4abde9e7ec8b">OAuth2</a> or <a href="https://medium.com/@robert.broeckelmann/understanding-openid-connect-series-37c93d25e92b">OpenID Connect</a> compliant identity provider..
@@ -42,16 +40,13 @@
 <div class="authz-error-report" id="authz-error-report"></div>
 
     <div class="step0" id="step0">
+    <legend>Configuration Parameters</legend>
     <form id="step0_expand_form">
-      <input class="btn2" type="submit" name="config_expand_button" id="config_expand_button" value="Hide" onclick="return debugger2.onClickShowConfigFieldSet('config_fieldset');"/>
+      <input class="btn2" type="submit" name="config_expand_button" id="config_expand_button" value="Hide" onclick="return debugger2.onClickShowFieldSet('config_expand_button', 'config_fieldset');"/>
     </form>
     <fieldset id="config_fieldset" name="config_fieldset" style="display: block;">
-    <legend>Configuration Parameters
-        <div class="form-group">
-          <input type="hidden" name="response_type" value="" id="response_type" />
-        </div>
-    </legend>
     <form action="" id="endpoints" name="endpoints">
+      <input type="hidden" name="response_type" value="" id="response_type" />
       <table border="0">
         <tbody>
           <tr>
@@ -152,6 +147,9 @@
 <div class="step3" id="step3">
     <legend id="h2_title_2" name="h2_title_2">Exchange Authorization Code for Access Token
     </legend>
+    <form id="step0_expand_form">
+      <input class="btn2" type="submit" name="token_expand_button" id="token_expand_button" value="Hide" onclick="return debugger2.onClickShowFieldSet('token_expand_button', 'token_fieldset');"/>
+    </form>
     <fieldset id="token_fieldset" name="token_fieldset" style="display: block;">
     <input class="input" id="token_grant_type" name="grant_type" type="hidden" value="authorization_code" />
     <table>
@@ -331,10 +329,13 @@
 </div>
 
 <div class="step4" id="step4">
-    <fieldset id="refresh_fieldset" name="refresh_fieldset">
-    <legend id="h2_title_3" name="h2_title_3">Obtain New Access Token Using Refresh Token
-      <input class="input" id="refresh_grant_type" name="refresh_grant_type" type="hidden" value="refresh_token" />
+    <legend>Obtain New Access Token Using Refresh Token
     </legend>
+    <form>
+      <input class="btn2" type="submit" name="refresh_expand_button" id="refresh_expand_button" value="Hide" onclick="return debugger2.onClickShowFieldSet('refresh_expand_button', 'refresh_fieldset');"/>
+    </form>
+    <fieldset id="refresh_fieldset" name="refresh_fieldset">
+    <input class="input" id="refresh_grant_type" name="refresh_grant_type" type="hidden" value="refresh_token" />
     <table>
       <tbody>
         <tr>
@@ -397,9 +398,13 @@
 <div class="refresh_endpoint_result" id="refresh_endpoint_result">&nbsp;
 </div>
 <div class="step5" id="step5">
-        <fieldset id="logout_fieldset" name="logout_fieldset">
-    <legend id="h2_title_3" name="h2_title_3">RP-initiated Logout
+    <legend>RP-initiated Logout
     </legend>
+    <form>
+      <input class="btn2" type="submit" name="logout_expand_button" id="logout_expand_button" value="Hide" onclick="return debugger2.onClickShowFieldSet('logout_expand_button', 'logout_fieldset');"/>
+    </form>
+    <fieldset id="logout_fieldset" name="logout_fieldset" style="display: block;">
+    <form>
     <table>
       <tbody>
         <tr>
@@ -448,6 +453,7 @@
         </tr>
       </tbody>
     </table>
+    </form>
   </fieldset>
 
 </div>

diff --git a/client/public/jwks.html b/client/public/jwks.html
@@ -31,8 +31,6 @@
 
     <div class="container">
 
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js" type="text/javascript">
-</script>
 <script type="text/javascript" src="/js/jwks.js">
 </script>
 <div class="step0" id="step0">

diff --git a/client/public/privacypolicy.html b/client/public/privacypolicy.html
@@ -40,8 +40,6 @@
 
     <div class="container">
 
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js" type="text/javascript">
-</script>
 	<header class="entry-header">
 
 		<h1 class="page-title">Privacy Policy</h1>

diff --git a/client/public/userinfo.html b/client/public/userinfo.html
@@ -30,7 +30,6 @@
 </div>
 
     <div class="container">
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js" type="text/javascript"/></script>
 <script type="text/javascript" src="/js/userinfo.js"></script>
 
    <legend>Configuration Parameters

diff --git a/client/src/debugger.js b/client/src/debugger.js
@@ -11,6 +11,7 @@
 var appconfig = require(process.env.CONFIG_FILE);
 var bunyan = require("bunyan");
 var DOMPurify = require("dompurify");
+var $ = require("jquery");
 console.log("logLevel: " + appconfig.logLevel);
 var log = bunyan.createLogger({ name: 'debugger',
                                 level: appconfig.logLevel });
@@ -59,6 +60,8 @@ function getParameterByName(name, url)
 
 $(document).ready(function() {
   log.debug("Entering ready function.");
+  // Eliminating use of window.onload function.
+  onload();
   $("#authorization_grant_type").change(function() {
     log.debug("Entering selection changed function().");
     var value = $(this).val();
@@ -73,9 +76,30 @@ $(document).ready(function() {
   var value = $("#authorization_grant_type").value;
   resetUI(value);
   recalculateAuthorizationRequestDescription();
+  initializeUIPostDebuggerInitialization();
   log.debug("Leaving ready function.");
 });
 
+function initializeUIPostDebuggerInitialization()
+{
+  log.debug("Entering initializeUIPostDebuggerInitialization().");
+  var debuggerInitialized = false;
+  if (localStorage) {
+    debuggerInitialized = getLSBooleanItem("debugger_initialized");
+  }
+  log.debug("debugger_initialized: " + debuggerInitialized);
+  if (debuggerInitialized) {
+    log.debug("The debugger configuration has been initialized through Discovery.");
+    document.getElementById("oidc_fieldset").style.display = "none";
+    document.getElementById("oidc_expand_button").value = "Expand";
+    document.getElementById("config_fieldset").style.display = "none";
+    document.getElementById("config_expand_button").value = "Expand";
+    document.getElementById("authz_fieldset").style.display = "block";
+    document.getElementById("authz_expand_button").value = "Collapse";
+  }
+  log.debug("Leaving initializeUIPostDebuggerInitialization().");
+}
+
 function resetUI(value)
 {
     log.debug("Entering resetUI().");
@@ -789,7 +813,7 @@ function recalculateRefreshRequestDescription()
   log.debug("Leaving recalculateRefreshRequestDescription().");
 }
 
-window.onload = function() {
+function onload() {
   log.debug("Entering onload function.");
   $("#password-form-group1").hide();
   $("#password-form-group2").hide();
@@ -834,7 +858,6 @@ window.onload = function() {
       localStorage.setItem("authzcustomParametersCheck-no", document.getElementById("authzcustomParametersCheck-no").checked);
       localStorage.setItem("usePKCE-yes", document.getElementById("usePKCE-yes").checked );
       localStorage.setItem("usePKCE-no", document.getElementById("usePKCE-no").checked );
-
       log.debug("Leaving auth_step submit event listener function.");
     });
   }
@@ -960,7 +983,7 @@ $("#auth_step").submit(function () {
       })
       .prop("name", "");
 });
-    log.debug("Leaving auth_step submit function.");
+    log.debug("Registered auth_step submit function.");
 });
 
 function recalculateAuthorizationErrorDescription()
@@ -1325,6 +1348,7 @@ function onSubmitPopulateFormsWithDiscoveryInformation() {
       localStorage.setItem("token_scope", scopesSupported );
       localStorage.setItem("jwks_endpoint", jwksUri);
       localStorage.setItem("end_session_endpoint", endSessionEndpoint);
+      localStorage.setItem("debugger_initialized", true);
   }
   log.debug('Leaving OnSubmitPopulateFormsWithDiscoveryInformation().');
   return true;

diff --git a/client/src/debugger2.js b/client/src/debugger2.js
@@ -5,6 +5,7 @@
 var appconfig = require(process.env.CONFIG_FILE);
 var bunyan = require("bunyan");
 var DOMPurify = require("dompurify");
+var $ = require("jquery");
 var log = bunyan.createLogger({ name: 'debugger2',
                                 level: appconfig.logLevel });
 log.info("Log initialized. logLevel=" + log.level());
@@ -1664,16 +1665,19 @@ function generateCustomParametersListUI()
   recalculateTokenRequestDescription();
 }
 
-function onClickShowConfigFieldSet(id) {
-  log.debug('Entering onClickShowConfigFieldSet(). id=' + id + ', style.display=' + document.getElementById(id).style.display);
-  if(document.getElementById(id).style.display == 'block') {
-    log.debug('Hide ' + id + '.');
-    document.getElementById(id).style.display = 'none'
-    document.getElementById("config_expand_button").value='Expand';
+function onClickShowFieldSet(expand_button_id, field_set_id) {
+  log.debug('Entering onClickShowConfigFieldSet(). expand_button_id='
+    + expand_button_id + ', field_set_id=' + field_set_id
+    + ', fieldset.style.display=' + document.getElementById(field_set_id).style.display
+    + ', expand_button.value=' + document.getElementById(expand_button_id).value);
+  if(document.getElementById(field_set_id).style.display == 'block') {
+    log.debug('Hide ' + field_set_id + '.');
+    document.getElementById(field_set_id).style.display = 'none'
+    document.getElementById(expand_button_id).value='Expand';
   } else {
-    log.debug('Show ' + id + '.');
-    document.getElementById(id).style.display = 'block';
-    document.getElementById("config_expand_button").value='Hide';
+    log.debug('Show ' + field_set_id + '.');
+    document.getElementById(field_set_id).style.display = 'block';
+    document.getElementById(expand_button_id).value='Hide';
   }
   document.getElementById("step0_expand_form").addEventListener("click", function(event) {
     event.preventDefault();
@@ -1777,7 +1781,7 @@ regenerateNonce,
 recreateTokenDisplay,
 displayTokenCustomParametersCheck,
 generateCustomParametersListUI,
-onClickShowConfigFieldSet,
+onClickShowFieldSet,
 initFields,
 usePKCERFC,
 setPostAuthStyleCheckToken,

diff --git a/client/src/jwks.js b/client/src/jwks.js
@@ -5,6 +5,7 @@
 //
 var appconfig = require(process.env.CONFIG_FILE);
 var bunyan = require("bunyan");
+var $ = require("jquery");
 var log = bunyan.createLogger({ name: 'jwks',
                                 level: appconfig.logLevel });
 log.info("Log initialized. logLevel=" + log.level());

diff --git a/client/src/logout.js b/client/src/logout.js
@@ -5,6 +5,7 @@
 //
 var appconfig = require(process.env.CONFIG_FILE);
 var bunyan = require("bunyan");
+var $ = require("jquery");
 var log = bunyan.createLogger({ name: 'logout',
                                 level: appconfig.logLevel });
 log.info("Log initialized. logLevel=" + log.level());

diff --git a/client/src/token_detail.js b/client/src/token_detail.js
@@ -7,6 +7,7 @@
 //
 var appconfig = require(process.env.CONFIG_FILE);
 var bunyan = require("bunyan");
+var $ = require("jquery");
 var log = bunyan.createLogger({ name: 'token_detail',
                                 level: appconfig.logLevel });
 log.info("Log initialized. logLevel=" + log.level());

diff --git a/client/src/userinfo.js b/client/src/userinfo.js
@@ -5,6 +5,7 @@
 //
 var appconfig = require(process.env.CONFIG_FILE);
 var bunyan = require("bunyan");
+var $ = require("jquery");
 var log = bunyan.createLogger({ name: 'userinfo',
                                 level: appconfig.logLevel });
 log.info("Log initialized. logLevel=" + log.level());