fixes based on PR comments

Author: RIT3shSapata

docs/api/paths/admin/db-_user-name-_access_history-compact.yaml

@@ -39,7 +39,7 @@ post:
             compacted_channels:
               scope1:
                 collection1:
-                  - scoped_channel2
+                  - scoped_channel1
     '400':
       description: Bad request. Invalid channel names or malformed request body.
       content:

docs/api/paths/admin/db-_user-name-_channel_history.yaml

@@ -2539,10 +2539,10 @@ func (h *handler) getUserChannelHistory() error {
 		colAccessHistoryMap[base.DefaultScope] = make(map[string][]string)
 		colAccessHistoryMap[base.DefaultScope][base.DefaultCollection] = slices.Collect(maps.Keys(user.ChannelHistory()))
 	} else {
-		for scope, _ := range colAccess {
+		for scope, cols := range colAccess {
 			colAccessHistoryMap[scope] = make(map[string][]string)
-			for col, _ := range colAccess[scope] {
-				colAccessHistoryMap[scope][col] = slices.Collect(maps.Keys(colAccess[scope][col].ChannelHistory_))
+			for col, colVal := range cols {
+				colAccessHistoryMap[scope][col] = slices.Collect(maps.Keys(colVal.ChannelHistory_))
 			}
 		}
 	}
@@ -2567,17 +2567,17 @@ func (h *handler) compactUserChannelHistory() error {
 	username := internalUserName(mux.Vars(h.rq)["name"])
 	authenticator := h.db.Authenticator(h.ctx())
 	user, err := authenticator.GetUser(username)
-	if user == nil {
-		if err == nil {
-			err = kNotFoundError
-		}
+	if err != nil {
 		return err
 	}
+	if user == nil {
+		return kNotFoundError
+	}
 
 	colAccessHistoryMap := make(map[string]map[string][]string)
-	for scope, _ := range reqUserChannelHistory.Channels {
+	for scope, cols := range reqUserChannelHistory.Channels {
 		colAccessHistoryMap[scope] = make(map[string][]string)
-		for col, _ := range reqUserChannelHistory.Channels[scope] {
+		for col, _ := range cols {
 			colAccessHistoryMap[scope][col] = user.CompactChannelHistory(scope, col, reqUserChannelHistory.Channels[scope][col])
 		}
 	}

rest/admin_api.go

@@ -903,8 +903,8 @@ func TestRevocationWithAdminChannels(t *testing.T) {
 	assert.Equal(t, "doc", changes.Results[0].ID)
 	assert.True(t, changes.Results[0].Revoked)
 
-	body := fmt.Sprintf(`{"channels": {%q:{%q:["A"]}}}'`, dataStore.ScopeName(), dataStore.CollectionName())
-	resp = rt.SendAdminRequest("POST", "/db/_user/user/_channel_history", body)
+	body := fmt.Sprintf(`{"channels": {%q:{%q:["A"]}}}`, dataStore.ScopeName(), dataStore.CollectionName())
+	resp = rt.SendAdminRequest("POST", "/db/_user/user/_access_history/compact", body)
 	RequireStatus(t, resp, http.StatusOK)
 
 	changes = rt.WaitForChanges(1, fmt.Sprintf("/{{.keyspace}}/_changes?since=%d&revocations=true", 2), "user", false)

rest/revocation_test.go

@@ -1701,6 +1701,51 @@ func TestGetUserChannelHistory(t *testing.T) {
 		assert.ElementsMatch(t, []string{"chan1", "chan2"}, channelHistory[scope][collection])
 	})
 
+	// User has channels revoked in two named collections (same scope). Both collections and their respective revoked channels should appear in _channel_history.
+	t.Run("MultipleNamedCollections", func(t *testing.T) {
+		base.RequireNumTestDataStores(t, 2)
+		rtMulti := NewRestTesterMultipleCollections(t, nil, 2)
+		defer rtMulti.Close()
+
+		scope := rtMulti.GetDbCollections()[0].ScopeName
+		col1 := rtMulti.GetDbCollections()[0].Name
+		col2 := rtMulti.GetDbCollections()[1].Name
+
+		userPayload := fmt.Sprintf(`{
+			"password": "letmein",
+			"collection_access": {
+				%q: {
+					%q: {"admin_channels": ["chan1", "chan2"]},
+					%q: {"admin_channels": ["chan3", "chan4"]}
+				}
+			}
+		}`, scope, col1, col2)
+		response := rtMulti.SendAdminRequest(http.MethodPut, "/db/_user/user1", userPayload)
+		RequireStatus(t, response, http.StatusCreated)
+
+		// Revoke all channels in both collections
+		revokePayload := fmt.Sprintf(`{
+			"collection_access": {
+				%q: {
+					%q: {"admin_channels": []},
+					%q: {"admin_channels": []}
+				}
+			}
+		}`, scope, col1, col2)
+		response = rtMulti.SendAdminRequest(http.MethodPut, "/db/_user/user1", revokePayload)
+		RequireStatus(t, response, http.StatusOK)
+
+		response = rtMulti.SendAdminRequest(http.MethodGet, "/db/_user/user1/_access_history", "")
+		RequireStatus(t, response, http.StatusOK)
+
+		var result map[string]ColAccessHistoryMap
+		require.NoError(t, base.JSONUnmarshal(response.Body.Bytes(), &result))
+
+		channelHistory := result["channels"]
+		assert.ElementsMatch(t, []string{"chan1", "chan2"}, channelHistory[scope][col1])
+		assert.ElementsMatch(t, []string{"chan3", "chan4"}, channelHistory[scope][col2])
+	})
+
 	// Revocation history is preserved even after a previously revoked channel is re-granted.
 	t.Run("ChannelHistoryAfterReGrant", func(t *testing.T) {
 		ds := rt.GetSingleDataStore()
@@ -1731,7 +1776,7 @@ func TestGetUserChannelHistory(t *testing.T) {
 	})
 }
 
-// TestCompactUserChannelHistory tests the POST /_user/{name}/_channel_history admin endpoint,
+// TestCompactUserChannelHistory tests the POST /_user/{name}/_access_history/compact admin endpoint,
 // which removes specified channels from a user's revocation history and returns those that were found and removed.
 func TestCompactUserChannelHistory(t *testing.T) {
 	rt := NewRestTester(t, nil)