Add '/pbl/*' as a valid URL

pedrozadotdev · Feb 6, 2024 · 61b9234 · 61b9234
1 parent 1e4db9b
commit 61b9234
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/client/packages/openblocks/src/pages/setting/branding/BrandingSetting.tsx b/client/packages/openblocks/src/pages/setting/branding/BrandingSetting.tsx
@@ -231,7 +231,7 @@ export function BrandingSettings() {
                     }
                     placeholder={trans("branding.logoPlaceholder")}
                     checkRule={{
-                      check: (value) => !value || checkUrlValid(value),
+                      check: (value) => !value || checkUrlValid(value) || value.startsWith("/pbl/"),
                       errorMsg: trans("branding.urlCheck"),
                     }}
                   />
@@ -270,7 +270,7 @@ export function BrandingSettings() {
                     }
                     placeholder={trans("branding.faviconPlaceholder")}
                     checkRule={{
-                      check: (value) => !value || checkUrlValid(value),
+                      check: (value) => !value || checkUrlValid(value) || value.startsWith("/pbl/"),
                       errorMsg: trans("branding.urlCheck"),
                     }}
                   />

diff --git a/client/packages/openblocks/src/pages/setting/idSource/createModal.tsx b/client/packages/openblocks/src/pages/setting/idSource/createModal.tsx
@@ -177,7 +177,7 @@ function CreateModal(props: CreateModalProp) {
                       }
                       placeholder={trans("idSource.customIconUrlPlaceholder")}
                       checkRule={{
-                        check: (value) => !value || checkUrlValid(value),
+                        check: (value) => !value || checkUrlValid(value) || value.startsWith("/pbl/"),
                         errorMsg: trans("idSource.customIconUrlCheckMsg"),
                       }}
                     />

diff --git a/client/packages/openblocks/src/util/stringUtils.ts b/client/packages/openblocks/src/util/stringUtils.ts
@@ -62,7 +62,7 @@ export const COLOR_PALETTE = [
 
 export const PHONE_NUMBER_PATTERN = /^1\d{10}$/;
 export const EMAIL_PATTERN = /^[\w-+.]+@([\w-]+\.)+[\w-]{2,}$/;
-export const URL_PATTERN = /^(https?:\/\/)?([\w-])+\.{1}([a-zA-Z]{2,63})([/\w-]*)*\/?\??([^#\n\r]*)?#?([^\n\r]*)$/; // prettier-ignore
+export const URL_PATTERN = /^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%\$#_]*)?$/; // prettier-ignore
 export const HEXCOLOR_PATTERN =/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/;
 
 export const checkOtpValid = (value: string): boolean => {

diff --git a/server/models/settings.go b/server/models/settings.go
@@ -2,6 +2,7 @@ package models
 
 import (
 	"encoding/json"
+	"strings"
 	"sync"
 
 	validation "github.com/go-ozzo/ozzo-validation/v4"
@@ -38,8 +39,8 @@ func (s *Settings) Validate(validateHomePageAppSlug ...validation.Rule) error {
 
 	return validation.ValidateStruct(s,
 		validation.Field(&s.Name, validation.Required),
-		validation.Field(&s.LogoUrl, is.URL),
-		validation.Field(&s.IconUrl, is.URL),
+		validation.Field(&s.LogoUrl, validation.When(strings.HasPrefix(s.LogoUrl, "/pbl/")).Else(is.URL)),
+		validation.Field(&s.IconUrl, validation.When(strings.HasPrefix(s.IconUrl, "/pbl/")).Else(is.URL)),
 		validation.Field(&s.HeaderColor, is.HexColor),
 		validation.Field(&s.HomePageAppSlug, validateHomePageAppSlug...),
 		validation.Field(&s.Themes, is.JSON),
@@ -207,6 +208,6 @@ type OauthAuth struct {
 // Validate makes OauthAuth validatable by implementing [validation.Validatable] interface.
 func (a *OauthAuth) Validate() error {
 	return validation.ValidateStruct(&a,
-		validation.Field(&a.CustomIconUrl, is.URL),
+		validation.Field(&a.CustomIconUrl, validation.When(strings.HasPrefix(a.CustomIconUrl, "/pbl/")).Else(is.URL)),
 	)
 }