express-generator-typescript 2.4.25 → 2.5.0

package/lib/project-files-auth/src/public/scripts/users.js

@@ -1,138 +0,0 @@
-// **** Variables **** //
-
-const DateFormatter = new Intl.DateTimeFormat('en-US', {
-  year: 'numeric',
-  month: '2-digit',
-  day: '2-digit',
-});
-
-const formatDate = (date) => DateFormatter.format(new Date(date));
-
-
-// **** Run **** //
-
-// Start
-displayUsers();
-
-/**
- * Call api
- */
-function displayUsers() {
-  Http
-    .get('/api/users/all')
-    .then(resp => resp.json())
-    .then(resp => {
-      var allUsersTemplate = document.getElementById('all-users-template'),
-        allUsersTemplateHtml = allUsersTemplate.innerHTML,
-        template = Handlebars.compile(allUsersTemplateHtml);
-      var allUsersAnchor = document.getElementById('all-users-anchor');
-      allUsersAnchor.innerHTML = template({
-        users: resp.users.map(user => ({
-          ...user,
-          createdFormatted: formatDate(user.created),
-        })),
-      });
-    });
-}
-
-// Setup event listener for button click
-document.addEventListener('click', event => {
-  event.preventDefault();
-  var ele = event.target;
-  if (ele.matches('#add-user-btn')) {
-    addUser();
-  } else if (ele.matches('.edit-user-btn')) {
-    showEditView(ele.parentNode.parentNode);
-  } else if (ele.matches('.cancel-edit-btn')) {
-    cancelEdit(ele.parentNode.parentNode);
-  } else if (ele.matches('.submit-edit-btn')) {
-    submitEdit(ele);
-  } else if (ele.matches('.delete-user-btn')) {
-    deleteUser(ele);
-  } else if (ele.matches('#logout-btn')) {
-    logoutUser();
-  }
-}, false);
-
-/**
- * Add a new user.
- */
-function addUser() {
-  var nameInput = document.getElementById('name-input');
-  var emailInput = document.getElementById('email-input');
-  var data = {
-    user: {
-      id: -1,
-      name: nameInput.value,
-      email: emailInput.value,
-      created: new Date(),
-    },
-  };
-  // Call api
-  Http
-    .post('/api/users/add', data)
-    .then(() => {
-      nameInput.value = '';
-      emailInput.value = '';
-      displayUsers();
-    });
-}
-
-/**
- * Show edit view.
- */
-function showEditView(userEle) {
-  var normalView = userEle.getElementsByClassName('normal-view')[0];
-  var editView = userEle.getElementsByClassName('edit-view')[0];
-  normalView.style.display = 'none';
-  editView.style.display = 'block';
-}
-
-/**
- * Cancel edit.
- */
-function cancelEdit(userEle) {
-  var normalView = userEle.getElementsByClassName('normal-view')[0];
-  var editView = userEle.getElementsByClassName('edit-view')[0];
-  normalView.style.display = 'block';
-  editView.style.display = 'none';
-}
-
-/**
- * Submit edit.
- */
-function submitEdit(ele) {
-  var userEle = ele.parentNode.parentNode;
-  var nameInput = userEle.getElementsByClassName('name-edit-input')[0];
-  var emailInput = userEle.getElementsByClassName('email-edit-input')[0];
-  var id = ele.getAttribute('data-user-id');
-  var created = ele.getAttribute('data-user-created');
-    console.log(ele, created)
-  var data = {
-    user: {
-      id: Number(id),
-      name: nameInput.value,
-      email: emailInput.value,
-      created: new Date(created),
-    },
-  };
-	Http
-    .put('/api/users/update', data)
-    .then(() => displayUsers());
-}
-
-/**
- * Delete a user
- */
-function deleteUser(ele) {
-  var id = ele.getAttribute('data-user-id');
-	Http
-    .delete('/api/users/delete/' + id)
-    .then(() => displayUsers());
-}
-
-function logoutUser() {
-  Http
-    .get('/api/auth/logout')
-    .then(() => window.location.href = '/');
-}

package/lib/project-files-auth/src/public/stylesheets/login.css

@@ -1,24 +0,0 @@
-body {
-  padding: 100px;
-  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
-}
-
-body .login-block {
-  display: inline-block;
-  margin-right: 2em;
-  vertical-align: top;
-}
-
-body .login-block .login-header {
-  font-weight: bold;
-  margin-bottom: 1em;
-}
-
-body .login-block .login-input {
-  margin-bottom: 1em;
-}
-
-body .login-block .default-login-user {
-  margin-top: 1em;
-  color: #909090;
-}

package/lib/project-files-auth/src/public/stylesheets/users.css

