4.8.0 mar23 rel v2

src/protectedApi_v8/resource.ts

@@ -1,12 +1,22 @@
 import { Router } from 'express'
+import { CONSTANTS } from '../utils/env'
 import { logInfo } from '../utils/logger'
 const _                 = require('lodash')
 export const userAuthKeyCloakApi = Router()
 userAuthKeyCloakApi.get('/', (req, res) => {
     const host = req.get('host')
     let queryParam = ''
     let isLocal = 0
-    logInfo('Received query param: ' + req.query)
+    logInfo('Received query param: ' + JSON.stringify(req.query))
+    if (req.session && req.session.authenticated ) {
+        logInfo('User is authenticated.. Updating Cookie with Secure and SameSite flags')
+        res.cookie('connect.sid', req.cookies['connect.sid'], {
+            httpOnly: true,
+            maxAge: CONSTANTS.KEYCLOAK_SESSION_TTL,
+            sameSite: 'None',
+            secure: true,
+        })
+    }
     if (!_.isEmpty(req.query)) {
         queryParam = req.query.q
         if (queryParam && queryParam.includes('localhost')) {

src/protectedApi_v8/user/profile-registry.ts

@@ -6,13 +6,15 @@ import { logError, logInfo } from '../../utils/logger'
 import { extractAuthorizationFromRequest,
   extractUserIdFromRequest,
   IAuthorizedRequest } from '../../utils/requestExtract'
-const fs = require('fs')
 
 const API_END_POINTS = {
   createUserRegistry: (userId: string) => `${CONSTANTS.NETWORK_HUB_SERVICE_BACKEND}/v1/user/create/profile?userId=${userId}`,
   getAllPosition: `${CONSTANTS.FRAC_API_BASE}/frac/getAllNodes?type=POSITION&status=VERIFIED`,
   getUserRegistry: `${CONSTANTS.NETWORK_HUB_SERVICE_BACKEND}/v1/user/get/profile`,
   getUserRegistryById: (userId: string) => `${CONSTANTS.NETWORK_HUB_SERVICE_BACKEND}/v1/user/search/profile?userId=${userId}`,
+  masterLanguages: `${CONSTANTS.KONG_API_BASE}/masterData/v1/languages`,
+  masterNationalities: `${CONSTANTS.KONG_API_BASE}/masterData/v1/nationalities`,
+  profilePageMetaData: `${CONSTANTS.KONG_API_BASE}/masterData/v1/profilePageMetaData`,
   searchUserRegistry: `${CONSTANTS.NETWORK_HUB_SERVICE_BACKEND}/v1/user/search/profile`,
   updateUserRegistry: (userId: string) => `${CONSTANTS.NETWORK_HUB_SERVICE_BACKEND}/v1/user/update/profile?userId=${userId}`,
   updateUserWorkflowRegistry: (userId: string) =>
@@ -25,6 +27,8 @@ const profileStatusCheckConfig = {
 }
 
 const ERROR_MESSAGE_CREATE_REGISTRY = 'ERROR CREATING USER REGISTRY >'
+const CONNECTION_ERROR = 'CONNECTIONS REQUESTS ERROR> '
+const unknown = 'Connections Apis:- Failed due to unknown reason'
 
 export const profileRegistryApi = Router()
 
@@ -152,176 +156,61 @@ profileRegistryApi.get('/getUserRegistryByUser/:id', async (req, res) => {
 
 profileRegistryApi.get('/getMasterNationalities', async (_req, res) => {
   try {
-    // tslint:disable-next-line: no-identical-functions
-    fs.readFile(__dirname + '/../../static-data/nationality.json', (err: Error, json: string) => {
-      if (!err) {
-        const obj = JSON.parse(json)
-        res.json(obj)
-      }
+    const response = await axios.get(API_END_POINTS.masterNationalities, {
+      ...axiosRequestConfig,
+      headers: {
+        Authorization: CONSTANTS.SB_API_KEY,
+      },
     })
+    res.send((response.data))
   } catch (err) {
-    res.status((err && err.response && err.response.status) || 500).send(err)
+    logError(CONNECTION_ERROR, err)
+    res.status((err && err.response && err.response.status) || 500).send(
+      (err && err.response && err.response.data) || {
+        error: unknown,
+      }
+    )
   }
 })
 
 profileRegistryApi.get('/getMasterLanguages', async (_req, res) => {
   try {
-    fs.readFile(__dirname + '/../../static-data/languages.json', (err: Error, json: string) => {
-      if (!err) {
-        const obj = JSON.parse(json)
-        res.json({
-          languages: obj.languages.map((item: string) => {
-            return { name: item }
-          }),
-        })
-      }
+    const response = await axios.get(API_END_POINTS.masterLanguages, {
+      ...axiosRequestConfig,
+      headers: {
+        Authorization: CONSTANTS.SB_API_KEY,
+      },
     })
+    res.send((response.data))
   } catch (err) {
-    res.status((err && err.response && err.response.status) || 500).send(err)
+    logError(CONNECTION_ERROR, err)
+    res.status((err && err.response && err.response.status) || 500).send(
+      (err && err.response && err.response.data) || {
+        error: unknown,
+      }
+    )
   }
 })
 
 profileRegistryApi.get('/getProfilePageMeta', async (_req, res) => {
   try {
-    const govtOrg = await govtOrgMeta()
-      .catch((err) => {
-        logError(`error fetching govtOrgMeta`, err)
-      })
-    const industries = await industreisMeta()
-      .catch((err) => {
-        logError(`error fetching industreisMeta`, err)
-      })
-    const degrees = await degreesMeta()
-      .catch((err) => {
-        logError(`error fetching degreesMeta`, err)
-      })
-    let designations = Object.create({})
-    designations = await designationMeta()
-      .catch((err) => {
-        logError(`error fetching designationMeta`, err)
-      })
-    designations.designations = await designationMetaFrac(_req)
-      .catch((err) => {
-        logError('error fetching desingations from FRAC', err)
-      })
-    res.json({
-      degrees,
-      designations,
-      govtOrg,
-      industries,
+    const response = await axios.get(API_END_POINTS.profilePageMetaData, {
+      ...axiosRequestConfig,
+      headers: {
+        Authorization: CONSTANTS.SB_API_KEY,
+      },
     })
+    res.send((response.data))
   } catch (err) {
-    res.status((err && err.response && err.response.status) || 500).send(err)
+    logError(CONNECTION_ERROR, err)
+    res.status((err && err.response && err.response.status) || 500).send(
+      (err && err.response && err.response.data) || {
+        error: unknown,
+      }
+    )
   }
 })
 
-export async function govtOrgMeta() {
-  return new Promise(async (resolve, reject) => {
-    try {
-      await fs.readFile(__dirname + '/../../static-data/govtOrg.json', (err: Error, json: string) => {
-        if (!err) {
-          const obj = JSON.parse(json)
-          const result = {
-            cadre: obj.cadre.map((item: string) => {
-              return { name: item }
-            }),
-            ministries: obj.ministries.map((item: string) => {
-              return { name: item }
-            }),
-            service: obj.services.map((item: string) => {
-              return { name: item }
-            }),
-          }
-          resolve(result)
-        } else {
-          reject(err)
-
-        }
-      })
-    } catch (err) {
-      logError('ERROR on govtOrgMeta')
-      throw err
-    }
-  })
-}
-
-export async function industreisMeta() {
-  return new Promise(async (resolve, reject) => {
-    try {
-      await fs.readFile(__dirname + '/../../static-data/industries.json', (err: Error, json: string) => {
-        if (!err) {
-          const obj = JSON.parse(json)
-          resolve(
-            obj.industries.map((item: string) => {
-              return { name: item }
-            })
-          )
-        } else {
-          reject(err)
-
-        }
-      })
-    } catch (err) {
-      logError('ERROR on industreisMeta')
-      throw err
-    }
-  })
-}
-
-export async function degreesMeta() {
-  return new Promise(async (resolve, reject) => {
-    try {
-      await fs.readFile(__dirname + '/../../static-data/degrees.json', (err: Error, json: string) => {
-        if (!err) {
-          const obj = JSON.parse(json)
-          const result = {
-            graduations: obj.graduations.map((item: string) => {
-              return { name: item }
-            }),
-            postGraduations: obj.postGraduations.map((item: string) => {
-              return { name: item }
-            }),
-          }
-          resolve(result)
-        } else {
-          reject(err)
-
-        }
-      })
-    } catch (err) {
-      logError('ERROR on degreesMeta')
-      throw err
-    }
-  })
-}
-
-export async function designationMeta() {
-  return new Promise(async (resolve, reject) => {
-    try {
-      await fs.readFile(__dirname + '/../../static-data/designation.json', (err: Error, json: string) => {
-        if (!err) {
-          const obj = JSON.parse(json)
-          const result = {
-            designations: obj.designations.map((item: string) => {
-              return { name: item }
-            }),
-            gradePay: obj.gradePay.map((item: string) => {
-              return { name: item }
-            }),
-          }
-          resolve(result)
-        } else {
-          reject(err)
-
-        }
-      })
-    } catch (err) {
-      logError('ERROR on designationMeta')
-      throw err
-    }
-  })
-}
-
 profileRegistryApi.post('/createUserRegistryV2/:userId', async (req, res) => {
   try {
     const userId = req.params.userId

src/proxies_v8/proxies_v8.ts

@@ -412,6 +412,10 @@ proxiesV8.use('/forms/*',
   proxyCreatorSunbird(express.Router(), `${CONSTANTS.KONG_API_BASE}`)
 )
 
+proxiesV8.use('/masterData/*',
+  proxyCreatorSunbird(express.Router(), `${CONSTANTS.KONG_API_BASE}`)
+)
+
 // proxiesV8.use('/api/framework/*',
 //   // tslint:disable-next-line: max-line-length
 //   proxyCreatorQML(express.Router(), `${CONSTANTS.KONG_API_BASE}`, '/api/')

src/server.ts

@@ -70,8 +70,6 @@ export class Server {
       const rootOrg = req.headers ? req.headers.rootOrg || req.headers.rootorg : ''
       if (rootOrg && req.hostname.toLowerCase().includes('localhost')) {
         res.cookie('rootorg', rootOrg)
-        res.cookie('secure', true)
-        res.cookie('sameSite', 'Lax')
       }
       next()
     })
@@ -113,6 +111,8 @@ export class Server {
     )
     // TODO: See what needs to be logged
     this.app.use((req, _, next) => {
+      logInfo('adding x-forward-proto header with https to request...')
+      req.headers['x-forwarded-proto'] = 'https'
       logInfo(`Server:ConfigureMiddleWare:: Worker ${process.pid} : ${req.protocol}://${req.hostname}/${req.url}`)
       next()
     })

src/utils/custom-keycloak.ts

@@ -57,6 +57,7 @@ export class CustomKeycloak {
   // tslint:disable-next-line: no-any
   authenticated = (reqObj: any, next: any) => {
     logInfo('Step 3: authenticated function', '------', new Date().toString())
+    reqObj.session.authenticated = true
     try {
       const userId = reqObj.kauth.grant.access_token.content.sub.split(':')
       reqObj.session.userId = userId[userId.length - 1]

src/utils/whitelistApis.ts

@@ -318,6 +318,13 @@ export const API_LIST = {
                 ROLE.PUBLIC,
             ],
         },
+        '/proxies/v8/forms/getCollectiveAggregation': {
+            checksNeeded: [CHECK.ROLE],
+            // tslint:disable-next-line: object-literal-sort-keys
+            ROLE_CHECK: [
+                ROLE.PUBLIC,
+            ],
+        },
         '/proxies/v8/forms/getAllForms': {
             checksNeeded: [CHECK.ROLE],
             // tslint:disable-next-line: object-literal-sort-keys
@@ -2006,14 +2013,21 @@ export const API_LIST = {
                 ROLE.MDO_ADMIN,
             ],
         },
-      '/proxies/v8/user/offensive/data/flag': {
+        '/proxies/v8/user/offensive/data/flag': {
+            checksNeeded: [CHECK.ROLE],
+            // tslint:disable-next-line: object-literal-sort-keys
+            ROLE_CHECK: [
+                ROLE.PUBLIC,
+            ],
+        },
+        '/proxies/v8/user/offensive/data/flag/getFlaggedData': {
             checksNeeded: [CHECK.ROLE],
             // tslint:disable-next-line: object-literal-sort-keys
             ROLE_CHECK: [
                 ROLE.PUBLIC,
             ],
         },
-      '/proxies/v8/user/offensive/data/flag/getFlaggedData': {
+        '/proxies/v8/masterData/v1/upsert': {
             checksNeeded: [CHECK.ROLE],
             // tslint:disable-next-line: object-literal-sort-keys
             ROLE_CHECK: [
@@ -2111,6 +2125,7 @@ export const API_LIST = {
             '/proxies/v8/wat/dashboard/getDashboardConfig/Karmayogi/overview',
             '/proxies/v8/forms/createForm',
             '/proxies/v8/forms/getFormById',
+            '/proxies/v8/forms/getCollectiveAggregation',
             '/proxies/v8/forms/getAllForms',
             '/proxies/v8/forms/v1/saveFormSubmit',
             '/proxies/v8/forms/getAllApplications',
@@ -2289,5 +2304,6 @@ export const API_LIST = {
             '/proxies/v8/mdo/content/v3/batch/removeUser',
             '/proxies/v8/user/offensive/data/flag',
             '/proxies/v8/user/offensive/data/flag/getFlaggedData',
+            '/proxies/v8/masterData/v1/upsert',
            ],
 }