Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
feat(backend:notifications): include link password in sent emails
johaven1a3ed0a7624c
diff --git a/backend/src/applications/notifications/i18n/fr.ts b/backend/src/applications/notifications/i18n/fr.tsindex 4d6c03dd..74b4278e 100644--- a/backend/src/applications/notifications/i18n/fr.ts+++ b/backend/src/applications/notifications/i18n/fr.ts@@ -29,6 +29,7 @@ export const fr = {'You no longer have access to the share': `Vous n'avez plus accès au partage`,'You are no longer a member of the parent share, your child share has been deleted': `Vous n'êtes plus membre du partage parent, votre partage enfant a été supprimé`,'Access your shares from': 'Accédez à vos partages depuis',+ 'Access password': `Mot de passe d'accès`,Sync: 'Synchronisation','Access your syncs from': 'Accédez à vos synchronisations depuis','You are no longer synchronizing': 'Vous ne synchronisez plus'diff --git a/backend/src/applications/notifications/interfaces/notification-properties.interface.ts b/backend/src/applications/notifications/interfaces/notification-properties.interface.tsindex 362f4728..367e5beb 100644--- a/backend/src/applications/notifications/interfaces/notification-properties.interface.ts+++ b/backend/src/applications/notifications/interfaces/notification-properties.interface.ts@@ -23,6 +23,7 @@ export interface NotificationOptions {content?: stringaction?: ACTIONlinkUUID?: string+ linkPassword?: string}export type NotificationFromUser = Omit<Notification, 'fromUserId' | 'toUserId'> & { fromUser: Owner }diff --git a/backend/src/applications/notifications/mails/models.ts b/backend/src/applications/notifications/mails/models.tsindex 64e3806b..aaa4d2fd 100644--- a/backend/src/applications/notifications/mails/models.ts+++ b/backend/src/applications/notifications/mails/models.ts@@ -121,16 +121,22 @@ export function linkMail(author: UserModelaction: ACTIONlinkUUID: string+ linkPassword: string}): [string, string] {const tr = translateObject(language, {title: options.action === ACTION.ADD ? 'Share' : 'Space',defaultFooter: defaultFooter,+ passwordText: 'Access password',urlText: 'Access it from',event: notification.event})- const content = `${options.author ? mailAuthor(options.author) : ''}${mailEventOnElement(tr.event, notification.element)}`+ let content = `${options.author ? mailAuthor(options.author) : ''}${mailEventOnElement(tr.event, notification.element)}`++ if (options.linkPassword) {+ content += `<br><br>${tr.passwordText}: <div style="border:1px solid #000; padding:8px; display:inline-block;">${options.linkPassword}</div>`+ }const footer = `<br>${tr.urlText} <a href="${urlFromLink(options.currentUrl, options.linkUUID)}">${SERVER_NAME}</a><br>${tr.defaultFooter}`diff --git a/backend/src/applications/notifications/mails/templates.ts b/backend/src/applications/notifications/mails/templates.tsindex d6038b80..52b4fc53 100644--- a/backend/src/applications/notifications/mails/templates.ts+++ b/backend/src/applications/notifications/mails/templates.ts@@ -26,6 +26,6 @@ ${footer}export const mailAuthor = (author: UserModel) =>`<img style="border-radius: 50% !important; vertical-align: middle; object-fit: cover;" height="40" width="40" src="${author.avatarBase64}" alt="avatar"> <b>${author.fullName}</b> `-export const mailEventOnElement = (event: string, element: string) => `${event} : <b>${capitalizeString(element)}</b>`+export const mailEventOnElement = (event: string, element: string) => `${event}: <b>${capitalizeString(element)}</b>`export const mailItalicContent = (content: string) => `<p><i>${content}</i></p>`diff --git a/backend/src/applications/notifications/services/notifications-manager.service.ts b/backend/src/applications/notifications/services/notifications-manager.service.tsindex b1f985e5..bccf04fc 100644--- a/backend/src/applications/notifications/services/notifications-manager.service.ts+++ b/backend/src/applications/notifications/services/notifications-manager.service.ts@@ -109,6 +109,7 @@ export class NotificationsManager {currentUrl: options.currentUrl,author: options.author,linkUUID: options.linkUUID,+ linkPassword: options.linkPassword,action: options.action})case NOTIFICATION_APP.SYNC:diff --git a/backend/src/applications/shares/services/shares-manager.service.ts b/backend/src/applications/shares/services/shares-manager.service.tsindex 8fbad5f0..de57b61b 100644--- a/backend/src/applications/shares/services/shares-manager.service.ts+++ b/backend/src/applications/shares/services/shares-manager.service.ts@@ -1124,6 +1124,7 @@ export class SharesManager {{author: user,linkUUID: link.linkSettings.uuid,+ linkPassword: link.linkSettings.password,currentUrl: this.contextManager.get('headerOriginUrl'),action: action} satisfies NotificationOptionsdiff --git a/frontend/src/assets/mimes/text-x-c.svg b/frontend/src/assets/mimes/text-x-c.svgnew file mode 100644index 00000000..2d8ac394--- /dev/null+++ b/frontend/src/assets/mimes/text-x-c.svg@@ -0,0 +1 @@+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><title>file_type_c3</title><path d="M29,10.232a2.387,2.387,0,0,0-.318-1.244,2.451,2.451,0,0,0-.936-.879Q22.552,5.241,17.353,2.376A2.642,2.642,0,0,0,14.59,2.4c-1.378.779-8.275,4.565-10.331,5.706A2.287,2.287,0,0,0,3,10.231V21.77a2.4,2.4,0,0,0,.3,1.22,2.434,2.434,0,0,0,.954.9c2.056,1.141,8.954,4.927,10.332,5.706a2.642,2.642,0,0,0,2.763.026q5.19-2.871,10.386-5.733a2.444,2.444,0,0,0,.955-.9,2.4,2.4,0,0,0,.3-1.22V10.232" style="fill:#a9b9cb"/><path d="M28.549,23.171a2.126,2.126,0,0,0,.147-.182,2.4,2.4,0,0,0,.3-1.22V10.232a2.387,2.387,0,0,0-.318-1.244c-.036-.059-.089-.105-.13-.16L16,16Z" style="fill:#8b97a3"/><path d="M28.549,23.171,16,16,3.451,23.171a2.435,2.435,0,0,0,.809.72c2.056,1.141,8.954,4.927,10.332,5.706a2.642,2.642,0,0,0,2.763.026q5.19-2.871,10.386-5.733A2.43,2.43,0,0,0,28.549,23.171Z" style="fill:#7f8b99"/><path d="M19.6,18.02a4.121,4.121,0,1,1-.027-4.087l3.615-2.073A8.309,8.309,0,0,0,7.7,16a8.216,8.216,0,0,0,1.1,4.117A8.319,8.319,0,0,0,23.211,20.1L19.6,18.02" style="fill:#fff"/></svg>\ No newline at end of file