@@ -1,43 +0,0 @@
-body {
-  padding: 100px;
-  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
-}
-
-body .users-column {
-  display: inline-block;
-  margin-right: 2em;
-  vertical-align: top;
-}
-
-body .users-column .column-header {
-  padding-bottom: 5px;
-  font-weight: 700;
-  font-size: 1.2em;
-}
-
-
-/** Add User Column **/
-
-body .add-user-col input {
-  margin-bottom: 10px;
-}
-
-
-/** Users Display Column **/
-
-.email-edit {
-  padding-bottom: 8px;
-}
-
-body .users-column .user-display-ele {
-  padding-bottom: 10px;
-}
-
-body .users-column .user-display-ele button {
-  margin-top: 2px;
-  margin-bottom: 10px;
-}
-
-body .users-column .user-display-ele .edit-view {
-  display: none;
-}

package/lib/project-files-auth/src/repos/MockOrm.ts

@@ -1,42 +0,0 @@
-
-
-import jsonfile from 'jsonfile';
-
-import { IUser } from '@src/models/User';
-
-
-// **** Variables **** //
-
-const DB_FILE_NAME = 'database.json';
-
-
-// **** Types **** //
-
-interface IDb {
-  users: IUser[];
-}
-
-
-// **** Functions **** //
-
-/**
- * Fetch the json from the file.
- */
-function openDb(): Promise<IDb> {
-  return jsonfile.readFile(__dirname + '/' + DB_FILE_NAME) as Promise<IDb>;
-}
-
-/**
- * Update the file.
- */
-function saveDb(db: IDb): Promise<void> {
-  return jsonfile.writeFile((__dirname + '/' + DB_FILE_NAME), db);
-}
-
-
-// **** Export default **** //
-
-export default {
-  openDb,
-  saveDb,
-} as const;

package/lib/project-files-auth/src/repos/UserRepo.ts

@@ -1,93 +0,0 @@
-import { IUser } from '@src/models/User';
-import { getRandomInt } from '@src/util/misc';
-import orm from './MockOrm';
-
-
-// **** Functions **** //
-
-/**
- * Get one user.
- */
-async function getOne(email: string): Promise<IUser | null> {
-  const db = await orm.openDb();
-  for (const user of db.users) {
-    if (user.email === email) {
-      return user;
-    }
-  }
-  return null;
-}
-
-/**
- * See if a user with the given id exists.
- */
-async function persists(id: number): Promise<boolean> {
-  const db = await orm.openDb();
-  for (const user of db.users) {
-    if (user.id === id) {
-      return true;
-    }
-  }
-  return false;
-}
-
-/**
- * Get all users.
- */
-async function getAll(): Promise<IUser[]> {
-  const db = await orm.openDb();
-  return db.users;
-}
-
-/**
- * Add one user.
- */
-async function add(user: IUser): Promise<void> {
-  const db = await orm.openDb();
-  user.id = getRandomInt();
-  db.users.push(user);
-  return orm.saveDb(db);
-}
-
-/**
- * Update a user.
- */
-async function update(user: IUser): Promise<void> {
-  const db = await orm.openDb();
-  for (let i = 0; i < db.users.length; i++) {
-    if (db.users[i].id === user.id) {
-      const dbUser = db.users[i];
-      db.users[i] = {
-        ...dbUser,
-        name: user.name,
-        email: user.email,
-      };
-      return orm.saveDb(db);
-    }
-  }
-}
-
-/**
- * Delete one user.
- */
-async function delete_(id: number): Promise<void> {
-  const db = await orm.openDb();
-  for (let i = 0; i < db.users.length; i++) {
-    if (db.users[i].id === id) {
-      db.users.splice(i, 1);
-      return orm.saveDb(db);
-    }
-  }
-}
-
-
-// **** Export default **** //
-
-export default {
-  getOne,
-  persists,
-  getAll,
-  add,
-  update,
-  delete: delete_,
-} as const;

package/lib/project-files-auth/src/repos/database.json

@@ -1 +0,0 @@
-{"users":[{"name":"Sean Maxwell","email":"sean.maxwell@gmail.com","pwdHash":"$2b$12$1mE2OI9hMS/rgH9Mi0s85OM2V5gzm7aF3gJIWH1y0S1MqVBueyjsy","role":1,"id":159123164363,"created":"2024-03-22T05:20:55.079Z"},{"name":"John Smith","email":"john.smith@yahoo.com","pwdHash":"$2b$12$1mE2OI9hMS/rgH9Mi0s85OM2V5gzm7aF3gJIWH1y0S1MqVBueyjsy","role":0,"id":357437875835,"created":"2024-03-22T05:20:55.079Z"},{"id":28541714318,"name":"Gordan Freeman","email":"nova@prospect.com","created":"2024-03-23T15:56:42.615Z"}]}

