Add prefix to operation id in maskOperation

apollographql · Nov 13, 2024 · 3c8b82b · 3c8b82b
1 parent 81c14b3
commit 3c8b82b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/core/ApolloClient.ts b/src/core/ApolloClient.ts
@@ -510,7 +510,7 @@ export class ApolloClient<TCacheShape> implements DataProxy {
   >(
     options: SubscriptionOptions<TVariables, T>
   ): Observable<FetchResult<MaybeMasked<T>>> {
-    const id = `s${this.queryManager.generateQueryId()}`;
+    const id = this.queryManager.generateQueryId();
 
     return this.queryManager
       .startGraphQLSubscription<T>(options)

diff --git a/src/core/QueryManager.ts b/src/core/QueryManager.ts
@@ -1574,23 +1574,21 @@ export class QueryManager<TStore> {
 
     if (__DEV__) {
       const { fetchPolicy, id } = options;
+      const operationType = getOperationDefinition(document)?.operation;
+      const operationId = (operationType?.[0] ?? "o") + id;
 
       if (
         this.dataMasking &&
         fetchPolicy === "no-cache" &&
         !isFullyUnmaskedOperation(document) &&
-        (!id || !this.noCacheWarningsByQueryId.has(id))
+        !this.noCacheWarningsByQueryId.has(operationId)
       ) {
-        if (id) {
-          this.noCacheWarningsByQueryId.add(id);
-        }
+        this.noCacheWarningsByQueryId.add(operationId);
 
         invariant.warn(
           '[%s]: Fragments masked by data masking are inaccessible when using fetch policy "no-cache". Please add `@unmask` to each fragment spread to access the data.',
           getOperationName(document) ??
-            `Unnamed ${
-              getOperationDefinition(document)?.operation ?? "operation"
-            }`
+            `Unnamed ${operationType ?? "operation"}`
         );
       }
     }