chore: added filters for permissions, reverted logger

hanzel98 · hanzel98 · commit ef7bcf71899b · 2025-10-24T14:06:44.000-06:00
diff --git a/packages/gator-permissions-snap/src/index.ts b/packages/gator-permissions-snap/src/index.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-restricted-globals */
 import type { GetSnapsResponse } from '@metamask/7715-permissions-shared/types';
-import { logger, logToFile } from '@metamask/7715-permissions-shared/utils';
+import { logger } from '@metamask/7715-permissions-shared/utils';
 import {
   AuthType,
   JwtBearerAuth,
@@ -208,28 +208,8 @@ export const onRpcRequest: OnRpcRequestHandler = async ({
   request,
 }) => {
   logger.debug(`RPC request (origin="${origin}"): method="${request.method}"`);
-  logToFile('SNAP================================================1');
-  logger.debug('🔍 Detailed origin info:', {
-    origin,
-    originType: typeof origin,
-    originLength: origin?.length,
-    method: request.method,
-  });
-  logToFile('SNAP================================================2');
-  // Special logging for revocation requests
-  if (request.method === 'permissionsProvider_submitRevocation') {
-    logger.debug('🚨 REVOCATION RPC REQUEST DETECTED 🚨');
-    logger.debug('Origin:', origin);
-    logger.debug('Origin type:', typeof origin);
-    logger.debug('Method:', request.method);
-    logger.debug('Params:', request.params);
-  }
 
   if (!isMethodAllowedForOrigin(origin, request.method)) {
-    logger.debug('❌ Permission denied:', {
-      origin,
-      method: request.method,
-    });
     throw new InvalidRequestError(
       `Origin '${origin}' is not allowed to call '${request.method}'`,
     );
diff --git a/packages/gator-permissions-snap/src/profileSync/profileSync.ts b/packages/gator-permissions-snap/src/profileSync/profileSync.ts
@@ -5,7 +5,6 @@ import { zPermissionResponse } from '@metamask/7715-permissions-shared/types';
 import {
   logger,
   extractZodError,
-  logToFile,
 } from '@metamask/7715-permissions-shared/utils';
 import {
   hashDelegation,
@@ -202,13 +201,10 @@ export function createProfileSyncManager(
    */
   async function authenticate(): Promise<void> {
     try {
-      logToFile('🔐 PROFILE SYNC: Starting authentication...');
       logger.debug('Profile Sync: Attempting to get access token');
       await auth.getAccessToken();
-      logToFile('✅ PROFILE SYNC: Authentication successful');
       logger.debug('Profile Sync: Access token obtained successfully');
     } catch (error) {
-      logToFile('❌ PROFILE SYNC: Authentication failed:', error);
       logger.error('Error fetching access token:', error);
       throw error;
     }
@@ -393,11 +389,6 @@ export function createProfileSyncManager(
     isRevoked: boolean,
   ): Promise<void> {
     try {
-      logToFile('🔄 PROFILE SYNC: Updating permission revocation status:', {
-        delegationHash: existingPermission.permissionResponse.context,
-        currentRevokedStatus: existingPermission.isRevoked,
-        newRevokedStatus: isRevoked,
-      });
       logger.debug('Profile Sync: Updating permission revocation status:', {
         existingPermission,
         isRevoked,
@@ -410,26 +401,16 @@ export function createProfileSyncManager(
         ...existingPermission,
         isRevoked,
       };
-      logToFile('📝 PROFILE SYNC: Created updated permission object:', {
-        delegationHash: updatedPermission.permissionResponse.context,
-        isRevoked: updatedPermission.isRevoked,
-        siteOrigin: updatedPermission.siteOrigin,
-      });
+
       logger.debug(
         'Profile Sync: Created updated permission object:',
         updatedPermission,
       );
 
       // Store the updated permission
-      logToFile('💾 PROFILE SYNC: Storing updated permission...');
       await storeGrantedPermission(updatedPermission);
-      logToFile('✅ PROFILE SYNC: Successfully stored updated permission');
       logger.debug('Profile Sync: Successfully stored updated permission');
     } catch (error) {
-      logToFile(
-        '❌ PROFILE SYNC: Error updating permission revocation status:',
-        error,
-      );
       logger.error(
         'Error updating permission revocation status with existing permission:',
         error,
diff --git a/packages/gator-permissions-snap/src/rpc/rpcHandler.ts b/packages/gator-permissions-snap/src/rpc/rpcHandler.ts
@@ -1,5 +1,5 @@
 import type { PermissionResponse } from '@metamask/7715-permissions-shared/types';
-import { logger, logToFile } from '@metamask/7715-permissions-shared/utils';
+import { logger } from '@metamask/7715-permissions-shared/utils';
 import { decodeDelegations, hashDelegation } from '@metamask/delegation-core';
 import { InvalidInputError, type Json } from '@metamask/snaps-sdk';
 
@@ -36,9 +36,10 @@ export type RpcHandler = {
   /**
    * Handles get granted permissions requests.
    *
-   * @returns The granted permissions.
+   * @param params - Optional parameters for filtering permissions.
+   * @returns The granted permissions, optionally filtered.
    */
-  getGrantedPermissions(): Promise<Json>;
+  getGrantedPermissions(params?: Json): Promise<Json>;
 
   /**
    * Handles submit revocation requests.
@@ -124,13 +125,58 @@ export function createRpcHandler(config: {
   /**
    * Handles get granted permissions requests.
    *
-   * @returns The granted permissions.
+   * @param params - Optional parameters for filtering permissions.
+   * @returns The granted permissions, optionally filtered.
    */
-  const getGrantedPermissions = async (): Promise<Json> => {
-    logger.debug('getGrantedPermissions()');
-    const grantedPermission =
-      await profileSyncManager.getAllGrantedPermissions();
-    return grantedPermission as Json[];
+  const getGrantedPermissions = async (params?: Json): Promise<Json> => {
+    logger.debug('getGrantedPermissions()', params);
+
+    // Get all permissions
+    const allPermissions = await profileSyncManager.getAllGrantedPermissions();
+
+    // If no params provided, return all permissions (backward compatibility)
+    if (!params || typeof params !== 'object') {
+      return allPermissions as Json[];
+    }
+
+    // Parse filtering options
+    const { isRevoked, siteOrigin, chainId, delegationManager } = params as {
+      isRevoked?: boolean;
+      siteOrigin?: string;
+      chainId?: string;
+      delegationManager?: string;
+    };
+
+    // Apply filters
+    let filteredPermissions = allPermissions;
+
+    if (typeof isRevoked === 'boolean') {
+      filteredPermissions = filteredPermissions.filter(
+        (permission) => permission.isRevoked === isRevoked,
+      );
+    }
+
+    if (typeof siteOrigin === 'string') {
+      filteredPermissions = filteredPermissions.filter(
+        (permission) => permission.siteOrigin === siteOrigin,
+      );
+    }
+
+    if (typeof chainId === 'string') {
+      filteredPermissions = filteredPermissions.filter(
+        (permission) => permission.permissionResponse.chainId === chainId,
+      );
+    }
+
+    if (typeof delegationManager === 'string') {
+      filteredPermissions = filteredPermissions.filter(
+        (permission) =>
+          permission.permissionResponse.signerMeta.delegationManager ===
+          delegationManager,
+      );
+    }
+
+    return filteredPermissions as Json[];
   };
 
   /**
@@ -140,41 +186,24 @@ export function createRpcHandler(config: {
    * @returns Success confirmation.
    */
   const submitRevocation = async (params: Json): Promise<Json> => {
-    logToFile('================================================2');
-    logger.debug('=== SUBMIT REVOCATION RPC CALLED ===');
     logger.debug('submitRevocation() called with params:', params);
-    logger.debug('Params type:', typeof params);
-    logger.debug('Params stringified:', JSON.stringify(params, null, 2));
 
     const { permissionContext } = validateRevocationParams(params);
 
-    logger.debug('Validated permissionContext:', permissionContext);
-
     // First, get the existing permission to validate it exists
     logger.debug(
       'Looking up existing permission for permissionContext:',
       permissionContext,
     );
     const existingPermission =
       await profileSyncManager.getGrantedPermission(permissionContext);
-    console.log('existingPermissionBefore:', existingPermission);
 
     if (!existingPermission) {
-      logger.debug(
-        '❌ Permission not found for permissionContext:',
-        permissionContext,
-      );
       throw new InvalidInputError(
         `Permission not found for permission context: ${permissionContext}`,
       );
     }
 
-    logger.debug('✅ Found existing permission:', {
-      permissionContext,
-      isRevoked: existingPermission.isRevoked,
-      siteOrigin: existingPermission.siteOrigin,
-    });
-
     // Extract delegationManager and chainId from the permission response for logging
     const { chainId: permissionChainId, signerMeta } =
       existingPermission.permissionResponse;
@@ -188,7 +217,6 @@ export function createRpcHandler(config: {
 
     // Check if the delegation is actually disabled on-chain
     if (!delegationManager) {
-      logger.debug('❌ No delegation manager found');
       throw new InvalidInputError(
         `No delegation manager found for permission context: ${permissionContext}`,
       );
@@ -197,7 +225,6 @@ export function createRpcHandler(config: {
     // For on-chain validation, we need to check each delegation in the context
     try {
       const delegations = decodeDelegations(permissionContext);
-      logger.debug('Decoded delegations from context:', delegations.length);
 
       // Check if any delegation is disabled on-chain
       // For now, we'll check the first delegation. This might need adjustment based on business logic
@@ -209,27 +236,16 @@ export function createRpcHandler(config: {
       }
 
       const delegationHash = hashDelegation(firstDelegation);
-      logger.debug('Checking if delegation is disabled on-chain...', {
-        delegationHash,
-        chainId: permissionChainId,
-        delegationManager,
-      });
-
       const isDelegationDisabled =
         await profileSyncManager.checkDelegationDisabledOnChain(
           delegationHash,
           permissionChainId,
           delegationManager,
         );
 
-      console.log(
-        '++++++++++++++++++++isDelegationDisabled:',
-        isDelegationDisabled,
-      );
       logger.debug('On-chain check result:', { isDelegationDisabled });
 
       if (!isDelegationDisabled) {
-        logger.debug('❌ Delegation is not disabled on-chain');
         throw new InvalidInputError(
           `Delegation ${delegationHash} is not disabled on-chain. Cannot process revocation.`,
         );
@@ -245,22 +261,12 @@ export function createRpcHandler(config: {
       );
     }
 
-    // Update the permission's revocation status using the optimized method
-    // This avoids re-fetching the permission we already have
     logger.debug('Updating permission revocation status to true...');
     await profileSyncManager.updatePermissionRevocationStatusWithPermission(
       existingPermission,
       true,
     );
 
-    const existingPermissionAfter =
-      await profileSyncManager.getGrantedPermission(permissionContext);
-
-    console.log('existingPermissionAfter:', existingPermissionAfter);
-    logToFile('existingPermissionAfter:', existingPermissionAfter);
-
-    logger.debug('✅ Revocation completed successfully');
-    logger.debug('=== SUBMIT REVOCATION RPC COMPLETED ===');
     return { success: true };
   };
 
diff --git a/packages/gator-permissions-snap/src/utils/validate.ts b/packages/gator-permissions-snap/src/utils/validate.ts
@@ -2,11 +2,7 @@ import {
   type RequestExecutionPermissionsParam,
   zRequestExecutionPermissionsParam,
 } from '@metamask/7715-permissions-shared/types';
-import {
-  extractZodError,
-  logger,
-  logToFile,
-} from '@metamask/7715-permissions-shared/utils';
+import { extractZodError } from '@metamask/7715-permissions-shared/utils';
 import type { Hex } from '@metamask/delegation-core';
 import { InvalidInputError, type Json } from '@metamask/snaps-sdk';
 import { z } from 'zod';
@@ -57,24 +53,16 @@ export function validateRevocationParams(params: Json): {
   permissionContext: Hex;
 } {
   try {
-    logToFile('================================================3');
-    logger.debug('🔍 Validating revocation params:', params);
-    logger.debug('Params type:', typeof params);
-
     if (!params || typeof params !== 'object') {
-      logger.debug('❌ Invalid params: not an object');
       throw new InvalidInputError('Parameters are required');
     }
 
-    logger.debug('✅ Params is valid object, parsing with Zod...');
     const validated = zRevocationParams.parse(params);
-    logger.debug('✅ Zod validation successful:', validated);
 
     return {
       permissionContext: validated.permissionContext as Hex,
     };
   } catch (error) {
-    logger.debug('❌ Validation failed:', error);
     if (error instanceof z.ZodError) {
       throw new InvalidInputError(extractZodError(error.errors));
     }
diff --git a/packages/gator-permissions-snap/test/end-to-end/index.test.tsx b/packages/gator-permissions-snap/test/end-to-end/index.test.tsx
@@ -43,5 +43,29 @@ describe('Kernel Snap', () => {
         });
       });
     });
+
+    describe('success', () => {
+      it('should return empty array when no permissions are granted', async () => {
+        const response = await snapRequest({
+          method: 'permissionsProvider_getGrantedPermissions',
+          origin: 'metamask',
+        });
+
+        expect(response).toRespondWith([]);
+      });
+
+      it('should accept filtering parameters', async () => {
+        const response = await snapRequest({
+          method: 'permissionsProvider_getGrantedPermissions',
+          origin: 'metamask',
+          params: {
+            isRevoked: false,
+            siteOrigin: 'https://example.com',
+          },
+        });
+
+        expect(response).toRespondWith([]);
+      });
+    });
   });
 });
diff --git a/packages/gator-permissions-snap/test/rpc/rpcHandler.test.ts b/packages/gator-permissions-snap/test/rpc/rpcHandler.test.ts
diff --git a/packages/shared/src/utils/logger.ts b/packages/shared/src/utils/logger.ts
