From 791499af4f474fe8ec7863ab9fe7b5b1120ac5ce Mon Sep 17 00:00:00 2001
From: Sam Wilkins <samwilkins333@gmail.com>
Date: Sat, 11 Jan 2020 15:19:06 -0500
Subject: small changes

---
 src/server/ApiManagers/SessionManager.ts   | 12 +++++-------
 src/server/DashSession/DashSessionAgent.ts |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/server/ApiManagers/SessionManager.ts b/src/server/ApiManagers/SessionManager.ts
index d989d8d1b..1816d492d 100644
--- a/src/server/ApiManagers/SessionManager.ts
+++ b/src/server/ApiManagers/SessionManager.ts
@@ -29,15 +29,13 @@ export default class SessionManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: this.secureSubscriber("debug", "mode?", "recipient?"),
-            secureHandler: this.authorizedAction(async ({ req, res }) => {
-                const { mode, recipient } = req.params;
-                if (mode && !["passive", "active"].includes(mode)) {
+            secureHandler: this.authorizedAction(async ({ req: { params }, res }) => {
+                const mode = params.mode || "active";
+                const recipient = params.recipient || DashSessionAgent.notificationRecipient;
+                if (!["passive", "active"].includes(mode)) {
                     res.send(`Your request failed. '${mode}' is not a valid mode: please choose either 'active' or 'passive'`);
                 } else {
-                    const response = await sessionAgent.serverWorker.emitToMonitorPromise("debug", {
-                        mode: mode || "active",
-                        recipient: recipient || DashSessionAgent.notificationRecipient
-                    });
+                    const response = await sessionAgent.serverWorker.emitToMonitorPromise("debug", { mode, recipient });
                     if (response instanceof Error) {
                         res.send(response);
                     } else {
diff --git a/src/server/DashSession/DashSessionAgent.ts b/src/server/DashSession/DashSessionAgent.ts
index fe7cdae88..a688f2909 100644
--- a/src/server/DashSession/DashSessionAgent.ts
+++ b/src/server/DashSession/DashSessionAgent.ts
@@ -88,7 +88,7 @@ export class DashSessionAgent extends AppliedSessionAgent {
         const error = await Email.dispatch({
             to: notificationRecipient,
             subject: "Dash Release Session Admin Authentication Key",
-            content: `Here's the key for this session (started @ ${new Date().toUTCString()}):\n\n${sessionKey}.\n\n${this.signature}`
+            content: `Here's the key for this session (started @ ${new Date().toUTCString()}):\n\n${sessionKey}\n\n${this.signature}`
         });
         if (error) {
             this.sessionMonitor.mainLog(red(`dispatch failure @ ${notificationRecipient} (${yellow(error.message)})`));
-- 
cgit v1.2.3-70-g09d2