chore: remove the passwordResetToken field from the database (twentyh…

…q#6377) # This PR - Fix twentyhq#6305
AdityaPimpalkar · Jul 24, 2024 · fd6f37b · fd6f37b
1 parent 6ee8c92
commit fd6f37b
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 51 deletions.
diff --git a/...nty-server/src/database/typeorm/core/migrations/1721738579379-DeletePasswordResetToken.ts b/...nty-server/src/database/typeorm/core/migrations/1721738579379-DeletePasswordResetToken.ts
@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class DeletePasswordResetToken1721738579379
+  implements MigrationInterface
+{
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" DROP COLUMN "passwordResetToken"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" DROP COLUMN "passwordResetTokenExpiresAt"`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" ADD "passwordResetToken" character varying`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" ADD "passwordResetTokenExpiresAt" TIMESTAMP`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts
@@ -1,51 +1,51 @@
-import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
 import {
   BadRequestException,
   ForbiddenException,
   InternalServerErrorException,
   NotFoundException,
   UseGuards,
 } from '@nestjs/common';
+import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
 import { InjectRepository } from '@nestjs/typeorm';
 
 import { Repository } from 'typeorm';
 
-import { AppTokenInput } from 'src/engine/core-modules/auth/dto/app-token.input';
-import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
-import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
-import { assert } from 'src/utils/assert';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
-import { User } from 'src/engine/core-modules/user/user.entity';
 import { ApiKeyTokenInput } from 'src/engine/core-modules/auth/dto/api-key-token.input';
-import { ValidatePasswordResetToken } from 'src/engine/core-modules/auth/dto/validate-password-reset-token.entity';
-import { TransientToken } from 'src/engine/core-modules/auth/dto/transient-token.entity';
-import { UserService } from 'src/engine/core-modules/user/services/user.service';
-import { ValidatePasswordResetTokenInput } from 'src/engine/core-modules/auth/dto/validate-password-reset-token.input';
-import { UpdatePasswordViaResetTokenInput } from 'src/engine/core-modules/auth/dto/update-password-via-reset-token.input';
-import { EmailPasswordResetLink } from 'src/engine/core-modules/auth/dto/email-password-reset-link.entity';
-import { InvalidatePassword } from 'src/engine/core-modules/auth/dto/invalidate-password.entity';
-import { EmailPasswordResetLinkInput } from 'src/engine/core-modules/auth/dto/email-password-reset-link.input';
-import { GenerateJwtInput } from 'src/engine/core-modules/auth/dto/generate-jwt.input';
+import { AppTokenInput } from 'src/engine/core-modules/auth/dto/app-token.input';
 import { AuthorizeApp } from 'src/engine/core-modules/auth/dto/authorize-app.entity';
 import { AuthorizeAppInput } from 'src/engine/core-modules/auth/dto/authorize-app.input';
-import { ExchangeAuthCodeInput } from 'src/engine/core-modules/auth/dto/exchange-auth-code.input';
+import { EmailPasswordResetLink } from 'src/engine/core-modules/auth/dto/email-password-reset-link.entity';
+import { EmailPasswordResetLinkInput } from 'src/engine/core-modules/auth/dto/email-password-reset-link.input';
 import { ExchangeAuthCode } from 'src/engine/core-modules/auth/dto/exchange-auth-code.entity';
+import { ExchangeAuthCodeInput } from 'src/engine/core-modules/auth/dto/exchange-auth-code.input';
+import { GenerateJwtInput } from 'src/engine/core-modules/auth/dto/generate-jwt.input';
+import { InvalidatePassword } from 'src/engine/core-modules/auth/dto/invalidate-password.entity';
+import { TransientToken } from 'src/engine/core-modules/auth/dto/transient-token.entity';
+import { UpdatePasswordViaResetTokenInput } from 'src/engine/core-modules/auth/dto/update-password-via-reset-token.input';
+import { ValidatePasswordResetToken } from 'src/engine/core-modules/auth/dto/validate-password-reset-token.entity';
+import { ValidatePasswordResetTokenInput } from 'src/engine/core-modules/auth/dto/validate-password-reset-token.input';
+import { UserService } from 'src/engine/core-modules/user/services/user.service';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
 import { CaptchaGuard } from 'src/engine/integrations/captcha/captcha.guard';
+import { assert } from 'src/utils/assert';
 
-import { ApiKeyToken, AuthTokens } from './dto/token.entity';
-import { TokenService } from './services/token.service';
-import { Verify } from './dto/verify.entity';
-import { VerifyInput } from './dto/verify.input';
-import { AuthService } from './services/auth.service';
-import { LoginToken } from './dto/login-token.entity';
 import { ChallengeInput } from './dto/challenge.input';
+import { ImpersonateInput } from './dto/impersonate.input';
+import { LoginToken } from './dto/login-token.entity';
+import { SignUpInput } from './dto/sign-up.input';
+import { ApiKeyToken, AuthTokens } from './dto/token.entity';
 import { UserExists } from './dto/user-exists.entity';
 import { CheckUserExistsInput } from './dto/user-exists.input';
+import { Verify } from './dto/verify.entity';
+import { VerifyInput } from './dto/verify.input';
 import { WorkspaceInviteHashValid } from './dto/workspace-invite-hash-valid.entity';
 import { WorkspaceInviteHashValidInput } from './dto/workspace-invite-hash.input';
-import { SignUpInput } from './dto/sign-up.input';
-import { ImpersonateInput } from './dto/impersonate.input';
+import { AuthService } from './services/auth.service';
+import { TokenService } from './services/token.service';
 
 @Resolver()
 export class AuthResolver {

diff --git a/packages/twenty-server/src/engine/core-modules/user/user.entity.ts b/packages/twenty-server/src/engine/core-modules/user/user.entity.ts
@@ -1,24 +1,24 @@
 import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';
 
+import { IDField } from '@ptc-org/nestjs-query-graphql';
 import {
-  Entity,
   Column,
-  PrimaryGeneratedColumn,
   CreateDateColumn,
-  UpdateDateColumn,
-  OneToMany,
+  Entity,
   ManyToOne,
+  OneToMany,
+  PrimaryGeneratedColumn,
   Relation,
+  UpdateDateColumn,
 } from 'typeorm';
-import { IDField } from '@ptc-org/nestjs-query-graphql';
 
-import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { WorkspaceMember } from 'src/engine/core-modules/user/dtos/workspace-member.dto';
-import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
 import { KeyValuePair } from 'src/engine/core-modules/key-value-pair/key-value-pair.entity';
 import { OnboardingStatus } from 'src/engine/core-modules/onboarding/enums/onboarding-status.enum';
+import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
+import { WorkspaceMember } from 'src/engine/core-modules/user/dtos/workspace-member.dto';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 
 registerEnumType(OnboardingStatus, {
   name: 'OnboardingStatus',
@@ -86,22 +86,6 @@ export class User {
   @Column()
   defaultWorkspaceId: string;
 
-  @Field({
-    nullable: true,
-    deprecationReason:
-      'field migrated into the AppTokens Table ref: https://github.com/twentyhq/twenty/issues/5021',
-  })
-  @Column({ nullable: true })
-  passwordResetToken: string;
-
-  @Field({
-    nullable: true,
-    deprecationReason:
-      'field migrated into the AppTokens Table ref: https://github.com/twentyhq/twenty/issues/5021',
-  })
-  @Column({ nullable: true, type: 'timestamptz' })
-  passwordResetTokenExpiresAt: Date;
-
   @OneToMany(() => AppToken, (appToken) => appToken.user, {
     cascade: true,
   })