fix: remove username, fix user creation error in frontend

bin/create-account.ts

@@ -12,19 +12,13 @@ import { create } from "../src/lib/member";
 dotenv.config();
 
 (async () => {
-  const { name, username, email } = await inquirer.prompt([
+  const { name, email } = await inquirer.prompt([
     {
       type: "input",
       name: "name",
       message: "Name:",
       validate: (input) => input.length > 0,
     },
-    {
-      type: "input",
-      name: "username",
-      message: "Username:",
-      validate: (input) => input.length > 0,
-    },
     {
       type: "input",
       name: "email",
@@ -36,12 +30,11 @@ dotenv.config();
   const password = (await randomBytes(8)).toString("hex");
   const member = await create({
     name,
-    username,
     email,
     status: MemberStatuses.ACTIVE,
     password,
   });
 
-  console.log(`Created ${name} (${username}) ${member}`);
+  console.log(`Created ${name} ${member}`);
   console.log("Password:", password);
 })();

prisma/migrations/20240905182619_/migration.sql

@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `deleted` on the `SpaceTransaction` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "SpaceTransaction" DROP COLUMN "deleted";

prisma/migrations/20240905190329_/migration.sql

@@ -0,0 +1,11 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `username` on the `Member` table. All the data in the column will be lost.
+
+*/
+-- DropIndex
+DROP INDEX "Member_username_key";
+
+-- AlterTable
+ALTER TABLE "Member" DROP COLUMN "username";

prisma/schema.prisma

@@ -71,7 +71,6 @@ model Member {
   id       String         @id @default(uuid())
   name     String
   email    String         @unique
-  username String         @unique
   status   MemberStatuses @default(ACTIVE)
   joinedAt DateTime       @default(now())
 

src/app/(protected)/members/[id]/page.tsx

@@ -21,7 +21,7 @@ async function MemberPage(props: { params: { id: string } }) {
   const membershipHistory = await fetchMemberHistory(member.id);
   const acsKeys = await fetchMemberKeys(member.id);
   const balanceData = await fetchBalance(member.id);
-  console.log('balanceData', balanceData);
+
   return (
     <>
       <div className="flex flex-col gap-8">

src/app/(protected)/members/_components/CreateMember.tsx

@@ -10,7 +10,6 @@ import Spinner from "@/shared/Spinner";
 export type FormValues = {
   email: string;
   name: string;
-  username: string;
 };
 
 export type CreateMemberModalProps = {
@@ -46,7 +45,7 @@ const CreateMemberModal: React.FC<CreateMemberModalProps> = ({ onClose }) => {
           </header>
           <form onSubmit={handleSubmit(onSubmit)}>
             <div className="flex flex-col gap-4">
-              {error && (
+              {error !== undefined && (
                 <div
                   className="p-4 mb-4 text-sm text-red-800 rounded-lg bg-red-50 dark:text-red-400"
                   role="alert"
@@ -70,21 +69,6 @@ const CreateMemberModal: React.FC<CreateMemberModalProps> = ({ onClose }) => {
                   })}
                 />
               </div>
-              <div className="flex flex-col gap-1">
-                <span className="font-semibold text-gray-600">Username</span>
-                <input
-                  type="text"
-                  className={classNames(
-                    "w-full rounded ring-1 ring-gray-200 p-3",
-                    { "ring-red-500 text-red-600": !!errors.username }
-                  )}
-                  placeholder="mary_doe"
-                  {...register("username", {
-                    pattern: /^[a-zA-Z]+[a-zA-Z0-9_]*$/u,
-                    required: true,
-                  })}
-                />
-              </div>
               <div className="flex flex-col gap-1">
                 <span className="font-semibold text-gray-600">Email</span>
                 <input

src/app/(protected)/members/_components/MembersTable.tsx

@@ -7,7 +7,6 @@ export type MembersTableProps = {
   members: {
     id: string;
     name: string;
-    username: string;
     status: MemberStatuses;
   }[];
   title: string;
@@ -41,9 +40,6 @@ const MembersTable: React.FC<MembersTableProps> = ({
           <th scope="col" className="px-6 py-3">
             Name
           </th>
-          <th scope="col" className="px-6 py-3">
-            Username
-          </th>
           <th scope="col" className="px-6 py-3">
             <span className="sr-only">Actions</span>
           </th>
@@ -66,7 +62,6 @@ const MembersTable: React.FC<MembersTableProps> = ({
               >
                 {member.name}
               </th>
-              <td className="px-6 py-4">{member.username}</td>
               <td className="px-6 py-4 text-right">
                 <Link
                   href={`/members/${member.id}`}

src/app/api/tg-accounting/residents/debt/route.ts

@@ -3,7 +3,6 @@ import { PrismaClient } from '@prisma/client'
 import authorizedOnlyRequest from "@/lib/auth/telegram-bot-api";
 
 type DebtData = {
-    username: string,
     id: string,
     debt: number
 };

src/app/auth.ts

@@ -10,13 +10,11 @@ const nextAuth = NextAuth({
         provider: token.externalProvider as string,
       };
       session.user.id = token.sub as string;
-      session.user.username = token.username as string | undefined;
       session.user.image = token.picture;
       return session;
     },
     async jwt({ token, user, profile, account }) {
       if (profile && account) {
-        token.username = user.name;
         token.picture = user.image;
         token.externalId = profile.sub;
         token.externalProvider = account.provider;

src/data/members/action.ts

@@ -7,8 +7,7 @@ import { Record, Static, String } from "runtypes";
 
 const CreateMemberRequest = Record({
   email: String,
-  name: String,
-  username: String,
+  name: String
 });
 
 export type CreateMemberRequest = Static<typeof CreateMemberRequest>;

src/data/members/fetch.ts

@@ -4,7 +4,6 @@ import { MemberStatuses } from "@prisma/client";
 export type GetAllMembersDTO = {
   id: string;
   name: string;
-  username: string;
   status: MemberStatuses;
 }[];
 
@@ -13,7 +12,6 @@ export async function getAll(): Promise<GetAllMembersDTO> {
   return members.map((m) => ({
     id: m.id,
     name: m.name,
-    username: m.username,
     status: m.status,
   }));
 }

src/lib/auth/profile.ts

@@ -4,7 +4,6 @@ export type Profile = {
   id: string;
   name: string;
   email: string;
-  username: string;
   image?: string;
 };
 
@@ -16,12 +15,11 @@ export function memberToProfile(
   member: Member,
   ssoProfile?: SSOProfile,
 ): Profile {
-  const { id, email, name, username } = member;
+  const { id, email, name } = member;
   return {
     id,
     email,
     name,
-    username,
     image: ssoProfile?.image,
   };
 }

src/lib/integrations/logto/account-management.ts

@@ -149,7 +149,6 @@ export default class LogtoAccountManagement
     const api = await this.getClient();
     const response = await api.post("/users", {
       name: props.name,
-      username: props.username,
       password: props.password,
       primaryEmail: props.email,
     });

src/lib/integrations/logto/auth-provider.ts

@@ -7,7 +7,6 @@ type LogtoProfile = {
   sub: string;
   name: string | null;
   picture: string | null;
-  username: string;
   email: string;
   email_verified: boolean;
   at_hash: string;

src/lib/member/index.ts

@@ -1,11 +1,10 @@
 import { MemberStatuses, PrismaClient } from "@prisma/client";
 import { AccountManagement } from "../auth/provider";
-import { isEmail, isName, isUsername } from "../validation";
+import { isEmail, isName } from "../validation";
 import prisma from "../db";
 
 export type AccountCreateDTO = {
   name: string;
-  username: string;
   email: string;
   status?: MemberStatuses;
   password?: string;
@@ -48,7 +47,6 @@ export async function isExistsById(memberId: string): Promise<boolean> {
  */
 export async function create({
   name,
-  username,
   email,
   status,
   password,
@@ -63,15 +61,10 @@ export async function create({
     throw new Error("Incorrect email");
   }
 
-  if (!isUsername(username)) {
-    throw new Error("Incorrect username");
-  }
-
   const { member, externalAccount } = await prisma.$transaction(async (tx) => {
     const member = await tx.member.create({
       data: {
         name,
-        username,
         email,
         status,
       },
@@ -80,7 +73,6 @@ export async function create({
     const externalAccount = await accountManagement.createAccount({
       name,
       email,
-      username,
       password,
       active: status ? status === "ACTIVE" : true,
     });

src/lib/validation.ts

@@ -7,11 +7,6 @@ const isName = isGenericEntityName;
 
 const isEmail = (email: string) => email.match(/.+@.+\..+/);
 
-const isUsername = (username: string) =>
-  username.match(/^[a-zA-Z]+[a-zA-Z0-9_]*$/u) &&
-  username.length >= 3 &&
-  username.length <= 64;
-
 const isSubscriptionTitle = (title: string) =>
   title.length >= 0 && title.match(/^.*$/u);
 
@@ -47,7 +42,6 @@ const isACSKeyName = isGenericEntityName;
 
 export {
   isName,
-  isUsername,
   isEmail,
   isSubscriptionTitle,
   isTransactionDescription,

src/types/interfaces/account-management.ts

@@ -14,7 +14,6 @@ export interface AccountDTO {
 export interface AccountCreateDTO {
   email: string;
   name: string;
-  username: string;
   active?: boolean;
   password?: string;
 }