fix: lgtm, removed ajv from global namespace (#93)

* chore: fixed global namespace polution, fixed lgtm

* 3.8.1-0

* chore: prepare for release

* chore: prepare for release 3.8.1 🎉

* chore: lgtm

Closes #93

Author: sn0wcat

.gitignore

@@ -52,6 +52,8 @@ flows/.config.json
 dist/
 .mc
 docs
+schema.json
+
 #ignore bower, we copy the files for now to public/assets
 bower.json
 bower_components
@@ -66,4 +68,5 @@ tmp
 report.xml
 
 # ignore istanbul code coverage
-.nyc_output
+.nyc_output
+

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.8.1 (Vienna Tigers) - July 2020
+
+## Bugfix 3.8.1
+
+- Removed Ajv from global scope
+
 ## 3.8.0 (Vienna Tigers) - July 2020
 
 ## New Features 3.8.0

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@mindconnect/node-red-contrib-mindconnect",
-    "version": "3.8.0",
+    "version": "3.8.1",
     "description": "node red mindconnect node using mindconnect-nodejs library.",
     "main": "index.js",
     "scripts": {

package.json

@@ -6,7 +6,7 @@
             &nbsp;&nbsp;<a href="https://opensource.mindsphere.io/docs/node-red-contrib-mindconnect/index.html" target="_new" class="headerLink" title="Documentation">
                 <i class="fa fa-globe"></i> MindConnect Node-RED Agent
             </a>
-        </span> <span style="color:#aaaaaa !important">v3.8.0</span>
+        </span> <span style="color:#aaaaaa !important">v3.8.1</span>
     </div>
 
     <div class="form-row">
@@ -249,48 +249,10 @@
                     </ul>
                 </p>
 </script>
-<script type="text/javascript" src="mindconnect/ajv.min.js"></script>
 
-<script type="text/javascript">
-    const configurationSchema = {
-        type: "object",
-        required: ["content"],
-        properties: {
-            content: {
-                type: "object",
-                required: ["baseUrl", "iat", "clientCredentialProfile", "clientId", "tenant"],
-                properties: {
-                    baseUrl: {
-                        type: "string",
-                    },
-                    iat: {
-                        type: "string",
-                    },
-                    clientCredentialProfile: {
-                        type: "array",
-                        items: {
-                            type: "string",
-                        },
-                    },
-                    clientId: {
-                        type: "string",
-                    },
-                    tenant: {
-                        type: "string",
-                    },
-                },
-            },
-            expiration: {
-                type: "string",
-            },
-        },
-    };
-
-    function configValidator() {
-        const schemaValidator = new Ajv({ $data: true, allErrors: true });
-        return schemaValidator.compile(configurationSchema);
-    }
 
+<script type="text/javascript">
+    
     RED.nodes.registerType("mindconnect", {
         category: "mindsphere",
         color: "#41aaaa",
@@ -310,6 +272,9 @@
                         if (data.action === "delete" && data.clientId) {
                             return true;
                         }
+
+                        // generated json schema for validation if the data type is indeed configuration object
+                        function configValidator(){"use strict";var e=function e(r,t,a,i,s){if(!r||"object"!=typeof r||Array.isArray(r))return e.errors=[{keyword:"type",dataPath:(t||"")+"",schemaPath:"#/type",params:{type:"object"},message:"should be object"}],!1;var n=r.content;if(void 0===n)return e.errors=[{keyword:"required",dataPath:(t||"")+"",schemaPath:"#/required",params:{missingProperty:"content"},message:"should have required property 'content'"}],!1;var o=0;if(!n||"object"!=typeof n||Array.isArray(n))return e.errors=[{keyword:"type",dataPath:(t||"")+".content",schemaPath:"#/properties/content/type",params:{type:"object"},message:"should be object"}],!1;if(void 0===n.baseUrl)return e.errors=[{keyword:"required",dataPath:(t||"")+".content",schemaPath:"#/properties/content/required",params:{missingProperty:"baseUrl"},message:"should have required property 'baseUrl'"}],!1;var p=0;if("string"!=typeof n.baseUrl)return e.errors=[{keyword:"type",dataPath:(t||"")+".content.baseUrl",schemaPath:"#/properties/content/properties/baseUrl/type",params:{type:"string"},message:"should be string"}],!1;if(0===p){if(void 0===n.iat)return e.errors=[{keyword:"required",dataPath:(t||"")+".content",schemaPath:"#/properties/content/required",params:{missingProperty:"iat"},message:"should have required property 'iat'"}],!1;if(p=0,"string"!=typeof n.iat)return e.errors=[{keyword:"type",dataPath:(t||"")+".content.iat",schemaPath:"#/properties/content/properties/iat/type",params:{type:"string"},message:"should be string"}],!1;if(0===p){var d=n.clientCredentialProfile;if(void 0===d)return e.errors=[{keyword:"required",dataPath:(t||"")+".content",schemaPath:"#/properties/content/required",params:{missingProperty:"clientCredentialProfile"},message:"should have required property 'clientCredentialProfile'"}],!1;if(p=0,!Array.isArray(d))return e.errors=[{keyword:"type",dataPath:(t||"")+".content.clientCredentialProfile",schemaPath:"#/properties/content/properties/clientCredentialProfile/type",params:{type:"array"},message:"should be array"}],!1;for(var y=0;y<d.length;y++)if("string"!=typeof d[y])return e.errors=[{keyword:"type",dataPath:(t||"")+".content.clientCredentialProfile["+y+"]",schemaPath:"#/properties/content/properties/clientCredentialProfile/items/type",params:{type:"string"},message:"should be string"}],!1;if(0===p){if(void 0===n.clientId)return e.errors=[{keyword:"required",dataPath:(t||"")+".content",schemaPath:"#/properties/content/required",params:{missingProperty:"clientId"},message:"should have required property 'clientId'"}],!1;if(p=0,"string"!=typeof n.clientId)return e.errors=[{keyword:"type",dataPath:(t||"")+".content.clientId",schemaPath:"#/properties/content/properties/clientId/type",params:{type:"string"},message:"should be string"}],!1;if(0===p){if(void 0===n.tenant)return e.errors=[{keyword:"required",dataPath:(t||"")+".content",schemaPath:"#/properties/content/required",params:{missingProperty:"tenant"},message:"should have required property 'tenant'"}],!1;if(p=0,"string"!=typeof n.tenant)return e.errors=[{keyword:"type",dataPath:(t||"")+".content.tenant",schemaPath:"#/properties/content/properties/tenant/type",params:{type:"string"},message:"should be string"}],!1}}}}if(0===o)if(void 0===r.expiration);else if(o=0,"string"!=typeof r.expiration)return e.errors=[{keyword:"type",dataPath:(t||"")+".expiration",schemaPath:"#/properties/expiration/type",params:{type:"string"},message:"should be string"}],!1;return e.errors=null,!0};return e.schema={type:"object",required:["content"],properties:{content:{type:"object",required:["baseUrl","iat","clientCredentialProfile","clientId","tenant"],properties:{baseUrl:{type:"string"},iat:{type:"string"},clientCredentialProfile:{type:"array",items:{type:"string"}},clientId:{type:"string"},tenant:{type:"string"}}},expiration:{type:"string"}}},e.errors=null,e}; // lgtm [js/useless-assignment-to-local]
                         const validator = configValidator();
                         const result = validator(data);
                         return result;
@@ -383,7 +348,6 @@
         oneditprepare: function () {
             $("#noLinkSpan").hide();
             try {
-                const node = this;
                 const agentConfig = JSON.parse(this.agentconfig);
                 const target =
                     agentConfig.content.baseUrl.replace("southgate", `${agentConfig.content.tenant}-assetmanager`) +

src/mindconnect.html

@@ -366,11 +366,6 @@ export = function (RED: any): void {
 
     RED.nodes.registerType("mindconnect", nodeRedMindConnectAgent);
 
-    RED.httpAdmin.get("/mindconnect/ajv.min.js", function (req, res) {
-        const filename = require.resolve("ajv/dist/ajv.min.js");
-        res.sendFile(filename);
-    });
-
     RED.httpAdmin.get("/mindconnect/mindsphere.css", function (req, res) {
         const filename = path.join(__dirname, "mindsphere.css");
         res.sendFile(filename);