aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbobzel <zzzman@gmail.com>2024-04-04 21:57:38 -0400
committerbobzel <zzzman@gmail.com>2024-04-04 21:57:38 -0400
commite9beb7f86c50b460bb2a7a5b5d4136d0571ef2d3 (patch)
tree76ce4ec6ea35aee65fecb3e6cb2b2e988fe47468
parent63a4516c0bf6d5ece7601ea76ed7628e6a0e6ee7 (diff)
trying to get start-release to work
-rw-r--r--package.json2
-rw-r--r--src/server/authentication/AuthenticationManager.ts24
-rw-r--r--tsconfig.json5
3 files changed, 16 insertions, 15 deletions
diff --git a/package.json b/package.json
index 5874d913e..4b1a12a60 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
"child_process": "empty"
},
"scripts": {
- "start-release": "cross-env RELEASE=true USE_AZURE=false NODE_OPTIONS=--max_old_space_size=4096 ts-node-dev --transpile-only -- src/server/index.ts",
+ "start-release": "cross-env RELEASE=true USE_AZURE=false NODE_OPTIONS=--max_old_space_size=4096 ts-node-dev --files src/server/index.ts",
"start-release-debug": "cross-env RELEASE=true USE_AZURE=true NODE_OPTIONS=--max_old_space_size=4096 ts-node-dev --inspect -- src/server/index.ts",
"start": "cross-env NODE_OPTIONS=--max_old_space_size=4096 ts-node-dev --debug --transpile-only -- src/server/index.ts",
"debug": "cross-env NODE_OPTIONS=--max_old_space_size=8192 ts-node-dev --transpile-only --inspect -- src/server/index.ts",
diff --git a/src/server/authentication/AuthenticationManager.ts b/src/server/authentication/AuthenticationManager.ts
index b1b84c300..9c1525df0 100644
--- a/src/server/authentication/AuthenticationManager.ts
+++ b/src/server/authentication/AuthenticationManager.ts
@@ -56,7 +56,7 @@ export let postSignup = (req: Request, res: Response, next: NextFunction) => {
const user = new User(model);
User.findOne({ email })
- .then(existingUser => {
+ .then((existingUser: any) => {
if (existingUser) {
return res.redirect('/login');
}
@@ -67,9 +67,9 @@ export let postSignup = (req: Request, res: Response, next: NextFunction) => {
tryRedirectToTarget(req, res);
});
})
- .catch(err => next(err));
+ .catch((err: any) => next(err));
})
- .catch(err => next(err));
+ .catch((err: any) => next(err));
};
const tryRedirectToTarget = (req: Request, res: Response) => {
@@ -104,8 +104,8 @@ export let getLogin = (req: Request, res: Response) => {
export let postLogin = (req: Request, res: Response, next: NextFunction) => {
if (req.body.email === '') {
User.findOne({ email: 'guest' })
- .then(user => !user && initializeGuest())
- .catch(err => err);
+ .then((user: any) => !user && initializeGuest())
+ .catch((err: any) => err);
req.body.email = 'guest';
req.body.password = 'guest';
} else {
@@ -115,7 +115,7 @@ export let postLogin = (req: Request, res: Response, next: NextFunction) => {
}
if (validationResult(req).array().length) {
- req.flash('errors', 'Unable to login at this time. Please try again.');
+ // req.flash('errors', 'Unable to login at this time. Please try again.');
return res.redirect('/signup');
}
@@ -171,7 +171,7 @@ export let postForgot = function (req: Request, res: Response, next: NextFunctio
});
},
function (token: string, done: any) {
- User.findOne({ email }).then(user => {
+ User.findOne({ email }).then((user: any) => {
if (!user) {
// NO ACCOUNT WITH SUBMITTED EMAIL
res.redirect('/forgotPassword');
@@ -219,14 +219,14 @@ export let postForgot = function (req: Request, res: Response, next: NextFunctio
export let getReset = function (req: Request, res: Response) {
User.findOne({ passwordResetToken: req.params.token, passwordResetExpires: { $gt: Date.now() } })
- .then(user => {
+ .then((user: any) => {
if (!user) return res.redirect('/forgotPassword');
res.render('reset.pug', {
title: 'Reset Password',
user: req.user,
});
})
- .catch(err => res.redirect('/forgotPassword'));
+ .catch((err: any) => res.redirect('/forgotPassword'));
};
export let postReset = function (req: Request, res: Response) {
@@ -234,7 +234,7 @@ export let postReset = function (req: Request, res: Response) {
[
function (done: any) {
User.findOne({ passwordResetToken: req.params.token, passwordResetExpires: { $gt: Date.now() } })
- .then(user => {
+ .then((user: any) => {
if (!user) return res.redirect('back');
check('password', 'Password must be at least 4 characters long').isLength({ min: 4 }).run(req);
@@ -251,10 +251,10 @@ export let postReset = function (req: Request, res: Response) {
() => (req as any).logIn(user),
(err: any) => err
)
- .catch(err => res.redirect('/login'));
+ .catch((err: any) => res.redirect('/login'));
done(null, user);
})
- .catch(err => res.redirect('back'));
+ .catch((err: any) => res.redirect('back'));
},
function (user: DashUserModel, done: any) {
const smtpTransport = nodemailer.createTransport({
diff --git a/tsconfig.json b/tsconfig.json
index 680927421..dd9a66bc0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -13,7 +13,7 @@
"sourceMap": true,
"outDir": "dist",
"lib": ["dom", "es2017"],
- "typeRoots": ["node_modules/@types", "./src/typings", "./src/extensions/General"],
+ "typeRoots": ["./src/typings", "node_modules/@types", "./src/extensions/General"],
"resolveJsonModule": true,
"moduleResolution": "node"
},
@@ -21,5 +21,6 @@
// "node_modules",
// "static"
// ],
- "typeRoots": ["./node_modules/@types", "./src/typings"]
+
+ "typeRoots": ["./src/typings", "./node_modules/@types"]
}