@things-factory/integration-base 4.3.424 → 4.3.425

package/dist-server/sqs-client.js

@@ -1,42 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const client_secrets_manager_1 = require("@aws-sdk/client-secrets-manager");
 const client_sqs_1 = require("@aws-sdk/client-sqs");
 const sqs_const_1 = require("./sqs-const");
 if (sqs_const_1.SQS) {
-    const getAWSSecret = async () => {
-        const secretManager = new client_secrets_manager_1.SecretsManagerClient({ region: sqs_const_1.AWSCREDENTIAL.region });
-        const secretManagerParams = {
-            SecretId: sqs_const_1.AWSCREDENTIAL.secretName,
-            VersionStage: 'AWSCURRENT'
-        };
-        const command = new client_secrets_manager_1.GetSecretValueCommand(secretManagerParams);
-        try {
-            const data = await secretManager.send(command);
-            const dataSecretString = data.SecretString;
-            if (dataSecretString) {
-                const secretString = JSON.parse(dataSecretString);
-                return { accessKeyId: secretString.accessKeyId, secretAccessKey: secretString.secretAccessKey };
-            }
-            else {
-                return null;
-            }
-        }
-        catch (error) {
-            console.log(`[SFTP Get Secret]: ${error}`);
+    const client = new client_sqs_1.SQSClient({
+        region: sqs_const_1.SQS.region,
+        credentials: {
+            accessKeyId: sqs_const_1.SQS.accessKeyId,
+            secretAccessKey: sqs_const_1.SQS.secretAccessKey
         }
-    };
+    });
     /* send message to sqs */
     sqs_const_1.SQS.sendMessage = async ({ event }) => {
         const { body, deduplicationId, groupId, queueName } = event;
-        const { accessKeyId, secretAccessKey } = await getAWSSecret();
-        const client = new client_sqs_1.SQSClient({
-            region: sqs_const_1.AWSCREDENTIAL.region,
-            credentials: {
-                accessKeyId: accessKeyId,
-                secretAccessKey: secretAccessKey
-            }
-        });
         let messageBody = Object.assign(Object.assign({}, body), { configuration: sqs_const_1.SQS.configuration });
         // Set the parameters
         const params = {

package/dist-server/sqs-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"sqs-client.js","sourceRoot":"","sources":["../server/sqs-client.ts"],"names":[],"mappings":";;AAAA,4EAA6F;AAC7F,oDAAmE;AAEnE,2CAAgD;AAEhD,IAAI,eAAG,EAAE;IACP,MAAM,YAAY,GAAG,KAAK,IAAI,EAAE;QAC9B,MAAM,aAAa,GAAG,IAAI,6CAAoB,CAAC,EAAE,MAAM,EAAE,yBAAa,CAAC,MAAM,EAAE,CAAC,CAAA;QAChF,MAAM,mBAAmB,GAAG;YAC1B,QAAQ,EAAE,yBAAa,CAAC,UAAU;YAClC,YAAY,EAAE,YAAY;SAC3B,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,8CAAqB,CAAC,mBAAmB,CAAC,CAAA;QAC9D,IAAI;YACF,MAAM,IAAI,GAAQ,MAAM,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACnD,MAAM,gBAAgB,GAAQ,IAAI,CAAC,YAAY,CAAA;YAC/C,IAAI,gBAAgB,EAAE;gBACpB,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;gBAEjD,OAAO,EAAE,WAAW,EAAE,YAAY,CAAC,WAAW,EAAE,eAAe,EAAE,YAAY,CAAC,eAAe,EAAE,CAAA;aAChG;iBAAM;gBACL,OAAO,IAAI,CAAA;aACZ;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,sBAAsB,KAAK,EAAE,CAAC,CAAA;SAC3C;IACH,CAAC,CAAA;IAED,yBAAyB;IACzB,eAAG,CAAC,WAAW,GAAG,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;QACpC,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,KAAK,CAAA;QAC3D,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,MAAM,YAAY,EAAE,CAAA;QAE7D,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC;YAC3B,MAAM,EAAE,yBAAa,CAAC,MAAM;YAC5B,WAAW,EAAE;gBACX,WAAW,EAAE,WAAW;gBACxB,eAAe,EAAE,eAAe;aACjC;SACF,CAAC,CAAA;QAEF,IAAI,WAAW,mCACV,IAAI,KACP,aAAa,EAAE,eAAG,CAAC,aAAa,GACjC,CAAA;QACD,qBAAqB;QACrB,MAAM,MAAM,GAAG;YACb,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;YACxC,sBAAsB,EAAE,eAAe;YACvC,cAAc,EAAE,OAAO;YACvB,QAAQ,EAAE,yDAAyD,SAAS,EAAE;SAC/E,CAAA;QAED,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,+BAAkB,CAAC,MAAM,CAAC,CAAC,CAAA;QAC9D,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QAEhE,OAAO,IAAI,CAAA;IACb,CAAC,CAAA;CACF"}
+{"version":3,"file":"sqs-client.js","sourceRoot":"","sources":["../server/sqs-client.ts"],"names":[],"mappings":";;AAAA,oDAAmE;AAEnE,2CAAiC;AAEjC,IAAI,eAAG,EAAE;IACP,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC;QAC3B,MAAM,EAAE,eAAG,CAAC,MAAM;QAClB,WAAW,EAAE;YACX,WAAW,EAAE,eAAG,CAAC,WAAW;YAC5B,eAAe,EAAE,eAAG,CAAC,eAAe;SACrC;KACF,CAAC,CAAA;IAEF,yBAAyB;IACzB,eAAG,CAAC,WAAW,GAAG,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;QACpC,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,KAAK,CAAA;QAE3D,IAAI,WAAW,mCACV,IAAI,KACP,aAAa,EAAE,eAAG,CAAC,aAAa,GACjC,CAAA;QACD,qBAAqB;QACrB,MAAM,MAAM,GAAG;YACb,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;YACxC,sBAAsB,EAAE,eAAe;YACvC,cAAc,EAAE,OAAO;YACvB,QAAQ,EAAE,yDAAyD,SAAS,EAAE;SAC/E,CAAA;QAED,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,+BAAkB,CAAC,MAAM,CAAC,CAAC,CAAA;QAC9D,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QAEhE,OAAO,IAAI,CAAA;IACb,CAAC,CAAA;CACF"}

package/dist-server/sqs-const.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AWSCREDENTIAL = exports.SQS = void 0;
+exports.SQS = void 0;
 const env_1 = require("@things-factory/env");
 exports.SQS = env_1.config.get('awsSqs');
-exports.AWSCREDENTIAL = env_1.config.get('awsCredential');
 //# sourceMappingURL=sqs-const.js.map

package/dist-server/sqs-const.js.map

@@ -1 +1 @@
-{"version":3,"file":"sqs-const.js","sourceRoot":"","sources":["../server/sqs-const.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAEjC,QAAA,GAAG,GAAQ,YAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;AAC/B,QAAA,aAAa,GAAQ,YAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA"}
+{"version":3,"file":"sqs-const.js","sourceRoot":"","sources":["../server/sqs-const.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAEjC,QAAA,GAAG,GAAQ,YAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "4.3.424",
+  "version": "4.3.425",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -26,11 +26,10 @@
   "dependencies": {
     "@apollo/client": "^3.5.6",
     "@aws-sdk/client-lambda": "3.513.0",
-    "@aws-sdk/client-secrets-manager": "^3.46.0",
     "@aws-sdk/client-sqs": "^3.46.0",
-    "@things-factory/api": "^4.3.424",
-    "@things-factory/auth-base": "^4.3.424",
-    "@things-factory/oauth2-client": "^4.3.424",
+    "@things-factory/api": "^4.3.425",
+    "@things-factory/auth-base": "^4.3.425",
+    "@things-factory/oauth2-client": "^4.3.425",
     "@things-factory/shell": "^4.3.381",
     "async-mqtt": "^2.5.0",
     "cron": "^1.7.2",
@@ -42,5 +41,5 @@
     "promise-socket": "^7.0.0",
     "vm2": "^3.9.2"
   },
-  "gitHead": "0c04dd6934c7eb335fc5ad2dd55172b5e79cdca7"
+  "gitHead": "43a4d63f2d8411e2f7446c3627dbf8acafbd3c44"
 }

package/server/sqs-client.ts

@@ -1,43 +1,19 @@
-import { GetSecretValueCommand, SecretsManagerClient } from '@aws-sdk/client-secrets-manager'
 import { SendMessageCommand, SQSClient } from '@aws-sdk/client-sqs'
 
-import { AWSCREDENTIAL, SQS } from './sqs-const'
+import { SQS } from './sqs-const'
 
 if (SQS) {
-  const getAWSSecret = async () => {
-    const secretManager = new SecretsManagerClient({ region: AWSCREDENTIAL.region })
-    const secretManagerParams = {
-      SecretId: AWSCREDENTIAL.secretName,
-      VersionStage: 'AWSCURRENT'
+  const client = new SQSClient({
+    region: SQS.region,
+    credentials: {
+      accessKeyId: SQS.accessKeyId,
+      secretAccessKey: SQS.secretAccessKey
     }
-    const command = new GetSecretValueCommand(secretManagerParams)
-    try {
-      const data: any = await secretManager.send(command)
-      const dataSecretString: any = data.SecretString
-      if (dataSecretString) {
-        const secretString = JSON.parse(dataSecretString)
-
-        return { accessKeyId: secretString.accessKeyId, secretAccessKey: secretString.secretAccessKey }
-      } else {
-        return null
-      }
-    } catch (error) {
-      console.log(`[SFTP Get Secret]: ${error}`)
-    }
-  }
+  })
 
   /* send message to sqs */
   SQS.sendMessage = async ({ event }) => {
     const { body, deduplicationId, groupId, queueName } = event
-    const { accessKeyId, secretAccessKey } = await getAWSSecret()
-
-    const client = new SQSClient({
-      region: AWSCREDENTIAL.region,
-      credentials: {
-        accessKeyId: accessKeyId,
-        secretAccessKey: secretAccessKey
-      }
-    })
 
     let messageBody = {
       ...body,

package/server/sqs-const.ts

@@ -1,4 +1,3 @@
 import { config } from '@things-factory/env'
 
 export var SQS: any = config.get('awsSqs')
-export var AWSCREDENTIAL: any = config.get('awsCredential')