go/pocketbase
1
0
Fork 0
mirror of https://github.com/pocketbase/pocketbase.git synced 2025-11-06 09:29:19 +02:00
Code Issues Releases Activity

soft deprecated apis.RequestData(c) in favor of apis.RequestInfo(c) and updated jsvm bindings

Browse Source
This commit is contained in:
Gani Georgiev
2023-07-17 23:13:39 +03:00
parent 7d4017225c
commit 0110869c89
22 changed files with 3158 additions and 2990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
forms/record_upsert.go
View File

@@ -117,7 +117,7 @@ func (form *RecordUpsert) getContentType(r *http.Request) string {
return t
}
func (form *RecordUpsert) extractRequestData(
func (form *RecordUpsert) extractRequestInfo(
r *http.Request,
keyPrefix string,
) (map[string]any, map[string][]*filesystem.File, error) {
@@ -219,12 +219,12 @@ func (form *RecordUpsert) extractMultipartFormData(
//
// File upload is supported only via multipart/form-data.
func (form *RecordUpsert) LoadRequest(r *http.Request, keyPrefix string) error {
requestData, uploadedFiles, err := form.extractRequestData(r, keyPrefix)
requestInfo, uploadedFiles, err := form.extractRequestInfo(r, keyPrefix)
if err != nil {
return err
}
if err := form.LoadData(requestData); err != nil {
if err := form.LoadData(requestInfo); err != nil {
return err
}
@@ -349,39 +349,39 @@ func (form *RecordUpsert) RemoveFiles(key string, toDelete ...string) error {
}
// LoadData loads and normalizes the provided regular record data fields into the form.
func (form *RecordUpsert) LoadData(requestData map[string]any) error {
func (form *RecordUpsert) LoadData(requestInfo map[string]any) error {
// load base system fields
if v, ok := requestData[schema.FieldNameId]; ok {
if v, ok := requestInfo[schema.FieldNameId]; ok {
form.Id = cast.ToString(v)
}
// load auth system fields
if form.record.Collection().IsAuth() {
if v, ok := requestData[schema.FieldNameUsername]; ok {
if v, ok := requestInfo[schema.FieldNameUsername]; ok {
form.Username = cast.ToString(v)
}
if v, ok := requestData[schema.FieldNameEmail]; ok {
if v, ok := requestInfo[schema.FieldNameEmail]; ok {
form.Email = cast.ToString(v)
}
if v, ok := requestData[schema.FieldNameEmailVisibility]; ok {
if v, ok := requestInfo[schema.FieldNameEmailVisibility]; ok {
form.EmailVisibility = cast.ToBool(v)
}
if v, ok := requestData[schema.FieldNameVerified]; ok {
if v, ok := requestInfo[schema.FieldNameVerified]; ok {
form.Verified = cast.ToBool(v)
}
if v, ok := requestData["password"]; ok {
if v, ok := requestInfo["password"]; ok {
form.Password = cast.ToString(v)
}
if v, ok := requestData["passwordConfirm"]; ok {
if v, ok := requestInfo["passwordConfirm"]; ok {
form.PasswordConfirm = cast.ToString(v)
}
if v, ok := requestData["oldPassword"]; ok {
if v, ok := requestInfo["oldPassword"]; ok {
form.OldPassword = cast.ToString(v)
}
}
// replace modifiers (if any)
requestData = form.record.ReplaceModifers(requestData)
requestInfo = form.record.ReplaceModifers(requestInfo)
// create a shallow copy of form.data
var extendedData = make(map[string]any, len(form.data))
@@ -390,7 +390,7 @@ func (form *RecordUpsert) LoadData(requestData map[string]any) error {
}
// extend form.data with the request data
rawData, err := json.Marshal(requestData)
rawData, err := json.Marshal(requestInfo)
if err != nil {
return err
}