Skip to content

Fixes to password reset functionality #5913

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.

Sign up for GitHub

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

Open
christopherholland-workday wants to merge 14 commits into
base: main
Choose a base branch
from
+20 −5
Open

Fixes to password reset functionality #5913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1c79579
Fix Reset Password Auth Bypass
Mar 4, 2026
fed7fb3
Fix auth bypass in password reset
Mar 4, 2026
7d1e199
Fix unauthorized password reset
Mar 4, 2026
9f20506
Update packages/server/src/enterprise/services/account.service.ts
christopherholland-workday Mar 6, 2026
8c95cf9
Merge branch 'main' into password-reset
yau-wd Mar 9, 2026
0f39950
Fixes to password reset functionality
Mar 9, 2026
55cb67d
Fix Reset Password Auth Bypass
Mar 4, 2026
3697eac
Fix auth bypass in password reset
Mar 4, 2026
37fc467
Fix unauthorized password reset
Mar 4, 2026
43c39de
Update packages/server/src/enterprise/services/account.service.ts
christopherholland-workday Mar 6, 2026
46d3c23
Fixes to password reset functionality
Mar 9, 2026
916dd54
Fixes to password reset functionality
Mar 9, 2026
827083d
Merge branch 'password-reset' of https://github.com/FlowiseAI/Flowise…
Mar 9, 2026
4c3258f
Merge branch 'main' into password-reset
yau-wd Mar 10, 2026
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
13 changes: 12 additions & 1 deletion packages/server/src/enterprise/database/entities/user.entity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,18 @@ export class User {
@Column({ type: 'text', nullable: true, unique: true })
tempToken?: string | null

@CreateDateColumn({ nullable: true })
@Column({
Copy link
Contributor

@yau-wd yau-wd Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The error still persists.

Image

type: 'datetime',
nullable: true,
default: null,
transformer: {
to: (v: Date | null | undefined): string | null => (v instanceof Date ? v.toISOString() : null),
from: (v: string | Date | null): Date | null => {
if (!v) return null
return v instanceof Date ? v : new Date(v)
}
}
})
tokenExpiry?: Date | null

@Column({ type: 'varchar', length: 20, default: UserStatus.UNVERIFIED })
Expand Down
12 changes: 8 additions & 4 deletions packages/server/src/enterprise/services/account.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ export class AccountService {
const user = await this.userService.readUserByToken(data.user.tempToken, queryRunner)
if (!user) throw new InternalFlowiseError(StatusCodes.NOT_FOUND, UserErrorMessage.USER_NOT_FOUND)
data.user = user
data.user.tempToken = ''
data.user.tempToken = null
data.user.tokenExpiry = null
data.user.status = UserStatus.ACTIVE
data.user = await this.userService.saveUser(data.user, queryRunner)
Expand Down Expand Up @@ -568,12 +568,16 @@ export class AccountService {
const queryRunner = this.dataSource.createQueryRunner()
await queryRunner.connect()
try {
if (!data.user.tempToken) throw new InternalFlowiseError(StatusCodes.BAD_REQUEST, UserErrorMessage.INVALID_TEMP_TOKEN)

const user = await this.userService.readUserByEmail(data.user.email, queryRunner)
if (!user) throw new InternalFlowiseError(StatusCodes.NOT_FOUND, UserErrorMessage.USER_NOT_FOUND)
if (user.tempToken !== data.user.tempToken)
if (!user.tempToken || user.tempToken !== data.user.tempToken)
throw new InternalFlowiseError(StatusCodes.BAD_REQUEST, UserErrorMessage.INVALID_TEMP_TOKEN)

const tokenExpiry = user.tokenExpiry
if (!tokenExpiry) throw new InternalFlowiseError(StatusCodes.BAD_REQUEST, UserErrorMessage.INVALID_TEMP_TOKEN)

const now = moment()
const expiryInMins = process.env.PASSWORD_RESET_TOKEN_EXPIRY_IN_MINUTES
? parseInt(process.env.PASSWORD_RESET_TOKEN_EXPIRY_IN_MINUTES)
Expand All @@ -592,8 +596,8 @@ export class AccountService {
const hash = bcrypt.hashSync(password, salt)
data.user = user
data.user.credential = hash
data.user.tempToken = ''
data.user.tokenExpiry = undefined
data.user.tempToken = null
data.user.tokenExpiry = null
data.user.status = UserStatus.ACTIVE

await queryRunner.startTransaction()
Expand Down