Skip to content

fix(admin-form): validate email domain before transfer ownership #9235

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
faizkhairi wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix(admin-form): validate email domain before transfer ownership #9235

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73c4449
fix(admin-form): validate email domain before transfer ownership
faizkhairi Mar 24, 2026
9f28683
refactor: reuse AuthService.validateEmailDomain for domain validation
faizkhairi Mar 25, 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
17 changes: 16 additions & 1 deletion apps/backend/src/app/modules/form/admin-form/admin-form.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ import {
MalformedParametersError,
PossibleDatabaseError,
} from '../../core/core.errors'
import { InvalidDomainError } from '../../auth/auth.errors'
import * as AuthService from '../../auth/auth.service'
import { MissingUserError } from '../../user/user.errors'
import * as UserService from '../../user/user.service'
import { removeFormsFromAllWorkspaces } from '../../workspace/workspace.service'
Expand Down Expand Up @@ -312,7 +314,7 @@ export const archiveForm = (
*
* @return ok(updated form) if transfer is successful
* @return err(MissingUserError) if the current form admin cannot be found
* @return err(TransferOwnershipError) if new owner cannot be found in the database or new owner email is same as current owner
* @return err(TransferOwnershipError) if new owner cannot be found in the database, new owner email is same as current owner, or new owner email domain is not whitelisted
* @return err(DatabaseError) if any database errors like missing admin of current owner occurs
*/
export const transferFormOwnership = (
Expand Down Expand Up @@ -342,6 +344,19 @@ export const transferFormOwnership = (
}
return okAsync(currentOwner)
})
// Step 1b: Validate that the new owner's email domain is whitelisted.
.andThen((currentOwner) =>
AuthService.validateEmailDomain(newOwnerEmail)
.map(() => currentOwner)
.mapErr((error) => {
if (error instanceof InvalidDomainError) {
return new TransferOwnershipError(
`${newOwnerEmail} is not part of a whitelisted agency`,
)
}
return error
}),
)
.andThen((currentOwner) =>
// Step 2: Retrieve user document for new owner.
UserService.findUserByEmail(newOwnerEmail)
Expand Down