Code cleanup

mods/agents/package.json

@@ -45,7 +45,7 @@
   "dependencies": {
     "@fonos/core": "^0.0.81",
     "@fonos/logger": "^0.0.81",
-    "grpc": "^1.24.6",
+    "grpc": "^1.24.7",
     "grpc-promise": "^1.4.0",
     "grpc-ts-health-check": "^2.0.6"
   },

mods/agents/test/agents.unit.test.ts

@@ -25,6 +25,37 @@ describe('Agents Service', () => {
     })
   })
 
+ context('agent decoder', () => {
+    const decoder = require('../dist/common/decoders/agent_decoder')
+    it('should create an agent object from a json object', () => {
+      const jsonObj = {
+        metadata: {
+          ref: '001',
+          name: 'Peter',
+          createdOn: 'DATE',
+          modifiedOn: 'DATE'
+        },
+        spec: {
+          credentials: {
+            username: 'peter',
+            secret: 'secret'
+          },
+          domains: ['sip.local']
+        }
+      }
+      const agent = decoder(jsonObj)
+      expect(agent.getRef()).to.be.equal(jsonObj.metadata.ref)
+      expect(agent.getName()).to.be.equal(jsonObj.metadata.name)
+      expect(agent.getCreateTime()).to.be.equal(jsonObj.metadata.createdOn)
+      expect(agent.getUpdateTime()).to.be.equal(jsonObj.metadata.modifiedOn)
+      expect(agent.getUsername()).to.be.equal(jsonObj.spec.credentials.username)
+      expect(agent.getSecret()).to.be.equal(jsonObj.spec.credentials.secret)
+      expect(agent.getDomainsList())
+        .to.be.a('array')
+        .lengthOf(1)
+    })
+  })
+
   // The backend(routr) is failing at this
   it.skip('Create agent missing username', done => {
     agents

mods/appmanager/package.json

@@ -49,11 +49,13 @@
     "@fonos/events": "^0.0.81",
     "@fonos/errors": "^0.0.81",
     "fs-extra": "^8.1.0",
-    "grpc": "^1.24.6",
     "grpc-promise": "^1.4.0",
     "grpc-ts-health-check": "^2.0.6",
     "tar": "^6.0.1"
   },
+  "peerDependencies": {
+    "grpc": "^1.24.7"
+  },
   "devDependencies": {
     "@types/fs-extra": "^9.0.1",
     "@types/tar": "^4.0.3",

mods/auth/package.json

@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@fonos/logger": "^0.0.81",
-    "grpc": "^1.24.6",
+    "grpc": "^1.24.7",
     "jsonwebtoken": "^8.5.1",
     "mongoose": "^5.12.4"
   },

mods/core/test/auth_middleware.unit.test.ts → mods/auth/test/auth_middleware.unit.test.ts

@@ -24,5 +24,4 @@ describe("@fonos/core/commom", () => {
 
     expect(next.calledOnce);
   });
-});
-*/
+});*/

mods/callmanager/package.json

@@ -47,7 +47,7 @@
     "@fonos/errors": "^0.0.81",
     "@fonos/logger": "^0.0.81",
     "ari-client": "^2.2.0",
-    "grpc": "^1.24.6",
+    "grpc": "^1.24.7",
     "grpc-promise": "^1.4.0",
     "grpc-ts-health-check": "^2.0.6",
     "phone": "^2.4.21"

mods/core/src/common/trust_util.ts

@@ -1,11 +1,9 @@
 import logger from "@fonos/logger";
-import {getSalt} from "@fonos/certs";
 import path from "path";
-import grpc from "grpc";
-import jwt from "jsonwebtoken";
 import * as os from "os";
 import * as fs from "fs";
-const atob = require("atob");
+import atob from "atob";
+import grpc from "grpc";
 
 const prepCert = (cert: string) => Buffer.from(atob(cert), "utf-8");
 
@@ -46,7 +44,7 @@ const getServerCredentials = () => {
   }
 };
 
-const getClientCredentials = () => {
+const getClientCredentials = (grpc?) => {
   try {
     return grpc.credentials.createSsl(
       prepCert(config.caCertificate),

mods/core/src/service_runner.ts

@@ -22,7 +22,7 @@ export default function run(srvInf: ServiceInf) {
   const grpcHealthCheck = new GrpcHealthCheck(healthCheckStatusMap);
   const server = new grpc.Server();
 
-  server.addService<unknown>(srvInf.service, srvInf.server);
+  server.addService(srvInf.service, srvInf.server);
   server.addService(HealthService, grpcHealthCheck)
   server.bind(ENDPOINT, getServerCredentials());
   server.start();