fixes and removing auth

Author: RomanBachaloSigmaSoftware

lib/connect/controllers/eg001ValidateWebhookMessage.js

@@ -23,16 +23,6 @@ const mustAuthenticate = '/ds/mustAuthenticateJWT';
  * @param {object} res Response obj
  */
 eg001ValidateWebhookMessage.createController = async (req, res) => {
-  // Check that the authentication token is ok with a long buffer time.
-  // If needed, now is the best time to ask the user to authenticate
-  // since they have not yet entered any information into the form.
-  const isTokenOK = req.dsAuth.checkToken();
-  if (!isTokenOK) {
-    // Save the current operation so it will be resumed after authentication
-    req.dsAuth.setEg(req, eg);
-    return res.redirect(mustAuthenticate);
-  }
-
   // Call the worker method
   const { body } = req;
   const args = {
@@ -44,8 +34,8 @@ eg001ValidateWebhookMessage.createController = async (req, res) => {
   try {
     results = computeHash(args);
   } catch (error) {
-    const errorCode = error && error.code;
-    const errorMessage = error && error.message;
+    const errorCode = error?.code;
+    const errorMessage = error?.message;
     // In production, may want to provide customized error messages and
     // remediation advice to the user.
     res.render('pages/error', { err: error, errorCode, errorMessage });
@@ -63,16 +53,6 @@ eg001ValidateWebhookMessage.createController = async (req, res) => {
  * Form page for this application
  */
 eg001ValidateWebhookMessage.getController = (req, res) => {
-  // Check that the authentication token is ok with a long buffer time.
-  // If needed, now is the best time to ask the user to authenticate
-  // since they have not yet entered any information into the form.
-  const isTokenOK = req.dsAuth.checkToken();
-  if (!isTokenOK) {
-    // Save the current operation so it will be resumed after authentication
-    req.dsAuth.setEg(req, eg);
-    return res.redirect(mustAuthenticate);
-  }
-
   const example = getExampleByNumber(res.locals.manifest, exampleNumber, api);
   const sourceFile =
     path.basename(__filename)[5].toLowerCase() +

public/assets/search.js

@@ -29,7 +29,7 @@ const DS_SEARCH = (function () {
       if (
         name === matches[i].value ||
         description === matches[i].value ||
-        pathNames.indexOf(matches[i].value) > -1
+        pathNames && pathNames.indexOf(matches[i].value) > -1
       ) {
         return true;
       }
@@ -175,8 +175,9 @@ const DS_SEARCH = (function () {
               );
 
               $("#filtered_code_examples").append("<p>");
-              if (example.LinksToAPIMethod && example.LinksToAPIMethod.length !== 0) {
-                if (example.LinksToAPIMethod.length == 1) {
+              const links = example.LinksToAPIMethod || [];
+              if (links.length > 0) {
+                if (links.length == 1) {
                   $("#filtered_code_examples").append(
                     processJSONData().SupportingTexts.APIMethodUsed
                   );
@@ -186,27 +187,18 @@ const DS_SEARCH = (function () {
                   );
                 }
 
-                for (
-                  let index = 0;
-                  index < example.LinksToAPIMethod.length;
-                  index++
-                ) {
-                  $("#filtered_code_examples").append(
-                    " <a target='_blank' href='" +
-                      example.LinksToAPIMethod[index].Path +
-                      "'>" +
-                      example.LinksToAPIMethod[index].PathName +
-                      "</a>"
-                  );
+                links.forEach((link, index) => {
+                  $("#filtered_code_examples").append(`<a target='_blank' href='${link.Path}'>${link.PathName}</a>`);
 
-                  if (index + 1 === example.LinksToAPIMethod.length) {
+                  if (index + 1 === links.length) {
                     $("#filtered_code_examples").append("<span></span>");
-                  } else if (index + 1 === example.LinksToAPIMethod.length - 1) {
+                  } else if (index + 1 === links.length - 1) {
                     $("#filtered_code_examples").append("<span> and </span>");
                   } else {
                     $("#filtered_code_examples").append("<span>, </span>");
                   }
-                }
+                })
+
               }
 
               $("#filtered_code_examples").append("</p> ");
@@ -268,12 +260,10 @@ function updateValue(esearchPattern) {
             })[0];
 
             group.Examples.forEach((example, index) => {
-              const clearedExample = unfilteredGroup.Examples.filter(
-                (apiExample) => {
-                  return apiExample.ExampleNumber === example.ExampleNumber;
-                }
-              )[0];
-              x.item.Groups[groupIndex].Examples[index] = clearedExample;
+              const clearedExamples = unfilteredGroup.Examples.filter((apiExample) => {
+                return apiExample.ExampleNumber === example.ExampleNumber;
+              })
+              x.item.Groups[groupIndex].Examples[index] = clearedExamples[0];
             });
           });
 

views/pages/index_examples_list.ejs

@@ -32,10 +32,12 @@
                         <p><%- example.ExampleDescription %></p>
                     
                         <p>
-                            <% if (example.LinksToAPIMethod?.length > 1) { %>
-                                API methods used:
-                            <% } else { %>
-                                API method used:
+                            <% if (example.LinksToAPIMethod?.length > 0) { %>
+                                <% if (example.LinksToAPIMethod?.length > 1) { %>
+                                    API methods used:
+                                <% } else { %>
+                                    API method used:
+                                <% } %>
                             <% } %>
                             
                             <% example.LinksToAPIMethod?.forEach(function(link) { %>

views/partials/genericHead.ejs

@@ -1,8 +1,9 @@
 <%- include("head") %>
 
 <% if (locals.user) { %>
-<div class="container" style="padding-top:30px">
-    <% } else { %>
-        <div class="container-full-bg">
+    <div class="container" style="padding-top:30px; margin-left: 90px;">
+    <section id="content" style="margin-top:-60px!important; padding-top:30px!important;">
+<% } else { %>
+    <div class="container-full-bg">
+    <section id="content" style="margin:0 90px 0 90px; padding:0 15px 0 15px;">
 <% } %>
-<section id="content" style="margin-top:-60px!important; padding-top:30px!important;">