Skip to content

High performance self-hosted photo and video management solution.

fix: welcome email password (#21732)

Jason Rasmussen39eee6a634cd
diff --git a/server/src/repositories/event.repository.ts b/server/src/repositories/event.repository.ts
index c1b26d5dde..ec4c8a8f52 100644
--- a/server/src/repositories/event.repository.ts
+++ b/server/src/repositories/event.repository.ts
@@ -81,7 +81,7 @@ type EventMap = {
StackDeleteAll: [{ stackIds: string[]; userId: string }];
// user events
- UserSignup: [{ notify: boolean; id: string; tempPassword?: string }];
+ UserSignup: [{ notify: boolean; id: string; password?: string }];
// websocket events
WebsocketConnect: [{ userId: string }];
diff --git a/server/src/services/notification.service.spec.ts b/server/src/services/notification.service.spec.ts
index eef1c4f8b2..11c385b1e2 100644
--- a/server/src/services/notification.service.spec.ts
+++ b/server/src/services/notification.service.spec.ts
@@ -147,7 +147,7 @@ describe(NotificationService.name, () => {
await sut.onUserSignup({ id: '', notify: true });
expect(mocks.job.queue).toHaveBeenCalledWith({
name: JobName.NotifyUserSignup,
- data: { id: '', tempPassword: undefined },
+ data: { id: '', password: undefined },
});
});
});
diff --git a/server/src/services/notification.service.ts b/server/src/services/notification.service.ts
index 1a257309b2..91a043d405 100644
--- a/server/src/services/notification.service.ts
+++ b/server/src/services/notification.service.ts
@@ -191,9 +191,9 @@ export class NotificationService extends BaseService {
}
@OnEvent({ name: 'UserSignup' })
- async onUserSignup({ notify, id, tempPassword }: ArgOf<'UserSignup'>) {
+ async onUserSignup({ notify, id, password: password }: ArgOf<'UserSignup'>) {
if (notify) {
- await this.jobRepository.queue({ name: JobName.NotifyUserSignup, data: { id, tempPassword } });
+ await this.jobRepository.queue({ name: JobName.NotifyUserSignup, data: { id, password } });
}
}
@@ -251,70 +251,8 @@ export class NotificationService extends BaseService {
return { messageId };
}
- async getTemplate(name: EmailTemplate, customTemplate: string) {
- const { server, templates } = await this.getConfig({ withCache: false });
-
- let templateResponse = '';
-
- switch (name) {
- case EmailTemplate.WELCOME: {
- const { html: _welcomeHtml } = await this.emailRepository.renderEmail({
- template: EmailTemplate.WELCOME,
- data: {
- baseUrl: getExternalDomain(server),
- displayName: 'John Doe',
- username: '[email protected]',
- password: 'thisIsAPassword123',
- },
- customTemplate: customTemplate || templates.email.welcomeTemplate,
- });
-
- templateResponse = _welcomeHtml;
- break;
- }
- case EmailTemplate.ALBUM_UPDATE: {
- const { html: _updateAlbumHtml } = await this.emailRepository.renderEmail({
- template: EmailTemplate.ALBUM_UPDATE,
- data: {
- baseUrl: getExternalDomain(server),
- albumId: '1',
- albumName: 'Favorite Photos',
- recipientName: 'Jane Doe',
- cid: undefined,
- },
- customTemplate: customTemplate || templates.email.albumInviteTemplate,
- });
- templateResponse = _updateAlbumHtml;
- break;
- }
-
- case EmailTemplate.ALBUM_INVITE: {
- const { html } = await this.emailRepository.renderEmail({
- template: EmailTemplate.ALBUM_INVITE,
- data: {
- baseUrl: getExternalDomain(server),
- albumId: '1',
- albumName: "John Doe's Favorites",
- senderName: 'John Doe',
- recipientName: 'Jane Doe',
- cid: undefined,
- },
- customTemplate: customTemplate || templates.email.albumInviteTemplate,
- });
- templateResponse = html;
- break;
- }
- default: {
- templateResponse = '';
- break;
- }
- }
-
- return { name, html: templateResponse };
- }
-
@OnJob({ name: JobName.NotifyUserSignup, queue: QueueName.Notification })
- async handleUserSignup({ id, tempPassword }: JobOf<JobName.NotifyUserSignup>) {
+ async handleUserSignup({ id, password }: JobOf<JobName.NotifyUserSignup>) {
const user = await this.userRepository.get(id, { withDeleted: false });
if (!user) {
return JobStatus.Skipped;
@@ -327,7 +265,7 @@ export class NotificationService extends BaseService {
baseUrl: getExternalDomain(server),
displayName: user.name,
username: user.email,
- password: tempPassword,
+ password,
},
customTemplate: templates.email.welcomeTemplate,
});
diff --git a/server/src/services/user-admin.service.ts b/server/src/services/user-admin.service.ts
index 3ae9d429eb..ce70419ff6 100644
--- a/server/src/services/user-admin.service.ts
+++ b/server/src/services/user-admin.service.ts
@@ -38,7 +38,7 @@ export class UserAdminService extends BaseService {
await this.eventRepository.emit('UserSignup', {
notify: !!notify,
id: user.id,
- tempPassword: user.shouldChangePassword ? userDto.password : undefined,
+ password: userDto.password,
});
return mapUserAdmin(user);
diff --git a/server/src/types.ts b/server/src/types.ts
index 9e54de80bb..ce0baa1672 100644
--- a/server/src/types.ts
+++ b/server/src/types.ts
@@ -249,7 +249,7 @@ export interface IEmailJob {
}
export interface INotifySignupJob extends IEntityJob {
- tempPassword?: string;
+ password?: string;
}
export interface INotifyAlbumInviteJob extends IEntityJob {