Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-09-29 15:31:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: welcome email password (#21732)

Browse Source
This commit is contained in:
Jason Rasmussen 2025-09-10 09:11:42 -04:00 committed by GitHub
parent ee98e69097
commit 39eee6a634
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/repositories/event.repository.ts
View File

@ -81,7 +81,7 @@ type EventMap = {
StackDeleteAll: [{ stackIds: string[]; userId: string }]; StackDeleteAll: [{ stackIds: string[]; userId: string }];
// user events // user events
UserSignup: [{ notify: boolean; id: string; tempPassword?: string }]; UserSignup: [{ notify: boolean; id: string; password?: string }];
// websocket events // websocket events
WebsocketConnect: [{ userId: string }]; WebsocketConnect: [{ userId: string }];

2
server/src/services/notification.service.spec.ts
View File

@ -147,7 +147,7 @@ describe(NotificationService.name, () => {
await sut.onUserSignup({ id: '', notify: true }); await sut.onUserSignup({ id: '', notify: true });
expect(mocks.job.queue).toHaveBeenCalledWith({ expect(mocks.job.queue).toHaveBeenCalledWith({
name: JobName.NotifyUserSignup, name: JobName.NotifyUserSignup,
data: { id: '', tempPassword: undefined }, data: { id: '', password: undefined },
}); });
}); });
}); });

70
server/src/services/notification.service.ts
View File

@ -191,9 +191,9 @@ export class NotificationService extends BaseService {
} }
@OnEvent({ name: 'UserSignup' }) @OnEvent({ name: 'UserSignup' })
async onUserSignup({ notify, id, tempPassword }: ArgOf<'UserSignup'>) { async onUserSignup({ notify, id, password: password }: ArgOf<'UserSignup'>) {
if (notify) { 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 }; 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: 'john@doe.com',
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 }) @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 }); const user = await this.userRepository.get(id, { withDeleted: false });
if (!user) { if (!user) {
return JobStatus.Skipped; return JobStatus.Skipped;
@ -327,7 +265,7 @@ export class NotificationService extends BaseService {
baseUrl: getExternalDomain(server), baseUrl: getExternalDomain(server),
displayName: user.name, displayName: user.name,
username: user.email, username: user.email,
password: tempPassword, password,
}, },
customTemplate: templates.email.welcomeTemplate, customTemplate: templates.email.welcomeTemplate,
}); });

2
server/src/services/user-admin.service.ts
View File

@ -38,7 +38,7 @@ export class UserAdminService extends BaseService {
await this.eventRepository.emit('UserSignup', { await this.eventRepository.emit('UserSignup', {
notify: !!notify, notify: !!notify,
id: user.id, id: user.id,
tempPassword: user.shouldChangePassword ? userDto.password : undefined, password: userDto.password,
}); });
return mapUserAdmin(user); return mapUserAdmin(user);

2
server/src/types.ts
View File

@ -249,7 +249,7 @@ export interface IEmailJob {
} }
export interface INotifySignupJob extends IEntityJob { export interface INotifySignupJob extends IEntityJob {
tempPassword?: string; password?: string;
} }
export interface INotifyAlbumInviteJob extends IEntityJob { export interface INotifyAlbumInviteJob extends IEntityJob {