fixed autocomplete base collection keys caching

apis/realtime.go

@@ -251,7 +251,7 @@ func (api *realtimeApi) canAccessRecord(client subscriptions.Client, record *mod
 		}
 
 		// emulate request data
-		requestData := &models.FilterRequestData{
+		requestData := &models.RequestData{
 			Method: "GET",
 		}
 		requestData.AuthRecord, _ = client.Get(ContextAuthRecordKey).(*models.Record)

apis/record_auth.go

@@ -72,7 +72,7 @@ func (api *recordAuthApi) authResponse(c echo.Context, authRecord *models.Record
 		expands := strings.Split(c.QueryParam(expandQueryParam), ",")
 		if len(expands) > 0 {
 			// create a copy of the cached request data and adjust it to the current auth record
-			requestData := *GetRequestData(e.HttpContext)
+			requestData := *RequestData(e.HttpContext)
 			requestData.Admin = nil
 			requestData.AuthRecord = e.Record
 			failed := api.app.Dao().ExpandRecord(
@@ -204,7 +204,7 @@ func (api *recordAuthApi) authWithOAuth2(c echo.Context) error {
 
 	record, authData, submitErr := form.Submit(func(createForm *forms.RecordUpsert, authRecord *models.Record, authUser *auth.AuthUser) error {
 		return createForm.DrySubmit(func(txDao *daos.Dao) error {
-			requestData := GetRequestData(c)
+			requestData := RequestData(c)
 			requestData.Data = form.CreateData
 
 			createRuleFunc := func(q *dbx.SelectQuery) error {

apis/record_crud.go

@@ -51,7 +51,7 @@ func (api *recordApi) list(c echo.Context) error {
 		return err
 	}
 
-	requestData := GetRequestData(c)
+	requestData := RequestData(c)
 
 	if requestData.Admin == nil && collection.ListRule == nil {
 		// only admins can access if the rule is nil
@@ -110,7 +110,7 @@ func (api *recordApi) view(c echo.Context) error {
 		return NewNotFoundError("", nil)
 	}
 
-	requestData := GetRequestData(c)
+	requestData := RequestData(c)
 
 	if requestData.Admin == nil && collection.ViewRule == nil {
 		// only admins can access if the rule is nil
@@ -155,7 +155,7 @@ func (api *recordApi) create(c echo.Context) error {
 		return NewNotFoundError("", "Missing collection context.")
 	}
 
-	requestData := GetRequestData(c)
+	requestData := RequestData(c)
 
 	if requestData.Admin == nil && collection.CreateRule == nil {
 		// only admins can access if the rule is nil
@@ -251,7 +251,7 @@ func (api *recordApi) update(c echo.Context) error {
 		return NewNotFoundError("", nil)
 	}
 
-	requestData := GetRequestData(c)
+	requestData := RequestData(c)
 
 	if requestData.Admin == nil && collection.UpdateRule == nil {
 		// only admins can access if the rule is nil
@@ -325,7 +325,7 @@ func (api *recordApi) delete(c echo.Context) error {
 		return NewNotFoundError("", nil)
 	}
 
-	requestData := GetRequestData(c)
+	requestData := RequestData(c)
 
 	if requestData.Admin == nil && collection.DeleteRule == nil {
 		// only admins can access if the rule is nil

apis/record_helpers.go

@@ -15,17 +15,22 @@ import (
 
 const ContextRequestDataKey = "requestData"
 
-// GetRequestData exports common request data fields
+// Deprecated: Will be removed after v0.9. Use apis.RequestData(c) instead.
+func GetRequestData(c echo.Context) *models.RequestData {
+	return RequestData(c)
+}
+
+// RequestData exports cached common request data fields
 // (query, body, logged auth state, etc.) from the provided context.
-func GetRequestData(c echo.Context) *models.FilterRequestData {
-	// return cached to avoid reading the body multiple times
+func RequestData(c echo.Context) *models.RequestData {
+	// return cached to avoid copying the body multiple times
 	if v := c.Get(ContextRequestDataKey); v != nil {
-		if data, ok := v.(*models.FilterRequestData); ok {
+		if data, ok := v.(*models.RequestData); ok {
 			return data
 		}
 	}
 
-	result := &models.FilterRequestData{
+	result := &models.RequestData{
 		Method: c.Request().Method,
 		Query:  map[string]any{},
 		Data:   map[string]any{},
@@ -54,7 +59,7 @@ func EnrichRecord(c echo.Context, dao *daos.Dao, record *models.Record, defaultE
 // - ensures that the emails of the auth records and their expanded auth relations
 //   are visibe only for the current logged admin, record owner or record with manage access
 func EnrichRecords(c echo.Context, dao *daos.Dao, records []*models.Record, defaultExpands ...string) error {
-	requestData := GetRequestData(c)
+	requestData := RequestData(c)
 
 	if err := autoIgnoreAuthRecordsEmailVisibility(dao, records, requestData); err != nil {
 		return fmt.Errorf("Failed to resolve email visibility: %v", err)
@@ -77,7 +82,7 @@ func EnrichRecords(c echo.Context, dao *daos.Dao, records []*models.Record, defa
 // expandFetch is the records fetch function that is used to expand related records.
 func expandFetch(
 	dao *daos.Dao,
-	requestData *models.FilterRequestData,
+	requestData *models.RequestData,
 ) daos.ExpandFetchFunc {
 	return func(relCollection *models.Collection, relIds []string) ([]*models.Record, error) {
 		records, err := dao.FindRecordsByIds(relCollection.Id, relIds, func(q *dbx.SelectQuery) error {
@@ -117,7 +122,7 @@ func expandFetch(
 func autoIgnoreAuthRecordsEmailVisibility(
 	dao *daos.Dao,
 	records []*models.Record,
-	requestData *models.FilterRequestData,
+	requestData *models.RequestData,
 ) error {
 	if len(records) == 0 || !records[0].Collection().IsAuth() {
 		return nil // nothing to check
@@ -185,7 +190,7 @@ func autoIgnoreAuthRecordsEmailVisibility(
 func hasAuthManageAccess(
 	dao *daos.Dao,
 	record *models.Record,
-	requestData *models.FilterRequestData,
+	requestData *models.RequestData,
 ) bool {
 	if !record.Collection().IsAuth() {
 		return false

apis/record_helpers_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/pocketbase/pocketbase/tests"
 )
 
-func TestGetRequestData(t *testing.T) {
+func TestRequestData(t *testing.T) {
 	e := echo.New()
 	req := httptest.NewRequest(http.MethodPost, "/?test=123", strings.NewReader(`{"test":456}`))
 	req.Header.Set(echo.HeaderContentType, echo.MIMEApplicationJSON)
@@ -28,10 +28,10 @@ func TestGetRequestData(t *testing.T) {
 	dummyAdmin.Id = "id2"
 	c.Set(apis.ContextAdminKey, dummyAdmin)
 
-	result := apis.GetRequestData(c)
+	result := apis.RequestData(c)
 
 	if result == nil {
-		t.Fatal("Expected *models.FilterRequestData instance, got nil")
+		t.Fatal("Expected *models.RequestData instance, got nil")
 	}
 
 	if result.Method != http.MethodPost {