From b4a23b21bbe0a44df1328419c7d94b97a772e54f Mon Sep 17 00:00:00 2001
From: kimdahey <claire_kim1@brown.edu>
Date: Tue, 19 Nov 2019 19:06:47 -0500
Subject: progress w password

---
 src/server/index.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/server')

diff --git a/src/server/index.ts b/src/server/index.ts
index 1595781dc..d5dbe8913 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -668,6 +668,16 @@ addSecureRoute({
     onRejection: (_req, res) => res.send(JSON.stringify({ id: "__guest__", email: "" }))
 });
 
+addSecureRoute({
+    method: Method.POST,
+    subscribers: '/internalResetPassword',
+    onValidation: (user, _req, res) => {
+        // user password auth
+        // new pass same
+        // do extra stuff
+    }
+});
+
 const ServicesApiKeyMap = new Map<string, string | undefined>([
     ["face", process.env.FACE],
     ["vision", process.env.VISION],
-- 
cgit v1.2.3-70-g09d2


From 56b83d89f37a5523ab319977e3385f539ecaf996 Mon Sep 17 00:00:00 2001
From: kimdahey <claire_kim1@brown.edu>
Date: Sat, 23 Nov 2019 16:59:53 -0500
Subject: pushing progress...need to figure out bcrypt.compare"

---
 src/client/util/SettingsManager.scss | 16 ++++++++----
 src/client/util/SettingsManager.tsx  | 22 +++++++++++++----
 src/server/index.ts                  | 48 +++++++++++++++++++++++++++++++++---
 3 files changed, 73 insertions(+), 13 deletions(-)

(limited to 'src/server')

diff --git a/src/client/util/SettingsManager.scss b/src/client/util/SettingsManager.scss
index cd9d2569a..0d637868b 100644
--- a/src/client/util/SettingsManager.scss
+++ b/src/client/util/SettingsManager.scss
@@ -17,18 +17,24 @@
         .settings-content {
             padding-left: 1em;
             display: flex;
+            flex-direction: column;
             justify-content: space-between;
+
+            input {
+                min-width: 100%;
+            }
         }
     }
 
     .focus-span {
         text-decoration: underline;
     }
-p {
-    text-align: left;
-    padding: 0;
-    margin: 0 0 20px 0;
-}
+
+    p {
+        text-align: left;
+        padding: 0;
+        margin: 0 0 20px 0;
+    }
 
     h1 {
         color: $dark-color;
diff --git a/src/client/util/SettingsManager.tsx b/src/client/util/SettingsManager.tsx
index 76f4bb964..ee2d9ff21 100644
--- a/src/client/util/SettingsManager.tsx
+++ b/src/client/util/SettingsManager.tsx
@@ -18,6 +18,8 @@ export default class SettingsManager extends React.Component<{}> {
     @observable private dialogueBoxOpacity = 1;
     @observable private overlayOpacity = 0.4;
     private curr_password_ref = React.createRef<HTMLInputElement>();
+    private new_password_ref = React.createRef<HTMLInputElement>();
+    private new_confirm_ref = React.createRef<HTMLInputElement>();
 
     public open = action(() => {
         SelectionManager.DeselectAll();
@@ -35,12 +37,19 @@ export default class SettingsManager extends React.Component<{}> {
 
     private dispatchRequest = async () => {
         const curr_pass = this.curr_password_ref.current!.value;
-        const { error: resultError, ...others } = await Identified.PostToServer('/internalResetPassword', { curr_pass });
-        if (resultError) {
+        const new_pass = this.new_password_ref.current!.value;
+        const new_confirm = this.new_confirm_ref.current!.value;
+        console.log('ready!');
+        // const { error, hello } = await Identified.PostToServer('/internalResetPassword', { curr_pass, new_pass, new_confirm });
+        const resp = await Identified.PostToServer('/internalResetPassword', { curr_pass, new_pass, new_confirm });
+        console.log('set!');
+        console.log('response', resp);
+        console.log('hm', resp.hm);
+        if (resp.error) {
             // we failed
-            console.log(resultError);
+            console.log(resp.error);
         }
-        console.log(others);
+        console.log('go!');
         // do stuff with response
     }
 
@@ -59,7 +68,10 @@ export default class SettingsManager extends React.Component<{}> {
                         <p>static data</p>
                     </div>
                     <div className="settings-content">
-                        <input ref={this.curr_password_ref}></input>
+                        <input ref={this.curr_password_ref} />
+                        <input ref={this.new_password_ref} />
+                        <input ref={this.new_confirm_ref} />
+                        <button onClick={this.dispatchRequest}>submit</button>
                         this changes with what you select!
                     </div>
                 </div>
diff --git a/src/server/index.ts b/src/server/index.ts
index d96bd4d9a..df9edac50 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -19,7 +19,7 @@ import { Socket } from 'socket.io';
 import * as webpack from 'webpack';
 import * as wdm from 'webpack-dev-middleware';
 import * as whm from 'webpack-hot-middleware';
-import { Utils } from '../Utils';
+import { Utils, returnEmptyString } from '../Utils';
 import { getForgot, getLogin, getLogout, getReset, getSignup, postForgot, postLogin, postReset, postSignup } from './authentication/controllers/user_controller';
 import { DashUserModel } from './authentication/models/user_model';
 import { Client } from './Client';
@@ -56,6 +56,8 @@ import { reject } from 'bluebird';
 import { ExifData } from 'exif';
 import { Result } from '../client/northstar/model/idea/idea';
 import RouteSubscriber from './RouteSubscriber';
+//@ts-ignore
+import * as bcrypt from "bcrypt-nodejs";
 
 const download = (url: string, dest: fs.PathLike) => request.get(url).pipe(fs.createWriteStream(dest));
 let youtubeApiKey: string;
@@ -671,10 +673,51 @@ addSecureRoute({
 addSecureRoute({
     method: Method.POST,
     subscribers: '/internalResetPassword',
-    onValidation: (user, _req, res) => {
+    onValidation: async (user, req, res) => {
+        const result: any = {};
+        // perhaps should assert whether curr password is entered correctly
+        const validated = await new Promise<Opt<boolean>>(resolve => {
+            bcrypt.compare(req.body.curr_pass, user.password, (err, result_1) => {
+                if (err) {
+                    result.error = "Incorrect current password";
+                    res.send(result);
+                    resolve(undefined);
+                } else {
+                    result.hm = err;
+                    resolve(result_1);
+                }
+            });
+        });
+
+        if (validated === undefined) {
+            return;
+        }
+
+        result.hello = validated;
+        req.assert("new_pass", "Password must be at least 4 characters long").len({ min: 4 });
+        req.assert("new_confirm", "Passwords do not match").equals(req.body.new_pass);
+
+        // was there error in validating new passwords?
+        if (req.validationErrors()) {
+            // was there error?
+            result.error = req.validationErrors();
+            result.pass = user.password;
+        }
+
+        user.password = req.body.password;
+        user.passwordResetToken = undefined;
+        user.passwordResetExpires = undefined;
+
+        user.save(function (err) {
+            result.error = "saving";
+            // was there error?
+        });
+
         // user password auth
         // new pass same
         // do extra stuff
+        //
+        res.send(result);
     }
 });
 
@@ -1173,7 +1216,6 @@ const suffixMap: { [type: string]: (string | [string, string | ((json: any) => a
     "pdf": ["_t", "url"],
     "audio": ["_t", "url"],
     "web": ["_t", "url"],
-    "RichTextField": ["_t", value => value.Text],
     "date": ["_d", value => new Date(value.date).toISOString()],
     "proxy": ["_i", "fieldId"],
     "list": ["_l", list => {
-- 
cgit v1.2.3-70-g09d2


From 88a716d8b7abb0255feea5bc32843ba68910eff5 Mon Sep 17 00:00:00 2001
From: kimdahey <claire_kim1@brown.edu>
Date: Thu, 5 Dec 2019 11:57:15 -0500
Subject: password reset live

---
 package.json                          |  2 +-
 src/client/util/SettingsManager.scss  | 34 +++++++++++++++++++++++-
 src/client/util/SettingsManager.tsx   | 50 +++++++++++++++++++++--------------
 src/server/ApiManagers/UserManager.ts | 49 ++++++++++++++++++++++++++++++++++
 4 files changed, 113 insertions(+), 22 deletions(-)

(limited to 'src/server')

diff --git a/package.json b/package.json
index 499aefdb5..574c7e7fa 100644
--- a/package.json
+++ b/package.json
@@ -229,4 +229,4 @@
         "xoauth2": "^1.2.0",
         "youtube": "^0.1.0"
     }
-}
\ No newline at end of file
+}
diff --git a/src/client/util/SettingsManager.scss b/src/client/util/SettingsManager.scss
index 0d637868b..228625182 100644
--- a/src/client/util/SettingsManager.scss
+++ b/src/client/util/SettingsManager.scss
@@ -1,17 +1,45 @@
 @import "../views/globalCssVariables";
 
+.dialogue-box {
+    background-color: whitesmoke !important;
+    color: grey;
+
+    button {
+        background: $lighter-alt-accent;
+        outline: none;
+        border-radius: 5px;
+        border: 0px;
+        color: #fcfbf7;
+        text-transform: uppercase;
+        letter-spacing: 2px;
+        font-size: 75%;
+        padding: 10px;
+        transition: transform 0.2s;
+        margin: 2px;
+    }
+}
+
 .settings-interface {
     display: flex;
     flex-direction: column;
 
+    input {
+        border-radius: 5px;
+        border: none;
+        padding: 4px 4px 4px 10px;
+        margin: 2px;
+    }
+
     .settings-body {
         display: flex;
         flex-direction: row;
 
+
         .settings-type {
             display: flex;
             flex-direction: column;
             flex-basis: 30%;
+
         }
 
         .settings-content {
@@ -20,6 +48,10 @@
             flex-direction: column;
             justify-content: space-between;
 
+            button {
+                background: $darker-alt-accent;
+            }
+
             input {
                 min-width: 100%;
             }
@@ -40,7 +72,7 @@
         color: $dark-color;
         text-transform: uppercase;
         letter-spacing: 2px;
-        font-size: 75%;
+        font-size: 120%;
     }
 
     .close-button {
diff --git a/src/client/util/SettingsManager.tsx b/src/client/util/SettingsManager.tsx
index ee2d9ff21..0fcb80a3f 100644
--- a/src/client/util/SettingsManager.tsx
+++ b/src/client/util/SettingsManager.tsx
@@ -7,7 +7,7 @@ import * as fa from '@fortawesome/free-solid-svg-icons';
 import { SelectionManager } from "./SelectionManager";
 import "./SettingsManager.scss";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { Identified } from "../Network";
+import { Networking } from "../Network";
 
 library.add(fa.faWindowClose);
 
@@ -36,21 +36,31 @@ export default class SettingsManager extends React.Component<{}> {
     }
 
     private dispatchRequest = async () => {
-        const curr_pass = this.curr_password_ref.current!.value;
-        const new_pass = this.new_password_ref.current!.value;
-        const new_confirm = this.new_confirm_ref.current!.value;
-        console.log('ready!');
-        // const { error, hello } = await Identified.PostToServer('/internalResetPassword', { curr_pass, new_pass, new_confirm });
-        const resp = await Identified.PostToServer('/internalResetPassword', { curr_pass, new_pass, new_confirm });
-        console.log('set!');
-        console.log('response', resp);
-        console.log('hm', resp.hm);
-        if (resp.error) {
-            // we failed
-            console.log(resp.error);
+        const curr_pass = this.curr_password_ref.current?.value;
+        const new_pass = this.new_password_ref.current?.value;
+        const new_confirm = this.new_confirm_ref.current?.value;
+
+        if (!(curr_pass && new_pass && new_confirm)) {
+            alert("Hey we're missing some fields!");
+            return;
+        }
+
+        const passwordBundle = {
+            curr_pass,
+            new_pass,
+            new_confirm
+        };
+        const { error } = await Networking.PostToServer('/internalResetPassword', passwordBundle);
+        if (error) {
+            alert("Uh oh! " + error);
+            return;
         }
-        console.log('go!');
-        // do stuff with response
+
+        alert("Password successfully updated!");
+    }
+
+    onClick = (event: any) => {
+        console.log(event);
     }
 
     private get settingsInterface() {
@@ -64,13 +74,13 @@ export default class SettingsManager extends React.Component<{}> {
                 </div>
                 <div className="settings-body">
                     <div className="settings-type">
-                        <p>changeable settings</p>
-                        <p>static data</p>
+                        <button onClick={this.onClick} value="settings">settings</button>
+                        <button onClick={this.onClick} value="data">data</button>
                     </div>
                     <div className="settings-content">
-                        <input ref={this.curr_password_ref} />
-                        <input ref={this.new_password_ref} />
-                        <input ref={this.new_confirm_ref} />
+                        <input placeholder="current password" ref={this.curr_password_ref} />
+                        <input placeholder="new password" ref={this.new_password_ref} />
+                        <input placeholder="confirm new password" ref={this.new_confirm_ref} />
                         <button onClick={this.dispatchRequest}>submit</button>
                         this changes with what you select!
                     </div>
diff --git a/src/server/ApiManagers/UserManager.ts b/src/server/ApiManagers/UserManager.ts
index 0f7d14320..7e8ceb189 100644
--- a/src/server/ApiManagers/UserManager.ts
+++ b/src/server/ApiManagers/UserManager.ts
@@ -2,6 +2,8 @@ import ApiManager, { Registration } from "./ApiManager";
 import { Method } from "../RouteManager";
 import { Database } from "../database";
 import { msToTime } from "../ActionUtilities";
+import * as bcrypt from "bcrypt-nodejs";
+import { Opt } from "../../new_fields/Doc";
 
 export const timeMap: { [id: string]: number } = {};
 interface ActivityUnit {
@@ -36,6 +38,53 @@ export default class UserManager extends ApiManager {
             onUnauthenticated: ({ res }) => res.send(JSON.stringify({ id: "__guest__", email: "" }))
         });
 
+        register({
+            method: Method.POST,
+            subscription: '/internalResetPassword',
+            onValidation: async ({ user, req, res }) => {
+                const result: any = {};
+                const { curr_pass, new_pass, new_confirm } = req.body;
+                // perhaps should assert whether curr password is entered correctly
+                const validated = await new Promise<Opt<boolean>>(resolve => {
+                    bcrypt.compare(curr_pass, user.password, (err, passwords_match) => {
+                        if (err) {
+                            result.error = "Incorrect current password";
+                            res.send(result);
+                            resolve(undefined);
+                        } else {
+                            resolve(passwords_match);
+                        }
+                    });
+                });
+
+                if (validated === undefined) {
+                    return;
+                }
+
+                req.assert("new_pass", "Password must be at least 4 characters long").len({ min: 4 });
+                req.assert("new_confirm", "Passwords do not match").equals(new_pass);
+
+                // was there error in validating new passwords?
+                if (req.validationErrors()) {
+                    // was there error?
+                    result.error = req.validationErrors();
+                }
+
+                user.password = new_pass;
+                user.passwordResetToken = undefined;
+                user.passwordResetExpires = undefined;
+
+                user.save(err => {
+                    if (err) {
+                        result.error = "saving";
+                    }
+                });
+
+                res.send(result);
+            }
+        });
+
+
         register({
             method: Method.GET,
             subscription: "/activity",
-- 
cgit v1.2.3-70-g09d2


From a9dab5e6befa36c54afd1e46507f266fda30a42e Mon Sep 17 00:00:00 2001
From: kimdahey <claire_kim1@brown.edu>
Date: Sat, 7 Dec 2019 17:07:36 -0500
Subject: progress

---
 src/client/util/SettingsManager.scss    |  9 ++++++
 src/client/util/SettingsManager.tsx     | 49 +++++++++++++++++++++++++--------
 src/server/ApiManagers/DeleteManager.ts | 17 +++++++++++-
 src/server/ApiManagers/UserManager.ts   | 12 +++++---
 4 files changed, 70 insertions(+), 17 deletions(-)

(limited to 'src/server')

diff --git a/src/client/util/SettingsManager.scss b/src/client/util/SettingsManager.scss
index 228625182..5839fa748 100644
--- a/src/client/util/SettingsManager.scss
+++ b/src/client/util/SettingsManager.scss
@@ -47,6 +47,7 @@
             display: flex;
             flex-direction: column;
             justify-content: space-between;
+            text-align: left;
 
             button {
                 background: $darker-alt-accent;
@@ -55,6 +56,14 @@
             input {
                 min-width: 100%;
             }
+
+            .error-text {
+                color: #C40233;
+            }
+
+            .success-text {
+                color: #009F6B;
+            }
         }
     }
 
diff --git a/src/client/util/SettingsManager.tsx b/src/client/util/SettingsManager.tsx
index 0fcb80a3f..e475cac1f 100644
--- a/src/client/util/SettingsManager.tsx
+++ b/src/client/util/SettingsManager.tsx
@@ -17,6 +17,9 @@ export default class SettingsManager extends React.Component<{}> {
     @observable private isOpen = false;
     @observable private dialogueBoxOpacity = 1;
     @observable private overlayOpacity = 0.4;
+    @observable private settingsContent = "settings";
+    @observable private errorText = "";
+    @observable private successText = "";
     private curr_password_ref = React.createRef<HTMLInputElement>();
     private new_password_ref = React.createRef<HTMLInputElement>();
     private new_confirm_ref = React.createRef<HTMLInputElement>();
@@ -35,13 +38,15 @@ export default class SettingsManager extends React.Component<{}> {
         SettingsManager.Instance = this;
     }
 
+    @action
     private dispatchRequest = async () => {
         const curr_pass = this.curr_password_ref.current?.value;
         const new_pass = this.new_password_ref.current?.value;
         const new_confirm = this.new_confirm_ref.current?.value;
 
         if (!(curr_pass && new_pass && new_confirm)) {
-            alert("Hey we're missing some fields!");
+            this.changeAlertText("Hey, we're missing some fields!", "");
+            // alert("Hey we're missing some fields!");
             return;
         }
 
@@ -50,17 +55,31 @@ export default class SettingsManager extends React.Component<{}> {
             new_pass,
             new_confirm
         };
-        const { error } = await Networking.PostToServer('/internalResetPassword', passwordBundle);
+
+        const res = await Networking.PostToServer('/internalResetPassword', passwordBundle);
+        const error = res.error;
+        console.log(res, "is res");
         if (error) {
-            alert("Uh oh! " + error);
+            console.log(error, error[0].msg);
+            this.changeAlertText("Uh oh! " + error[0].msg + "...", "");
+            // alert("Uh oh! " + error.msg);
             return;
         }
 
-        alert("Password successfully updated!");
+        this.changeAlertText("", "Password successfully updated!");
+        console.log('success!');
+        // alert("Password successfully updated!");
+    }
+
+    @action
+    private changeAlertText = (errortxt: string, successtxt: string) => {
+        this.errorText = errortxt;
+        this.successText = successtxt;
     }
 
+    @action
     onClick = (event: any) => {
-        console.log(event);
+        this.settingsContent = event.currentTarget.value;
     }
 
     private get settingsInterface() {
@@ -77,13 +96,19 @@ export default class SettingsManager extends React.Component<{}> {
                         <button onClick={this.onClick} value="settings">settings</button>
                         <button onClick={this.onClick} value="data">data</button>
                     </div>
-                    <div className="settings-content">
-                        <input placeholder="current password" ref={this.curr_password_ref} />
-                        <input placeholder="new password" ref={this.new_password_ref} />
-                        <input placeholder="confirm new password" ref={this.new_confirm_ref} />
-                        <button onClick={this.dispatchRequest}>submit</button>
-                        this changes with what you select!
-                    </div>
+                    {this.settingsContent === "settings" ?
+                        <div className="settings-content">
+                            change password here:
+                            <input placeholder="current password" ref={this.curr_password_ref} />
+                            <input placeholder="new password" ref={this.new_password_ref} />
+                            <input placeholder="confirm new password" ref={this.new_confirm_ref} />
+                            {this.errorText ? <div className="error-text">{this.errorText}</div> : undefined}
+                            {this.successText ? <div className="success-text">{this.successText}</div> : undefined}
+                            <button onClick={this.dispatchRequest}>submit</button>
+
+                        </div>
+                        :
+                        <div className="settings-content">hello?</div>}
                 </div>
 
             </div>
diff --git a/src/server/ApiManagers/DeleteManager.ts b/src/server/ApiManagers/DeleteManager.ts
index 71818c673..1fdc7cc36 100644
--- a/src/server/ApiManagers/DeleteManager.ts
+++ b/src/server/ApiManagers/DeleteManager.ts
@@ -1,5 +1,5 @@
 import ApiManager, { Registration } from "./ApiManager";
-import { Method, _permission_denied } from "../RouteManager";
+import { Method, _permission_denied, OnUnauthenticated } from "../RouteManager";
 import { WebSocket } from "../Websocket/Websocket";
 import { Database } from "../database";
 
@@ -31,6 +31,21 @@ export default class DeleteManager extends ApiManager {
             }
         });
 
+        const hi: OnUnauthenticated = async ({ res, isRelease }) => {
+            if (isRelease) {
+                return _permission_denied(res, deletionPermissionError);
+            }
+            await Database.Instance.deleteAll('users');
+            res.redirect("/home");
+        };
+
+        // register({
+        //     method: Method.GET,
+        //     subscription: "/deleteUsers",
+        //     onValidation: hi,
+        //     onUnauthenticated: hi
+        // });
+
 
         register({
             method: Method.GET,
diff --git a/src/server/ApiManagers/UserManager.ts b/src/server/ApiManagers/UserManager.ts
index 7e8ceb189..3ae2a5d30 100644
--- a/src/server/ApiManagers/UserManager.ts
+++ b/src/server/ApiManagers/UserManager.ts
@@ -47,8 +47,8 @@ export default class UserManager extends ApiManager {
                 // perhaps should assert whether curr password is entered correctly
                 const validated = await new Promise<Opt<boolean>>(resolve => {
                     bcrypt.compare(curr_pass, user.password, (err, passwords_match) => {
-                        if (err) {
-                            result.error = "Incorrect current password";
+                        if (err || !passwords_match) {
+                            result.error = [{ msg: "Incorrect current password" }];
                             res.send(result);
                             resolve(undefined);
                         } else {
@@ -61,9 +61,13 @@ export default class UserManager extends ApiManager {
                     return;
                 }
 
-                req.assert("new_pass", "Password must be at least 4 characters long").len({ min: 4 });
+                // req.assert("new_pass", "Password must be at least 4 characters long").len({ min: 4 });
                 req.assert("new_confirm", "Passwords do not match").equals(new_pass);
 
+                if (req.assert("new_pass", "Password must be at least 4 characters long").len({ min: 4 })) {
+                    result.inch = "interesting";
+                }
+
                 // was there error in validating new passwords?
                 if (req.validationErrors()) {
                     // was there error?
@@ -76,7 +80,7 @@ export default class UserManager extends ApiManager {
 
                 user.save(err => {
                     if (err) {
-                        result.error = "saving";
+                        result.error = [{ msg: "Error while saving new password" }];
                     }
                 });
 
-- 
cgit v1.2.3-70-g09d2


From 130aaa1a8f2525db12479fcfef2204ed85a2b58b Mon Sep 17 00:00:00 2001
From: kimdahey <claire_kim1@brown.edu>
Date: Sat, 7 Dec 2019 17:21:40 -0500
Subject: rolled back to working state, saving new changes

---
 src/client/util/SettingsManager.tsx   | 49 ++++++++++++++++++++++++++---------
 src/server/ApiManagers/UserManager.ts | 13 +++++++---
 2 files changed, 46 insertions(+), 16 deletions(-)

(limited to 'src/server')

diff --git a/src/client/util/SettingsManager.tsx b/src/client/util/SettingsManager.tsx
index 0fcb80a3f..e475cac1f 100644
--- a/src/client/util/SettingsManager.tsx
+++ b/src/client/util/SettingsManager.tsx
@@ -17,6 +17,9 @@ export default class SettingsManager extends React.Component<{}> {
     @observable private isOpen = false;
     @observable private dialogueBoxOpacity = 1;
     @observable private overlayOpacity = 0.4;
+    @observable private settingsContent = "settings";
+    @observable private errorText = "";
+    @observable private successText = "";
     private curr_password_ref = React.createRef<HTMLInputElement>();
     private new_password_ref = React.createRef<HTMLInputElement>();
     private new_confirm_ref = React.createRef<HTMLInputElement>();
@@ -35,13 +38,15 @@ export default class SettingsManager extends React.Component<{}> {
         SettingsManager.Instance = this;
     }
 
+    @action
     private dispatchRequest = async () => {
         const curr_pass = this.curr_password_ref.current?.value;
         const new_pass = this.new_password_ref.current?.value;
         const new_confirm = this.new_confirm_ref.current?.value;
 
         if (!(curr_pass && new_pass && new_confirm)) {
-            alert("Hey we're missing some fields!");
+            this.changeAlertText("Hey, we're missing some fields!", "");
+            // alert("Hey we're missing some fields!");
             return;
         }
 
@@ -50,17 +55,31 @@ export default class SettingsManager extends React.Component<{}> {
             new_pass,
             new_confirm
         };
-        const { error } = await Networking.PostToServer('/internalResetPassword', passwordBundle);
+
+        const res = await Networking.PostToServer('/internalResetPassword', passwordBundle);
+        const error = res.error;
+        console.log(res, "is res");
         if (error) {
-            alert("Uh oh! " + error);
+            console.log(error, error[0].msg);
+            this.changeAlertText("Uh oh! " + error[0].msg + "...", "");
+            // alert("Uh oh! " + error.msg);
             return;
         }
 
-        alert("Password successfully updated!");
+        this.changeAlertText("", "Password successfully updated!");
+        console.log('success!');
+        // alert("Password successfully updated!");
+    }
+
+    @action
+    private changeAlertText = (errortxt: string, successtxt: string) => {
+        this.errorText = errortxt;
+        this.successText = successtxt;
     }
 
+    @action
     onClick = (event: any) => {
-        console.log(event);
+        this.settingsContent = event.currentTarget.value;
     }
 
     private get settingsInterface() {
@@ -77,13 +96,19 @@ export default class SettingsManager extends React.Component<{}> {
                         <button onClick={this.onClick} value="settings">settings</button>
                         <button onClick={this.onClick} value="data">data</button>
                     </div>
-                    <div className="settings-content">
-                        <input placeholder="current password" ref={this.curr_password_ref} />
-                        <input placeholder="new password" ref={this.new_password_ref} />
-                        <input placeholder="confirm new password" ref={this.new_confirm_ref} />
-                        <button onClick={this.dispatchRequest}>submit</button>
-                        this changes with what you select!
-                    </div>
+                    {this.settingsContent === "settings" ?
+                        <div className="settings-content">
+                            change password here:
+                            <input placeholder="current password" ref={this.curr_password_ref} />
+                            <input placeholder="new password" ref={this.new_password_ref} />
+                            <input placeholder="confirm new password" ref={this.new_confirm_ref} />
+                            {this.errorText ? <div className="error-text">{this.errorText}</div> : undefined}
+                            {this.successText ? <div className="success-text">{this.successText}</div> : undefined}
+                            <button onClick={this.dispatchRequest}>submit</button>
+
+                        </div>
+                        :
+                        <div className="settings-content">hello?</div>}
                 </div>
 
             </div>
diff --git a/src/server/ApiManagers/UserManager.ts b/src/server/ApiManagers/UserManager.ts
index 7e8ceb189..3a7e924ee 100644
--- a/src/server/ApiManagers/UserManager.ts
+++ b/src/server/ApiManagers/UserManager.ts
@@ -47,8 +47,8 @@ export default class UserManager extends ApiManager {
                 // perhaps should assert whether curr password is entered correctly
                 const validated = await new Promise<Opt<boolean>>(resolve => {
                     bcrypt.compare(curr_pass, user.password, (err, passwords_match) => {
-                        if (err) {
-                            result.error = "Incorrect current password";
+                        if (err || !passwords_match) {
+                            result.error = [{ msg: "Incorrect current password" }];
                             res.send(result);
                             resolve(undefined);
                         } else {
@@ -61,9 +61,13 @@ export default class UserManager extends ApiManager {
                     return;
                 }
 
-                req.assert("new_pass", "Password must be at least 4 characters long").len({ min: 4 });
+                // req.assert("new_pass", "Password must be at least 4 characters long").len({ min: 4 });
                 req.assert("new_confirm", "Passwords do not match").equals(new_pass);
 
+                // if (req.assert("new_pass", "Password must be at least 4 characters long").len({ min: 4 })) {
+                //     result.inch = "interesting";
+                // }
+
                 // was there error in validating new passwords?
                 if (req.validationErrors()) {
                     // was there error?
@@ -76,7 +80,7 @@ export default class UserManager extends ApiManager {
 
                 user.save(err => {
                     if (err) {
-                        result.error = "saving";
+                        result.error = [{ msg: "Error while saving new password" }];
                     }
                 });
 
@@ -85,6 +89,7 @@ export default class UserManager extends ApiManager {
         });
 
 
+
         register({
             method: Method.GET,
             subscription: "/activity",
-- 
cgit v1.2.3-70-g09d2


From 4e3037dac61105f01397d55febb38b2d5bfa50f1 Mon Sep 17 00:00:00 2001
From: kimdahey <claire_kim1@brown.edu>
Date: Sat, 7 Dec 2019 18:04:34 -0500
Subject: added forgot password indication

---
 src/client/util/SettingsManager.tsx   | 10 ++--------
 src/server/ApiManagers/UserManager.ts | 23 +++++++++--------------
 views/login.pug                       |  2 +-
 3 files changed, 12 insertions(+), 23 deletions(-)

(limited to 'src/server')

diff --git a/src/client/util/SettingsManager.tsx b/src/client/util/SettingsManager.tsx
index e475cac1f..4872d7280 100644
--- a/src/client/util/SettingsManager.tsx
+++ b/src/client/util/SettingsManager.tsx
@@ -46,7 +46,6 @@ export default class SettingsManager extends React.Component<{}> {
 
         if (!(curr_pass && new_pass && new_confirm)) {
             this.changeAlertText("Hey, we're missing some fields!", "");
-            // alert("Hey we're missing some fields!");
             return;
         }
 
@@ -56,19 +55,13 @@ export default class SettingsManager extends React.Component<{}> {
             new_confirm
         };
 
-        const res = await Networking.PostToServer('/internalResetPassword', passwordBundle);
-        const error = res.error;
-        console.log(res, "is res");
+        const { error } = await Networking.PostToServer('/internalResetPassword', passwordBundle);
         if (error) {
-            console.log(error, error[0].msg);
             this.changeAlertText("Uh oh! " + error[0].msg + "...", "");
-            // alert("Uh oh! " + error.msg);
             return;
         }
 
         this.changeAlertText("", "Password successfully updated!");
-        console.log('success!');
-        // alert("Password successfully updated!");
     }
 
     @action
@@ -105,6 +98,7 @@ export default class SettingsManager extends React.Component<{}> {
                             {this.errorText ? <div className="error-text">{this.errorText}</div> : undefined}
                             {this.successText ? <div className="success-text">{this.successText}</div> : undefined}
                             <button onClick={this.dispatchRequest}>submit</button>
+                            <a href="/forgotPassword">forgot password?</a>
 
                         </div>
                         :
diff --git a/src/server/ApiManagers/UserManager.ts b/src/server/ApiManagers/UserManager.ts
index 6997cb192..4556e01ea 100644
--- a/src/server/ApiManagers/UserManager.ts
+++ b/src/server/ApiManagers/UserManager.ts
@@ -61,28 +61,23 @@ export default class UserManager extends ApiManager {
                     return;
                 }
 
-                // req.assert("new_pass", "Password must be at least 4 characters long").len({ min: 4 });
+                req.assert("new_pass", "Password must be at least 4 characters long").len({ min: 4 });
                 req.assert("new_confirm", "Passwords do not match").equals(new_pass);
-
-<<<<<<< HEAD
-                // if (req.assert("new_pass", "Password must be at least 4 characters long").len({ min: 4 })) {
-                //     result.inch = "interesting";
-                // }
-=======
-                if (req.assert("new_pass", "Password must be at least 4 characters long").len({ min: 4 })) {
-                    result.inch = "interesting";
+                if (curr_pass === new_pass) {
+                    result.error = [{ msg: "Current and new password are the same" }];
                 }
->>>>>>> a9dab5e6befa36c54afd1e46507f266fda30a42e
-
                 // was there error in validating new passwords?
                 if (req.validationErrors()) {
                     // was there error?
                     result.error = req.validationErrors();
                 }
 
-                user.password = new_pass;
-                user.passwordResetToken = undefined;
-                user.passwordResetExpires = undefined;
+                // will only change password if there are no errors.
+                if (!result.error) {
+                    user.password = new_pass;
+                    user.passwordResetToken = undefined;
+                    user.passwordResetExpires = undefined;
+                }
 
                 user.save(err => {
                     if (err) {
diff --git a/views/login.pug b/views/login.pug
index 26da5e29e..98816e9c8 100644
--- a/views/login.pug
+++ b/views/login.pug
@@ -9,7 +9,7 @@ block content
         .overlay(id='overlay_login')
             a(href="/signup")
                 img(id='new_user', src="https://bit.ly/2EuqPb4", alt="")
-            a(href="/forgot")
+            a(href="/forgotPassword")
                 img(id='forgot', src="https://bit.ly/2XjHpSo", alt="")
             .inner.login
                 h3.auth_header Log In
-- 
cgit v1.2.3-70-g09d2


From acf72eb45bdcdda5a87a7017f698793d2feea1c4 Mon Sep 17 00:00:00 2001
From: kimdahey <claire_kim1@brown.edu>
Date: Thu, 16 Jan 2020 11:46:12 -0500
Subject: extra fixes after pull from master

---
 src/client/views/MainView.tsx         | 3 ---
 src/server/ApiManagers/UserManager.ts | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/server')

diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index 05bfee95b..b300b0471 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -39,12 +39,9 @@ import MarqueeOptionsMenu from './collections/collectionFreeForm/MarqueeOptionsM
 import InkSelectDecorations from './InkSelectDecorations';
 import { Scripting } from '../util/Scripting';
 import { AudioBox } from './nodes/AudioBox';
-<<<<<<< HEAD
 import SettingsManager from '../util/SettingsManager';
-=======
 import { TraceMobx } from '../../new_fields/util';
 import RichTextMenu from '../util/RichTextMenu';
->>>>>>> e410cde0e430553002d4e1a2f64364b57b65fdbc
 
 @observer
 export class MainView extends React.Component {
diff --git a/src/server/ApiManagers/UserManager.ts b/src/server/ApiManagers/UserManager.ts
index 36d48e366..b0d868918 100644
--- a/src/server/ApiManagers/UserManager.ts
+++ b/src/server/ApiManagers/UserManager.ts
@@ -41,7 +41,7 @@ export default class UserManager extends ApiManager {
         register({
             method: Method.POST,
             subscription: '/internalResetPassword',
-            onValidation: async ({ user, req, res }) => {
+            secureHandler: async ({ user, req, res }) => {
                 const result: any = {};
                 const { curr_pass, new_pass, new_confirm } = req.body;
                 // perhaps should assert whether curr password is entered correctly
-- 
cgit v1.2.3-70-g09d2


From 42b325a94f66e6da0a9fdb0ca0740c01ac7b52f1 Mon Sep 17 00:00:00 2001
From: kimdahey <claire_kim1@brown.edu>
Date: Thu, 16 Jan 2020 14:59:37 -0500
Subject: additional qol changes

---
 src/client/util/SettingsManager.scss | 38 ++++++++++++++++++++++++------------
 src/client/util/SettingsManager.tsx  |  6 +++++-
 src/client/views/MainView.scss       | 12 +++++++-----
 src/server/Websocket/Websocket.ts    |  7 ++++++-
 4 files changed, 44 insertions(+), 19 deletions(-)

(limited to 'src/server')

diff --git a/src/client/util/SettingsManager.scss b/src/client/util/SettingsManager.scss
index 5839fa748..9b6a2ccae 100644
--- a/src/client/util/SettingsManager.scss
+++ b/src/client/util/SettingsManager.scss
@@ -3,6 +3,8 @@
 .dialogue-box {
     background-color: whitesmoke !important;
     color: grey;
+    width: 400px;
+    height: 300px;
 
     button {
         background: $lighter-alt-accent;
@@ -14,6 +16,7 @@
         letter-spacing: 2px;
         font-size: 75%;
         padding: 10px;
+        margin: 10px;
         transition: transform 0.2s;
         margin: 2px;
     }
@@ -23,6 +26,23 @@
     display: flex;
     flex-direction: column;
 
+    button {
+        width: 100px;
+        align-self: center;
+        background: $darker-alt-accent;
+    }
+
+    .delete-button {
+        background: rgb(227, 86, 86);
+    }
+
+    .close-button {
+        position: absolute;
+        right: 1em;
+        top: 1em;
+    }
+
+
     input {
         border-radius: 5px;
         border: none;
@@ -32,8 +52,7 @@
 
     .settings-body {
         display: flex;
-        flex-direction: row;
-
+        justify-content: space-between;
 
         .settings-type {
             display: flex;
@@ -44,13 +63,14 @@
 
         .settings-content {
             padding-left: 1em;
+            padding-right: 1em;
             display: flex;
             flex-direction: column;
-            justify-content: space-between;
-            text-align: left;
+            justify-content: space-around;
+            // text-align: left;
 
-            button {
-                background: $darker-alt-accent;
+            ::placeholder {
+                color: $intermediate-color;
             }
 
             input {
@@ -84,12 +104,6 @@
         font-size: 120%;
     }
 
-    .close-button {
-        position: absolute;
-        right: 1em;
-        top: 1em;
-    }
-
     .container {
         display: block;
         position: relative;
diff --git a/src/client/util/SettingsManager.tsx b/src/client/util/SettingsManager.tsx
index 652af438b..6f852a3e6 100644
--- a/src/client/util/SettingsManager.tsx
+++ b/src/client/util/SettingsManager.tsx
@@ -101,7 +101,11 @@ export default class SettingsManager extends React.Component<{}> {
                         </div>
                         : undefined}
                     {this.settingsContent === "data" ?
-                        <div className="settings-content">hiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii</div>
+                        <div className="settings-content">
+                            WARNING: <br />
+                            THIS WILL ERASE ALL YOUR CURRENT DOCUMENTS STORED ON DASH. IF YOU WISH TO PROCEED, CLICK THE BUTTON BELOW.
+                            <button className="delete-button">DELETE</button>
+                        </div>
                         : undefined}
                 </div>
 
diff --git a/src/client/views/MainView.scss b/src/client/views/MainView.scss
index ab0a8e49b..0bc07fa43 100644
--- a/src/client/views/MainView.scss
+++ b/src/client/views/MainView.scss
@@ -5,6 +5,7 @@
 .mainView-tabButtons {
     position: relative;
     width: 100%;
+
     .documentView-node-topmost {
         height: 200% !important;
     }
@@ -12,8 +13,8 @@
 
 .mainContent-div {
     position: relative;
-    width:100%;
-    height:100%;
+    width: 100%;
+    height: 100%;
 }
 
 .mainView-contentArea {
@@ -21,6 +22,7 @@
         height: 200% !important;
     }
 }
+
 // add nodes menu. Note that the + button is actually an input label, not an actual button.
 .mainView-docButtons {
     position: absolute;
@@ -79,8 +81,8 @@
 
 .mainView-logout {
     position: absolute;
-    right: 5;
-    bottom: 5;
+    right: 0;
+    bottom: 0;
     font-size: 8px;
 }
 
@@ -90,7 +92,7 @@
 
 .mainView-libraryFlyout {
     height: 100%;
-    width:100%;
+    width: 100%;
     position: absolute;
     display: flex;
     flex-direction: column;
diff --git a/src/server/Websocket/Websocket.ts b/src/server/Websocket/Websocket.ts
index 6dda6956e..9e6ad1c72 100644
--- a/src/server/Websocket/Websocket.ts
+++ b/src/server/Websocket/Websocket.ts
@@ -28,7 +28,7 @@ export namespace WebSocket {
 
     function initialize(isRelease: boolean) {
         const endpoint = io();
-        endpoint.on("connection", function(socket: Socket) {
+        endpoint.on("connection", function (socket: Socket) {
             _socket = socket;
 
             socket.use((_packet, next) => {
@@ -89,6 +89,11 @@ export namespace WebSocket {
         await Database.Instance.deleteAll('newDocuments');
     }
 
+    // export async function deleteUserDocuments() {
+    //     await Database.Instance.deleteAll();
+    //     await Database.Instance.deleteAll('newDocuments');
+    // }
+
     export async function deleteAll() {
         await Database.Instance.deleteAll();
         await Database.Instance.deleteAll('newDocuments');
-- 
cgit v1.2.3-70-g09d2