package/lib/project-files-auth/src/routes/AuthRoutes.ts

@@ -1,42 +0,0 @@
-import HttpStatusCodes from '@src/common/HttpStatusCodes';
-import SessionUtil from '@src/util/SessionUtil';
-import AuthService from '@src/services/AuthService';
-
-import { IReq, IRes } from './common/types';
-import check from './common/check';
-
-
-// **** Functions **** //
-
-/**
- * Login a user.
- */
-async function login(req: IReq, res: IRes) {
-  const [ email, password ] = check.isStr(req.body, ['email', 'password']),
-    user = await AuthService.login(email, password);
-  // Setup Admin Cookie
-  await SessionUtil.addSessionData(res, {
-    id: user.id,
-    email: user.name,
-    name: user.name,
-    role: user.role,
-  });
-  // Return
-  res.status(HttpStatusCodes.OK).end();
-}
-
-/**
- * Logout the user.
- */
-function logout(_: IReq, res: IRes) {
-  SessionUtil.clearCookie(res);
-  res.status(HttpStatusCodes.OK).end();
-}
-
-
-// **** Export default **** //
-
-export default {
-  login,
-  logout,
-} as const;

package/lib/project-files-auth/src/routes/UserRoutes.ts

@@ -1,55 +0,0 @@
-import HttpStatusCodes from '@src/common/HttpStatusCodes';
-
-import UserService from '@src/services/UserService';
-import User from '@src/models/User';
-
-import { IReq, IRes } from './common/types';
-import check from './common/check';
-
-
-// **** Functions **** //
-
-/**
- * Get all users.
- */
-async function getAll(_: IReq, res: IRes) {
-  const users = await UserService.getAll();
-  res.status(HttpStatusCodes.OK).json({ users });
-}
-
-/**
- * Add one user.
- */
-async function add(req: IReq, res: IRes) {
-  const user = check.isValid(req.body, 'user', User.isUser);
-  await UserService.addOne(user);
-  res.status(HttpStatusCodes.CREATED).end();
-}
-
-/**
- * Update one user.
- */
-async function update(req: IReq, res: IRes) {
-  const user = check.isValid(req.body, 'user', User.isUser);
-  await UserService.updateOne(user);
-  res.status(HttpStatusCodes.OK).end();
-}
-
-/**
- * Delete one user.
- */
-async function delete_(req: IReq, res: IRes) {
-  const id = check.isNum(req.params, 'id');
-  await UserService.delete(id);
-  res.status(HttpStatusCodes.OK).end();
-}
-
-
-// **** Export default **** //
-
-export default {
-  getAll,
-  add,
-  update,
-  delete: delete_,
-} as const;

package/lib/project-files-auth/src/routes/common/check.ts

@@ -1,143 +0,0 @@
-import { ValidationErr } from '@src/common/classes';
-
-
-type TReqObj = Record<string, unknown>;
-
-
-/**
- * Check that param/s is a string
- */
-function isStr(reqObj: TReqObj, params: string): string;
-function isStr(reqObj: TReqObj, params: readonly string[]): string[];
-function isStr(
-  reqObj: TReqObj,
-  params: string | readonly string[],
-): string | string[] {
-  return _checkWrapper(reqObj, params, _checkStr);
-}
-
-/**
- * Check validator for string
- */
-function _checkStr(val: unknown): string | undefined {
-  if (!!val && typeof val === 'string') {
-    return val;
-  } else {
-    return undefined;
-  }
-}
-
-/**
- * Check that param/s is a number.
- */
-function isNum(reqObj: TReqObj, params: string): number;
-function isNum(reqObj: TReqObj, params: readonly string[]): number[];
-function isNum(
-  reqObj: TReqObj,
-  params: string | readonly string[],
-): number | number[] {
-  return _checkWrapper(reqObj, params, _checkNum);
-}
-
-/**
- * Check validator for string
- */
-function _checkNum(val: unknown): number | undefined {
-  const valF = Number(val);
-  if (!isNaN(valF)) {
-    return valF;
-  } else {
-    return undefined;
-  }
-}
-
-/**
- * Check that param/s is a number
- */
-function isBool(reqObj: TReqObj, params: string): boolean;
-function isBool(reqObj: TReqObj, params: readonly string[]): boolean[];
-function isBool(
-  reqObj: TReqObj,
-  params: string | readonly string[],
-): boolean | boolean[] {
-  return _checkWrapper(reqObj, params, _checkBool);
-}
-
-/**
- * Check validator for string
- */
-function _checkBool(val: unknown): boolean | undefined {
-  if (typeof val === 'boolean') {
-    return val;
-  } else if (typeof val === 'string') {
-    val = val.toLowerCase();
-    if (val === 'true') {
-      return true;
-    } else if (val === 'false') {
-      return false;
-    } else {
-      return undefined;
-    }
-  } else {
-    return undefined;
-  }
-}
-
-/**
- * Check that param satisfies the validator function.
- */
-function isValid<T>(
-  reqObj: TReqObj,
-  param: string,
-  validatorFn: (param: unknown) => param is T,
-): T {
-  const val = reqObj[param];
-  if (validatorFn(val)) {
-    return val;
-  } else {
-    throw new ValidationErr(param);
-  }
-}
-
-
-// **** Shared Helpers **** //
-
-/**
- * Do stuff based on whether or not params is an array
- */
-function _checkWrapper<T>(
-  reqObj: TReqObj,
-  params: string | readonly string[],
-  checkFn: (val: unknown) => T | undefined,
-): T | T[] {
-  // If is array
-  if (params instanceof Array) {
-    const retVal: T[] = [];
-    for (const param of params) {
-      const val = checkFn(reqObj[param]);
-      if (val !== undefined) {
-        retVal.push(val);
-      } else {
-        throw new ValidationErr(param);
-      }
-    }
-    return retVal;
-  }
-  // If not an array
-  const val = checkFn(reqObj[params]);
-  if (val !== undefined) {
-    return val;
-  }
-  // Throw error
-  throw new ValidationErr(params);
-}
-
-
-// **** Export Default **** //
-
-export default {
-  isStr,
-  isNum,
-  isBool,
-  isValid,
-} as const;

