浏览代码

fix(webapp): don't allow underscore in domain on sign-up

Peter Thomassen 5 年之前
父节点
当前提交
e3e005105f
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      webapp/src/validation.js
  2. 2 2
      webapp/src/views/SignUp.vue

+ 1 - 1
webapp/src/validation.js

@@ -1,2 +1,2 @@
-export const domain_pattern = /^([a-z0-9_.-]+\.)+[a-z]+$/i;
+export const domain_pattern = /^([a-z0-9.-]+\.)+[a-z]+$/i;
 export const email_pattern = /^(([^<>()[\]\\.,;:\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,}))$/;

+ 2 - 2
webapp/src/views/SignUp.vue

@@ -193,8 +193,8 @@
       /* domain field */
       domain: '',
       domainType: null,
-      domain_rules: [v => !!v && !!domain_pattern.test(v) || 'Domain names can only contain letters, numbers, underscores (_), dots (.), and dashes (-), and must end with a top-level domain.'],
-      dyn_domain_rules: [v => !!v && v.indexOf('.') < 0 && !!domain_pattern.test(v + '.' + LOCAL_PUBLIC_SUFFIXES[0]) || 'Your domain name can only contain letters, numbers, underscores (_), and dashes (-).'],
+      domain_rules: [v => !!v && !!domain_pattern.test(v) || 'Domain names can only contain letters, numbers, dots (.), and dashes (-), and must end with a top-level domain.'],
+      dyn_domain_rules: [v => !!v && v.indexOf('.') < 0 && !!domain_pattern.test(v + '.' + LOCAL_PUBLIC_SUFFIXES[0]) || 'Your domain name can only contain letters, numbers, and dashes (-).'],
       domain_errors: [],
     }),
     async mounted() {