More touchups

Author: RickCarlino

__tests__/security/authenticate.ts

@@ -1,33 +1,33 @@
 import "jest";
-import { authenticate as auth } from "../../app/security/authenticate";
+import { authenticate as auth } from "../../app/authentication/authenticate";
 import axios from "axios";
 var EMAIL = "[email protected]";
 var PASSWORD = "password123";
 var validJWT;
 
-describe("authentication", function() {
-    beforeAll(function(done) {
+describe("authentication", function () {
+    beforeAll(function (done) {
         axios
             .post("http://localhost:3000/api/tokens", {
                 user: {
                     email: EMAIL,
                     password: PASSWORD
                 }
             })
-            .then(function(resp) {
+            .then(function (resp) {
                 console.log("=========================");
                 validJWT = resp.data.token.encoded;
                 done();
             })
-            .catch(function() {
+            .catch(function () {
                 console.log("STAND UP AN API SERVER LOCALLY!");
             })
     })
 
-    xit("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: any = {};
-        var callback = function(_, isAuthorized) {
+        var callback = function (_, isAuthorized) {
             expect(isAuthorized).toBeTruthy();
             expect(client.permissions).toBeDefined();
             expect(client.permissions.sub).toBe(EMAIL);
@@ -36,10 +36,10 @@ describe("authentication", function() {
         auth(client, EMAIL, PASSWORD, callback);
     })
 
-    it("logs in with a JWT as a password", function(done) {
+    it("logs in with a JWT as a password", function (done) {
         var finished = false;
         var client: any = {};
-        var callback = function(_, isAuthorized) {
+        var callback = function (_, isAuthorized) {
             expect(isAuthorized).toBeTruthy();
             expect(client.permissions).toBeDefined();
             expect(client.permissions.sub).toBe('[email protected]');

__tests__/security/authorize_publish.ts

@@ -1,4 +1,4 @@
-import * as all from "../../app/security/authorize_publish";
+import * as all from "../../app/authorization/authorize_publish";
 
 describe("foo", () => {
     it("bars", () => {

__tests__/security/authorize_subscribe.ts

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

__tests__/security/can_use_topic.ts

@@ -1,4 +1,4 @@
-import * as all from "../../app/security/can_use_topic";
+import * as all from "../../app/authorization/can_use_topic";
 
 describe("foo", () => {
     it("bars", () => {

app/authentication/authenticate.ts

@@ -0,0 +1,13 @@
+// test@test.com password123
+import { verifyToken } from "../security/verify_token";
+import { log } from "../logger";
+import { authenticateOk } from "./authenticate_ok";
+import { authenticateNo } from "./authenticate_no";
+
+/** Determine if user is authorized to use the server. */
+export function authenticate(client, username: string, password: string, callback) {
+    log("AUTH START");
+    let ok = authenticateOk(client, callback, username);
+    let no = authenticateNo(client, callback, username);
+    verifyToken(password.toString()).then(ok, no);
+}

app/authentication/authenticate_no.ts

@@ -0,0 +1,11 @@
+import { log } from "../logger";
+/** Creates a function that is triggered when a JWT is invalid. */
+export function authenticateNo(client, callback, username) {
+    return function (error) {
+        log("AUTH FAIL " + username);
+        log(error.message);
+        log(error);
+        client.authError = error;
+        callback(null, false);
+    };
+}

app/authentication/authenticate_ok.ts

@@ -0,0 +1,9 @@
+import { log } from "../logger";
+/** Creates a function that is triggered when a JWT is invalid. */
+export function authenticateOk(client, callback, username) {
+    return function (permissions) {
+        log("AUTH OK " + username);
+        client.permissions = permissions;
+        callback(null, true);
+    };
+}

app/security/authorize_publish.ts app/authorization/authorize_publish.ts

@@ -1,5 +1,6 @@
 import { canUseTopic } from "./can_use_topic";
 
+/** Determines if a user is allowed to publish to a particular topic. */
 export function authorizePublish(client, topic, payload, callback) {
   callback(null, canUseTopic(client, topic));
 }

app/security/authorize_subscribe.ts app/authorization/authorize_subscribe.ts

@@ -1,5 +1,6 @@
 import { canUseTopic } from "./can_use_topic";
 
+/** Determines if a user is allowed to listen to a particular topic. */
 export function authorizeSubscribe(client, topic, callback) {
     callback(null, canUseTopic(client, topic));
 }

app/security/can_use_topic.ts app/authorization/can_use_topic.ts

@@ -1,15 +1,16 @@
 import { log } from "../logger";
 
-// If a user has a bot of id XYZ, then they may access any topic
-// following pattern bot/XYZ/#
-
+/** If a user has a bot of id XYZ, then they may access any topic
+ *  following pattern bot/XYZ/# */
 export function canUseTopic(client, topic) {
     let hasBot = topic &&
         client &&
         client.permissions &&
         client.permissions.bot;
     if (!hasBot) {
-        log("Tried to access topic " + (topic || "???") + " but no bot/topic provided.");
+        log("Tried to access topic " +
+            (topic || "???") +
+            " but no bot/topic provided.");
         return false;
     };
     let botID = client.permissions.bot;

app/on_ready.ts

@@ -1,6 +1,6 @@
-import { authenticate } from "./security/authenticate";
-import { authorizePublish } from "./security/authorize_publish";
-import { authorizeSubscribe } from "./security/authorize_subscribe";
+import { authenticate } from "./authentication/authenticate";
+import { authorizePublish } from "./authorization/authorize_publish";
+import { authorizeSubscribe } from "./authorization/authorize_subscribe";
 import { log } from "./logger";
 
 export let onReady = (server) => () => {