strapi-plugin-firebase-authentication 1.1.9 → 1.1.10

package/dist/_chunks/{App-C0XJYDQh.mjs → App-Beg-rhfs.mjs}

@@ -5,13 +5,13 @@ import { Provider } from "@radix-ui/react-tooltip";
 import React, { useState, useCallback, useMemo, useEffect, useRef, useLayoutEffect } from "react";
 import { Link, Flex, Box, Button, Tooltip, Tbody, Tr, Td, Checkbox, Typography, Modal, Table, Thead, Th, SingleSelect, SingleSelectOption, SearchForm, Searchbar, IconButton, Dialog, Tabs, TextInput, Alert, Field, Toggle, Divider } from "@strapi/design-system";
 import { useIntl } from "react-intl";
-import { i as isArguments_1, a as isBufferExports, b as isTypedArray_1, c as isLength_1, d as isFunction_1, _ as _getTag, e as _Stack, f as _equalArrays, g as _equalByTag, h as isObjectLike_1, j as getDefaultExportFromCjs, k as _baseGetTag, l as _MapCache, m as _Symbol, P as PLUGIN_ID, n as getAugmentedNamespace, o as commonjsGlobal } from "./index-4s0RQKAx.mjs";
+import { i as isArguments_1, a as isBufferExports, b as isTypedArray_1, c as isLength_1, d as isFunction_1, _ as _getTag, e as _Stack, f as _equalArrays, g as _equalByTag, h as isObjectLike_1, j as getDefaultExportFromCjs, k as _baseGetTag, l as _MapCache, m as _Symbol, P as PLUGIN_ID, n as getAugmentedNamespace, o as commonjsGlobal } from "./index-Dxg4gNu5.mjs";
 import { ArrowLeft, Key, Trash, WarningCircle, CaretUp, CaretDown, Search, Plus, Pencil } from "@strapi/icons";
 import styled from "styled-components";
 import { RxCheck, RxCross2 } from "react-icons/rx";
 import { AiOutlineUserAdd, AiFillPhone, AiFillMail, AiFillYahoo, AiFillGithub, AiFillTwitterCircle, AiFillFacebook, AiFillApple, AiFillGoogleCircle } from "react-icons/ai";
 import { MdPassword } from "react-icons/md";
-import { g as getFirebaseConfig$1 } from "./api-CM79I13t.mjs";
+import { g as getFirebaseConfig$1 } from "./api-BznQNKgc.mjs";
 import * as PhoneInputModule from "react-phone-input-2";
 import "react-phone-input-2/lib/style.css";
 import validator from "validator";
@@ -5421,16 +5421,17 @@ const StyledPhoneInputWrapper = styled.div`
 
   /* Flag dropdown button styles */
   .flag-dropdown {
-    background: transparent;
+    background: transparent !important;
     border: none;
     border-right: none;
 
     &.open {
+      background: transparent !important;
       z-index: 1001;
     }
 
     .selected-flag {
-      padding: 0 0 0 0.75rem;
+      padding: 0 0.5rem 0 1rem;
       height: 40px;
       display: flex;
       align-items: center;
@@ -5444,8 +5445,26 @@ const StyledPhoneInputWrapper = styled.div`
         margin-left: 8px;
       }
 
-      &.open .arrow {
-        border-top-color: ${({ theme }) => theme.colors.neutral800};
+      /* Fix flag background in all interactive states */
+      &:hover,
+      &:focus,
+      &:active,
+      &.open {
+        background: transparent;
+        background-color: transparent;
+
+        .arrow {
+          border-top-color: ${({ theme }) => theme.colors.neutral800};
+        }
+
+        .flag {
+          background-color: transparent;
+        }
+      }
+
+      /* Fix flag background flash on initial load */
+      .flag {
+        background-color: transparent;
       }
     }
   }
