express-generator-typescript 2.4.7 → 2.4.10

package/lib/project-files-auth/src/util/SessionUtil.ts

@@ -32,6 +32,23 @@ function getSessionData<T>(req: Request): Promise<string | T | undefined> {
   return _decode(jwt);
 }
 
+/**
+ * Decrypt JWT and extract client data.
+ */
+function _decode<T>(jwt: string): Promise<string | undefined | T> {
+  return new Promise((res, rej) => {
+    jsonwebtoken.verify(jwt, EnvVars.Jwt.Secret, (err, decoded) => {
+      if (!!err) {
+        const err = new RouteError(HttpStatusCodes.UNAUTHORIZED, 
+          Errors.Validation);
+        return rej(err);
+      } else {
+        return res(decoded as T);
+      }
+    });
+  });
+}
+
 /**
  * Add a JWT to the response 
  */
@@ -49,37 +66,23 @@ async function addSessionData(
   return res.cookie(Key, jwt, Options);
 }
 
-/**
- * Remove cookie
- */
-function clearCookie(res: Response): Response {
-  const { Key, Options } = EnvVars.CookieProps;
-  return res.clearCookie(Key, Options);
-}
-
-
-// **** Helper Functions **** //
-
 /**
  * Encrypt data and return jwt.
  */
 function _sign(data: string | object | Buffer): Promise<string> {
   return new Promise((res, rej) => {
     jsonwebtoken.sign(data, EnvVars.Jwt.Secret, Options, (err, token) => {
-      return err ? rej(err) : res(token || '');
+      return (err ? rej(err) : res(token ?? ''));
     });
   });
 }
 
 /**
- * Decrypt JWT and extract client data.
+ * Remove cookie
  */
