fix: remove lamassu login-related filtering

fix: use logger instead of console

lib/new-admin/middlewares/cleanUserSessions.js

@@ -1,6 +1,7 @@
 const { asyncLocalStorage } = require('../../async-storage')
 const db = require('../../db')
 const { USER_SESSIONS_TABLE_NAME } = require('../../constants')
+const logger = require('../../logger')
 
 const schemaCache = {}
 
@@ -11,7 +12,7 @@ const cleanUserSessions = (cleanInterval) => (req, res, next) => {
   if (!schema) return next()
   if (schema && schemaCache.schema + cleanInterval > now) return next()
 
-  console.log('Clearing expired sessions for schema', schema)
+  logger.debug(`Clearing expired sessions for schema ${schema}`)
   return db.none('DELETE FROM $1^ WHERE expire < to_timestamp($2 / 1000.0)', [USER_SESSIONS_TABLE_NAME, now])
     .then(() => {
       schemaCache.schema = now

lib/new-admin/middlewares/session.js

@@ -20,13 +20,9 @@ const getSecret = () => {
 
 const hostname = options.hostname
 
-const lamaDb = {
-  query: (query, values, qrm) => db.query(query, values, qrm, false)
-}
-
 router.use('*', session({
   store: new PgSession({
-    pgPromise: lamaDb,
+    pgPromise: db,
     tableName: USER_SESSIONS_TABLE_NAME
   }),
   name: 'lamassu_sid',

new-lamassu-admin/src/pages/Authentication/Input2FAState.js

@@ -2,7 +2,6 @@ import { useMutation, useLazyQuery } from '@apollo/react-hooks'
 import { makeStyles } from '@material-ui/core/styles'
 import base64 from 'base-64'
 import gql from 'graphql-tag'
-import * as R from 'ramda'
 import React, { useContext, useState } from 'react'
 import { useHistory } from 'react-router-dom'
 
@@ -66,11 +65,7 @@ const Input2FAState = ({ state, dispatch }) => {
             }
           }
         }
-        return getUserData(
-          process.env.REACT_APP_BUILD_TARGET === 'LAMASSU'
-            ? R.omit(['context'], options)
-            : options
-        )
+        return getUserData(options)
       }
       return setInvalidToken(true)
     }
@@ -106,11 +101,7 @@ const Input2FAState = ({ state, dispatch }) => {
       }
     }
 
-    input2FA(
-      process.env.REACT_APP_BUILD_TARGET === 'LAMASSU'
-        ? R.omit(['context'], options)
-        : options
-    )
+    input2FA(options)
   }
 
   const getErrorMsg = () => {

new-lamassu-admin/src/pages/Authentication/LoginState.js

@@ -3,7 +3,6 @@ import { makeStyles } from '@material-ui/core/styles'
 import base64 from 'base-64'
 import { Field, Form, Formik } from 'formik'
 import gql from 'graphql-tag'
-import * as R from 'ramda'
 import React from 'react'
 import * as Yup from 'yup'
 
@@ -62,11 +61,7 @@ const LoginState = ({ state, dispatch }) => {
         }
       }
     }
-    const { data: loginResponse } = await login(
-      process.env.REACT_APP_BUILD_TARGET === 'LAMASSU'
-        ? R.omit(['context'], options)
-        : options
-    )
+    const { data: loginResponse } = await login(options)
 
     if (!loginResponse.login) return
 

new-lamassu-admin/src/pages/Authentication/Register.js

@@ -3,7 +3,6 @@ import { makeStyles, Grid } from '@material-ui/core'
 import Paper from '@material-ui/core/Paper'
 import { Field, Form, Formik } from 'formik'
 import gql from 'graphql-tag'
-import * as R from 'ramda'
 import React, { useReducer } from 'react'
 import { useLocation, useHistory } from 'react-router-dom'
 import * as Yup from 'yup'
@@ -125,9 +124,7 @@ const Register = () => {
 
   const { error: queryError, loading } = useQuery(
     VALIDATE_REGISTER_LINK,
-    process.env.REACT_APP_BUILD_TARGET === 'LAMASSU'
-      ? R.omit(['context'], queryOptions)
-      : queryOptions
+    queryOptions
   )
 
   const [register, { error: mutationError }] = useMutation(REGISTER, {

new-lamassu-admin/src/pages/Authentication/Setup2FAState.js

@@ -3,7 +3,6 @@ import { makeStyles } from '@material-ui/core/styles'
 import base64 from 'base-64'
 import gql from 'graphql-tag'
 import QRCode from 'qrcode.react'
-import * as R from 'ramda'
 import React, { useContext, useState } from 'react'
 import { useHistory } from 'react-router-dom'
 
@@ -96,12 +95,7 @@ const Setup2FAState = ({ state, dispatch }) => {
     }
   }
 
-  const { error: queryError } = useQuery(
-    GET_2FA_SECRET,
-    process.env.REACT_APP_BUILD_TARGET === 'LAMASSU'
-      ? R.omit(['context'], queryOptions)
-      : queryOptions
-  )
+  const { error: queryError } = useQuery(GET_2FA_SECRET, queryOptions)
 
   const [getUserData] = useLazyQuery(GET_USER_DATA, {
     onCompleted: ({ userData }) => {
@@ -119,13 +113,7 @@ const Setup2FAState = ({ state, dispatch }) => {
           }
         }
       }
-      success
-        ? getUserData(
-            process.env.REACT_APP_BUILD_TARGET === 'LAMASSU'
-              ? R.omit(['context'], options)
-              : options
-          )
-        : setInvalidToken(true)
+      success ? getUserData(options) : setInvalidToken(true)
     }
   })
 
@@ -190,11 +178,7 @@ const Setup2FAState = ({ state, dispatch }) => {
                 setInvalidToken(true)
                 return
               }
-              setup2FA(
-                process.env.REACT_APP_BUILD_TARGET === 'LAMASSU'
-                  ? R.omit(['context'], mutationOptions)
-                  : mutationOptions
-              )
+              setup2FA(mutationOptions)
             }}
             buttonClassName={classes.loginButton}>
             Done

new-lamassu-admin/src/pages/UserManagement/modals/CreateUserModal.js

@@ -76,6 +76,7 @@ const CreateUserModal = ({ state, dispatch }) => {
   const [createUser, { error }] = useMutation(CREATE_USER, {
     onCompleted: ({ createRegisterToken: token }) => {
       const queryParams =
+        // Pazuz-created register tokens add a field to identify the creator
         process.env.REACT_APP_BUILD_TARGET === 'LAMASSU'
           ? `t=${token.token}`
           : `t=${token.token}&id=${base64.encode(usernameField)}`