Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-3245 Change password from settings page #3538

Merged
merged 44 commits into from
Jan 25, 2024
Merged
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
1c47a86
GH-3245 add passwordResetToken and passwordResetTokenExpiresAt column…
i-am-chitti Jan 9, 2024
b3bca79
Add password reset token expiry delay env variable
i-am-chitti Jan 10, 2024
a095d3b
Add generatePasswordResetToken mutation resolver
i-am-chitti Jan 10, 2024
332a6bf
Update .env.sample file on server
i-am-chitti Jan 10, 2024
28d56aa
Add password reset token and expiry migration script
i-am-chitti Jan 10, 2024
a822926
Add validate password reset token query and a dummy password update (…
i-am-chitti Jan 10, 2024
2e3b5ab
Fix bug in password reset token generate
i-am-chitti Jan 10, 2024
949ade1
Merge branch 'main' into GH-3245/password-reset
i-am-chitti Jan 11, 2024
bd16ea6
add update password mutation
i-am-chitti Jan 11, 2024
fe2249d
Merge branch 'main' into GH-3245/password-reset
i-am-chitti Jan 12, 2024
ea035a6
Update name and add email password reset link
i-am-chitti Jan 13, 2024
a519dd2
Add change password UI on settings page
i-am-chitti Jan 13, 2024
48b4d04
Add reset password route on frontend
i-am-chitti Jan 14, 2024
1e1a82d
Add reset password form UI
i-am-chitti Jan 14, 2024
f5f91e1
Merge branch 'main' into GH-3245/password-reset
i-am-chitti Jan 16, 2024
dcd3533
sign in user on password reset
i-am-chitti Jan 16, 2024
fe45e11
format code
i-am-chitti Jan 16, 2024
f09ebff
make PASSWORD_RESET_TOKEN_EXPIRES_IN optional
i-am-chitti Jan 16, 2024
50bb409
add email template for password reset
i-am-chitti Jan 16, 2024
431668f
Improve error message
i-am-chitti Jan 16, 2024
f2dc994
Rename methods and DTO to improve naming
i-am-chitti Jan 16, 2024
7c63e14
fix formatting of backend code
i-am-chitti Jan 16, 2024
8ca7d72
Merge branch 'main' into GH-3245/password-reset
i-am-chitti Jan 17, 2024
ee13204
Update change password component
i-am-chitti Jan 17, 2024
75ffcbd
Update password reset via token component
i-am-chitti Jan 17, 2024
fd6f562
update graphql files
i-am-chitti Jan 17, 2024
2711d36
spelling fix
i-am-chitti Jan 17, 2024
dc34769
Make password-reset route authless on frontend
i-am-chitti Jan 18, 2024
8075361
show token generation wait time
i-am-chitti Jan 18, 2024
4dceb01
Merge branch 'main' into GH-3245/password-reset
i-am-chitti Jan 18, 2024
b090d12
remove constant from .env.example
i-am-chitti Jan 18, 2024
9a9c6af
Add PASSWORD_RESET_TOKEN_EXPIRES_IN in docs
i-am-chitti Jan 18, 2024
8fd1073
Merge branch 'main' into GH-3245/password-reset
i-am-chitti Jan 22, 2024
9f498a8
refactor emails module in reset password
i-am-chitti Jan 22, 2024
0d292c4
update Graphql generated file
i-am-chitti Jan 22, 2024
bc217aa
update email template of password reset
i-am-chitti Jan 23, 2024
f359b42
add space between date and text
i-am-chitti Jan 23, 2024
d482130
update method name
i-am-chitti Jan 23, 2024
32c5052
Merge branch 'main' into GH-3245/password-reset
i-am-chitti Jan 23, 2024
c743107
fix lint issues
i-am-chitti Jan 23, 2024
552426c
Merge branch 'main' into GH-3245/password-reset
i-am-chitti Jan 24, 2024
6a16b2a
remove unused code, fix indentation, and email link color
i-am-chitti Jan 24, 2024
18f6b23
update test file for auth and token service
i-am-chitti Jan 24, 2024
4f481df
Fix ci: build twenty-emails when running tests
martmull Jan 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
GH-3245 add passwordResetToken and passwordResetTokenExpiresAt column…
… on user entity
  • Loading branch information
i-am-chitti committed Jan 9, 2024
commit 1c47a86ef1b122ebbf40aae25204bd4b7ddf378e
8 changes: 8 additions & 0 deletions packages/twenty-server/src/core/user/user.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,14 @@ export class User {
})
defaultWorkspace: Workspace;

@Field({ nullable: true })
@Column({ nullable: true })
passwordResetToken: string;

@Field({ nullable: true })
@Column({ nullable: true })
passwordResetTokenExpiresAt: Date;

@OneToMany(() => RefreshToken, (refreshToken) => refreshToken.user, {
cascade: true,
})
Expand Down