From a183de1d367b678fc95941e8b6e3d2855f29cb88 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Wed, 12 Aug 2020 14:43:12 +0200 Subject: [PATCH] Allow alphanumeric, - and _ for account uuids --- pkg/service/v0/validator.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkg/service/v0/validator.go b/pkg/service/v0/validator.go index 13fa4faf3..defa45ff7 100644 --- a/pkg/service/v0/validator.go +++ b/pkg/service/v0/validator.go @@ -13,10 +13,6 @@ var ( validation.Required, validation.Match(regexForKeys), } - settingKeyRule = []validation.Rule{ - validation.Required, - validation.Match(regexForKeys), - } ) func validateSaveSettingsBundle(req *proto.SaveSettingsBundleRequest) error { @@ -52,6 +48,7 @@ func validateGetSettingsValue(req *proto.GetSettingsValueRequest) error { func validateListSettingsValues(req *proto.ListSettingsValuesRequest) error { return validation.ValidateStruct( req.Identifier, + validation.Field(&req.Identifier.AccountUuid, keyRule...), validation.Field(&req.Identifier.Extension, validation.Match(regexForKeys)), validation.Field(&req.Identifier.Extension, validation.When(req.Identifier.BundleKey != "", validation.Required)), validation.Field(&req.Identifier.BundleKey, validation.Match(regexForKeys)), @@ -73,6 +70,7 @@ func validateValueIdentifier(identifier *proto.Identifier) error { identifier, validation.Field(&identifier.Extension, keyRule...), validation.Field(&identifier.BundleKey, keyRule...), - validation.Field(&identifier.SettingKey, settingKeyRule...), + validation.Field(&identifier.SettingKey, keyRule...), + validation.Field(&identifier.AccountUuid, keyRule...), ) }