Merge branch 'master' into data-visualization-view-naafi

1 files changed, 18 insertions, 13 deletions

diff --git a/src/server/authentication/AuthenticationManager.ts b/src/server/authentication/AuthenticationManager.ts
index 3622be4c5..52d876e95 100644
--- a/src/server/authentication/AuthenticationManager.ts
+++ b/src/server/authentication/AuthenticationManager.ts
@@ -1,4 +1,4 @@
-import { default as User, DashUserModel } from './DashUserModel';
+import { default as User, DashUserModel, initializeGuest } from './DashUserModel';
 import { Request, Response, NextFunction } from 'express';
 import * as passport from 'passport';
 import { IVerifyOptions } from 'passport-local';
@@ -30,6 +30,7 @@ export let getSignup = (req: Request, res: Response) => {
  * Create a new local account.
  */
 export let postSignup = (req: Request, res: Response, next: NextFunction) => {
+    const email = req.body.email as String;
     req.assert('email', 'Email is not valid').isEmail();
     req.assert('password', 'Password must be at least 4 characters long').len({ min: 4 });
     req.assert('confirmPassword', 'Passwords do not match').equals(req.body.password);
@@ -41,15 +42,14 @@ export let postSignup = (req: Request, res: Response, next: NextFunction) => {
         return res.redirect('/signup');
     }
 
-    const email = req.body.email as String;
     const password = req.body.password;
 
     const model = {
         email,
         password,
-        userDocumentId: Utils.GenerateGuid(),
-        sharingDocumentId: Utils.GenerateGuid(),
-        linkDatabaseId: Utils.GenerateGuid(),
+        userDocumentId: email === 'guest' ? '__guest__' : Utils.GenerateGuid(),
+        sharingDocumentId: email === 'guest' ? 2 : Utils.GenerateGuid(),
+        linkDatabaseId: email === 'guest' ? 3 : Utils.GenerateGuid(),
         cacheDocumentIds: '',
     } as Partial<DashUserModel>;
 
@@ -106,18 +106,22 @@ export let getLogin = (req: Request, res: Response) => {
  * On failure, redirect to signup page
  */
 export let postLogin = (req: Request, res: Response, next: NextFunction) => {
-    req.assert('email', 'Email is not valid').isEmail();
-    req.assert('password', 'Password cannot be blank').notEmpty();
-    req.sanitize('email').normalizeEmail({ gmail_remove_dots: false });
-
-    const errors = req.validationErrors();
+    if (req.body.email === '') {
+        User.findOne({ email: 'guest' }, (err: any, user: DashUserModel) => !user && initializeGuest());
+        req.body.email = 'guest';
+        req.body.password = 'guest';
+    } else {
+        req.assert('email', 'Email is not valid').isEmail();
+        req.assert('password', 'Password cannot be blank').notEmpty();
+        req.sanitize('email').normalizeEmail({ gmail_remove_dots: false });
+    }
 
-    if (errors) {
+    if (req.validationErrors()) {
         req.flash('errors', 'Unable to login at this time. Please try again.');
         return res.redirect('/signup');
     }
 
-    passport.authenticate('local', (err: Error, user: DashUserModel, _info: IVerifyOptions) => {
+    const callback = (err: Error, user: DashUserModel, _info: IVerifyOptions) => {
         if (err) {
             next(err);
             return;
@@ -132,7 +136,8 @@ export let postLogin = (req: Request, res: Response, next: NextFunction) => {
             }
             tryRedirectToTarget(req, res);
         });
-    })(req, res, next);
+    };
+    setTimeout(() => passport.authenticate('local', callback)(req, res, next), 500);
 };
 
 /**