@openinc/parse-server-opendash 2.3.14 → 2.4.3

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/types/GTFS_Route.d.ts

@@ -7,6 +7,7 @@ export interface GTFS_RouteAttributes {
     createdAt: Date;
     updatedAt: Date;
     agency_id: GTFS_Agency;
+    key: string;
     route_color?: string;
     route_desc?: string;
     route_id: string;
@@ -23,6 +24,8 @@ export declare class GTFS_Route extends Parse.Object<GTFS_RouteAttributes> {
     constructor(data?: Partial<GTFS_RouteAttributes>);
     get agency_id(): GTFS_Agency;
     set agency_id(value: GTFS_Agency);
+    get key(): string;
+    set key(value: string);
     get route_color(): string | undefined;
     set route_color(value: string | undefined);
     get route_desc(): string | undefined;

package/dist/types/GTFS_Route.js

@@ -11,6 +11,12 @@ class GTFS_Route extends Parse.Object {
     set agency_id(value) {
         super.set("agency_id", value);
     }
+    get key() {
+        return super.get("key");
+    }
+    set key(value) {
+        super.set("key", value);
+    }
     get route_color() {
         return super.get("route_color");
     }

package/dist/types/GTFS_Trip.d.ts

@@ -12,6 +12,7 @@ export interface GTFS_TripAttributes {
     updatedAt: Date;
     bikes_allowed?: GTFS_Bikes_Allowed;
     direction_id?: GTFS_Direction;
+    key: string;
     route_id: GTFS_Route;
     service_id: GTFS_Calendar;
     tenant: Tenant;
@@ -26,6 +27,8 @@ export declare class GTFS_Trip extends Parse.Object<GTFS_TripAttributes> {
     set bikes_allowed(value: GTFS_Bikes_Allowed | undefined);
     get direction_id(): GTFS_Direction | undefined;
     set direction_id(value: GTFS_Direction | undefined);
+    get key(): string;
+    set key(value: string);
     get route_id(): GTFS_Route;
     set route_id(value: GTFS_Route);
     get service_id(): GTFS_Calendar;

package/dist/types/GTFS_Trip.js

@@ -17,6 +17,12 @@ class GTFS_Trip extends Parse.Object {
     set direction_id(value) {
         super.set("direction_id", value);
     }
+    get key() {
+        return super.get("key");
+    }
+    set key(value) {
+        super.set("key", value);
+    }
     get route_id() {
         return super.get("route_id");
     }

package/dist/types/Maintenance_Message.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="parse" />
+import type { Tenant } from "./Tenant";
 import type { _User } from "./_User";
 export interface Maintenance_MessageAttributes {
     id: string;
@@ -8,6 +9,7 @@ export interface Maintenance_MessageAttributes {
     classname: string;
     data?: any;
     referencedObjectId: string;
+    tenant?: Tenant;
     title?: string;
     user?: _User;
 }
@@ -20,6 +22,8 @@ export declare class Maintenance_Message extends Parse.Object<Maintenance_Messag
     set data(value: any | undefined);
     get referencedObjectId(): string;
     set referencedObjectId(value: string);
+    get tenant(): Tenant | undefined;
+    set tenant(value: Tenant | undefined);
     get title(): string | undefined;
     set title(value: string | undefined);
     get user(): _User | undefined;

package/dist/types/Maintenance_Message.js

@@ -23,6 +23,12 @@ class Maintenance_Message extends Parse.Object {
     set referencedObjectId(value) {
         super.set("referencedObjectId", value);
     }
+    get tenant() {
+        return super.get("tenant");
+    }
+    set tenant(value) {
+        super.set("tenant", value);
+    }
     get title() {
         return super.get("title");
     }

package/dist/types/Maintenance_Message_Body.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="parse" />
 import type { Maintenance_Message } from "./Maintenance_Message";
+import type { Tenant } from "./Tenant";
 import type { _User } from "./_User";
 export interface Maintenance_Message_BodyAttributes {
     id: string;
@@ -7,7 +8,9 @@ export interface Maintenance_Message_BodyAttributes {
     createdAt: Date;
     updatedAt: Date;
     content?: string;
+    data?: any;
     message?: Maintenance_Message;
+    tenant?: Tenant;
     user?: _User;
 }
 export declare class Maintenance_Message_Body extends Parse.Object<Maintenance_Message_BodyAttributes> {
@@ -15,8 +18,12 @@ export declare class Maintenance_Message_Body extends Parse.Object<Maintenance_M
     constructor(data?: Partial<Maintenance_Message_BodyAttributes>);
     get content(): string | undefined;
     set content(value: string | undefined);
+    get data(): any | undefined;
+    set data(value: any | undefined);
     get message(): Maintenance_Message | undefined;
     set message(value: Maintenance_Message | undefined);
+    get tenant(): Tenant | undefined;
+    set tenant(value: Tenant | undefined);
     get user(): _User | undefined;
     set user(value: _User | undefined);
 }

package/dist/types/Maintenance_Message_Body.js

@@ -11,12 +11,24 @@ class Maintenance_Message_Body extends Parse.Object {
     set content(value) {
         super.set("content", value);
     }
+    get data() {
+        return super.get("data");
+    }
+    set data(value) {
+        super.set("data", value);
+    }
     get message() {
         return super.get("message");
     }
     set message(value) {
         super.set("message", value);
     }
+    get tenant() {
+        return super.get("tenant");
+    }
+    set tenant(value) {
+        super.set("tenant", value);
+    }
     get user() {
         return super.get("user");
     }

package/package.json

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

package/schema/GTFS_Route.json

@@ -5,6 +5,10 @@
       "targetClass": "{{PREFIX}}GTFS_Agency",
       "required": true
     },
+    "key": {
+      "type": "String",
+      "required": true
+    },
     "route_color": {
       "type": "String",
       "required": false

package/schema/GTFS_Trip.json

@@ -10,6 +10,10 @@
       "targetClass": "{{PREFIX}}GTFS_Direction",
       "required": false
     },
+    "key": {
+      "type": "String",
+      "required": true
+    },
     "route_id": {
       "type": "Pointer",
       "targetClass": "{{PREFIX}}GTFS_Route",

package/schema/Maintenance_Message.json

@@ -12,6 +12,11 @@
       "type": "String",
       "required": true
     },
+    "tenant": {
+      "type": "Pointer",
+      "targetClass": "{{PREFIX}}Tenant",
+      "required": false
+    },
     "title": {
       "type": "String",
       "required": false

package/schema/Maintenance_Message_Body.json

@@ -4,11 +4,20 @@
       "type": "String",
       "required": false
     },
+    "data": {
+      "type": "Object",
+      "required": false
+    },
     "message": {
       "type": "Pointer",
       "targetClass": "{{PREFIX}}Maintenance_Message",
       "required": false
     },
+    "tenant": {
+      "type": "Pointer",
+      "targetClass": "{{PREFIX}}Tenant",
+      "required": false
+    },
     "user": {
       "type": "Pointer",
       "targetClass": "_User",