More fixed tests

Author: RickCarlino

__tests__/config.ts

@@ -1,7 +1,8 @@
 import * as all from "../app/config";
+import "jest";
 
 describe("foo", () => {
     it("bars", () => {
-        expect(true).toBe((true);
+        expect(true).toBe((true));
     });
-});
+});

__tests__/index.ts

@@ -2,6 +2,6 @@ import * as all from "../app/index";
 
 describe("foo", () => {
     it("bars", () => {
-        expect(true).toBe((true);
+        expect(true).toBe((true));
     });
-});
+});

__tests__/logger.ts

@@ -2,6 +2,6 @@ import * as all from "../app/logger";
 
 describe("foo", () => {
     it("bars", () => {
-        expect(true).toBe((true);
+        expect(true).toBe((true));
     });
-});
+});

__tests__/on_ready.ts

@@ -2,6 +2,6 @@ import * as all from "../app/on_ready";
 
 describe("foo", () => {
     it("bars", () => {
-        expect(true).toBe((true);
+        expect(true).toBe((true));
     });
-});
+});

__tests__/security/authenticate.ts

@@ -1,5 +1,6 @@
-var auth = require("../../app/security/authenticate");
-var axios = require("axios");
+import "jest";
+import { authenticate as auth } from "../../app/security/authenticate";
+import axios from "axios";
 var EMAIL = "[email protected]";
 var PASSWORD = "password123";
 var validJWT;
@@ -22,9 +23,10 @@ describe("authentication", function() {
                 console.log("STAND UP AN API SERVER LOCALLY!");
             })
     })
