2 files changed, 19 insertions, 22 deletions

diff --git a/src/server/ApiManagers/DeleteManager.ts b/src/server/ApiManagers/DeleteManager.ts
index 56d8aff60..c6c4ca464 100644
--- a/src/server/ApiManagers/DeleteManager.ts
+++ b/src/server/ApiManagers/DeleteManager.ts
@@ -1,21 +1,19 @@
-import ApiManager, { Registration } from "./ApiManager";
-import { Method, _permission_denied } from "../RouteManager";
-import { WebSocket } from "../websocket";
-import { Database } from "../database";
-import { rimraf } from "rimraf";
-import { filesDirectory } from "..";
-import { DashUploadUtils } from "../DashUploadUtils";
-import { mkdirSync } from "fs";
-import RouteSubscriber from "../RouteSubscriber";
+import ApiManager, { Registration } from './ApiManager';
+import { Method, _permission_denied } from '../RouteManager';
+import { WebSocket } from '../websocket';
+import { Database } from '../database';
+import { rimraf } from 'rimraf';
+import { filesDirectory } from '..';
+import { DashUploadUtils } from '../DashUploadUtils';
+import { mkdirSync } from 'fs';
+import RouteSubscriber from '../RouteSubscriber';
 
 export default class DeleteManager extends ApiManager {
-
     protected initialize(register: Registration): void {
-
         register({
             method: Method.GET,
             requireAdminInRelease: true,
-            subscription: new RouteSubscriber("delete").add("target?"),
+            subscription: new RouteSubscriber('delete').add('target?'),
             secureHandler: async ({ req, res }) => {
                 const { target } = req.params;
 
@@ -24,12 +22,12 @@ export default class DeleteManager extends ApiManager {
                 } else {
                     let all = false;
                     switch (target) {
-                        case "all":
+                        case 'all':
                             all = true;
-                        case "database":
+                        case 'database':
                             await WebSocket.doDelete(false);
                             if (!all) break;
-                        case "files":
+                        case 'files':
                             rimraf.sync(filesDirectory);
                             mkdirSync(filesDirectory);
                             await DashUploadUtils.buildFileDirectories();
@@ -39,10 +37,8 @@ export default class DeleteManager extends ApiManager {
                     }
                 }
 
-                res.redirect("/home");
-            }
+                res.redirect('/home');
+            },
         });
-
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/server/ApiManagers/UserManager.ts b/src/server/ApiManagers/UserManager.ts
index 9252202b0..0d36ee957 100644
--- a/src/server/ApiManagers/UserManager.ts
+++ b/src/server/ApiManagers/UserManager.ts
@@ -7,6 +7,7 @@ import { Opt } from '../../fields/Doc';
 import { WebSocket } from '../websocket';
 import { resolvedPorts } from '../server_Initialization';
 import { DashVersion } from '../../fields/DocSymbols';
+import { Utils } from '../../Utils';
 
 export const timeMap: { [id: string]: number } = {};
 interface ActivityUnit {
@@ -49,7 +50,7 @@ export default class UserManager extends ApiManager {
             method: Method.GET,
             subscription: '/getUserDocumentIds',
             secureHandler: ({ res, user }) => res.send({ userDocumentId: user.userDocumentId, linkDatabaseId: user.linkDatabaseId, sharingDocumentId: user.sharingDocumentId }),
-            publicHandler: ({ res }) => res.send({ userDocumentId: '__guest__', linkDatabaseId: 3, sharingDocumentId: 2 }),
+            publicHandler: ({ res }) => res.send({ userDocumentId: Utils.GuestID(), linkDatabaseId: 3, sharingDocumentId: 2 }),
         });
 
         register({
@@ -81,7 +82,7 @@ export default class UserManager extends ApiManager {
                         resolvedPorts,
                     })
                 ),
-            publicHandler: ({ res }) => res.send(JSON.stringify({ id: '__guest__', email: 'guest' })),
+            publicHandler: ({ res }) => res.send(JSON.stringify({ userDocumentId: Utils.GuestID(), email: 'guest', resolvedPorts })),
         });
 
         register({