@openinc/parse-server-opendash 3.29.0 → 3.29.2

package/dist/features/notifications/services/initEmailTransport.js

@@ -10,9 +10,10 @@ const path_1 = require("path");
 const __1 = require("..");
 const config_1 = require("../../config");
 async function initEmailTransport() {
-    const emailState = __1.EmailState.getInstance();
     try {
         if (config_1.ConfigInstance.getInstance().getBoolean("SMTP_ENABLED")) {
+            const emailState = __1.EmailState.getInstance();
+            console.log("[@openinc/parse-server-opendash] Initializing email transport...");
             const transportOptions = {
                 host: config_1.ConfigInstance.getInstance().get("SMTP_HOST"),
                 port: config_1.ConfigInstance.getInstance().getNumber("SMTP_PORT"),
@@ -27,7 +28,11 @@ async function initEmailTransport() {
                 };
             }
             const transport = nodemailer_1.default.createTransport(transportOptions);
-            await transport.verify();
+            if (config_1.ConfigInstance.getInstance().get("SMTP_USER") &&
+                config_1.ConfigInstance.getInstance().get("SMTP_PASS")) {
+                console.log("[@openinc/parse-server-opendash] Verifying SMTP transport...");
+                await transport.verify();
+            }
             emailState.setTransport(transport);
             const templateDir = (0, path_1.resolve)(process.cwd(), config_1.ConfigInstance.getInstance().get("EMAIL_TEMPLATE_DIR"));
             emailState.setEmailTemplateDir(templateDir);

package/dist/features/openservice/functions/assignUsersAndRoles.js

@@ -49,6 +49,7 @@ async function assignUsersAndRoles(ticket, assignedTo, fetchOptions, assigningUs
     const userNotifiedIds = [];
     for await (const assignedTo of newUsers) {
         const resipientlanguage = await (0, getUserLanguage_1.getUserLanguage)(assignedTo);
+        const recipientlink = await (0, getTicketLink_1.getTicketLink)(ticket, assignedTo);
         await i18next_1.default.changeLanguage(resipientlanguage);
         assignments.push(new types_1.Maintenance_Ticket_Assignment({
             ticket,
@@ -74,7 +75,7 @@ async function assignUsersAndRoles(ticket, assignedTo, fetchOptions, assigningUs
             description: i18next_1.default.t("maintenance:ticket.assignuser.notification.description", {
                 username: (0, openinc_openservice_save_ticket_data_1.getUsername)(assigningUser) ?? "System",
                 ticketName: ticket.get("title"),
-                ticketLink: (0, getTicketLink_1.getTicketLink)(ticket),
+                ticketLink: recipientlink,
             }),
         }).save(null, { useMasterKey: true });
         userNotifiedIds.push(assignedTo.id);
@@ -96,6 +97,7 @@ async function assignUsersAndRoles(ticket, assignedTo, fetchOptions, assigningUs
                 roleUser.id === assigningUser?.id)
                 continue;
             const resipientlanguage = await (0, getUserLanguage_1.getUserLanguage)(roleUser);
+            const recipientlink = await (0, getTicketLink_1.getTicketLink)(ticket, roleUser);
             await i18next_1.default.changeLanguage(resipientlanguage);
             await new types_1.Notification({
                 data: {
@@ -114,7 +116,7 @@ async function assignUsersAndRoles(ticket, assignedTo, fetchOptions, assigningUs
                     username: (0, openinc_openservice_save_ticket_data_1.getUsername)(assigningUser) ?? "System",
                     ticketName: ticket.get("title"),
                     role: assignedTo.get("label"),
-                    ticketLink: (0, getTicketLink_1.getTicketLink)(ticket),
+                    ticketLink: recipientlink,
                 }),
             }).save(null, { useMasterKey: true });
         }

package/dist/features/openservice/ticket/getTicketLink.d.ts

@@ -1,2 +1,7 @@
-import { Maintenance_Ticket } from "../../../types";
-export declare function getTicketLink(ticket: Maintenance_Ticket): string;
+import { _User, Maintenance_Ticket } from "../../../types";
+/**
+ * Returns the link to a ticket.
+ * @param ticket
+ * @returns
+ */
+export declare function getTicketLink(ticket: Maintenance_Ticket, user: _User): Promise<string>;

package/dist/features/openservice/ticket/getTicketLink.js

@@ -2,14 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTicketLink = getTicketLink;
 const config_1 = require("../../config");
-function getTicketLink(ticket) {
-    //Get hostname from environment variable or default to localhost
+/**
+ * Returns the link to a ticket.
+ * @param ticket
+ * @returns
+ */
+async function getTicketLink(ticket, user) {
+    //Get hostname from tenant or environment variable or default to localhost
     let hostname = "localhost";
     try {
+        const baseurl = user.get("tenant")?.get("baseUrl");
         const publicurl = config_1.ConfigInstance.getInstance()
             .get("PARSE_PUBLIC_SERVER_URL")
             .replace("/parse", "");
-        if (publicurl) {
+        if (baseurl !== undefined && baseurl !== "") {
+            hostname = baseurl;
+        }
+        else if (publicurl) {
             hostname = publicurl;
         }
     }

package/dist/functions/openinc-auth-email-confirmation-request.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = init;
-const __1 = require("..");
+const notifications_1 = require("../features/notifications");
 const transformLogin_1 = require("../helper/transformLogin");
 const openinc_auth_common_1 = require("./openinc-auth.common");
 async function init(name) {
@@ -14,7 +14,7 @@ async function init(name) {
             throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, "No user was found with the given email.");
         }
         const { url } = await (0, openinc_auth_common_1.createToken)("verify-email", user.id, request.params.url);
-        await (0, __1.sendTemplateEmail)({
+        await (0, notifications_1.sendTemplateEmail)({
             template: "openinc-auth-email-confirmation",
             subject: "E-Mail Bestätigung / Email confirmation",
             to: email,

package/dist/functions/openinc-auth-login-passwordless.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = init;
-const __1 = require("..");
+const notifications_1 = require("../features/notifications");
 const transformLogin_1 = require("../helper/transformLogin");
 const openinc_auth_common_1 = require("./openinc-auth.common");
 async function init(name) {
@@ -22,7 +22,7 @@ async function init(name) {
         });
         const url = urlTemplate.replace("{{token}}", sessionToken);
         console.log(url);
-        await (0, __1.sendTemplateEmail)({
+        await (0, notifications_1.sendTemplateEmail)({
             template: "openinc-auth-login-passwordless",
             subject: "Passwordless Login",
             to: email,

package/dist/functions/openinc-auth-password-reset-request.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = init;
-const __1 = require("..");
+const notifications_1 = require("../features/notifications");
 const transformLogin_1 = require("../helper/transformLogin");
 const openinc_auth_common_1 = require("./openinc-auth.common");
 async function init(name) {
@@ -14,7 +14,7 @@ async function init(name) {
             throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, "No user was found with the given email.");
         }
         const { url } = await (0, openinc_auth_common_1.createToken)("password-reset", user.id, request.params.url);
-        await (0, __1.sendTemplateEmail)({
+        await (0, notifications_1.sendTemplateEmail)({
             template: "openinc-auth-password-reset",
             subject: "Passwort zurücksetzen / Password reset",
             to: email,

package/dist/functions/openinc-mail-test.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = init;
-const __1 = require("..");
+const notifications_1 = require("../features/notifications");
 async function init(name) {
     // sendTestEmail - Sends a test email
     Parse.Cloud.define(name, async (request) => {
@@ -9,7 +9,7 @@ async function init(name) {
             return { message: "Unauthorized" };
         }
         const { to } = request.params;
-        const mail = await (0, __1.sendSimpleEmail)(to, "open.INC Test Mail", "This is a test email from open.INC Stack.");
+        const mail = await (0, notifications_1.sendSimpleEmail)(to, "open.INC Test Mail", "This is a test email from open.INC Stack.");
         return mail;
     }, {
         requireUser: true,

package/dist/hooks/Notification.js

@@ -7,6 +7,7 @@ exports.init = init;
 const web_push_1 = __importDefault(require("web-push"));
 const __1 = require("..");
 const config_1 = require("../features/config");
+const notifications_1 = require("../features/notifications");
 const types_1 = require("../types");
 async function init() {
     (0, __1.beforeSaveHook)(types_1.Notification, async (request) => {
@@ -32,7 +33,7 @@ async function init() {
                         body += config_1.ConfigInstance.getInstance().get("APP_URL");
                         body += object.get("data")?.url;
                     }
-                    await (0, __1.sendSimpleEmail)(email, title, body);
+                    await (0, notifications_1.sendSimpleEmail)(email, title, body);
                 }
             }
             // Handle Push

package/dist/hooks/_User.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = init;
 const __1 = require("..");
 const config_1 = require("../features/config");
+const notifications_1 = require("../features/notifications");
 const settings_1 = require("../features/user/settings");
 const transformLogin_1 = require("../helper/transformLogin");
 const types_1 = require("../types");
@@ -111,7 +112,7 @@ async function init() {
                     .equalTo("tenantAdmin", true)
                     .findAll({ useMasterKey: true });
                 for (const admin of admins) {
-                    await (0, __1.sendTemplateEmail)({
+                    await (0, notifications_1.sendTemplateEmail)({
                         template: "openinc-auth-tenant-verification-request",
                         subject: "Ein neuer Nutzer muss verifiziert werden",
                         to: admin.get("email"),
@@ -126,7 +127,7 @@ async function init() {
                 object.get("tenantVerified") === true) {
                 const email = object.get("email");
                 verificationEmailCache[object.id] = true;
-                await (0, __1.sendTemplateEmail)({
+                await (0, notifications_1.sendTemplateEmail)({
                     template: "openinc-auth-tenant-verification",
                     subject: "Dein Account wurde verifiziert",
                     to: email,

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 import type { Cloud as ParseCloud } from "parse";
 import { Permission } from "./types";
-export { sendSimpleEmail, sendTemplateEmail } from "./features/notifications";
 /**
  * Initializes the Cloud Code for open.DASH.
  * This function performs various initialization tasks such as
@@ -194,3 +193,4 @@ export declare function autoloadCloudCode(path: string, regex?: RegExp): Promise
  * @returns The updated or newly created permission.
  */
 export declare function ensurePermission(key: string, acl?: Parse.ACL): Promise<Permission>;
+export {};

package/dist/index.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendTemplateEmail = exports.sendSimpleEmail = void 0;
 exports.init = init;
 exports.hasPermission = hasPermission;
 exports.requirePermission = requirePermission;
@@ -48,12 +47,8 @@ dayjs_1.default.extend(weekday_1.default);
 dayjs_1.default.extend(dayOfYear_1.default);
 dayjs_1.default.extend(weekOfYear_1.default);
 dayjs_1.default.extend(duration_1.default);
-var notifications_2 = require("./features/notifications");
-Object.defineProperty(exports, "sendSimpleEmail", { enumerable: true, get: function () { return notifications_2.sendSimpleEmail; } });
-Object.defineProperty(exports, "sendTemplateEmail", { enumerable: true, get: function () { return notifications_2.sendTemplateEmail; } });
 const PREFIX = "OD3_";
 let config;
-// const lang_deu = require("../i18n/deu.json");
 let schema = {};
 /**
  * Initializes the Cloud Code for open.DASH.

package/dist/types/Tenant.d.ts

@@ -5,6 +5,7 @@ export interface TenantAttributes {
     objectId: string;
     createdAt: Date;
     updatedAt: Date;
+    baseUrl: string;
     dataProtectionUrl: string;
     dataSource?: Source | undefined;
     description: string;
@@ -21,6 +22,8 @@ export interface TenantAttributes {
 export declare class Tenant extends Parse.Object<TenantAttributes> {
     static className: string;
     constructor(data?: Partial<TenantAttributes>);
+    get baseUrl(): string;
+    set baseUrl(value: string);
     get dataProtectionUrl(): string;
     set dataProtectionUrl(value: string);
     get dataSource(): Source | undefined;

package/dist/types/Tenant.js

@@ -5,6 +5,12 @@ class Tenant extends Parse.Object {
     constructor(data) {
         super("OD3_Tenant", data);
     }
+    get baseUrl() {
+        return super.get("baseUrl");
+    }
+    set baseUrl(value) {
+        super.set("baseUrl", value);
+    }
     get dataProtectionUrl() {
         return super.get("dataProtectionUrl");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openinc/parse-server-opendash",
-  "version": "3.29.0",
+  "version": "3.29.2",
   "description": "Parse Server Cloud Code for open.INC Stack.",
   "packageManager": "pnpm@10.20.0",
   "keywords": [