🐛 Fix default username bug

package.json

@@ -1,6 +1,6 @@
 {
   "name": "staart",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "main": "index.js",
   "repository": "[email protected]:AnandChowdhary/staart.git",
   "author": "Anand Chowdhary <[email protected]>",

src/crud/organization.ts

@@ -5,14 +5,17 @@ import {
   removeReadOnlyValues
 } from "../helpers/mysql";
 import { Organization } from "../interfaces/tables/organization";
-import { capitalizeFirstAndLastLetter, dateToDateTime } from "../helpers/utils";
+import {
+  capitalizeFirstAndLastLetter,
+  dateToDateTime,
+  createSlug
+} from "../helpers/utils";
 import { KeyValue } from "../interfaces/general";
 import { cachedQuery, deleteItemFromCache } from "../helpers/cache";
 import { CacheCategories, ErrorCode } from "../interfaces/enum";
 import { ApiKey } from "../interfaces/tables/user";
 import cryptoRandomString from "crypto-random-string";
 import { getPaginatedData } from "./data";
-import slugify from "slugify";
 
 /*
  * Create a new organization for a user
@@ -22,9 +25,7 @@ export const createOrganization = async (organization: Organization) => {
   organization.name = capitalizeFirstAndLastLetter(organization.name);
   organization.createdAt = new Date();
   organization.updatedAt = organization.createdAt;
-  organization.username = `${slugify(organization.name, {
-    lower: true
-  }).replace(/'|"/g, "")}-${cryptoRandomString({ length: 5, type: "hex" })}`;
+  organization.username = createSlug(organization.name);
   // Create organization
   return await query(
     `INSERT INTO organizations ${tableValues(organization)}`,

src/helpers/utils.ts

@@ -3,6 +3,8 @@ import { User } from "../interfaces/tables/user";
 import Joi from "@hapi/joi";
 import { getOrganizationIdFromUsername } from "../crud/organization";
 import { Request, Response } from "express";
+import slugify from "slugify";
+import cryptoRandomString = require("crypto-random-string");
 
 /**
  * Capitalize each first letter in a string
@@ -62,6 +64,11 @@ export const organizationUsernameToId = async (id: string) => {
   }
 };
 
+export const createSlug = (name: string) =>
+  `${slugify(name, {
+    lower: true
+  }).replace(/'|"/g, "")}-${cryptoRandomString({ length: 5, type: "hex" })}`;
+
 export const safeRedirect = (req: Request, res: Response, url: string) => {
   if (req.get("X-Requested-With") === "XMLHttpRequest")
     return res.json({ redirect: url });

src/interfaces/tables/user.ts

@@ -9,6 +9,7 @@ import {
 export interface User {
   id?: number;
   name: string;
+  username?: string;
   nickname?: string;
   primaryEmail?: number;
   password?: string;

src/rest/auth.ts

@@ -58,6 +58,7 @@ import {
 } from "../config";
 import axios from "axios";
 import { GitHubEmail } from "../interfaces/oauth";
+import { createSlug } from "../helpers/utils";
 
 export const validateRefreshToken = async (token: string, locals: Locals) => {
   const data = <User>await verifyToken(token, Tokens.REFRESH);
@@ -104,6 +105,7 @@ export const register = async (
   role?: MembershipRole
 ) => {
   if (email) await checkIfNewEmail(email);
+  if (!user.username) user.username = createSlug(user.name);
   const result = <InsertResult>await createUser(user);
   const userId = result.insertId;
   // Set email

src/rest/membership.ts

@@ -64,14 +64,6 @@ export const inviteMemberToOrganization = async (
       } catch (error) {}
       if (isMemberAlready) throw new Error(ErrorCode.USER_IS_MEMBER_ALREADY);
       await createMembership({ userId: newUser.id, organizationId, role });
-      await createNotification({
-        userId: newUser.id,
-        category: NotificationCategories.JOINED_ORGANIZATION,
-        text: `You were invited to the organization **${
-          (await getOrganization(organizationId)).name
-        }**`,
-        link: "/settings/organizations"
-      });
       return;
     } else {
       await register(