sjs/immich
1
0
Fork 0
mirror of https://github.com/samsonjs/immich.git synced 2026-04-27 15:07:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: notification-admin controller (#17748)

Browse source
This commit is contained in:
Jason Rasmussen 2025-04-21 10:49:26 -04:00 committed by GitHub
parent f0ff8581da
commit 488dc4efbd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
mobile/openapi/README.md generated
View file

Binary file not shown.

BIN
mobile/openapi/lib/api.dart generated
View file

Binary file not shown.

BIN
mobile/openapi/lib/api/notifications_api.dart → mobile/openapi/lib/api/notifications_admin_api.dart generated
View file

Binary file not shown.

12
open-api/immich-openapi-specs.json
View file

@ -3485,9 +3485,9 @@
] ]
} }
}, },
"/notifications/templates/{name}": { "/notifications/admin/templates/{name}": {
"post": { "post": {
"operationId": "getNotificationTemplate", "operationId": "getNotificationTemplateAdmin",
"parameters": [ "parameters": [
{ {
"name": "name", "name": "name",
@ -3532,13 +3532,13 @@
} }
], ],
"tags": [ "tags": [
"Notifications" "Notifications (Admin)"
] ]
} }
}, },
"/notifications/test-email": { "/notifications/admin/test-email": {
"post": { "post": {
"operationId": "sendTestEmail", "operationId": "sendTestEmailAdmin",
"parameters": [], "parameters": [],
"requestBody": { "requestBody": {
"content": { "content": {
@ -3574,7 +3574,7 @@
} }
], ],
"tags": [ "tags": [
"Notifications" "Notifications (Admin)"
] ]
} }
}, },

8
open-api/typescript-sdk/src/fetch-client.ts
View file

