@apolitical/server 2.5.4-beta.1 → 2.5.6-rc.1

package/CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.5.5] - 2022-07-19
+### Added
+- Unit tests for `buildOptions` helper
+
 ## [2.5.4] - 2022-07-08
 ### Added
 - Generating apolitical-auth token function

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apolitical/server",
-  "version": "2.5.4-beta.1",
+  "version": "2.5.6-rc.1",
   "description": "Node.js module to encapsulate Apolitical's express server setup",
   "author": "Apolitical Group Limited <engineering@apolitical.co>",
   "license": "MIT",

package/src/helpers/opts.helper.js

@@ -1,13 +1,14 @@
 'use strict';
 
 module.exports = ({ jwtEncodeHelper, config }) => {
-  const { SESSION_SECRET } = config.SERVER;
+  const { SESSION_SECRET } = config;
   const {
     APOLITICAL: { ISSUER, ADMIN_ROLE, COOKIE_KEY },
   } = config.JWT;
 
-  function generateAdminToken() {
-    const token = jwtEncodeHelper(SESSION_SECRET, {
+  function generateAdminToken(sessionSecret) {
+    const secret = SESSION_SECRET || sessionSecret;
+    const token = jwtEncodeHelper(secret, {
       role: ADMIN_ROLE,
       admin: true,
       iss: ISSUER,
@@ -16,23 +17,23 @@ module.exports = ({ jwtEncodeHelper, config }) => {
     return token;
   }
 
-  function buildHeaders({ authToken }) {
+  function buildHeaders({ authToken }, sessionSecret) {
     const headers = {};
-    if (typeof authToken === 'boolean' && authToken) {
+    if (authToken && typeof authToken === 'boolean') {
       // When authToken is a boolean then generate an admin token
-      const adminToken = generateAdminToken();
+      const adminToken = generateAdminToken(sessionSecret);
       Object.assign(headers, { Cookie: `${COOKIE_KEY}=${adminToken}` });
-    } else if (typeof authToken === 'string' && authToken) {
+    } else if (authToken && typeof authToken === 'string') {
       // When authToken is a string then use the it as the token
       Object.assign(headers, { Cookie: `${COOKIE_KEY}=${authToken}` });
     }
     return headers;
   }
 
-  function buildOptions({ headers, params, validateStatus, data }) {
+  function buildOptions({ headers, params, validateStatus, data, sessionSecret }) {
     const opts = {};
     if (headers) {
-      Object.assign(opts, { headers: buildHeaders(headers) });
+      Object.assign(opts, { headers: buildHeaders(headers, sessionSecret) });
     }
     if (params) {
       Object.assign(opts, { params });