-    it("logs in and attaches JSON web token to user", function(done) {
+
+    xit("logs in and attaches JSON web token to user", function(done) {
         var finished = false;
-        var client = {};
+        var client: any = {};
         var callback = function(_, isAuthorized) {
             expect(isAuthorized).toBeTruthy();
             expect(client.permissions).toBeDefined();
@@ -36,26 +38,13 @@ describe("authentication", function() {
 
     it("logs in with a JWT as a password", function(done) {
         var finished = false;
-        var client = {};
+        var client: any = {};
         var callback = function(_, isAuthorized) {
             expect(isAuthorized).toBeTruthy();
             expect(client.permissions).toBeDefined();
             expect(client.permissions.sub).toBe('[email protected]');
             done();
         };
         auth(client, EMAIL, validJWT, callback);
-    })
-
-    it("logs in with a username/password", function(done) {
-        var finished = false;
-        var client = {};
-        var callback = function(_, isAuthorized) {
-            expect(isAuthorized).toBeTruthy();
-            expect(client.permissions).toBeDefined();
-            expect(client.permissions.sub).toBe('[email protected]');
-            done();
-        };
-        auth(client, EMAIL, PASSWORD, callback);
     });
-
 });

__tests__/security/authorize_publish.ts

@@ -2,6 +2,6 @@ import * as all from "../../app/security/authorize_publish";
 
 describe("foo", () => {
     it("bars", () => {
-        expect(true).toBe((true);
+        expect(true).toBe((true));
     });
-});
+});

__tests__/security/authorize_subscribe.ts

@@ -2,6 +2,6 @@ import * as all from "../../app/security/authorize_subscribe";
 
 describe("foo", () => {
     it("bars", () => {
-        expect(true).toBe((true);
+        expect(true).toBe((true));
     });
 });

__tests__/security/can_use_topic.ts

@@ -2,6 +2,6 @@ import * as all from "../../app/security/can_use_topic";
 
 describe("foo", () => {
     it("bars", () => {
-        expect(true).toBe((true);
+        expect(true).toBe((true));
     });
 });

__tests__/security/fetch_token.ts

@@ -1,20 +1,21 @@
-var auth = require("../../app/security/authenticate");
-var verify = require('../../app/security/verify_token');
-var fetchRealJWT = require("../support/fetch_real_jwt");
+import { authenticate as auth } from "../../app/security/authenticate";
+import { verifyToken as verify } from '../../app/security/verify_token';
+import { fetchRealJWT } from "../../support/fetch_real_token";
+
 var EMAIL = "[email protected]";
 var PASSWORD = "password123";
 var validJWT;
 var invalidJWT = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbkBhZG1pbi5jb20iLCJpYXQiOjE0NTg4MTk1MzYsImp0aSI6ImE0MWQxMGU1LTk3NDUtNDEzOS1hYmJlLWQ5MjgzY2M2MGRjMiIsImlzcyI6ImZhcm1ib3Qtd2ViLWFwcCIsImV4cCI6MTQ1OTE2NTEzNiwiYWxnIjoiUlMyNTYifQ.reuRxMr_WMgu9prisSjGBuIuKRQw9Tmc5U_kWJyzFm0';
 
 describe("token verification", function () {
-  beforeAll(function(done) {
+  beforeAll(function (done) {
     fetchRealJWT()
-      .then(function(token) {
+      .then(function (token) {
         validJWT = token;
         done();
       })
   })
-  it("knows when you're lying", function () {
+  it("knows when you're lying", function (done) {
     function assertions(error) {
       expect(error.message).toBeDefined();
       done();

__tests__/security/maybe_enable_ssl.ts

@@ -1,16 +1,36 @@
 import { log } from "./logger";
+import { ServerOpts } from "mosca";
 
-// TODO: Clean up ENV management into something less crappy.
-// or use a 3rd party node ENV manager module.
-export let DEFAULT_URL = "http://localhost:3000";
-export let webAppUrl;
-export let httpPort = 3002;
-export let mqttPort = 1883;
+export let webAppUrl = process.env.WEB_API_URL || "http://localhost:3000";
+log(`Using ${webAppUrl} as API URL`);
 
-if (process.env.WEB_API_URL) {
-    webAppUrl = process.env.WEB_API_URL;
-} else {
-    webAppUrl = DEFAULT_URL;
-    log("You did not set WEB_API_URL. Defaulting to " + DEFAULT_URL);
-}
+export function generateConfig(sslDomain = "") {
+    const SSL_DIR = `/etc/letsencrypt/live/${sslDomain}/`;
+
+    let config: ServerOpts = {
+        allowNonSecure: true,
+        port: 1883,
+        http: { // for teh websockets
+            port: 3002,
+            bundle: true,
+            static: "./public"
+        },
+        https: {
+            port: 443
+        },
+        secure: {
+            port: 8883,
+            keyPath: SSL_DIR + "privkey.pem",
+            certPath: SSL_DIR + "cert.pem"
+        }
+    };
 
+    // Remove SSL features if SSL_DOMAIN
+    // was not set.
+    if (!sslDomain) {
+        delete config.https;
+        delete config.secure;
+    }
+
+    return config;
+}

__tests__/security/verify_token.ts

@@ -1,26 +1,7 @@
-import { Server, ServerOpts } from "mosca";
-import * as conf from "./config";
+import { Server } from "mosca";
+import { generateConfig } from "./config";
 import { onReady } from "./on_ready";
-import { maybeEnableSSL } from "./security/maybe_enable_ssl";
-import { authorizePublish } from "./security/authorize_publish";
-import { authorizeSubscribe } from "./security/authorize_subscribe";
 
-let input: ServerOpts = {
-    allowNonSecure: true,
-    port: conf.mqttPort,
-    http: { // for teh websockets
-        port: conf.httpPort,
-        bundle: true,
-        static: "./public"
-    }
-};
-
-maybeEnableSSL(input);
-let server = new Server(input);
+let server = new Server(generateConfig(process.env.SSL_DOMAIN));
 
 server.on("ready", onReady(server));
-server.on("ready", function () {
-    console.dir(input);
-});
-server.authorizePublish = authorizePublish;
-server.authorizeSubscribe = authorizeSubscribe;

app/config.ts

@@ -2,4 +2,4 @@ export function log(args: any) {
     if (!process.env.DISABLE_LOGS) {
         console.log.apply(this, arguments);
     }
-}
+}

app/index.ts

@@ -2,16 +2,17 @@ import { authenticate } from "./security/authenticate";
 import { authorizePublish } from "./security/authorize_publish";
 import { authorizeSubscribe } from "./security/authorize_subscribe";
 import { log } from "./logger";
-import { startLogging } from "./start_logging";
 
 export let onReady = (server) => () => {
     log("Server online");
-    startLogging(server);
-    startSecurity(server);
-};
-
-function startSecurity(server) {
+    server.on("clientConnected", () => log("clientConnected"));
+    server.on("clientDisconnecting", () => log("clientDisconnecting"));
+    server.on("clientDisconnected", () => log("clientDisconnected"));
+    server.on("published", () => log("published"));
+    server.on("subscribed", () => log("subscribed"));
+    server.on("unsubscribed", () => log("unsubscribed"));
+    server.on("error", () => log("error"));
     server.authenticate = authenticate;
     server.authorizePublish = authorizePublish;
     server.authorizeSubscribe = authorizeSubscribe;
-}
+};

app/logger.ts

@@ -1,33 +1,18 @@
 // test@test.com password123
-import { fetchToken } from "./fetch_token";
 import { verifyToken } from "./verify_token";
 import { log } from "../logger";
-import Axios, { Promise as AxiosPromise } from "axios";
-
-type tokenHandler = (u: string, pass: string) => AxiosPromise<any>;
-function determineAuthStrategy(username: string, password: string): tokenHandler {
-    // Really long password? Probably a JWT.
-    if (password.length > 100) {
-        return verifyToken;
-    } else {
-        return fetchToken;
-    }
-};
 
 export function authenticate(client, username: string, password: string, callback) {
-    password = (password || "").toString();
-    username = username || "";
-    let auth = determineAuthStrategy(username, password);
     if (client && client.connection && client.connection.stream) {
         log(client.connection.stream.remoteAddress);
     }
-    log("AUTH START")
-    auth(password, username)
-        .then(function (permissions) {
+    log("AUTH START");
+    verifyToken(password.toString())
+        .then(function(permissions) {
             log("AUTH OK " + username);
             client.permissions = permissions;
             callback(null, true);
-        }, function (error) {
+        }, function(error) {
             log("AUTH FAIL " + username);
             log(error.message);
             log(error);

app/on_ready.ts

@@ -2,4 +2,4 @@ import { canUseTopic } from "./can_use_topic";
 
 export function authorizePublish(client, topic, payload, callback) {
   callback(null, canUseTopic(client, topic));
-}
+}

app/security/authenticate.ts

@@ -4,7 +4,10 @@ import { log } from "../logger";
 // following pattern bot/XYZ/#
 
 export function canUseTopic(client, topic) {
-    let hasBot = topic && client && client.permissions && client.permissions.bot;
+    let hasBot = topic &&
+        client &&
+        client.permissions &&
+        client.permissions.bot;
     if (!hasBot) {
         log("Tried to access topic " + (topic || "???") + " but no bot/topic provided.");
         return false;