@develit-io/backend-sdk 9.5.1 → 9.6.0

package/dist/index.d.mts

@@ -452,7 +452,8 @@ type IdentityContextVariables = {
         id: string;
         email: string;
         role: string;
-        rawUserMetaData: string | null;
+        organizationId?: string;
+        exchangeOfficeId?: string;
     };
 };
 

package/dist/index.d.ts

@@ -452,7 +452,8 @@ type IdentityContextVariables = {
         id: string;
         email: string;
         role: string;
-        rawUserMetaData: string | null;
+        organizationId?: string;
+        exchangeOfficeId?: string;
     };
 };
 

package/dist/middlewares.mjs

@@ -120,7 +120,13 @@ const jwt = () => {
           message: "User data integrity check failed."
         });
       }
-      context.set("identity", data.payload);
+      context.set("identity", {
+        user: {
+          ...data.payload.user,
+          organizationId: rawUserMetaData.organizationId,
+          exchangeOfficeId: rawUserMetaData.exchangeOfficeId
+        }
+      });
     }
     await next();
   });
@@ -131,9 +137,7 @@ const ip = () => {
     if (!context.env.MIDDLEWARE_IP_DISABLED) {
       const requestIp = getRequestIpAddress(context.req);
       const identityContext = context.get("identity");
-      const rawUserMetaDataString = identityContext.user.rawUserMetaData;
-      const rawUserMetaData = rawUserMetaDataString ? JSON.parse(rawUserMetaDataString) : null;
-      const organizationId = rawUserMetaData.organizationId;
+      const organizationId = identityContext.user.organizationId;
       if (!organizationId) {
         throw new HTTPException(401, {
           message: "Failed to retrieve request organization ID."
@@ -186,8 +190,8 @@ const logger = () => {
       logRequest(requestLog);
       if (!context.env.MIDDLEWARE_LOGGER_AUDITLOG_DISABLED) {
         const identityContext = context.get("identity");
-        const rawUserMetaDataString = identityContext?.user?.rawUserMetaData;
-        const rawUserMetaData = rawUserMetaDataString ? JSON.parse(rawUserMetaDataString) : null;
+        const organizationId = identityContext.user.organizationId;
+        const exchangeOfficeId = identityContext.user.exchangeOfficeId;
         const requestId = uuidv4();
         context.set("auditLog", {
           requestId
@@ -198,11 +202,8 @@ const logger = () => {
           path: requestLog.path,
           actor: {
             email: identityContext?.user?.email || "NOT_AUTHORIZED",
-            ...rawUserMetaData?.organizationId ? {
-              organizationId: rawUserMetaData?.organizationId || "NOT_AUTHORIZED"
-            } : rawUserMetaData?.exchangeOfficeId ? {
-              exchangeOfficeId: rawUserMetaData?.exchangeOfficeId || "NOT_AUTHORIZED"
-            } : null
+            organizationId: organizationId || "NOT_AUTHORIZED",
+            exchangeOficeId: exchangeOfficeId || "NOT_AUTHORIZED"
           },
           metadata: {
             ip: getRequestIpAddress(context.req),
@@ -224,8 +225,8 @@ const logger = () => {
       logResponse(responseLog);
       if (!context.env.MIDDLEWARE_LOGGER_AUDITLOG_DISABLED) {
         const identityContext = context.get("identity");
-        const rawUserMetaDataString = identityContext?.user?.rawUserMetaData;
-        const rawUserMetaData = rawUserMetaDataString ? JSON.parse(rawUserMetaDataString) : null;
+        const organizationId = identityContext.user.organizationId;
+        const exchangeOfficeId = identityContext.user.exchangeOfficeId;
         const auditLogContext = context.get("auditLog");
         await context.env.ACTIVITY_SERVICE.processAuditLog({
           type: "RESPONSE",
@@ -233,11 +234,8 @@ const logger = () => {
           path: responseLog.path,
           actor: {
             email: identityContext?.user?.email || "NOT_AUTHORIZED",
-            ...rawUserMetaData?.organizationId ? {
-              organizationId: rawUserMetaData?.organizationId || "NOT_AUTHORIZED"
-            } : rawUserMetaData?.exchangeOfficeId ? {
-              exchangeOfficeId: rawUserMetaData?.exchangeOfficeId || "NOT_AUTHORIZED"
-            } : null
+            organizationId: organizationId || "NOT_AUTHORIZED",
+            exchangeOficeId: exchangeOfficeId || "NOT_AUTHORIZED"
           },
           metadata: {
             ip: getRequestIpAddress(context.req),
@@ -268,9 +266,9 @@ const signature = () => {
       }
       const payload = JSON.stringify(await context.req.json().catch(() => null));
       const identityContext = context.get("identity");
-      const rawUserMetaDataString = identityContext.user.rawUserMetaData;
-      const rawUserMetaData = rawUserMetaDataString ? JSON.parse(rawUserMetaDataString) : null;
-      const identityId = rawUserMetaData.organizationId ?? rawUserMetaData.exchangeOfficeId;
+      const organizationId = identityContext.user.organizationId;
+      const exchangeOfficeId = identityContext.user.exchangeOfficeId;
+      const identityId = organizationId ?? exchangeOfficeId;
       if (!identityId) {
         throw new HTTPException(401, {
           message: "Failed to retrieve request identity ID."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@develit-io/backend-sdk",
-  "version": "9.5.1",
+  "version": "9.6.0",
   "description": "Develit Backend SDK",
   "author": "Develit.io",
   "license": "ISC",