✨ Add support for creating emails

Author: AnandChowdhary

schema.sql

@@ -0,0 +1,81 @@
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for backup-codes
+-- ----------------------------
+DROP TABLE IF EXISTS `backup-codes`;
+CREATE TABLE `backup-codes` (
+  `code` int(6) NOT NULL,
+  `userId` int(11) NOT NULL,
+  `used` int(1) NOT NULL DEFAULT '0',
+  `createdAt` datetime NOT NULL,
+  `updatedAt` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for emails
+-- ----------------------------
+DROP TABLE IF EXISTS `emails`;
+CREATE TABLE `emails` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `email` varchar(255) NOT NULL,
+  `userId` int(11) NOT NULL,
+  `isVerified` int(1) NOT NULL DEFAULT '0',
+  `isPrimary` int(1) NOT NULL DEFAULT '0',
+  `createdAt` datetime NOT NULL,
+  `updatedAt` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for memberships
+-- ----------------------------
+DROP TABLE IF EXISTS `memberships`;
+CREATE TABLE `memberships` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `organizationId` int(11) NOT NULL,
+  `userId` int(11) NOT NULL,
+  `role` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT 'member',
+  `createdAt` datetime NOT NULL,
+  `updatedAt` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for organizations
+-- ----------------------------
+DROP TABLE IF EXISTS `organizations`;
+CREATE TABLE `organizations` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) DEFAULT NULL,
+  `invitationDomain` varchar(255) DEFAULT NULL,
+  `createdAt` datetime NOT NULL,
+  `updatedAt` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- ----------------------------
+-- Table structure for users
+-- ----------------------------
+DROP TABLE IF EXISTS `users`;
+CREATE TABLE `users` (
+  `id` int(12) NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `nickname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `primaryEmail` int(12) DEFAULT NULL,
+  `password` varchar(255) DEFAULT NULL,
+  `twoFactorEnabled` int(1) NOT NULL DEFAULT '0',
+  `twoFactorSecret` varchar(255) DEFAULT NULL,
+  `countryCode` varchar(2) DEFAULT NULL,
+  `timezone` varchar(255) NOT NULL DEFAULT 'Europe/Amsterdam',
+  `notificationEmails` int(1) NOT NULL DEFAULT '1',
+  `preferredLanguage` varchar(5) NOT NULL DEFAULT 'en-us',
+  `prefersReducedMotion` int(1) NOT NULL DEFAULT '0',
+  `createdAt` datetime(6) NOT NULL,
+  `updatedAt` datetime(6) NOT NULL ON UPDATE CURRENT_TIMESTAMP(6),
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+SET FOREIGN_KEY_CHECKS = 1;

src/crud/email.ts

@@ -0,0 +1,16 @@
+import { query, tableValues } from "../helpers/mysql";
+import { Email } from "../interfaces/tables/emails";
+
+export const createEmail = async (email: Email) => {
+  // Clean up values
+  email.email = email.email.toLowerCase();
+  email.isVerified = false;
+  email.isPrimary = false;
+  email.createdAt = new Date();
+  email.updatedAt = email.createdAt;
+  // Create user
+  return await query(
+    `INSERT INTO emails ${tableValues(email)}`,
+    Object.values(email)
+  );
+};

src/crud/user.ts

@@ -1,4 +1,4 @@
-import { query, tableValues } from "../helpers/mysql";
+import { query, tableValues, setValues } from "../helpers/mysql";
 import { User } from "../interfaces/tables/user";
 import { capitalizeFirstAndLastLetter } from "../helpers/string";
 import { hash } from "bcrypt";
@@ -26,3 +26,15 @@ export const createUser = async (user: User) => {
     Object.values(user)
   );
 };
+
+interface KV {
+  [index: string]: any;
+}
+export const updateUser = async (id: number, user: KV) => {
+  user.updatedAt = user.createdAt;
+  // Create user
+  return await query(`UPDATE users SET ${setValues(user)} WHERE id = ?`, [
+    ...Object.values(user),
+    id
+  ]);
+};

src/helpers/mysql.ts

@@ -50,6 +50,8 @@ export const cleanValues = (
   values: (string | number | boolean | Date | undefined)[]
 ) => {
   values = values.map(value => {
+    // Clean up strings
+    if (typeof value === "string") value = value.trim();
     // Convert true to 1, false to 0
     if (typeof value === "boolean") value = !!value;
     // Convert Date to mysql datetime
@@ -62,3 +64,14 @@ export const cleanValues = (
   });
   return values;
 };
+
+interface KV {
+  [index: string]: any;
+}
+export const setValues = (object: KV) => {
+  let query = "";
+  Object.keys(object).forEach(key => {
+    query += `${key} = "${object[key]}", `;
+  });
+  return query.slice(0, -2);
+};

src/interfaces/mysql.ts

@@ -0,0 +1,10 @@
+export interface InsertResult {
+  fieldCount: number;
+  affectedRows: number;
+  insertId: number;
+  serverStatus: number;
+  warningCount: number;
+  message: string;
+  protocol41: boolean;
+  changedRows: number;
+}

src/interfaces/tables/emails.ts

@@ -1,9 +1,9 @@
 export interface Email {
-  id: number;
+  id?: number;
   email: string;
   userId: number;
-  isVerified: boolean;
-  isPrimary: boolean;
-  createdAt: Date;
-  updatedAt: Date;
+  isVerified?: boolean;
+  isPrimary?: boolean;
+  createdAt?: Date;
+  updatedAt?: Date;
 }

src/rest/auth.ts

@@ -1,14 +1,24 @@
 import { User } from "../interfaces/tables/user";
-import { createUser } from "../crud/user";
+import { createUser, updateUser } from "../crud/user";
+import { InsertResult } from "../interfaces/mysql";
+import { createEmail } from "../crud/email";
 
 export const register = async (
-  user?: User,
+  user: User,
   email?: string,
   organizationId?: string
 ) => {
-  const result = await createUser({
-    name: "Anand Chowdhary"
-  });
-  console.log(result);
-  return "done!";
+  // Create user
+  const result = <InsertResult>await createUser(user);
+  const userId = result.insertId;
+  // Set email
+  if (email) {
+    const newEmail = <InsertResult>await createEmail({
+      userId,
+      email,
+      isPrimary: true
+    });
+    const emailId = newEmail.insertId;
+    await updateUser(userId, { primaryEmail: emailId });
+  }
 };