@openinc/parse-server-opendash 3.25.0 → 3.25.2

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

@@ -76,19 +76,31 @@ async function init(name) {
         const defaultTenant = await new Parse.Query(types_1.Tenant)
             .ascending("createdAt")
             .first({ useMasterKey: true });
-        let user = await new Parse.Query(Parse.User)
+        let user = (await new Parse.Query(Parse.User)
+            .equalTo("microsoftId", verifiedPayload.oid)
+            .first({ useMasterKey: true }));
+        // Legacy fallback: some older accounts might have been created using the oid as username.
+        let oldUser = (await new Parse.Query(Parse.User)
             .equalTo("username", verifiedPayload.oid)
-            .first({ useMasterKey: true });
-        if (!user) {
+            .first({ useMasterKey: true }));
+        if (!user && !oldUser) {
             user = new Parse.User();
-            user.set("username", verifiedPayload.oid);
+            user.set("username", account.username);
             user.set("email", account.username);
             user.set("password", (0, crypto_1.randomBytes)(16).toString("hex"));
+            user.set("microsoftId", verifiedPayload.oid);
             user.set("name", verifiedPayload.name || verifiedPayload.preferred_username);
             user.set("tenant", defaultTenant);
             user = await user.signUp(null, { useMasterKey: true });
             return user.getSessionToken();
         }
+        else if (!user && oldUser) {
+            // Migrate legacy account that used the oid as username to a modern record keyed by microsoftId.
+            user = oldUser;
+            user.set("microsoftId", verifiedPayload.oid);
+            user.set("username", account.username);
+            user = await user.save(null, { useMasterKey: true });
+        }
         const sessionToken = "r:" + (0, crypto_1.randomBytes)(16).toString("hex");
         const session = new Parse.Object("_Session");
         session.set("user", user);

package/dist/hooks/Maintenance_Schedule.js

@@ -34,8 +34,8 @@ async function init() {
             template?.relation("sources").remove(source);
         await template?.save(null, { useMasterKey: true });
         // Delete associated calendar event
-        if (object.get("meta")?.calendarEventId) {
-            await new CalendarManager_1.CalendarManager().deleteEvent(object.get("meta")?.calendarEventId);
+        if (object.get("meta")?.microsoftCalendarEventId) {
+            await new CalendarManager_1.CalendarManager().deleteEvent(object.get("meta")?.microsoftCalendarEventId);
         }
     });
 }
@@ -58,10 +58,10 @@ async function updateCalendarEvent(schedule) {
         return;
     const calendarManager = new CalendarManager_1.CalendarManager();
     const meta = schedule.get("meta") || {};
-    const calendarEventId = meta.calendarEventId;
-    if (calendarEventId) {
+    const microsoftCalendarEventId = meta.microsoftCalendarEventId;
+    if (microsoftCalendarEventId) {
         console.log("Updating schedule in calendar...");
-        await calendarManager.updateEvent(calendarEventId, event);
+        await calendarManager.updateEvent(microsoftCalendarEventId, event);
     }
     else {
         await addToCalendar(schedule);
@@ -82,7 +82,7 @@ async function addToCalendar(schedule) {
         const existingMeta = schedule.get("meta") || {};
         schedule.set("meta", {
             ...existingMeta,
-            calendarEventId: createdEvent.id,
+            microsoftCalendarEventId: createdEvent.id,
         });
         await schedule.save(null, { useMasterKey: true });
     }

package/dist/types/_User.d.ts

@@ -15,6 +15,7 @@ export interface _UserAttributes {
     miaas_cities: any[];
     miaas_userType?: string | undefined;
     miaasUserScope?: string | undefined;
+    microsoftId?: string | undefined;
     name?: string | undefined;
     password?: string | undefined;
     settings?: User_Setting | undefined;

package/package.json

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