@social-mail/social-mail-web-server 1.4.976 → 1.4.978

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.4.976",
+  "version": "1.4.978",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/server/model/entities/HostedZone.ts

@@ -22,10 +22,21 @@ export default class HostedZone {
     })
     zoneID: number;
 
+    @Column({ dataType: "Char", nullable: true })
+    @ReadOnlyJsonProperty
+    unsigned: string;
+
+    @Column({ dataType: "Char", nullable: true })
+    @ReadOnlyJsonProperty
+    digest: string;
+
     domain: Domain;
     records: HostedZoneRecord[];
     users: HostedZoneUser[];
 
+    @JsonProperty({})
+    zone: string;
+
 }
 
 @Table("HostedZoneUsers")

package/src/server/model/events/HostedZoneEvents.ts

@@ -7,6 +7,8 @@ import SocialMailContext from "../SocialMailContext.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import { globalEnv } from "../../../common/globalEnv.js";
+import EmailAddressService from "../../services/EmailAddressService.js";
+import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 
 export default class HostedZoneEvents extends AuthenticatedEvents<HostedZone> {
 
@@ -20,6 +22,21 @@ export default class HostedZoneEvents extends AuthenticatedEvents<HostedZone> {
         return query.where(this.sessionUser, (p) => (x) => x.users.some((u) => u.userID === p.userID));
     }
 
+    async beforeInsert(entity: HostedZone, entry: ChangeEntry<HostedZone>) {
+        if (this.verify) {
+            this.sessionUser.ensureIsAdmin();
+        }
+
+        const eas = ServiceProvider.resolve(this, EmailAddressService);
+
+        if (!entity.zoneID) {
+            if (!entity.zone) {
+                throw new EntityAccessError(`Zone name cannot be empty`);
+            }
+            entity.zoneID = await eas.getOrCreateDomain(entity.zone);
+        }
+    }
+
     async afterInsert(entity: HostedZone, entry: ChangeEntry<HostedZone>) {