oauth redirect userid exact len 15 err fix min-max revised

AlperRehaYAZGAN · Feb 10, 2024 · 9ab833c · 9ab833c
1 parent ee583b7
commit 9ab833c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/forms/admin_upsert.go b/forms/admin_upsert.go
@@ -55,7 +55,7 @@ func (form *AdminUpsert) Validate() error {
 			&form.Id,
 			validation.When(
 				form.admin.IsNew(),
-				validation.Length(models.DefaultIdLength, models.DefaultIdLength),
+				validation.Length(models.SnowflakeMinLen, models.SnowflakeMaxLen),
 				validation.Match(idRegex),
 				validation.By(validators.UniqueId(form.dao, form.admin.TableName())),
 			).Else(validation.In(form.admin.Id)),

diff --git a/forms/collection_upsert.go b/forms/collection_upsert.go
@@ -105,7 +105,7 @@ func (form *CollectionUpsert) Validate() error {
 			&form.Id,
 			validation.When(
 				form.collection.IsNew(),
-				validation.Length(models.DefaultIdLength, models.DefaultIdLength),
+				validation.Length(models.SnowflakeMinLen, models.SnowflakeMaxLen),
 				validation.Match(idRegex),
 				validation.By(validators.UniqueId(form.dao, form.collection.TableName())),
 			).Else(validation.In(form.collection.Id)),

diff --git a/forms/record_upsert.go b/forms/record_upsert.go
@@ -466,7 +466,7 @@ func (form *RecordUpsert) Validate() error {
 			&form.Id,
 			validation.When(
 				form.record.IsNew(),
-				validation.Length(models.DefaultIdLength, models.DefaultIdLength),
+				validation.Length(models.SnowflakeMinLen, models.SnowflakeMaxLen),
 				validation.Match(idRegex),
 				validation.By(validators.UniqueId(form.dao, form.record.TableName())),
 			).Else(validation.In(form.record.Id)),

diff --git a/models/base.go b/models/base.go
@@ -9,6 +9,8 @@ import (
 const (
 	// DefaultIdLength is the default length of the generated model id.
 	DefaultIdLength = 15
+	SnowflakeMinLen = 8
+	SnowflakeMaxLen = 32
 
 	// DefaultIdAlphabet is the default characters set used for generating the model id.
 	DefaultIdAlphabet = "abcdefghijklmnopqrstuvwxyz0123456789"