From 3c38dacdc7177bd9813c23f3d65394848124fe93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Oliveira?= <josepfo.w@gmail.com>
Date: Mon, 22 Nov 2021 11:31:56 +0000
Subject: [PATCH] fix: variable operator id variable name

---
 lib/middlewares/operatorId.js        | 4 ++--
 lib/new-admin/middlewares/session.js | 4 ++--
 lib/operator.js                      | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/middlewares/operatorId.js b/lib/middlewares/operatorId.js
index 663b7527..eeb7d6ac 100644
--- a/lib/middlewares/operatorId.js
+++ b/lib/middlewares/operatorId.js
@@ -2,8 +2,8 @@ const { getOperatorId } = require('../operator')
 
 function findOperatorId (req, res, next) {
   return getOperatorId('middleware')
-    .then(({ id }) => {
-      res.locals.operatorId = id
+    .then(({ operatorId }) => {
+      res.locals.operatorId = operatorId
       return next()
     })
     .catch(e => {
diff --git a/lib/new-admin/middlewares/session.js b/lib/new-admin/middlewares/session.js
index ff9093d4..7167a277 100644
--- a/lib/new-admin/middlewares/session.js
+++ b/lib/new-admin/middlewares/session.js
@@ -10,13 +10,13 @@ const { getOperatorId } = require('../../operator')
 const hostname = options.hostname
 
 router.use('*', async () => {
-  return getOperatorId('authentication').then(secret => session({
+  return getOperatorId('authentication').then(({ operatorId }) => session({
     store: new PgSession({
       pgPromise: db,
       tableName: USER_SESSIONS_TABLE_NAME
     }),
     name: 'lamassu_sid',
-    secret: secret,
+    secret: operatorId,
     resave: false,
     saveUninitialized: false,
     cookie: {
diff --git a/lib/operator.js b/lib/operator.js
index 52e64217..63cbb768 100644
--- a/lib/operator.js
+++ b/lib/operator.js
@@ -1,8 +1,10 @@
 const db = require('./db')
+const _ = require('lodash/fp')
 
 function getOperatorId (service) {
   const sql = `SELECT operator_id FROM operator_ids WHERE service = '${service}'`
   return db.oneOrNone(sql)
+    .then(_.mapKeys(_.camelCase))
 }
 
 module.exports = { getOperatorId }