✨ Add register

Author: AnandChowdhary

package.json

@@ -13,6 +13,7 @@
     "watch-server": "nodemon dist/index.js"
   },
   "devDependencies": {
+    "@types/bcrypt": "^3.0.0",
     "@types/dotenv": "^6.1.1",
     "@types/express": "^4.16.1",
     "@types/jest": "^24.0.11",
@@ -30,6 +31,7 @@
     "typescript": "^3.4.4"
   },
   "dependencies": {
+    "bcrypt": "^3.0.6",
     "mysql": "^2.17.1",
     "reflect-metadata": "^0.1.13"
   }

src/crud/user.ts

@@ -0,0 +1,28 @@
+import { query, tableValues } from "../helpers/mysql";
+import { User } from "../interfaces/tables/user";
+import { capitalizeFirstAndLastLetter } from "../helpers/string";
+import { hash } from "bcrypt";
+
+export const listAllUsers = async () => {
+  return <User[]>await query("SELECT * from users");
+};
+
+export const createUser = async (user: User) => {
+  // Clean up values
+  user.name = capitalizeFirstAndLastLetter(user.name);
+  // Default values for user
+  user.nickname = user.nickname || user.name.split(" ")[0];
+  user.twoFactorEnabled = user.twoFactorEnabled || false;
+  user.timezone = user.timezone || "Europe/Amsterdam";
+  user.password = await hash(user.password || "", 8);
+  user.notificationEmails = user.notificationEmails || 1;
+  user.preferredLanguage = user.preferredLanguage || "en-us";
+  user.prefersReducedMotion = user.prefersReducedMotion || false;
+  user.createdAt = new Date();
+  user.updatedAt = user.createdAt;
+  // Create user
+  return await query(
+    `INSERT INTO users ${tableValues(user)}`,
+    Object.values(user)
+  );
+};

src/helpers/crud.ts

@@ -1,11 +1,16 @@
-import { createPool, PoolConnection } from "mysql";
+import { createPool } from "mysql";
 import {
   DB_HOST,
   DB_USERNAME,
   DB_PORT,
   DB_PASSWORD,
   DB_DATABASE
 } from "../config";
+import { User } from "../interfaces/tables/user";
+import { BackupCode } from "../interfaces/tables/backup-codes";
+import { Email } from "../interfaces/tables/emails";
+import { Membership } from "../interfaces/tables/memberships";
+import { Organization } from "../interfaces/tables/organization";
 
 export const pool = createPool({
   host: DB_HOST,
@@ -17,15 +22,43 @@ export const pool = createPool({
 
 export const query = (
   queryString: string,
-  values?: (string | number | boolean | Date)[]
+  values?: (string | number | boolean | Date | undefined)[]
 ) =>
   new Promise((resolve, reject) => {
     pool.getConnection((error, connection) => {
       if (error) return reject(error);
+      if (values) values = cleanValues(values);
       connection.query(queryString, values, (error, result) => {
         connection.destroy();
         if (error) return reject(error);
         resolve(result);
       });
     });
   });
+
+export const tableValues = (
+  object: User | BackupCode | Email | Membership | Organization
+) => {
+  const values = Object.keys(object)
+    .map(() => "?")
+    .join(", ");
+  const query = `(${Object.keys(object).join(", ")}) VALUES (${values})`;
+  return query;
+};
+
+export const cleanValues = (
+  values: (string | number | boolean | Date | undefined)[]
+) => {
+  values = values.map(value => {
+    // Convert true to 1, false to 0
+    if (typeof value === "boolean") value = !!value;
+    // Convert Date to mysql datetime
+    if (typeof value === "object" && typeof value.getMonth === "function")
+      value = value
+        .toISOString()
+        .slice(0, 19)
+        .replace("T", " ");
+    return value;
+  });
+  return values;
+};

src/helpers/mysql.ts

@@ -0,0 +1,16 @@
+export const capitalizeEachFirstLetter = (string: string) =>
+  (string = string
+    .toLowerCase()
+    .split(" ")
+    .map(s => s.charAt(0).toUpperCase() + s.toLowerCase().substring(1))
+    .join(" "));
+
+export const capitalizeFirstAndLastLetter = (string: string) => {
+  const words = string.split(" ");
+  words[0] = capitalizeFirstLetter(words[0]);
+  words[words.length - 1] = capitalizeFirstLetter(words[words.length - 1]);
+  return words.join(" ");
+};
+
+export const capitalizeFirstLetter = (string: string) =>
+  string.charAt(0).toUpperCase() + string.toLowerCase().slice(1);

src/helpers/string.ts

@@ -1,13 +1,16 @@
 import express from "express";
 import { PORT } from "./config";
-import { listAllUsers } from "./helpers/crud";
+import { register } from "./rest/auth";
 
 const app = express();
 
 app.get("/", (req, res) => res.json({ hello: "world" }));
 app.get("/create-account", async (req, res) => {
   try {
-    const users = await listAllUsers();
+    const users = await register(
+      { name: "Anand Chowdhary" },
+      "anandchowdhary@gmail.com"
+    );
     res.json({ success: true, users });
   } catch (error) {
     console.log("Error", error);

src/index.ts

@@ -1,9 +1,9 @@
 export interface User {
-  id: number;
+  id?: number;
   name: string;
-  nickname: string;
+  nickname?: string;
   primaryEmail?: number;
-  password: string;
+  password?: string;
   twoFactorEnabled?: boolean;
   twoFactorSecret?: string;
   countryCode?: string;

src/interfaces/tables/user.ts

@@ -0,0 +1,14 @@
+import { User } from "../interfaces/tables/user";
+import { createUser } from "../crud/user";
+
+export const register = async (
+  user?: User,
+  email?: string,
+  organizationId?: string
+) => {
+  const result = await createUser({
+    name: "Anand Chowdhary"
+  });
+  console.log(result);
+  return "done!";
+};

src/rest/auth.ts

@@ -321,6 +321,11 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
+"@types/bcrypt@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/bcrypt/-/bcrypt-3.0.0.tgz#851489a9065a067cb7f3c9cbe4ce9bed8bba0876"
+  integrity sha512-nohgNyv+1ViVcubKBh0+XiNJ3dO8nYu///9aJ4cgSqv70gBL+94SNy/iC2NLzKPT2Zt/QavrOkBVbZRLZmw6NQ==
+
 "@types/body-parser@*":
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.0.tgz#9f5c9d9bd04bb54be32d5eb9fc0d8c974e6cf58c"
@@ -693,6 +698,14 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+bcrypt@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-3.0.6.tgz#f607846df62d27e60d5e795612c4f67d70206eb2"
+  integrity sha512-taA5bCTfXe7FUjKroKky9EXpdhkVvhE5owfxfLYodbrAR1Ul3juLmIQmIQBK4L9a5BuUcE6cqmwT+Da20lF9tg==
+  dependencies:
+    nan "2.13.2"
+    node-pre-gyp "0.12.0"
+
 bignumber.js@7.2.1:
   version "7.2.1"
   resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-7.2.1.tgz#80c048759d826800807c4bfd521e50edbba57a5f"
@@ -2975,7 +2988,7 @@ mysql@^2.17.1:
     safe-buffer "5.1.2"
     sqlstring "2.3.1"
 
-nan@^2.12.1:
+nan@2.13.2, nan@^2.12.1:
   version "2.13.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
   integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
@@ -3047,7 +3060,7 @@ node-notifier@^5.2.1:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-pre-gyp@^0.12.0:
+node-pre-gyp@0.12.0, node-pre-gyp@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
   integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==