strapi-plugin-firebase-authentication 1.1.9 → 1.1.11

package/dist/server/index.js

@@ -29490,9 +29490,8 @@ const settingsService = ({ strapi: strapi2 }) => {
           throw new ApplicationError2("Firebase configuration hash is missing");
         }
         const firebaseConfigJsonValue = await this.decryptJson(encryptionKey, firebaseConfigHash);
-        configData.firebaseConfigJson = firebaseConfigJsonValue;
-        res.firebaseConfigJson = configData;
-        res.firebase_config_json = configData;
+        res.firebaseConfigJson = firebaseConfigJsonValue;
+        res.firebase_config_json = firebaseConfigJsonValue;
         res.firebaseWebApiKey = res.firebase_web_api_key || null;
         res.passwordRequirementsRegex = res.passwordRequirementsRegex || passwordRequirementsRegex;
         res.passwordRequirementsMessage = res.passwordRequirementsMessage || passwordRequirementsMessage;
@@ -29851,9 +29850,71 @@ const userService = ({ strapi: strapi2 }) => {
     update: async (entityId, payload) => {
       try {
         ensureFirebaseInitialized();
-        const firebasePromise = strapi2.firebase.auth().updateUser(entityId, payload);
-        return Promise.allSettled([firebasePromise]);
+        const firebaseData = await strapi2.plugin("firebase-authentication").service("firebaseUserDataService").getByFirebaseUID(entityId);
+        if (!firebaseData?.user) {
+          throw new NotFoundError(`User not found for Firebase UID: ${entityId}`);
+        }
+        const firebasePayload = {};
+        if (payload.email !== void 0) firebasePayload.email = payload.email;
+        if (payload.phoneNumber !== void 0) firebasePayload.phoneNumber = payload.phoneNumber;
+        if (payload.displayName !== void 0) firebasePayload.displayName = payload.displayName;
+        if (payload.photoURL !== void 0) firebasePayload.photoURL = payload.photoURL;
+        if (payload.disabled !== void 0) firebasePayload.disabled = payload.disabled;
+        if (payload.emailVerified !== void 0) firebasePayload.emailVerified = payload.emailVerified;
+        if (payload.password !== void 0) firebasePayload.password = payload.password;
+        const firebasePromise = strapi2.firebase.auth().updateUser(entityId, firebasePayload);
+        const strapiPayload = {};
+        if (payload.email !== void 0) {
+          strapiPayload.email = payload.email;
+        }
+        if (payload.phoneNumber !== void 0) {
+          strapiPayload.phoneNumber = payload.phoneNumber;
+        }
+        if (payload.displayName !== void 0) {
+          if (payload.displayName) {
+            const nameParts = payload.displayName.trim().split(" ");
+            strapiPayload.firstName = nameParts[0] || "";
+            strapiPayload.lastName = nameParts.slice(1).join(" ") || "";
+          } else {
+            strapiPayload.firstName = "";
+            strapiPayload.lastName = "";
+          }
+        }
+        if (typeof payload.disabled === "boolean") {
+          strapiPayload.blocked = payload.disabled;
+        }
+        const strapiPromise = Object.keys(strapiPayload).length > 0 ? strapi2.db.query("plugin::users-permissions.user").update({
+          where: { documentId: firebaseData.user.documentId },
+          data: strapiPayload
+        }) : Promise.resolve(firebaseData.user);
+        const results = await Promise.allSettled([firebasePromise, strapiPromise]);
+        strapi2.log.info("User update operation", {
+          userId: entityId,
+          firebaseStatus: results[0].status,
+          strapiStatus: results[1].status,
+          updatedFields: Object.keys(firebasePayload)
+        });
+        if (results[0].status === "rejected" || results[1].status === "rejected") {
+          strapi2.log.error("Partial update failure detected", {
+            userId: entityId,
+            firebaseError: results[0].status === "rejected" ? results[0].reason : null,
+            strapiError: results[1].status === "rejected" ? results[1].reason : null
+          });
+        }
+        return results;
       } catch (e) {
+        if (e.code === "auth/email-already-exists") {
+          throw new ValidationError$1("Email address is already in use by another account");
+        }
+        if (e.code === "auth/phone-number-already-exists") {
+          throw new ValidationError$1("Phone number is already in use by another account");
+        }
+        if (e.code === "auth/invalid-email") {
+          throw new ValidationError$1("Invalid email address format");
+        }
+        if (e.code === "auth/invalid-phone-number") {
+          throw new ValidationError$1("Invalid phone number format");
+        }
         throw new ApplicationError$1(e.message.toString());
       }
     },
@@ -29871,8 +29932,8 @@ const userService = ({ strapi: strapi2 }) => {
         if (!firebaseData?.user) {
           throw new NotFoundError(`User not found for Firebase UID: ${entityId}`);
         }
-        return await strapi2.documents("plugin::users-permissions.user").update({
-          documentId: firebaseData.user.documentId,
+        return await strapi2.db.query("plugin::users-permissions.user").update({
+          where: { documentId: firebaseData.user.documentId },
           data: payload
         });
       } catch (e) {
@@ -29887,8 +29948,8 @@ const userService = ({ strapi: strapi2 }) => {
           throw new NotFoundError(`User not found for Firebase UID: ${entityId}`);
         }
         const firebasePromise = strapi2.firebase.auth().updateUser(entityId, payload);
-        const strapiPromise = strapi2.documents("plugin::users-permissions.user").update({
-          documentId: firebaseData.user.documentId,
+        const strapiPromise = strapi2.db.query("plugin::users-permissions.user").update({
+          where: { documentId: firebaseData.user.documentId },
           data: payload
         });
         return Promise.allSettled([firebasePromise, strapiPromise]);
@@ -29904,8 +29965,8 @@ const userService = ({ strapi: strapi2 }) => {
           throw new NotFoundError(`User not found for Firebase UID: ${entityId}`);
         }
         const firebasePromise = strapi2.firebase.auth().deleteUser(entityId);
-        const strapiPromise = strapi2.documents("plugin::users-permissions.user").delete({
-          documentId: firebaseData.user.documentId
+        const strapiPromise = strapi2.db.query("plugin::users-permissions.user").delete({
+          where: { documentId: firebaseData.user.documentId }
         });
         return Promise.allSettled([firebasePromise, strapiPromise]);
       } catch (e) {
@@ -29927,8 +29988,8 @@ const userService = ({ strapi: strapi2 }) => {
         if (!firebaseData?.user) {
           throw new NotFoundError(`User not found for Firebase UID: ${entityId}`);
         }
-        const response = await strapi2.documents("plugin::users-permissions.user").delete({
-          documentId: firebaseData.user.documentId
+        const response = await strapi2.db.query("plugin::users-permissions.user").delete({
+          where: { documentId: firebaseData.user.documentId }
         });
         return response;
       } catch (e) {
@@ -31349,7 +31410,7 @@ const firebaseUserDataService = ({ strapi: strapi2 }) => ({
           }
         });
       } catch (error2) {
-        if (error2.code === "23505") {
+        if (error2.code === "23505" || error2.name === "ValidationError") {
           strapi2.log.warn(`Race condition detected for user ${userId}, retrying findFirst`);
           firebaseData = await strapi2.documents("plugin::firebase-authentication.firebase-user-data").findFirst({
             filters: { user: { documentId: { $eq: userId } } }

package/dist/server/index.mjs

@@ -29458,9 +29458,8 @@ const settingsService = ({ strapi: strapi2 }) => {
           throw new ApplicationError2("Firebase configuration hash is missing");
         }
         const firebaseConfigJsonValue = await this.decryptJson(encryptionKey, firebaseConfigHash);
-        configData.firebaseConfigJson = firebaseConfigJsonValue;
-        res.firebaseConfigJson = configData;
-        res.firebase_config_json = configData;
+        res.firebaseConfigJson = firebaseConfigJsonValue;
+        res.firebase_config_json = firebaseConfigJsonValue;
         res.firebaseWebApiKey = res.firebase_web_api_key || null;
         res.passwordRequirementsRegex = res.passwordRequirementsRegex || passwordRequirementsRegex;
         res.passwordRequirementsMessage = res.passwordRequirementsMessage || passwordRequirementsMessage;
@@ -29819,9 +29818,71 @@ const userService = ({ strapi: strapi2 }) => {
     update: async (entityId, payload) => {
       try {
         ensureFirebaseInitialized();
-        const firebasePromise = strapi2.firebase.auth().updateUser(entityId, payload);
-        return Promise.allSettled([firebasePromise]);
+        const firebaseData = await strapi2.plugin("firebase-authentication").service("firebaseUserDataService").getByFirebaseUID(entityId);
+        if (!firebaseData?.user) {
+          throw new NotFoundError(`User not found for Firebase UID: ${entityId}`);
+        }
+        const firebasePayload = {};
+        if (payload.email !== void 0) firebasePayload.email = payload.email;
+        if (payload.phoneNumber !== void 0) firebasePayload.phoneNumber = payload.phoneNumber;
+        if (payload.displayName !== void 0) firebasePayload.displayName = payload.displayName;
+        if (payload.photoURL !== void 0) firebasePayload.photoURL = payload.photoURL;
+        if (payload.disabled !== void 0) firebasePayload.disabled = payload.disabled;
+        if (payload.emailVerified !== void 0) firebasePayload.emailVerified = payload.emailVerified;
+        if (payload.password !== void 0) firebasePayload.password = payload.password;
+        const firebasePromise = strapi2.firebase.auth().updateUser(entityId, firebasePayload);
+        const strapiPayload = {};
+        if (payload.email !== void 0) {
+          strapiPayload.email = payload.email;
+        }
+        if (payload.phoneNumber !== void 0) {
+          strapiPayload.phoneNumber = payload.phoneNumber;
+        }
+        if (payload.displayName !== void 0) {
+          if (payload.displayName) {
+            const nameParts = payload.displayName.trim().split(" ");
+            strapiPayload.firstName = nameParts[0] || "";
+            strapiPayload.lastName = nameParts.slice(1).join(" ") || "";
+          } else {
+            strapiPayload.firstName = "";
+            strapiPayload.lastName = "";
+          }
+        }
+        if (typeof payload.disabled === "boolean") {
+          strapiPayload.blocked = payload.disabled;
+        }
+        const strapiPromise = Object.keys(strapiPayload).length > 0 ? strapi2.db.query("plugin::users-permissions.user").update({
+          where: { documentId: firebaseData.user.documentId },
+          data: strapiPayload
+        }) : Promise.resolve(firebaseData.user);
+        const results = await Promise.allSettled([firebasePromise, strapiPromise]);
+        strapi2.log.info("User update operation", {
+          userId: entityId,
+          firebaseStatus: results[0].status,
+          strapiStatus: results[1].status,
+          updatedFields: Object.keys(firebasePayload)
+        });
+        if (results[0].status === "rejected" || results[1].status === "rejected") {
+          strapi2.log.error("Partial update failure detected", {
+            userId: entityId,
+            firebaseError: results[0].status === "rejected" ? results[0].reason : null,
+            strapiError: results[1].status === "rejected" ? results[1].reason : null
+          });
+        }
+        return results;
       } catch (e) {
+        if (e.code === "auth/email-already-exists") {
+          throw new ValidationError$1("Email address is already in use by another account");
+        }
+        if (e.code === "auth/phone-number-already-exists") {
+          throw new ValidationError$1("Phone number is already in use by another account");
+        }
+        if (e.code === "auth/invalid-email") {
+          throw new ValidationError$1("Invalid email address format");
+        }
+        if (e.code === "auth/invalid-phone-number") {
+          throw new ValidationError$1("Invalid phone number format");
+        }
         throw new ApplicationError$1(e.message.toString());
       }
     },
@@ -29839,8 +29900,8 @@ const userService = ({ strapi: strapi2 }) => {
         if (!firebaseData?.user) {
           throw new NotFoundError(`User not found for Firebase UID: ${entityId}`);
         }
-        return await strapi2.documents("plugin::users-permissions.user").update({
-          documentId: firebaseData.user.documentId,
+        return await strapi2.db.query("plugin::users-permissions.user").update({
+          where: { documentId: firebaseData.user.documentId },
           data: payload
         });
       } catch (e) {
@@ -29855,8 +29916,8 @@ const userService = ({ strapi: strapi2 }) => {
           throw new NotFoundError(`User not found for Firebase UID: ${entityId}`);
         }
         const firebasePromise = strapi2.firebase.auth().updateUser(entityId, payload);
-        const strapiPromise = strapi2.documents("plugin::users-permissions.user").update({
-          documentId: firebaseData.user.documentId,
+        const strapiPromise = strapi2.db.query("plugin::users-permissions.user").update({
+          where: { documentId: firebaseData.user.documentId },
           data: payload
         });
         return Promise.allSettled([firebasePromise, strapiPromise]);
@@ -29872,8 +29933,8 @@ const userService = ({ strapi: strapi2 }) => {
           throw new NotFoundError(`User not found for Firebase UID: ${entityId}`);
         }
         const firebasePromise = strapi2.firebase.auth().deleteUser(entityId);
-        const strapiPromise = strapi2.documents("plugin::users-permissions.user").delete({
-          documentId: firebaseData.user.documentId
+        const strapiPromise = strapi2.db.query("plugin::users-permissions.user").delete({
+          where: { documentId: firebaseData.user.documentId }
         });
         return Promise.allSettled([firebasePromise, strapiPromise]);
       } catch (e) {
@@ -29895,8 +29956,8 @@ const userService = ({ strapi: strapi2 }) => {
         if (!firebaseData?.user) {
           throw new NotFoundError(`User not found for Firebase UID: ${entityId}`);
         }
-        const response = await strapi2.documents("plugin::users-permissions.user").delete({
-          documentId: firebaseData.user.documentId
+        const response = await strapi2.db.query("plugin::users-permissions.user").delete({
+          where: { documentId: firebaseData.user.documentId }
         });
         return response;
       } catch (e) {
@@ -31317,7 +31378,7 @@ const firebaseUserDataService = ({ strapi: strapi2 }) => ({
           }
         });
       } catch (error2) {
-        if (error2.code === "23505") {
+        if (error2.code === "23505" || error2.name === "ValidationError") {
           strapi2.log.warn(`Race condition detected for user ${userId}, retrying findFirst`);
           firebaseData = await strapi2.documents("plugin::firebase-authentication.firebase-user-data").findFirst({
             filters: { user: { documentId: { $eq: userId } } }

package/dist/server/src/index.d.ts

@@ -119,7 +119,7 @@ declare const _default: {
                 };
             }>;
             updateFirebaseUser: (entityId: any, payload: any) => Promise<any>;
-            update: (entityId: any, payload: any) => Promise<[PromiseSettledResult<any>]>;
+            update: (entityId: any, payload: any) => Promise<[PromiseSettledResult<any>, PromiseSettledResult<any>]>;
             resetPasswordFirebaseUser: (entityId: any, payload: any) => Promise<any>;
             resetPasswordStrapiUser: (entityId: any, payload: any) => Promise<any>;
             resetPassword: (entityId: any, payload: any) => Promise<[PromiseSettledResult<any>, PromiseSettledResult<any>]>;

package/dist/server/src/services/index.d.ts

@@ -42,7 +42,7 @@ declare const _default: {
             };
         }>;
         updateFirebaseUser: (entityId: any, payload: any) => Promise<any>;
-        update: (entityId: any, payload: any) => Promise<[PromiseSettledResult<any>]>;
+        update: (entityId: any, payload: any) => Promise<[PromiseSettledResult<any>, PromiseSettledResult<any>]>;
         resetPasswordFirebaseUser: (entityId: any, payload: any) => Promise<any>;
         resetPasswordStrapiUser: (entityId: any, payload: any) => Promise<any>;
         resetPassword: (entityId: any, payload: any) => Promise<[PromiseSettledResult<any>, PromiseSettledResult<any>]>;

package/dist/server/src/services/userService.d.ts

@@ -12,7 +12,7 @@ declare const _default: ({ strapi }: {
         };
     }>;
     updateFirebaseUser: (entityId: any, payload: any) => Promise<any>;
-    update: (entityId: any, payload: any) => Promise<[PromiseSettledResult<any>]>;
+    update: (entityId: any, payload: any) => Promise<[PromiseSettledResult<any>, PromiseSettledResult<any>]>;
     resetPasswordFirebaseUser: (entityId: any, payload: any) => Promise<any>;
     resetPasswordStrapiUser: (entityId: any, payload: any) => Promise<any>;
     resetPassword: (entityId: any, payload: any) => Promise<[PromiseSettledResult<any>, PromiseSettledResult<any>]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-firebase-authentication",
-  "version": "1.1.9",
+  "version": "1.1.11",
   "description": "Allows easy integration between clients utilizing Firebase for authentication and Strapi",
   "license": "MIT",
   "repository": {