Custom profile attributes field endpoints (#29662)
* Adds the main Property System Architecture components This change adds the necessary migrations for the Property Groups, Fields and Values tables to be created, the store layer and a Property Service that can be used from the app layer. * Adds Custom Profile Attributes endpoints and app layer * implement get and patch cpa values * run i18n-extract * Update property field type to use user instead of person * Update PropertyFields to allow for unique nondeleted fields and remove redundant indexes * Update PropertyValues to allow for unique nondeleted fields and remove redundant indexes * Use StringMap instead of the map[string]any on property fields * Add i18n strings * Revert "Use StringMap instead of the map[string]any on property fields" This reverts commit e2735ab0f8589d2524d636419ca0cb144575c4d6. * Cast JSON binary data to string and add todo note for StringMap use * Add mocks to the retrylayer tests * Cast JSON binary data to string in property value store * Check for binary parameter instead of casting to string for JSON data * Fix bad merge * Check property field type is one of the allowed ones * Avoid reusing err variable to be explicit about the returned value * Merge Property System Migrations into one file * Adds NOT NULL to timestamps at the DB level * Update stores to use tableSelectQuery instead of a slice var * Update PropertyField model translations to be more explicit and avoid repetition * Update PropertyValue model translations to be more explicit and avoid repetition * Use ExecBuilder instead of ToSql&Exec * Update property field errors to add context * Ensure PerPage is greater than zero * Update store errors to give more context * Use ExecBuilder in the property stores where possible * Add an on conflict suffix to the group register to avoid race conditions * Remove user profile API documentation changes * Update patchCPAValues endpoint and docs to return the updated information * Merge two similar error conditions * Use a route function for ListCPAValues * Remove badly used translation string * Remove unused get in register group method * Adds input sanitization and validation to the CPA API endpoints * Takes login outside of one test case to make it clear it affects multiple t.Runs * Fix wrap error and return code when property field has been deleted * Fix receiver name * Adds comment to move the CPA group ID to the db cache * Set the PerPage of CPA fields to the fields limit * Update server/channels/app/custom_profile_attributes_test.go Co-authored-by: Alejandro García Montoro <alejandro.garciamontoro@gmail.com> * Standardize group ID access * Avoid polluting the state between tests * Use specific errors for the retrieval of CPA group --------- Co-authored-by: Scott Bishel <scott.bishel@mattermost.com> Co-authored-by: Mattermost Build <build@mattermost.com> Co-authored-by: Alejandro García Montoro <alejandro.garciamontoro@gmail.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
c6984941f1
Коммит
ca34c6a03f
@@ -600,6 +600,26 @@ func (c *Client4) limitsRoute() string {
|
||||
return "/limits"
|
||||
}
|
||||
|
||||
func (c *Client4) customProfileAttributesRoute() string {
|
||||
return "/custom_profile_attributes"
|
||||
}
|
||||
|
||||
func (c *Client4) userCustomProfileAttributesRoute(userID string) string {
|
||||
return fmt.Sprintf("%s/%s", c.userRoute(userID), c.customProfileAttributesRoute())
|
||||
}
|
||||
|
||||
func (c *Client4) customProfileAttributeFieldsRoute() string {
|
||||
return fmt.Sprintf("%s/fields", c.customProfileAttributesRoute())
|
||||
}
|
||||
|
||||
func (c *Client4) customProfileAttributeFieldRoute(fieldID string) string {
|
||||
return fmt.Sprintf("%s/%s", c.customProfileAttributeFieldsRoute(), fieldID)
|
||||
}
|
||||
|
||||
func (c *Client4) customProfileAttributeValuesRoute() string {
|
||||
return fmt.Sprintf("%s/values", c.customProfileAttributesRoute())
|
||||
}
|
||||
|
||||
func (c *Client4) GetServerLimits(ctx context.Context) (*ServerLimits, *Response, error) {
|
||||
r, err := c.DoAPIGet(ctx, c.limitsRoute()+"/users", "")
|
||||
if err != nil {
|
||||
@@ -9383,3 +9403,96 @@ func (c *Client4) RestorePostVersion(ctx context.Context, postId, versionId stri
|
||||
}
|
||||
return restoredPost, BuildResponse(r), nil
|
||||
}
|
||||
|
||||
func (c *Client4) CreateCPAField(ctx context.Context, field *PropertyField) (*PropertyField, *Response, error) {
|
||||
buf, err := json.Marshal(field)
|
||||
if err != nil {
|
||||
return nil, nil, NewAppError("CreateCPAField", "api.marshal_error", nil, "", http.StatusInternalServerError).Wrap(err)
|
||||
}
|
||||
r, err := c.DoAPIPostBytes(ctx, c.customProfileAttributeFieldsRoute(), buf)
|
||||
if err != nil {
|
||||
return nil, BuildResponse(r), err
|
||||
}
|
||||
defer closeBody(r)
|
||||
|
||||
var pf PropertyField
|
||||
if err := json.NewDecoder(r.Body).Decode(&pf); err != nil {
|
||||
return nil, nil, NewAppError("CreateCPAField", "api.unmarshal_error", nil, "", http.StatusInternalServerError).Wrap(err)
|
||||
}
|
||||
return &pf, BuildResponse(r), nil
|
||||
}
|
||||
|
||||
func (c *Client4) ListCPAFields(ctx context.Context) ([]*PropertyField, *Response, error) {
|
||||
r, err := c.DoAPIGet(ctx, c.customProfileAttributeFieldsRoute(), "")
|
||||
if err != nil {
|
||||
return nil, BuildResponse(r), err
|
||||
}
|
||||
defer closeBody(r)
|
||||
|
||||
var fields []*PropertyField
|
||||
if err := json.NewDecoder(r.Body).Decode(&fields); err != nil {
|
||||
return nil, nil, NewAppError("ListCPAFields", "api.unmarshal_error", nil, "", http.StatusInternalServerError).Wrap(err)
|
||||
}
|
||||
return fields, BuildResponse(r), nil
|
||||
}
|
||||
|
||||
func (c *Client4) PatchCPAField(ctx context.Context, fieldID string, patch *PropertyFieldPatch) (*PropertyField, *Response, error) {
|
||||
buf, err := json.Marshal(patch)
|
||||
if err != nil {
|
||||
return nil, nil, NewAppError("PatchCPAField", "api.marshal_error", nil, "", http.StatusInternalServerError).Wrap(err)
|
||||
}
|
||||
r, err := c.DoAPIPatchBytes(ctx, c.customProfileAttributeFieldRoute(fieldID), buf)
|
||||
if err != nil {
|
||||
return nil, BuildResponse(r), err
|
||||
}
|
||||
defer closeBody(r)
|
||||
|
||||
var pf PropertyField
|
||||
if err := json.NewDecoder(r.Body).Decode(&pf); err != nil {
|
||||
return nil, nil, NewAppError("PatchCPAField", "api.unmarshal_error", nil, "", http.StatusInternalServerError).Wrap(err)
|
||||
}
|
||||
return &pf, BuildResponse(r), nil
|
||||
}
|
||||
|
||||
func (c *Client4) DeleteCPAField(ctx context.Context, fieldID string) (*Response, error) {
|
||||
r, err := c.DoAPIDelete(ctx, c.customProfileAttributeFieldRoute(fieldID))
|
||||
if err != nil {
|
||||
return BuildResponse(r), err
|
||||
}
|
||||
defer closeBody(r)
|
||||
return BuildResponse(r), nil
|
||||
}
|
||||
|
||||
func (c *Client4) ListCPAValues(ctx context.Context, userID string) (map[string]string, *Response, error) {
|
||||
r, err := c.DoAPIGet(ctx, c.userCustomProfileAttributesRoute(userID), "")
|
||||
if err != nil {
|
||||
return nil, BuildResponse(r), err
|
||||
}
|
||||
defer closeBody(r)
|
||||
|
||||
fields := make(map[string]string)
|
||||
if err := json.NewDecoder(r.Body).Decode(&fields); err != nil {
|
||||
return nil, nil, NewAppError("ListCPAValues", "api.unmarshal_error", nil, "", http.StatusInternalServerError).Wrap(err)
|
||||
}
|
||||
return fields, BuildResponse(r), nil
|
||||
}
|
||||
|
||||
func (c *Client4) PatchCPAValues(ctx context.Context, values map[string]string) (map[string]string, *Response, error) {
|
||||
buf, err := json.Marshal(values)
|
||||
if err != nil {
|
||||
return nil, nil, NewAppError("PatchCPAValues", "api.marshal_error", nil, "", http.StatusInternalServerError).Wrap(err)
|
||||
}
|
||||
|
||||
r, err := c.DoAPIPatchBytes(ctx, c.customProfileAttributeValuesRoute(), buf)
|
||||
if err != nil {
|
||||
return nil, BuildResponse(r), err
|
||||
}
|
||||
defer closeBody(r)
|
||||
|
||||
var patchedValues map[string]string
|
||||
if err := json.NewDecoder(r.Body).Decode(&patchedValues); err != nil {
|
||||
return nil, nil, NewAppError("PatchCPAValues", "api.unmarshal_error", nil, "", http.StatusInternalServerError).Wrap(err)
|
||||
}
|
||||
|
||||
return patchedValues, BuildResponse(r), nil
|
||||
}
|
||||
|
||||
6
server/public/model/custom_profile_attributes.go
Обычный файл
6
server/public/model/custom_profile_attributes.go
Обычный файл
@@ -0,0 +1,6 @@
|
||||
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
||||
// See LICENSE.txt for license information.
|
||||
|
||||
package model
|
||||
|
||||
const CustomProfileAttributesPropertyGroupName = "custom_profile_attributes"
|
||||
@@ -57,6 +57,8 @@ type FeatureFlags struct {
|
||||
ExperimentalAuditSettingsSystemConsoleUI bool
|
||||
|
||||
ExperimentalCrossTeamSearch bool
|
||||
|
||||
CustomProfileAttributes bool
|
||||
}
|
||||
|
||||
func (f *FeatureFlags) SetDefaults() {
|
||||
@@ -81,6 +83,7 @@ func (f *FeatureFlags) SetDefaults() {
|
||||
f.NotificationMonitoring = true
|
||||
f.ExperimentalAuditSettingsSystemConsoleUI = false
|
||||
f.ExperimentalCrossTeamSearch = false
|
||||
f.CustomProfileAttributes = false
|
||||
}
|
||||
|
||||
// ToMap returns the feature flags as a map[string]string
|
||||
|
||||
@@ -3,7 +3,10 @@
|
||||
|
||||
package model
|
||||
|
||||
import "net/http"
|
||||
import (
|
||||
"net/http"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type PropertyFieldType string
|
||||
|
||||
@@ -29,6 +32,21 @@ type PropertyField struct {
|
||||
DeleteAt int64 `json:"delete_at"`
|
||||
}
|
||||
|
||||
func (pf *PropertyField) Auditable() map[string]interface{} {
|
||||
return map[string]interface{}{
|
||||
"id": pf.ID,
|
||||
"group_id": pf.GroupID,
|
||||
"name": pf.Name,
|
||||
"type": pf.Type,
|
||||
"attrs": pf.Attrs,
|
||||
"target_id": pf.TargetID,
|
||||
"target_type": pf.TargetType,
|
||||
"create_at": pf.CreateAt,
|
||||
"update_at": pf.UpdateAt,
|
||||
"delete_at": pf.DeleteAt,
|
||||
}
|
||||
}
|
||||
|
||||
func (pf *PropertyField) PreSave() {
|
||||
if pf.ID == "" {
|
||||
pf.ID = NewId()
|
||||
@@ -73,6 +91,56 @@ func (pf *PropertyField) IsValid() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (pf *PropertyField) SanitizeInput() {
|
||||
pf.Name = strings.TrimSpace(pf.Name)
|
||||
}
|
||||
|
||||
type PropertyFieldPatch struct {
|
||||
Name *string `json:"name"`
|
||||
Type *PropertyFieldType `json:"type"`
|
||||
Attrs *map[string]any `json:"attrs"`
|
||||
TargetID *string `json:"target_id"`
|
||||
TargetType *string `json:"target_type"`
|
||||
}
|
||||
|
||||
func (pfp *PropertyFieldPatch) Auditable() map[string]interface{} {
|
||||
return map[string]interface{}{
|
||||
"name": pfp.Name,
|
||||
"type": pfp.Type,
|
||||
"attrs": pfp.Attrs,
|
||||
"target_id": pfp.TargetID,
|
||||
"target_type": pfp.TargetType,
|
||||
}
|
||||
}
|
||||
|
||||
func (pfp *PropertyFieldPatch) SanitizeInput() {
|
||||
if pfp.Name != nil {
|
||||
pfp.Name = NewPointer(strings.TrimSpace(*pfp.Name))
|
||||
}
|
||||
}
|
||||
|
||||
func (pf *PropertyField) Patch(patch *PropertyFieldPatch) {
|
||||
if patch.Name != nil {
|
||||
pf.Name = *patch.Name
|
||||
}
|
||||
|
||||
if patch.Type != nil {
|
||||
pf.Type = *patch.Type
|
||||
}
|
||||
|
||||
if patch.Attrs != nil {
|
||||
pf.Attrs = *patch.Attrs
|
||||
}
|
||||
|
||||
if patch.TargetID != nil {
|
||||
pf.TargetID = *patch.TargetID
|
||||
}
|
||||
|
||||
if patch.TargetType != nil {
|
||||
pf.TargetType = *patch.TargetType
|
||||
}
|
||||
}
|
||||
|
||||
type PropertyFieldSearchOpts struct {
|
||||
GroupID string
|
||||
TargetType string
|
||||
|
||||
Ссылка в новой задаче
Block a user