Skip to content

fix: enable registration with different email when registration not completed #3081

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
xlamn wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: enable registration with different email when registration not completed #3081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/subdomains/supporting/realunit/controllers/realunit.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ export class RealUnitController {
@GetJwt() jwt: JwtPayload,
@Body() dto: RealUnitEmailRegistrationDto,
): Promise<RealUnitEmailRegistrationResponseDto> {
const status = await this.realunitService.registerEmail(jwt.account, dto);
const status = await this.realunitService.registerEmail(jwt.account, jwt.address, dto);
return { status };
}

Expand Down
6 changes: 6 additions & 0 deletions src/subdomains/supporting/realunit/dto/realunit-registration.dto.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ export class RealUnitEmailRegistrationDto {
@IsLowercase()
@Transform(Util.trim)
email: string;

@ApiProperty({ description: 'Ethereum wallet address (0x...)' })
@IsNotEmpty()
@IsString()
@Matches(/^0x[a-fA-F0-9]{40}$/, { message: 'walletAddress must be a valid Ethereum address' })
walletAddress: string;
}

export class RealUnitEmailRegistrationResponseDto {
Expand Down
23 changes: 18 additions & 5 deletions src/subdomains/supporting/realunit/realunit.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,11 +349,26 @@ export class RealUnitService {
return !success;
}

async registerEmail(userDataId: number, dto: RealUnitEmailRegistrationDto): Promise<RealUnitEmailRegistrationStatus> {
const userData = await this.userDataService.getUserData(userDataId, { users: true });
async registerEmail(
userDataId: number,
jwtAddress: string,
dto: RealUnitEmailRegistrationDto,
): Promise<RealUnitEmailRegistrationStatus> {
const userData = await this.userDataService.getUserData(userDataId, { users: true, kycSteps: true });
if (!userData) throw new NotFoundException('User not found');

if (!userData.mail) {
// Validate wallet address matches authenticated wallet
if (!Util.equalsIgnoreCase(dto.walletAddress, jwtAddress)) {
throw new BadRequestException('Wallet address does not match authenticated wallet');
}

const isNewEmail = !userData.mail || !Util.equalsIgnoreCase(dto.email, userData.mail);

if (isNewEmail) {
if (userData.mail && this.hasRegistrationForWallet(userData, dto.walletAddress)) {
throw new BadRequestException('Not allowed to register a new email for this address');
}

try {
await this.userDataService.trySetUserMail(userData, dto.email);
} catch (e) {
Expand All @@ -364,8 +379,6 @@ export class RealUnitService {
}
throw e;
}
} else if (!Util.equalsIgnoreCase(dto.email, userData.mail)) {
throw new BadRequestException('Email does not match verified email');
}

if (userData.kycLevel < KycLevel.LEVEL_10) {
Expand Down
Loading