Skip to content

fix: move recordToCreate declaration and using changed records from h… #2

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

Merged
merged 1 commit into from
Jan 22, 2025
Merged

fix: move recordToCreate declaration and using changed records from h… #2

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
22 changes: 10 additions & 12 deletions index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,14 +240,15 @@ export default class OpenSignupPlugin extends AdminForthPlugin {

// create user
if (!existingUser) {
let recordToCreate = {
...(this.options.defaultFieldValues || {}),
...(this.options.confirmEmails ? { [this.options.confirmEmails.emailConfirmedField]: false } : {}),
[this.emailField.name]: normalizedEmail,
[this.options.passwordHashField]: password ? await AdminForth.Utils.generatePasswordHash(password) : '',
};

if (this.options.hooks?.beforeUserSave) {
const hook = this.options.hooks.beforeUserSave;
const recordToCreate = {
...(this.options.defaultFieldValues || {}),
...(this.options.confirmEmails ? { [this.options.confirmEmails.emailConfirmedField]: false } : {}),
[this.emailField.name]: normalizedEmail,
[this.options.passwordHashField]: password ? await AdminForth.Utils.generatePasswordHash(password) : '',
};
const resp = await hook({
resource: this.authResource,
record: recordToCreate,
Expand All @@ -261,13 +262,10 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
if (resp.error) {
return { error: resp.error };
}
recordToCreate = resp.record || recordToCreate;
}
const created = await this.adminforth.resource(this.authResource.resourceId).create({
...(this.options.defaultFieldValues || {}),
...(this.options.confirmEmails ? { [this.options.confirmEmails.emailConfirmedField]: false } : {}),
[this.emailField.name]: normalizedEmail,
[this.options.passwordHashField]: password ? await AdminForth.Utils.generatePasswordHash(password) : '',
});

const created = await this.adminforth.resource(this.authResource.resourceId).create(recordToCreate);

if (this.options.hooks?.afterUserSave) {
const hook = this.options.hooks.afterUserSave;
Expand Down