@ -2318,26 +2318,26 @@ export function addMemoryAssets({ id, bulkIdsDto }: {
body: bulkIdsDto body: bulkIdsDto
}))); })));
} }
export function getNotificationTemplate({ name, templateDto }: { export function getNotificationTemplateAdmin({ name, templateDto }: {
name: string; name: string;
templateDto: TemplateDto; templateDto: TemplateDto;
}, opts?: Oazapfts.RequestOpts) { }, opts?: Oazapfts.RequestOpts) {
return oazapfts.ok(oazapfts.fetchJson<{ return oazapfts.ok(oazapfts.fetchJson<{
status: 200; status: 200;
data: TemplateResponseDto; data: TemplateResponseDto;
}>(`/notifications/templates/${encodeURIComponent(name)}`, oazapfts.json({ }>(`/notifications/admin/templates/${encodeURIComponent(name)}`, oazapfts.json({
...opts, ...opts,
method: "POST", method: "POST",
body: templateDto body: templateDto
}))); })));
} }
export function sendTestEmail({ systemConfigSmtpDto }: { export function sendTestEmailAdmin({ systemConfigSmtpDto }: {
systemConfigSmtpDto: SystemConfigSmtpDto; systemConfigSmtpDto: SystemConfigSmtpDto;
}, opts?: Oazapfts.RequestOpts) { }, opts?: Oazapfts.RequestOpts) {
return oazapfts.ok(oazapfts.fetchJson<{ return oazapfts.ok(oazapfts.fetchJson<{
status: 200; status: 200;
data: TestEmailResponseDto; data: TestEmailResponseDto;
}>("/notifications/test-email", oazapfts.json({ }>("/notifications/admin/test-email", oazapfts.json({
...opts, ...opts,
method: "POST", method: "POST",
body: systemConfigSmtpDto body: systemConfigSmtpDto

4
server/src/controllers/index.ts
View file

@ -13,7 +13,7 @@ import { JobController } from 'src/controllers/job.controller';
import { LibraryController } from 'src/controllers/library.controller'; import { LibraryController } from 'src/controllers/library.controller';
import { MapController } from 'src/controllers/map.controller'; import { MapController } from 'src/controllers/map.controller';
import { MemoryController } from 'src/controllers/memory.controller'; import { MemoryController } from 'src/controllers/memory.controller';
import { NotificationController } from 'src/controllers/notification.controller'; import { NotificationAdminController } from 'src/controllers/notification-admin.controller';
import { OAuthController } from 'src/controllers/oauth.controller'; import { OAuthController } from 'src/controllers/oauth.controller';
import { PartnerController } from 'src/controllers/partner.controller'; import { PartnerController } from 'src/controllers/partner.controller';
import { PersonController } from 'src/controllers/person.controller'; import { PersonController } from 'src/controllers/person.controller';
@ -47,7 +47,7 @@ export const controllers = [
LibraryController, LibraryController,
MapController, MapController,
MemoryController, MemoryController,
NotificationController, NotificationAdminController,
OAuthController, OAuthController,
PartnerController, PartnerController,
PersonController, PersonController,

10
server/src/controllers/notification.controller.ts → server/src/controllers/notification-admin.controller.ts
View file

@ -7,22 +7,22 @@ import { Auth, Authenticated } from 'src/middleware/auth.guard';
import { EmailTemplate } from 'src/repositories/notification.repository'; import { EmailTemplate } from 'src/repositories/notification.repository';
import { NotificationService } from 'src/services/notification.service'; import { NotificationService } from 'src/services/notification.service';
@ApiTags('Notifications') @ApiTags('Notifications (Admin)')
@Controller('notifications') @Controller('notifications/admin')
export class NotificationController { export class NotificationAdminController {
constructor(private service: NotificationService) {} constructor(private service: NotificationService) {}
@Post('test-email') @Post('test-email')
@HttpCode(HttpStatus.OK) @HttpCode(HttpStatus.OK)
@Authenticated({ admin: true }) @Authenticated({ admin: true })
sendTestEmail(@Auth() auth: AuthDto, @Body() dto: SystemConfigSmtpDto): Promise<TestEmailResponseDto> { sendTestEmailAdmin(@Auth() auth: AuthDto, @Body() dto: SystemConfigSmtpDto): Promise<TestEmailResponseDto> {
return this.service.sendTestEmail(auth.user.id, dto); return this.service.sendTestEmail(auth.user.id, dto);
} }
@Post('templates/:name') @Post('templates/:name')
@HttpCode(HttpStatus.OK) @HttpCode(HttpStatus.OK)
@Authenticated({ admin: true }) @Authenticated({ admin: true })
getNotificationTemplate( getNotificationTemplateAdmin(
@Auth() auth: AuthDto, @Auth() auth: AuthDto,
@Param('name') name: EmailTemplate, @Param('name') name: EmailTemplate,
@Body() dto: TemplateDto, @Body() dto: TemplateDto,

4
web/src/lib/components/admin-page/settings/notification-settings/notification-settings.svelte
View file

@ -12,7 +12,7 @@
import { SettingInputFieldType } from '$lib/constants'; import { SettingInputFieldType } from '$lib/constants';
import { user } from '$lib/stores/user.store'; import { user } from '$lib/stores/user.store';
import { handleError } from '$lib/utils/handle-error'; import { handleError } from '$lib/utils/handle-error';
import { sendTestEmail, type SystemConfigDto } from '@immich/sdk'; import { sendTestEmailAdmin, type SystemConfigDto } from '@immich/sdk';
import { Button } from '@immich/ui'; import { Button } from '@immich/ui';
import { isEqual } from 'lodash-es'; import { isEqual } from 'lodash-es';
import { t } from 'svelte-i18n'; import { t } from 'svelte-i18n';
@ -40,7 +40,7 @@
isSending = true; isSending = true;
try { try {
await sendTestEmail({ await sendTestEmailAdmin({
systemConfigSmtpDto: { systemConfigSmtpDto: {
enabled: config.notifications.smtp.enabled, enabled: config.notifications.smtp.enabled,
transport: { transport: {

4
web/src/lib/components/admin-page/settings/template-settings/template-settings.svelte
View file

@ -6,7 +6,7 @@
import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte'; import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';
import SettingTextarea from '$lib/components/shared-components/settings/setting-textarea.svelte'; import SettingTextarea from '$lib/components/shared-components/settings/setting-textarea.svelte';
import { handleError } from '$lib/utils/handle-error'; import { handleError } from '$lib/utils/handle-error';
import { type SystemConfigDto, type SystemConfigTemplateEmailsDto, getNotificationTemplate } from '@immich/sdk'; import { type SystemConfigDto, type SystemConfigTemplateEmailsDto, getNotificationTemplateAdmin } from '@immich/sdk';
import { Button } from '@immich/ui'; import { Button } from '@immich/ui';
import { mdiEyeOutline } from '@mdi/js'; import { mdiEyeOutline } from '@mdi/js';
import { t } from 'svelte-i18n'; import { t } from 'svelte-i18n';
@ -25,7 +25,7 @@
const getTemplate = async (name: string, template: string) => { const getTemplate = async (name: string, template: string) => {
try { try {
loadingPreview = true; loadingPreview = true;
const result = await getNotificationTemplate({ name, templateDto: { template } }); const result = await getNotificationTemplateAdmin({ name, templateDto: { template } });
htmlPreview = result.html; htmlPreview = result.html;
} catch (error) { } catch (error) {
handleError(error, 'Could not load template.'); handleError(error, 'Could not load template.');