@manyos/smileconnect-api 1.34.0 → 1.36.0

package/app.js

@@ -147,12 +147,15 @@ passport.use(
             clientId = requestedClientId
         }
 
+        const clientConfig = config.getClientConfig(clientId)
+        clientConfig.clientId = clientId
+
         const user = {
             'id': jwt_payload.sub,
             'azp': jwt_payload.azp,
             'scope': jwt_payload.scope,
             'exp': jwt_payload.exp,
-            'config': config.getClientConfig(clientId),
+            'config': clientConfig,
             'username': jwt_payload.preferred_username
         }
         log.debug('Passport User', jwt_payload);

package/conf/adapterConfig.js

@@ -9,6 +9,13 @@ const adapterParams = {
         cacheTime: env.AR_CACHE_TTL || 300,
         limitDefault: env.LIMIT_DEFAULT || 100,
         limitMax: env.LIMIT_MAX
+    },
+    smileconnect: {
+        type: "SMILEconnect",
+        clientId: env.SC_CLIENT,
+        secret: env.SC_SECRET,
+        ssoUrl: env.SC_SSO_URL,
+        smileConnectUrl: env.SC_SMILECONNECT_URL
     }
 };
 

package/conf/scripts/p2.js

@@ -8,5 +8,8 @@ if (remedyResult) {
 if (weatherResponse) {
     requestData.weather = await weatherResponse.json()
 }
+log.debug('testMessage')
+
+requestData.scResults = await adapter.smileconnect.getTicket('incidents', requestData.id, {clientId:'idm'})
 
 resolve();

package/controller/cmdbobjectController.js

@@ -12,6 +12,7 @@ const ticketCIRelationController = require('../controller/ticketCIRelationContro
 const mappingUtil = require('../util/mappingUtil');
 const { v4 } = require('uuid');
 const CMDBOBJECT = 'cmdbobject';
+const scriptController = require('./scriptController');
 
 const cmdbCache = new CacheService(process.env.CACHETTL_CMDB || 600); // Create a new cache service instance
 const schemaCache = new CacheService(process.env.CACHETTL_SCHEMANAMES || 3600); // Create a new cache service instance
@@ -299,7 +300,7 @@ async function updateCmdbObject(ticketConfig, clientConfig, id, ciData, classId)
 
     //run preScripts
     if (scripts && scripts.preMapping) {
-        await scriptController.runScripts(scripts.preMapping, ciData);
+        await scriptController.runScripts(scripts.preMapping, ciData, clientConfig.clientId);
     }
 
     const myClientConfig = {};
@@ -323,14 +324,14 @@ async function updateCmdbObject(ticketConfig, clientConfig, id, ciData, classId)
 
     //run postMapping
     if (scripts && scripts.postMapping) {
-        await scriptController.runScripts(scripts.postMapping, ciData);
+        await scriptController.runScripts(scripts.postMapping, ciData, clientConfig.clientId);
     }
 
     const update = await arquery.updateEntry(formName, ci['Request ID'], ciData);
 
     //run afterExecution
     if (scripts && scripts.afterExecution) {
-        await scriptController.runScripts(scripts.afterExecution, ciData);
+        await scriptController.runScripts(scripts.afterExecution, ciData, clientConfig.clientId);
     }
 
     return update;
@@ -365,7 +366,7 @@ async function createCmdbObject(assetConfig, clientConfig, classId, ciData) {
 
     //run preScripts
     if (scripts && scripts.preMapping) {
-        await scriptController.runScripts(scripts.preMapping, ciData);
+        await scriptController.runScripts(scripts.preMapping, ciData, clientConfig.clientId);
     }
 
     const mapping = getClassMapping(classId);
@@ -377,7 +378,7 @@ async function createCmdbObject(assetConfig, clientConfig, classId, ciData) {
 
     //run postMapping
     if (scripts && scripts.postMapping) {
-        await scriptController.runScripts(scripts.postMapping, ciData);
+        await scriptController.runScripts(scripts.postMapping, ciData, clientConfig.clientId);
     }
 
     ciData['Data Set Id'] = "BMC.ASSET"
@@ -388,7 +389,7 @@ async function createCmdbObject(assetConfig, clientConfig, classId, ciData) {
 
     //run afterExecution
     if (scripts && scripts.afterExecution) {
-        await scriptController.runScripts(scripts.afterExecution, ciData);
+        await scriptController.runScripts(scripts.afterExecution, ciData, clientConfig.clientId);
     }
 
     return instanceId;

package/controller/scriptController.js

@@ -45,7 +45,7 @@ function recFindByExt(base,ext,files,result) {
     return result
 }
 
-async function executeScriptInternal(scriptId, requestData, params, executedByScript) {
+async function executeScriptInternal(scriptId, requestData, params, executedByScript, clientId) {
 
     const code = await getGlobalScript(scriptId);
 
@@ -53,14 +53,15 @@ async function executeScriptInternal(scriptId, requestData, params, executedBySc
         throw (`Script ${scriptId} does not exist!`);
     }
 
-    return executeCode(code, requestData, params, null, executedByScript);
+    return executeCode(code, requestData, params, null, executedByScript, clientId, scriptId);
 }
 
-async function executeScript(scriptId, requestData, params) {
-    return executeScriptInternal(scriptId, requestData, params, false)
+async function executeScript(scriptId, requestData, params, clientId) {
+    return executeScriptInternal(scriptId, requestData, params, false, clientId)
 }
 
-async function executeCode(code, requestData, params, logStream, executedByScript) {
+async function executeCode(code, requestData, params, logStream, executedByScript, clientId, scriptId) {
+    const log = require('@manyos/logger').setupLog('SMILEcatalog_Script_' + scriptId);
     //todo should only be added once
     /*if (logStream) {
         log.addStream(logStream);
@@ -69,7 +70,7 @@ async function executeCode(code, requestData, params, logStream, executedByScrip
     //try to set user data for sandbox
 
     async function executeScriptByScript(scriptId, requestData, params) {
-        return executeScriptInternal(scriptId, requestData, params, true)
+        return executeScriptInternal(scriptId, requestData, params, true, clientId)
     }
 
     const sandbox = {
@@ -77,6 +78,7 @@ async function executeCode(code, requestData, params, logStream, executedByScrip
         params,
         adapter,
         log,
+        clientId,
         script:executeScriptByScript,
         env: process.env,
         fetch:fetch
@@ -243,10 +245,10 @@ async function getGlobalScripts() {
     return getScripts(path);
 }
 
-async function runScripts(scripts, data) {
+async function runScripts(scripts, data, clientId) {
     try {
         for (let x = 0; x < scripts.length; x++) {
-            await executeScript(scripts[x], data);
+            await executeScript(scripts[x], data, undefined, clientId);
         }
     } catch (error) {
         throw error;

package/controller/taskController.js

@@ -70,21 +70,21 @@ async function createTask(clientConfig, rootForm, rootRequestId, taskData, creat
 
         //run preScripts
         if (scripts && scripts.preMapping) {
-            await scriptController.runScripts(scripts.preMapping, taskData);
+            await scriptController.runScripts(scripts.preMapping, taskData, clientConfig.clientId);
         }
 
         taskData = mappingUtil.applyMapping2Remedy(taskData, mapping, clientConfig.task.constants, fields);
 
         //run postScripts
         if (scripts && scripts.postMapping) {
-            await scriptController.runScripts(scripts.postMapping, taskData);
+            await scriptController.runScripts(scripts.postMapping, taskData, clientConfig.clientId);
         }
 
         const taskResult = await arquery.createEntry('TMS:Task', taskData, clientConfig.options)
 
         //run afterExecution
         if (scripts && scripts.afterExecution) {
-            await scriptController.runScripts(scripts.afterExecution, data);
+            await scriptController.runScripts(scripts.afterExecution, data, clientConfig.clientId);
         }
 
         log.debug('Create Task Result', taskResult);
@@ -140,21 +140,21 @@ async function createWorklog(clientConfig, taskId, summary, text, attachment) {
 
     //run preScripts
     if (scripts && scripts.preMapping) {
-        await scriptController.runScripts(scripts.preMapping, data);
+        await scriptController.runScripts(scripts.preMapping, data, clientConfig.clientId);
     }
 
     data = mappingUtil.applyMapping2Remedy(data, mapping, clientConfig.taskWorklog.constants, fields);
 
     //run postScripts
     if (scripts && scripts.postMapping) {
-        await scriptController.runScripts(scripts.postMapping, data);
+        await scriptController.runScripts(scripts.postMapping, data, clientConfig.clientId);
     }
 
     const result = await arquery.createEntry('TMS:WorkInfo', data, clientConfig.options)
 
     //run afterExecution
     if (scripts && scripts.afterExecution) {
-        await scriptController.runScripts(scripts.afterExecution, data);
+        await scriptController.runScripts(scripts.afterExecution, data, clientConfig.clientId);
     }
 
     return(result);
@@ -196,7 +196,7 @@ function queryTasks(clientConfig, query) {
 
                 //run preScripts
                 if (scripts && scripts.preMapping) {
-                    await scriptController.runScripts(scripts.preMapping, element);
+                    await scriptController.runScripts(scripts.preMapping, element, clientConfig.clientId);
                 }
 
                 //Apply mapping
@@ -212,7 +212,7 @@ function queryTasks(clientConfig, query) {
 
                 //run preScripts
                 if (scripts && scripts.postMapping) {
-                    await scriptController.runScripts(scripts.postMapping, element);
+                    await scriptController.runScripts(scripts.postMapping, element, clientConfig.clientId);
                 }
             }
             return ({
@@ -252,7 +252,7 @@ async function queryWorklogs(clientConfig, query, mapping) {
 
                 //run preScripts
                 if (scripts && scripts.preMapping) {
-                    await scriptController.runScripts(scripts.preMapping, element);
+                    await scriptController.runScripts(scripts.preMapping, element, clientConfig.clientId);
                 }
 
                 //Apply mapping
@@ -268,7 +268,7 @@ async function queryWorklogs(clientConfig, query, mapping) {
 
                 //run postScripts
                 if (scripts && scripts.postMapping) {
-                    await scriptController.runScripts(scripts.postMapping, element);
+                    await scriptController.runScripts(scripts.postMapping, element, clientConfig.clientId);
                 }
             }
             return {
@@ -314,21 +314,21 @@ async function updateTask(clientConfig, id, taskData) {
 
     //run preScripts
     if (scripts && scripts.preMapping) {
-        await scriptController.runScripts(scripts.preMapping, taskData);
+        await scriptController.runScripts(scripts.preMapping, taskData, clientConfig.clientId);
     }
 
     taskData = mappingUtil.applyMapping2Remedy(taskData, mapping, taskConstants, fields);
 
     //run postScripts
     if (scripts && scripts.postMapping) {
-        await scriptController.runScripts(scripts.postMapping, taskData);
+        await scriptController.runScripts(scripts.postMapping, taskData, clientConfig.clientId);
     }
 
     const result = await arquery.updateEntry('TMS:Task', id, taskData);
 
     //run afterExecution
     if (scripts && scripts.afterExecution) {
-        await scriptController.runScripts(scripts.afterExecution, taskData);
+        await scriptController.runScripts(scripts.afterExecution, taskData, clientConfig.clientId);
     }
     return result;
 }

package/controller/ticketController.js

@@ -24,7 +24,7 @@ async function createTicket(ticketConfig, clientConfig, data) {
 
     //run preScripts
     if (scripts && scripts.preMapping) {
-        await scriptController.runScripts(scripts.preMapping, data);
+        await scriptController.runScripts(scripts.preMapping, data, clientConfig.clientId);
     }
 
     const requestType = ticketConfig.requestType;
@@ -39,7 +39,7 @@ async function createTicket(ticketConfig, clientConfig, data) {
 
     //run postScripts
     if (scripts && scripts.postMapping) {
-        await scriptController.runScripts(scripts.postMapping, data);
+        await scriptController.runScripts(scripts.postMapping, data, clientConfig.clientId);
     }
 
     const result = await arquery.createEntry(ticketConfig.forms.new, data, clientConfig.options)
@@ -63,7 +63,7 @@ async function createTicket(ticketConfig, clientConfig, data) {
 
     //run afterExecution
     if (scripts && scripts.afterExecution) {
-        await scriptController.runScripts(scripts.afterExecution, data);
+        await scriptController.runScripts(scripts.afterExecution, data, clientConfig.clientId);
     }
     return resultInterfaceCreate;
 }
@@ -136,7 +136,7 @@ async function handleTicket(ticketConfig, ticket, mapping, clientConfig, include
         const preScripts = scripts.preMapping;
         try {
             for (let x = 0; x < preScripts.length; x++) {
-                const result = await scriptController.executeScript(preScripts[x], ticket);
+                const result = await scriptController.executeScript(preScripts[x], ticket, null, clientConfig.clientId);
             }
         } catch (error) {
             throw error;
@@ -160,7 +160,7 @@ async function handleTicket(ticketConfig, ticket, mapping, clientConfig, include
         const postScripts = scripts.postMapping;
         try {
             for (let x = 0; x < postScripts.length; x++) {
-                const result = await scriptController.executeScript(postScripts[x], ticket);
+                const result = await scriptController.executeScript(postScripts[x], ticket, null, clientConfig.clientId);
             }
         } catch (error) {
             throw error;
@@ -283,16 +283,14 @@ async function updateTicket(ticketConfig, clientConfig, id, ticketData) {
 
     //run preScripts
     if (scripts && scripts.preMapping) {
-        await scriptController.runScripts(scripts.preMapping, ticketData);
+        await scriptController.runScripts(scripts.preMapping, ticketData, clientConfig.clientId);
     }
 
     log.debug(clientConfig[ticketConfig.requestType]);
     const myClientConfig = {};
     myClientConfig[ticketConfig.requestType] = {baseQuery: clientConfig[ticketConfig.requestType].baseQuery, fields: [1]};
     const myMapping = [{"oldName":ticketConfig.requestIdField, "newName" :  "internalId"}];
-    const ticket = await getTicket(ticketConfig, myClientConfig, id, myMapping);
-    log.debug('Ticket to Update', ticket);
-    //todo Abfangen wenn getTicket nichts liefert.
+
     const mapping = config.getMapping(ticketConfig.requestType);
 
     //Constants work only on new.
@@ -300,14 +298,17 @@ async function updateTicket(ticketConfig, clientConfig, id, ticketData) {
 
     //run postMapping
     if (scripts && scripts.postMapping) {
-        await scriptController.runScripts(scripts.postMapping, ticketData);
+        await scriptController.runScripts(scripts.postMapping, ticketData, clientConfig.clientId);
     }
 
+    const ticket = await getTicket(ticketConfig, myClientConfig, id, myMapping);
+    log.debug('Ticket to Update', ticket);
+    //todo Abfangen wenn getTicket nichts liefert.
     const update = await arquery.updateEntry(ticketConfig.forms.regular, ticket.data.internalId, ticketData);
 
     //run afterExecution
     if (scripts && scripts.afterExecution) {
-        await scriptController.runScripts(scripts.afterExecution, ticketData);
+        await scriptController.runScripts(scripts.afterExecution, ticketData, clientConfig.clientId);
     }
 
     return update;

package/controller/ticketWorkLogController.js

@@ -61,21 +61,21 @@ async function createWorklog(ticketConfig, clientConfig, ticketId, summary, text
 
     //run preScripts
     if (scripts && scripts.preMapping) {
-        await scriptController.runScripts(scripts.preMapping, data);
+        await scriptController.runScripts(scripts.preMapping, data, clientConfig.clientId);
     }
 
     data = mappingUtil.applyMapping2Remedy(data, mapping, clientConstants, fields);
 
     //run postScripts
     if (scripts && scripts.postMapping) {
-        await scriptController.runScripts(scripts.postMapping, data);
+        await scriptController.runScripts(scripts.postMapping, data, clientConfig.clientId);
     }
 
     const result = arquery.createEntry(ticketConfig.forms.workLog, data, clientConfig.options)
 
     //run afterExecution
     if (scripts && scripts.afterExecution) {
-        await scriptController.runScripts(scripts.afterExecution, data);
+        await scriptController.runScripts(scripts.afterExecution, data, clientConfig.clientId);
     }
 
     return result;
@@ -169,12 +169,12 @@ async function queryWorklogs(ticketConfig, clientConfig, query, mapping) {
                 const element = result.data[x];
                 //run preScripts
                 if (scripts && scripts.preMapping) {
-                    await scriptController.runScripts(scripts.preMapping, result.data);
+                    await scriptController.runScripts(scripts.preMapping, result.data, clientConfig.clientId);
                 }
                 applyMapping(element, mapping, 'Entry ID');
                 //run postScripts
                 if (scripts && scripts.postMapping) {
-                    await scriptController.runScripts(scripts.postMapping, result.data);
+                    await scriptController.runScripts(scripts.postMapping, result.data, clientConfig.clientId);
                 }
             }
             return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manyos/smileconnect-api",
-  "version": "1.34.0",
+  "version": "1.36.0",
   "description": "A proxy and abstraction layer for BMCs IT Service Management Suite",
   "main": "app.js",
   "scripts": {

package/test/incidentTest.js

@@ -46,9 +46,9 @@ describe('Integration Tests - Incidents', function () {
         })
 
         it ('it should get all incidents', function (done) {
-            this.timeout(5000);
+            this.timeout(25000);
             chai.request(server)
-                .get('/v1/incidents')
+                .get('/v1/incidents?limit=10')
                 .set('Authorization', 'Bearer ' + authUser.access_token)
                 .end(function(err, res) {
                     res.should.have.status(200);