@@ -5899,10 +5918,13 @@ const EditUserForm = ({ data }) => {
     setIsLoading(true);
     try {
       const updatedUser = await updateUser(userData.uid, userData);
-      if (updatedUser[0]?.status === "rejected") {
-        throw new Error("Error updating user");
+      const result = updatedUser[0];
+      if (result?.status === "rejected") {
+        const errorReason = result.reason;
+        const errorMessage = errorReason?.message || (errorReason?.code ? `Firebase error: ${errorReason.code}` : null) || "Error updating user";
+        throw new Error(errorMessage);
       }
-      setUserData(updatedUser[0].value);
+      setUserData(result.value);
       setIsLoading(false);
       toggleNotification({
         type: "success",
@@ -5910,9 +5932,10 @@ const EditUserForm = ({ data }) => {
       });
     } catch (error) {
       console.error("Error updating user:", error);
+      const errorMessage = error instanceof Error ? error.message : "An error occurred while updating the user";
       toggleNotification({
         type: "danger",
-        message: "An error occurred while updating the user"
+        message: errorMessage
       });
       setIsLoading(false);
       setUserData(data);

package/dist/_chunks/{App-COMAshYj.js → App-Cd5yIsKz.js}

@@ -7,13 +7,13 @@ const reactTooltip = require("@radix-ui/react-tooltip");
 const React = require("react");
 const designSystem = require("@strapi/design-system");
 const reactIntl = require("react-intl");
-const index = require("./index-DHMYqfl3.js");
+const index = require("./index-Dz1nqS7B.js");
 const icons = require("@strapi/icons");
 const styled = require("styled-components");
 const rx = require("react-icons/rx");
 const ai = require("react-icons/ai");
 const md = require("react-icons/md");
-const api = require("./api-DzbiYzK4.js");
+const api = require("./api-C7A4Ky3o.js");
 const PhoneInputModule = require("react-phone-input-2");
 require("react-phone-input-2/lib/style.css");
 const validator = require("validator");
@@ -5445,16 +5445,17 @@ const StyledPhoneInputWrapper = styled__default.default.div`
 
   /* Flag dropdown button styles */
   .flag-dropdown {
-    background: transparent;
+    background: transparent !important;
     border: none;
     border-right: none;
 
     &.open {
+      background: transparent !important;
       z-index: 1001;
     }
 
     .selected-flag {
-      padding: 0 0 0 0.75rem;
+      padding: 0 0.5rem 0 1rem;
       height: 40px;
       display: flex;
       align-items: center;
@@ -5468,8 +5469,26 @@ const StyledPhoneInputWrapper = styled__default.default.div`
         margin-left: 8px;
       }
 
-      &.open .arrow {
-        border-top-color: ${({ theme }) => theme.colors.neutral800};
+      /* Fix flag background in all interactive states */
+      &:hover,
+      &:focus,
+      &:active,
+      &.open {
+        background: transparent;
+        background-color: transparent;
+
+        .arrow {
+          border-top-color: ${({ theme }) => theme.colors.neutral800};
+        }
+
+        .flag {
+          background-color: transparent;
+        }
+      }
+
+      /* Fix flag background flash on initial load */
+      .flag {
+        background-color: transparent;
       }
     }
   }
@@ -5923,10 +5942,13 @@ const EditUserForm = ({ data }) => {
     setIsLoading(true);
     try {
       const updatedUser = await updateUser(userData.uid, userData);
-      if (updatedUser[0]?.status === "rejected") {
-        throw new Error("Error updating user");
+      const result = updatedUser[0];
+      if (result?.status === "rejected") {
+        const errorReason = result.reason;
+        const errorMessage = errorReason?.message || (errorReason?.code ? `Firebase error: ${errorReason.code}` : null) || "Error updating user";
+        throw new Error(errorMessage);
       }
-      setUserData(updatedUser[0].value);
+      setUserData(result.value);
       setIsLoading(false);
       toggleNotification({
         type: "success",
@@ -5934,9 +5956,10 @@ const EditUserForm = ({ data }) => {
       });
     } catch (error) {
       console.error("Error updating user:", error);
+      const errorMessage = error instanceof Error ? error.message : "An error occurred while updating the user";
       toggleNotification({
         type: "danger",
-        message: "An error occurred while updating the user"
+        message: errorMessage
       });
       setIsLoading(false);
       setUserData(data);

package/dist/_chunks/{api-CM79I13t.mjs → api-BznQNKgc.mjs}

@@ -1,5 +1,5 @@
 import { getFetchClient } from "@strapi/strapi/admin";
-import { P as PLUGIN_ID } from "./index-4s0RQKAx.mjs";
+import { P as PLUGIN_ID } from "./index-Dxg4gNu5.mjs";
 const saveFirebaseConfig = async (json, firebaseWebApiKey, passwordConfig) => {
   const url = `/${PLUGIN_ID}/settings/firebase-config`;
   const { post } = getFetchClient();

package/dist/_chunks/{api-DzbiYzK4.js → api-C7A4Ky3o.js}

@@ -1,6 +1,6 @@
 "use strict";
 const admin = require("@strapi/strapi/admin");
-const index = require("./index-DHMYqfl3.js");
+const index = require("./index-Dz1nqS7B.js");
 const saveFirebaseConfig = async (json, firebaseWebApiKey, passwordConfig) => {
   const url = `/${index.PLUGIN_ID}/settings/firebase-config`;
   const { post } = admin.getFetchClient();

package/dist/_chunks/{index-B8sQntQh.mjs → index-C3713gpv.mjs}

@@ -2,7 +2,7 @@ import { jsx, jsxs, Fragment } from "react/jsx-runtime";
 import { useState, useEffect } from "react";
 import { Flex, Box, Typography, JSONInput, Button, TextInput, Badge, Textarea, Toggle, NumberInput, Modal } from "@strapi/design-system";
 import { useNotification, Page } from "@strapi/strapi/admin";
-import { g as getFirebaseConfig, s as saveFirebaseConfig, d as delFirebaseConfig, a as savePasswordSettings } from "./api-CM79I13t.mjs";
+import { g as getFirebaseConfig, s as saveFirebaseConfig, d as delFirebaseConfig, a as savePasswordSettings } from "./api-BznQNKgc.mjs";
 import { useNavigate } from "react-router-dom";
 function SettingsPage() {
   const { toggleNotification } = useNotification();

package/dist/_chunks/{index-4s0RQKAx.mjs → index-Dxg4gNu5.mjs}

@@ -738,7 +738,7 @@ const index = {
         id: `${PLUGIN_ID}.page.title`,
         defaultMessage: PLUGIN_ID
       },
-      Component: () => import("./App-C0XJYDQh.mjs").then((mod) => ({
+      Component: () => import("./App-Beg-rhfs.mjs").then((mod) => ({
         default: mod.App
       })),
       permissions: PERMISSIONS["menu-link"]
@@ -760,7 +760,7 @@ const index = {
           id: "settings",
           to: `/settings/${PLUGIN_ID}`,
           async Component() {
-            const component = await import("./index-B8sQntQh.mjs");
+            const component = await import("./index-C3713gpv.mjs");
             return component.default;
           },
           permissions: PERMISSIONS["menu-link"]

package/dist/_chunks/{index-DHMYqfl3.js → index-Dz1nqS7B.js}

@@ -739,7 +739,7 @@ const index = {
         id: `${PLUGIN_ID}.page.title`,
         defaultMessage: PLUGIN_ID
       },
-      Component: () => Promise.resolve().then(() => require("./App-COMAshYj.js")).then((mod) => ({
+      Component: () => Promise.resolve().then(() => require("./App-Cd5yIsKz.js")).then((mod) => ({
         default: mod.App
       })),
       permissions: PERMISSIONS["menu-link"]
@@ -761,7 +761,7 @@ const index = {
           id: "settings",
           to: `/settings/${PLUGIN_ID}`,
           async Component() {
-            const component = await Promise.resolve().then(() => require("./index-DyXjIUy8.js"));
+            const component = await Promise.resolve().then(() => require("./index-d4XkRCYN.js"));
             return component.default;
           },
           permissions: PERMISSIONS["menu-link"]

package/dist/_chunks/{index-DyXjIUy8.js → index-d4XkRCYN.js}

@@ -4,7 +4,7 @@ const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
 const designSystem = require("@strapi/design-system");
 const admin = require("@strapi/strapi/admin");
-const api = require("./api-DzbiYzK4.js");
+const api = require("./api-C7A4Ky3o.js");
 const reactRouterDom = require("react-router-dom");
 function SettingsPage() {
   const { toggleNotification } = admin.useNotification();

package/dist/admin/index.js

@@ -1,5 +1,5 @@
 "use strict";
-const index = require("../_chunks/index-DHMYqfl3.js");
+const index = require("../_chunks/index-Dz1nqS7B.js");
 require("react/jsx-runtime");
 require("@strapi/strapi/admin");
 require("@strapi/design-system");

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-import { p } from "../_chunks/index-4s0RQKAx.mjs";
+import { p } from "../_chunks/index-Dxg4gNu5.mjs";
 import "react/jsx-runtime";
 import "@strapi/strapi/admin";
 import "@strapi/design-system";

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.10",
   "description": "Allows easy integration between clients utilizing Firebase for authentication and Strapi",
   "license": "MIT",
   "repository": {