package/lib/project-files-auth/src/routes/common/types.ts

@@ -1,22 +0,0 @@
-/**
- * Shared types for routes.
- */
-
-import { Response, Request } from 'express';
-import { ISessionUser } from '@src/models/User';
-
-
-// **** Express **** //
-
-type TObj = Record<string, unknown>;
-
-export interface IReq extends Request<TObj, void, TObj, TObj> {
-  signedCookies: Record<string, string>;
-}
-
-
-interface ILocals {
-  sessionUser: ISessionUser;
-}
-
-export type IRes = Response<unknown, ILocals>;

package/lib/project-files-auth/src/routes/index.ts

@@ -1,43 +0,0 @@
-import { Router } from 'express';
-
-import Paths from '@src/common/Paths';
-
-import adminMw from './middleware/adminMw';
-import AuthRoutes from './AuthRoutes';
-import UserRoutes from './UserRoutes';
-
-
-// **** Variables **** //
-
-const apiRouter = Router();
-
-
-// **** AuthRouter **** //
-
-const authRouter = Router();
-
-// Routes
-authRouter.post(Paths.Auth.Login, AuthRoutes.login);
-authRouter.get(Paths.Auth.Logout, AuthRoutes.logout);
-
-// Add AuthRouter
-apiRouter.use(Paths.Auth.Base, authRouter);
-
-
-// **** UserRouter **** //
-
-const userRouter = Router();
-
-// User Routes
-userRouter.get(Paths.Users.Get, UserRoutes.getAll);
-userRouter.post(Paths.Users.Add, UserRoutes.add);
-userRouter.put(Paths.Users.Update, UserRoutes.update);
-userRouter.delete(Paths.Users.Delete, UserRoutes.delete);
-
-// Add UserRouter
-apiRouter.use(Paths.Users.Base, adminMw, userRouter);
-
-
-// **** Export default **** //
-
-export default apiRouter;

package/lib/project-files-auth/src/routes/middleware/adminMw.ts

@@ -1,47 +0,0 @@
-import { NextFunction } from 'express';
-import { JwtPayload } from 'jsonwebtoken';
-
-import HttpStatusCodes from '@src/common/HttpStatusCodes';
-import SessionUtil from '@src/util/SessionUtil';
-import { ISessionUser, UserRoles } from '@src/models/User';
-
-import { IReq, IRes } from '../common/types';
-
-
-// **** Variables **** //
-
-const USER_UNAUTHORIZED_ERR = 'User not authorized to perform this action';
-
-type TSessionData = ISessionUser & JwtPayload;
-
-
-/**
- * See note at beginning of file.
- */
-async function adminMw(
-  req: IReq,
-  res: IRes,
-  next: NextFunction,
-) {
-  // Get session data
-  const sessionData = await SessionUtil.getSessionData<TSessionData>(req);
-  // Set session data to locals
-  if (
-    typeof sessionData === 'object' &&
-    sessionData?.role === UserRoles.Admin
-  ) {
-    res.locals.sessionUser = sessionData;
-    return next();
-  // Return an unauth error if user is not an admin
-  } else {
-    res
-      .status(HttpStatusCodes.UNAUTHORIZED)
-      .json({ error: USER_UNAUTHORIZED_ERR });
-    return;
-  }
-}
-
-
-// **** Export Default **** //
-
-export default adminMw;