@openinc/parse-server-opendash 2.3.13 → 2.4.0

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

@@ -12,6 +12,11 @@ async function init(name) {
             };
         }
         catch (error) {
+            if (error instanceof Parse.Error) {
+                if (error.message.startsWith("t:")) {
+                    throw error;
+                }
+            }
             try {
                 const user = await Parse.Cloud.run("ldap_login", {
                     username,

package/dist/hooks/Core_Email.js

@@ -54,7 +54,7 @@ async function sendTemplateEmail({ to, subject, fallback, template, data, }) {
     const email = new types_1.Core_Email({
         payload: {
             to,
-            subject,
+            subject: renderEmailTemplate("subject", template, data, subject),
             text: renderEmailTemplate("txt", template, data, fallback),
             html: renderEmailTemplate("html", template, data, undefined),
         },
@@ -75,9 +75,13 @@ function validateEmailTemplate(templateDir, template) {
 }
 function renderEmailTemplate(type, template, data, fallback) {
     const fullTemplate = template + "." + type;
-    return validateEmailTemplate(emailTemplateDir, fullTemplate)
-        ? nunjucks_1.default.render(fullTemplate, data)
-        : fallback;
+    if (validateEmailTemplate(emailTemplateDir, fullTemplate)) {
+        return nunjucks_1.default.render(fullTemplate, data);
+    }
+    if (type === "html") {
+        return renderEmailTemplate("txt", template, data, fallback);
+    }
+    return fallback || "";
 }
 async function init() {
     (0, __1.beforeSaveHook)(types_1.Core_Email, async (request) => {

package/dist/hooks/_User.js

@@ -2,13 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = void 0;
 const __1 = require("..");
+const config_1 = require("../config");
 const types_1 = require("../types");
 async function init() {
     (0, __1.beforeSaveHook)(Parse.User, async (request) => {
         const user = request.object;
         const tenant = user.get("tenant");
         const tenantId = tenant?.id;
-        user.set("username", user.get("username")?.toLowerCase());
+        user.set("email", user.get("email")?.toLowerCase().trim());
+        user.set("username", user.get("username")?.toLowerCase().trim());
         if (tenant) {
             await tenant.fetch({ useMasterKey: true });
         }
@@ -104,5 +106,42 @@ async function init() {
             }
         }
     });
+    const verificationEmailCache = {};
+    if (config_1.config.getBoolean("AUTH_VERIFY_TENANT")) {
+        (0, __1.afterSaveHook)(Parse.User, async (request) => {
+            const object = request.object;
+            const original = request.original;
+            const tenant = object.get("tenant");
+            if (tenant && !original && object.get("tenantVerified") === false) {
+                const admins = await new Parse.Query(Parse.User)
+                    .equalTo("tenant", tenant)
+                    .equalTo("tenantAdmin", true)
+                    .findAll({ useMasterKey: true });
+                for (const admin of admins) {
+                    await (0, __1.sendTemplateEmail)({
+                        template: "openinc-auth-tenant-verification-request",
+                        subject: "Ein neuer Nutzer muss verifiziert werden",
+                        to: admin.get("email"),
+                        fallback: "Ein neuer Nutzer muss verifiziert werden",
+                        data: {},
+                    });
+                }
+            }
+            if (!verificationEmailCache[object.id] &&
+                tenant &&
+                original?.get("tenantVerified") === false &&
+                object.get("tenantVerified") === true) {
+                const email = object.get("email");
+                verificationEmailCache[object.id] = true;
+                await (0, __1.sendTemplateEmail)({
+                    template: "openinc-auth-tenant-verification",
+                    subject: "Dein Account wurde verifiziert",
+                    to: email,
+                    fallback: "Account wurde verifiziert",
+                    data: {},
+                });
+            }
+        });
+    }
 }
 exports.init = init;

package/dist/hooks/_beforeLogin.js

@@ -6,15 +6,15 @@ async function init() {
     Parse.Cloud.beforeLogin(async ({ object }) => {
         const verifyEmail = config_1.config.getBoolean("AUTH_VERIFY_EMAIL");
         if (verifyEmail && !object.get("emailVerified")) {
-            throw new Parse.Error(-1, "OPENDASH_ACCOUNT_EMAIL_VERIFICATION");
+            throw new Parse.Error(-1, "t:AUTH_MISSING_EMAIL_VERIFICATION");
         }
         if (object.get("tenant")) {
             const verifyTenant = config_1.config.getBoolean("AUTH_VERIFY_TENANT");
             if (verifyTenant && !object.get("tenantVerified")) {
-                throw new Parse.Error(-1, "OPENDASH_ACCOUNT_TENANT_VERIFICATION");
+                throw new Parse.Error(-1, "t:AUTH_MISSING_TENANT_VERIFICATION");
             }
             if (object.get("tenantBanned")) {
-                throw new Parse.Error(-1, "OPENDASH_ACCOUNT_BANNED");
+                throw new Parse.Error(-1, "t:AUTH_BANNED");
             }
         }
     });

package/dist/ow.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.publishDataItem = exports.getToken = void 0;
-const node_fetch_1 = __importDefault(require("node-fetch"));
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+const node_fetch_1 = __importDefault(require("node-fetch"));
 const config_1 = require("./config");
 const LOG_PREFIX = "[@openinc/parse-server-opendash][open.WARE] ";
 async function getToken(usermail) {
@@ -63,11 +63,12 @@ async function publishDataItem(dataItem, usermail) {
     //     (await response.text())
     // );
     if (!response.ok) {
+        const text = await response.text();
         console.log(LOG_PREFIX +
             "PUBLISH ERROR Bad Status Code: " +
             response.status +
             "\n" +
-            (await response.text()));
+            text);
         console.log(LOG_PREFIX +
             "PUBLISH ERROR DEBUG: \n" +
             "URL = " +
@@ -79,12 +80,8 @@ async function publishDataItem(dataItem, usermail) {
             "PAYLOAD = " +
             JSON.stringify(dataItem, null, 2) +
             "\n" +
-            (await response.text()));
-        throw new Error(LOG_PREFIX +
-            "Bad Status Code: " +
-            response.status +
-            "\n" +
-            (await response.text()));
+            text);
+        throw new Error(LOG_PREFIX + "Bad Status Code: " + response.status + "\n" + text);
     }
     console.log(LOG_PREFIX + "PUBLISH SUCCESS " + (await response.text()));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openinc/parse-server-opendash",
-  "version": "2.3.13",
+  "version": "2.4.0",
   "description": "Parse Server Cloud Code for open.DASH",
   "keywords": [
     "parse",