Merge pull request #10 from RomanBachaloSigmaSoftware/fix/acg-flow

Fix AuthCodeGrant issue

Author: karissarjacobsen

server/controllers/acgController.js

@@ -23,7 +23,6 @@ class ACGController {
 
   login(req, res, next) {
     this.internalLogout(req);
-    req.session.authMethod = AuthMethod.ACG;
     passport.authenticate('docusign')(req, res, next);
   }
 
@@ -36,6 +35,7 @@ class ACGController {
     const { accessToken, tokenExpirationTimestamp, name, email } = req.user;
     this.logger.info(`Received accessToken: |${accessToken}|`);
     this.logger.info(`Expires at ${tokenExpirationTimestamp.format('dddd, MMMM Do YYYY, h:mm:ss a')}`);
+    req.session.authMethod = AuthMethod.ACG;
 
     // The DocuSign Passport strategy looks up the user's account information via OAuth::userInfo.
     // See https://developers.docusign.com/esign-rest-api/guides/authentication/user-info-endpoints

server/middlewares/authMiddleware.js

@@ -1,8 +1,16 @@
+const resolveAuthController = require("../utils/authControllerResolver");
+
 function authMiddleware(req, res, next) {
-  const isTokenValid = req.dsAuth.checkToken(req);
+  const dsAuth = resolveAuthController(req);
+  if (!dsAuth) {
+    req.logger.info(`[${req.originalUrl}] Cannot resolve auth method, returns 401`);
+    return res.status(401).send();
+  }
+
+  const isTokenValid = dsAuth.checkToken(req);
   if (!isTokenValid) {
     req.logger.info(`[${req.originalUrl}] Access token expired or doesn't exist, returns 401`);
-    req.dsAuth.internalLogout(req, res, next);
+    dsAuth.internalLogout(req, res, next);
     res.status(401).send();
     return;
   }

server/server.js

@@ -6,19 +6,18 @@ const bodyParser = require('body-parser');
 const session = require('express-session'); // https://github.com/expressjs/session
 const MemoryStore = require('memorystore')(session); // https://github.com/roccomuso/memorystore
 const passport = require('passport');
-const JwtController = require('./controllers/jwtController');
-const ACGController = require('./controllers/acgController');
 const cors = require('cors');
 const chalk = require('chalk');
 const DocusignStrategy = require('passport-docusign');
 const moment = require('moment');
 const config = require('./config');
-const { EMBEDDED_SENDING_SCOPES, BackendRoute, AuthMethod } = require('./constants');
+const { EMBEDDED_SENDING_SCOPES, BackendRoute } = require('./constants');
 const authRouter = require('./routes/authRouter');
 const templatesRouter = require('./routes/templatesRouter');
 const contactsRouter = require('./routes/contactsRouter');
 const envelopesRouter = require('./routes/envelopesRouter');
 const createPrefixedLogger = require('./utils/logger');
+const resolveAuthController = require('./utils/authControllerResolver');
 
 const logger = createPrefixedLogger();
 const maxSessionAge = 1000 * 60 * 60 * 24 * 1; // One day
@@ -42,18 +41,10 @@ const app = express()
   .use(passport.session())
   // Add an instance of dsAuthController to req
   .use((req, res, next) => {
-    req.dsAuthCodeGrant = new ACGController();
-    req.dsAuthJwt = new JwtController();
     req.logger = logger;
     req.logger.info(`[${req.originalUrl}]`);
 
-    switch (true) {
-      case req.session.authMethod === AuthMethod.JWT || req.url.startsWith(`${BackendRoute.AUTH}/jwt`):
-        req.dsAuth = req.dsAuthJwt;
-        break;
-      case req.session.authMethod === AuthMethod.ACG || req.url.startsWith(`${BackendRoute.AUTH}/passport`):
-        req.dsAuth = req.dsAuthCodeGrant;
-    }
+    req.dsAuth = resolveAuthController(req);
 
     next();
   })

server/utils/authControllerResolver.js

@@ -0,0 +1,15 @@
+const ACGController = require("../controllers/acgController");
+const JwtController = require("../controllers/jwtController");
+const { BackendRoute, AuthMethod } = require("../constants");
+
+const resolveAuthController = req => {
+  if (req.session.authMethod === AuthMethod.JWT || req.url.startsWith(`${BackendRoute.AUTH}/jwt`)) {
+    return new JwtController();
+  }
+  if (req.session.authMethod === AuthMethod.ACG || req.url.startsWith(`${BackendRoute.AUTH}/passport`)) {
+    return new ACGController();
+  }
+  return null;
+};
+
+module.exports = resolveAuthController;