Merge branch 'master' of https://github.com/docusign/code-examples-node-private

Author: raileendr

index.js

@@ -34,7 +34,7 @@ const {
 
 const {
   eg001click, eg002click, eg003click,
-  eg004click, eg005click, eg006click
+  eg004click, eg005click, eg006click,
 } = require("./lib/click/controllers");
 
 const {

lib/click/examples/embedClickwrap.js

@@ -81,5 +81,5 @@ const getInactiveClickwraps = async (args) => {
   return await accountApi.getClickwraps(args.accountId, {status: 'inactive'});
 }
 
- module.exports = { getInactiveClickwraps, getActiveClickwraps, embedClickwrap };
- 
+module.exports = { getInactiveClickwraps, getActiveClickwraps, embedClickwrap };
+

lib/commonControllers.js

@@ -33,15 +33,27 @@ commonControllers.indexController = async (req, res) => {
         });
     }
     else if (req.dsAuth.checkToken(3)){
-        let enableCFR = await isCFR(req.user.accessToken, req.session.accountId, req.session.basePath);
-        if (enableCFR == "enabled"){
-            res.locals.statusCFR = "enabled";
+        if (req.session.accountId == undefined) {
+            let enableCFR = await isCFR(req.user.accessToken, req.user.accountId, req.user.basePath);
+            if (enableCFR == "enabled"){
+                res.locals.statusCFR = "enabled";
+            }
+            res.render('pages/index', {
+                title: "Home",
+                documentation: dsConfig.documentation + documentationTopic,
+                showDoc: dsConfig.documentation    
+            });
+        } else {
+            let enableCFR = await isCFR(req.user.accessToken, req.session.accountId, req.session.basePath);
+            if (enableCFR == "enabled"){
+                res.locals.statusCFR = "enabled";
+            }
+            res.render('pages/index', {
+                title: "Home",
+                documentation: dsConfig.documentation + documentationTopic,
+                showDoc: dsConfig.documentation    
+            });
         }
-        res.render('pages/index', {
-            title: "Home",
-            documentation: dsConfig.documentation + documentationTopic,
-            showDoc: dsConfig.documentation    
-        });
     }
     else {
         res.render('pages/index', {

package-lock.json

@@ -42,11 +42,11 @@
     "fs": "0.0.1-security",
     "fs-extra": "^6.0.1",
     "helmet": "^3.18.0",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.0",
     "memorystore": "^1.6.1",
     "moment": "^2.29.4",
     "node-fetch": "2.6.7",
-    "passport": "^0.6.0",
+    "passport": "^0.4.0",
     "passport-docusign": "^1.1.0",
     "path": "^0.12.7",
     "request": "^2.88.2",