Browse Source

Fix the email validation problem for a.b@c.club. (#94)

Co-authored-by: yyzhang <yuanyuan.zhang@haochezhu.club>
tags/0.2.2
Yuanyuan Zhang 2 years ago
parent
commit
d8425f3f4c
No account linked to committer's email address
4 changed files with 4 additions and 4 deletions
  1. 1
    1
      api/libs/helper.py
  2. 1
    1
      web/app/install/installForm.tsx
  3. 1
    1
      web/app/signin/normalForm.tsx
  4. 1
    1
      web/config/index.ts

+ 1
- 1
api/libs/helper.py View File

@@ -21,7 +21,7 @@ class TimestampField(fields.Raw):

def email(email):
# Define a regex pattern for email addresses
pattern = r"^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$"
pattern = r"^[\w\.-]+@([\w-]+\.)+[\w-]{2,4}$"
# Check if the email matches the pattern
if re.match(pattern, email) is not None:
return email

+ 1
- 1
web/app/install/installForm.tsx View File

@@ -7,7 +7,7 @@ import { useRouter } from 'next/navigation'
import Toast from '../components/base/toast'
import { setup } from '@/service/common'

const validEmailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/
const validEmailReg = /^[\w\.-]+@([\w-]+\.)+[\w-]{2,4}$/
const validPassword = /^(?=.*[a-zA-Z])(?=.*\d).{8,}$/

const InstallForm = () => {

+ 1
- 1
web/app/signin/normalForm.tsx View File

@@ -13,7 +13,7 @@ import Button from '@/app/components/base/button'
import { login, oauth } from '@/service/common'
import { apiPrefix } from '@/config'

const validEmailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/
const validEmailReg = /^[\w\.-]+@([\w-]+\.)+[\w-]{2,4}$/

type IState = {
formValid: boolean

+ 1
- 1
web/config/index.ts View File

@@ -77,7 +77,7 @@ export const DEFAULT_VALUE_MAX_LEN = 48

export const zhRegex = /^[\u4e00-\u9fa5]$/gm
export const emojiRegex = /^[\uD800-\uDBFF][\uDC00-\uDFFF]$/gm
export const emailRegex = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
export const emailRegex = /^[\w\.-]+@([\w-]+\.)+[\w-]{2,4}$/gm
const MAX_ZN_VAR_NAME_LENGHT = 8
const MAX_EN_VAR_VALUE_LENGHT = 16
export const getMaxVarNameLength = (value: string) => {

Loading…
Cancel
Save