-function _decode<T>(jwt: string): Promise<string | undefined | T> {
-  return new Promise((res, rej) => {
-    jsonwebtoken.verify(jwt, EnvVars.Jwt.Secret, (err, decoded) => {
-      return err ? rej(Errors.Validation) : res(decoded as T);
-    });
-  });
+function clearCookie(res: Response): Response {
+  const { Key, Options } = EnvVars.CookieProps;
+  return res.clearCookie(Key, Options);
 }
 
 

package/lib/project-files-auth/src/views/login.html

@@ -1,10 +1,30 @@
 <!DOCTYPE html>
 <html lang="en">
+
+  <!-- Head -->
   <head>
     <meta charset="UTF-8">
     <title>Login</title>
     <link rel="stylesheet" type="text/css" href="/stylesheets/login.css" />
+
+    <!-- Handlebars -->
+    <script src="http://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.7.8/handlebars.min.js"></script>
+
+    <!-- Bootstrap -->
+    <link
+      href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css"
+      rel="stylesheet"
+      integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH"
+      crossorigin="anonymous"
+    />
+    <script
+      src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"
+      integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz"
+      crossorigin="anonymous"
+    ></script>
   </head>
+
+  <!-- Body -->
   <body>
 
     <div class="login-block">
@@ -12,16 +32,18 @@
 
       <div class="login-input">
         Username:<br/>
-        <input id="email-input" type="text"/>
+        <input id="email-input" type="text" class="form-control"/>
       </div>
       
       <div class="login-input">
         Password:<br/>
-        <input id="pwd-input" type="password"/>
+        <input id="pwd-input" type="password" class="form-control"/>
       </div>
 
       <div>
-        <button id="login-btn">Login</button>
+        <button id="login-btn" class="btn btn-primary">
+          Login
+        </button>
       </div>
 
       <div class="default-login-user">
@@ -30,6 +52,7 @@
     </div>
 
   </body>
+  
   <script src="scripts/http.js"></script>
   <script src="scripts/login.js"></script>
 </html>

package/lib/project-files-auth/src/views/users.html

@@ -1,10 +1,30 @@
 <!DOCTYPE html>
 <html lang="en">
+
+  <!-- Head -->
   <head>
     <meta charset="UTF-8">
     <title>Users</title>
     <link rel="stylesheet" type="text/css" href="/stylesheets/users.css" />
+
+    <!-- Handlebars -->
+    <script src="http://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.7.8/handlebars.min.js"></script>
+
+    <!-- Bootstrap -->
+    <link
+      href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css"
+      rel="stylesheet"
+      integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH"
+      crossorigin="anonymous"
+    />
+    <script
+      src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"
+      integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz"
+      crossorigin="anonymous"
+    ></script>
   </head>
+
+  <!-- Body -->
   <body>
 
     <!-- Add Users -->
@@ -13,18 +33,32 @@
         Add User:
       </div>
       <div>
-        <input id="name-input" placeholder="Name" />
+        <input
+          id="name-input"
+          type="text"
+          class="form-control"
+          placeholder="Name"
+        />
       </div>
       <div>
-        <input id="email-input" placeholder="Email" />
+        <input
+          id="email-input"
+          type="email"
+          class="form-control"
+          placeholder="Email"
+        />
       </div>
       <div>
-        <button id="add-user-btn">
+        <button
+          id="add-user-btn"
+          class="btn btn-success"
+        >
           Add
         </button>
-      </div>
-      <div>
-        <button id="logout-btn">
+        <button
+          id="logout-btn"
+          class="btn btn-secondary"
+        >
           Logout
         </button>
       </div>
@@ -32,11 +66,75 @@
 
     <!-- Display Users -->
     <div class="users-column">
-      <div class="column-header">Users:</div>
+      <div class="column-header">
+        Users:
+      </div>
+
       <div id="all-users-anchor"></div>
-    </div>
+      <script
+        id="all-users-template"
+        type="text/x-handlebars-template"
+      >
+        {{#each users}}
+          <div class="user-display-ele">
+            <div class="normal-view">
+              <div class="display-wrapper">
+                <div><b>Name:</b> {{name}}</div>
+                <div><b>Email:</b> {{email}}</div>
+                <div><b>Created:</b> {{createdFormatted}}</div>
+              </div>
+              <button
+                type="button"
+                class="btn btn-primary edit-user-btn"
+                data-user-id="{{id}}"
+              >
+                Edit
+              </button>
+              <button
+                class="btn btn-danger delete-user-btn"
+                data-user-id="{{id}}"
+              >
+                Delete
+              </button>
+            </div>
 
+            <div class="edit-view">
+              <div>
+                Name:&nbsp;
+                <input
+                  type="text"
+                  class="form-control name-edit-input"
+                  value="{{name}}"
+                />
+              </div>
+              <div class="email-edit">
+                Email:&nbsp;
+                <input
+                  type="email"
+                  class="form-control email-edit-input"
+                  value="{{email}}"
+                />
+              </div>
+              <button
+                class="btn btn-primary submit-edit-btn"
+                data-user-id="{{id}}"
+                data-user-created="{{created}}"
+              >
+                Submit
+              </button>
+              <button
+                class="btn btn-secondary cancel-edit-btn"
+                data-user-id="{{id}}"
+              >
+                Cancel
+              </button>
+            </div>
+          </div>
+        {{/each}}
+      </script>
+    </div>
   </body>
+
   <script src="scripts/http.js"></script>
   <script src="scripts/users.js"></script>
 </html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-generator-typescript",
-  "version": "2.4.7",
+  "version": "2.4.10",
   "description": "Generate new Express applications similar to express-generate which but sets it up to use TypeScript instead",
   "scripts": {
     "express-generator-typescript": "node bin/cli.js",

package/lib/project-files/spec/support/types.ts

@@ -1 +0,0 @@
-export type TReqBody = string | object | undefined;

package/lib/project-files-auth/spec/support/types.ts

@@ -1 +0,0 @@
-export type TReqBody = string | object | undefined;