@salesforce/webapp-experimental 1.33.2 → 1.33.4

package/dist/api/utils/user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../src/api/utils/user.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,UAAU,IAAI;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACb;AAeD;;;;GAIG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,CAkB3D"}
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../src/api/utils/user.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,UAAU,IAAI;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACb;AAmBD;;;;GAIG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,CAuB3D"}

package/dist/api/utils/user.js

@@ -3,19 +3,16 @@
  * All rights reserved.
  * For full license text, see the LICENSE.txt file
  */
-import { executeGraphQL, gql } from "../graphql.js";
-const CURRENT_USER_QUERY = gql `
-	query CurrentUser {
-		uiapi {
-			currentUser {
-				Id
-				Name {
-					value
-				}
-			}
-		}
-	}
-`;
+import { createDataSDK } from "@salesforce/sdk-data";
+import { API_VERSION } from "../clients.js";
+// Lazy-initialized SDK instance
+let sdkInstance = null;
+async function getSDK() {
+    if (!sdkInstance) {
+        sdkInstance = await createDataSDK();
+    }
+    return sdkInstance;
+}
 /**
  * Fetch current user information from Salesforce
  * Uses Chatter API to get current user details
@@ -23,14 +20,18 @@ const CURRENT_USER_QUERY = gql `
  */
 export async function getCurrentUser() {
     try {
-        const response = await executeGraphQL(CURRENT_USER_QUERY);
-        const userData = response.uiapi.currentUser;
-        if (!userData) {
-            throw new Error("No user data found");
+        const sdk = await getSDK();
+        const response = await sdk.fetch(`/services/data/v${API_VERSION}/chatter/users/me`);
+        if (!response.ok) {
+            throw new Error(`HTTP ${response.status}`);
+        }
+        const userData = await response.json();
+        if (!userData || !userData.id) {
+            throw new Error("No user data found in Chatter API response");
         }
         return {
-            id: userData.Id,
-            name: userData.Name?.value || "User",
+            id: userData.id,
+            name: userData.name || "User",
         };
     }
     catch (error) {

package/dist/api/utils/user.test.js

@@ -3,21 +3,14 @@
  * All rights reserved.
  * For full license text, see the LICENSE.txt file
  */
+import { createDataSDK } from "@salesforce/sdk-data";
 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
 import { getCurrentUser } from "./user.js";
-import { executeGraphQL } from "../graphql.js";
-vi.mock("../graphql", async () => {
-    return {
-        gql: vi.fn((strings, ...values) => {
-            return strings.reduce((prev, curr, i) => {
-                return prev + curr + (values[i] ?? "");
-            }, "");
-        }),
-        executeGraphQL: vi.fn(),
-    };
-});
-// Get reference to the mocked function for assertions
-const mockGraphql = vi.mocked(executeGraphQL);
+vi.mock("@salesforce/sdk-data", () => ({
+    createDataSDK: vi.fn(),
+}));
+const mockFetch = vi.fn();
+const mockSDK = { fetch: mockFetch };
 // Mock console.error to avoid noise in test output
 const mockConsoleError = vi.spyOn(console, "error").mockImplementation(() => {
     /* noop */
@@ -25,36 +18,37 @@ const mockConsoleError = vi.spyOn(console, "error").mockImplementation(() => {
 describe("User API Utils", () => {
     beforeEach(() => {
         vi.clearAllMocks();
+        vi.mocked(createDataSDK).mockResolvedValue(mockSDK);
     });
     afterEach(() => {
         mockConsoleError.mockClear();
     });
     describe("getCurrentUser", () => {
-        const mockResponse = {
-            uiapi: {
-                currentUser: {
-                    Id: "005000000000001",
-                    Name: { value: "John Doe" },
-                },
-            },
+        const mockChatterUser = {
+            id: "005000000000001",
+            name: "John Doe",
+            email: "john@example.com",
+            username: "john@example.com",
         };
         it("successfully fetches current user", async () => {
-            mockGraphql.mockResolvedValue(mockResponse);
+            mockFetch.mockResolvedValue({
+                ok: true,
+                json: () => Promise.resolve(mockChatterUser),
+            });
             const result = await getCurrentUser();
-            expect(mockGraphql).toHaveBeenCalledWith(expect.any(String));
+            expect(mockFetch).toHaveBeenCalledWith("/services/data/v99.0/chatter/users/me");
             expect(result).toEqual({
                 id: "005000000000001",
                 name: "John Doe",
             });
         });
         it('falls back to "User" when name is empty', async () => {
-            mockGraphql.mockResolvedValue({
-                uiapi: {
-                    currentUser: {
-                        Id: "005000000000003",
-                        Name: { value: "" },
-                    },
-                },
+            mockFetch.mockResolvedValue({
+                ok: true,
+                json: () => Promise.resolve({
+                    id: "005000000000003",
+                    name: "",
+                }),
             });
             const result = await getCurrentUser();
             expect(result).toEqual({
@@ -63,13 +57,12 @@ describe("User API Utils", () => {
             });
         });
         it('falls back to "User" when name is null', async () => {
-            mockGraphql.mockResolvedValue({
-                uiapi: {
-                    currentUser: {
-                        Id: "005000000000004",
-                        Name: { value: null },
-                    },
-                },
+            mockFetch.mockResolvedValue({
+                ok: true,
+                json: () => Promise.resolve({
+                    id: "005000000000004",
+                    name: null,
+                }),
             });
             const result = await getCurrentUser();
             expect(result).toEqual({
@@ -78,13 +71,11 @@ describe("User API Utils", () => {
             });
         });
         it('falls back to "User" when name is undefined', async () => {
-            mockGraphql.mockResolvedValue({
-                uiapi: {
-                    currentUser: {
-                        Id: "005000000000005",
-                        Name: { value: undefined },
-                    },
-                },
+            mockFetch.mockResolvedValue({
+                ok: true,
+                json: () => Promise.resolve({
+                    id: "005000000000005",
+                }),
             });
             const result = await getCurrentUser();
             expect(result).toEqual({
@@ -93,17 +84,26 @@ describe("User API Utils", () => {
             });
         });
         it("throws error when request fails", async () => {
-            const apiError = new Error("Bad stuff");
-            mockGraphql.mockRejectedValue(apiError);
-            await expect(getCurrentUser()).rejects.toThrow("Bad stuff");
-            expect(mockConsoleError).toHaveBeenCalledWith("Error fetching user data:", apiError);
+            mockFetch.mockResolvedValue({
+                ok: false,
+                status: 500,
+            });
+            await expect(getCurrentUser()).rejects.toThrow("HTTP 500");
+            expect(mockConsoleError).toHaveBeenCalled();
         });
         it("throws error when no user data is found", async () => {
-            mockGraphql.mockResolvedValue({
-                uiapi: {},
+            mockFetch.mockResolvedValue({
+                ok: true,
+                json: () => Promise.resolve({}),
             });
-            await expect(getCurrentUser()).rejects.toThrow("No user data found");
+            await expect(getCurrentUser()).rejects.toThrow("No user data found in Chatter API response");
             expect(mockConsoleError).toHaveBeenCalled();
         });
+        it("throws error when fetch rejects", async () => {
+            const apiError = new Error("Network error");
+            mockFetch.mockRejectedValue(apiError);
+            await expect(getCurrentUser()).rejects.toThrow("Network error");
+            expect(mockConsoleError).toHaveBeenCalledWith("Error fetching user data:", apiError);
+        });
     });
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/webapp-experimental",
   "description": "[experimental] Core package for Salesforce Web Applications",
-  "version": "1.33.2",
+  "version": "1.33.4",
   "license": "SEE LICENSE IN LICENSE.txt",
   "type": "module",
   "main": "./dist/index.js",
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@salesforce/core": "^8.23.4",
-    "@salesforce/sdk-data": "^1.33.2",
+    "@salesforce/sdk-data": "^1.33.4",
     "axios": "^1.7.7",
     "micromatch": "^4.0.8",
     "path-to-regexp": "^8.3.0"
@@ -55,5 +55,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bb8bb09df420bd823e210e09cf45a4bd8a4c4922"
+  "gitHead": "eeddfb5c8c8d44e2096b3196ca2ee902129e5655"
 }