From 9ab833c6473e26978ac39acb06f47de073493540 Mon Sep 17 00:00:00 2001 From: Alper Reha Yazgan Date: Sat, 10 Feb 2024 21:27:02 +0300 Subject: [PATCH] oauth redirect userid exact len 15 err fix min-max revised --- forms/admin_upsert.go | 2 +- forms/collection_upsert.go | 2 +- forms/record_upsert.go | 2 +- models/base.go | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/forms/admin_upsert.go b/forms/admin_upsert.go index afb14046d..65537c05b 100644 --- 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 index 400f172a5..99c2cea9c 100644 --- 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 index 5e7181357..08505cc4f 100644 --- 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 index 3916ff5d5..97a1793a7 100644 --- 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"