Support email calendar property

Author: NeilRashbrook

calendar/api/ext-calendar-utils.jsm

@@ -12,6 +12,7 @@ var EXPORTED_SYMBOLS = [
   "propsToItem",
   "convertItem",
   "convertAlarm",
+  "findIdentityKey",
 ];
 
 var { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
@@ -21,6 +22,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   ICAL: "resource:///modules/calendar/Ical.jsm",
   CalEvent: "resource:///modules/CalEvent.jsm",
   CalTodo: "resource:///modules/CalTodo.jsm",
+  MailServices: "resource:///modules/MailServices.jsm",
 });
 
 var { ExtensionError } = ChromeUtils.import(
@@ -79,6 +81,7 @@ function convertCalendar(extension, calendar) {
     readOnly: calendar.readOnly,
     enabled: !calendar.getProperty("disabled"),
     color: calendar.getProperty("color") || "#A8C2E1",
+    email: calendar.getProperty("imip.identity")?.email,
   };
 
   if (isOwnCalendar(calendar, extension)) {
@@ -218,3 +221,15 @@ function convertAlarm(item, alarm) {
     related: ALARM_RELATED_MAP[alarm.related],
   };
 }
+
+function findIdentityKey(email) {
+  if (!email) {
+    return null;
+  }
+  for (let identity of MailServices.accounts.allIdentities) {
+    if (identity.email == email) {
+      return identity.key;
+    }
+  }
+  throw new ExtensionError(`Email address ${email} is unknown`);
+}

calendar/api/parent/ext-calendar-calendars.js

@@ -18,6 +18,7 @@ this.calendar_calendars = class extends ExtensionAPI {
       getResolvedCalendarById,
       isOwnCalendar,
       convertCalendar,
+      findIdentityKey,
     } = ChromeUtils.import("resource://ext-calendar-draft/api/ext-calendar-utils.jsm");
 
     return {
@@ -73,6 +74,8 @@ this.calendar_calendars = class extends ExtensionAPI {
             }
           },
           create: async function(createProperties) {
+            let key = findIdentityKey(createProperties.email);
+
             let calendar = calmgr.createCalendar(
               createProperties.type,
               Services.io.newURI(createProperties.url)
@@ -82,9 +85,12 @@ this.calendar_calendars = class extends ExtensionAPI {
             }
 
             calendar.name = createProperties.name;
-            if (typeof createProperties.color != "undefined") {
+            if (createProperties.color != null) {
               calendar.setProperty("color", createProperties.color);
             }
+            if (key) {
+              calendar.setProperty("imip.identity.key", key);
+            }
 
             calmgr.registerCalendar(calendar);
 
@@ -118,6 +124,10 @@ this.calendar_calendars = class extends ExtensionAPI {
               }
             }
 
+            if (updateProperties.email != null) {
+              calendar.setProperty("imip.identity.key", findIdentityKey(updateProperties.email));
+            }
+
             // TODO capabilities merging
           },
           remove: async function(id) {
@@ -204,6 +214,10 @@ this.calendar_calendars = class extends ExtensionAPI {
                     case "disabled":
                       fire.sync(converted, { enabled: !value });
                       break;
+                    case "imip.identity.key":
+                      let identity = calendar.getProperty("imip.identity");
+                      fire.sync(converted, { email: identity?.email });
+                      break;
                   }
                 },
               });

calendar/api/parent/ext-calendar-provider.js

@@ -9,7 +9,7 @@ var { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
 var { ExtensionAPI, EventManager } = ExtensionCommon;
 
 class ExtCalendarProvider extends cal.provider.BaseClass {
-  QueryInterface = ChromeUtils.generateQI(["calICalendar", "calIChangeLog"]);
+  QueryInterface = ChromeUtils.generateQI(["calICalendar", "calIChangeLog", "calISchedulingSupport"]);
 
   static register(extension) {
     let calmgr = cal.getCalendarManager();

calendar/api/schema/calendar-calendars.json

@@ -13,6 +13,7 @@
           "url": { "type": "string" },
           "readOnly": { "type": "boolean" },
           "enabled": { "type": "boolean" },
+          "email": { "type": "string", "optional": true },
           "color": { "type": "string", "optional": true },
           "capabilities": { "$ref": "CalendarCapabilities", "optional": true }
         }
@@ -25,6 +26,7 @@
           "url": { "type": "string" },
           "readOnly": { "type": "boolean" },
           "enabled": { "type": "boolean" },
+          "email": { "type": "string", "optional": true },
           "color": { "type": "string", "optional": true }
         }
       },
@@ -128,6 +130,7 @@
               "url": { "type": "string" },
               "readOnly": { "type": "boolean", "optional": true },
               "enabled": { "type": "boolean", "optional": true },
+              "email": { "type": "string", "optional": true },
               "color": { "type": "string", "optional": true },
               "capabilities": { "$ref": "CalendarCapabilities", "optional": true }
             }
@@ -148,6 +151,7 @@
               "url": { "type": "string", "optional": true },
               "readOnly": { "type": "boolean", "optional": true },
               "enabled": { "type": "boolean", "optional": true },
+              "email": { "type": "string", "optional": true },
               "color": { "type": "string", "optional": true },
               "capabilities": { "$ref": "CalendarCapabilities", "optional": true }
             }