From 486d12e1c3a5d6658ca0ebd8fd28bec9f6753ce9 Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Fri, 21 Oct 2016 17:19:28 -0700 Subject: PLT-4165 removing team name reserved words (#4289) --- model/utils.go | 47 ++--------------------------------------------- 1 file changed, 2 insertions(+), 45 deletions(-) (limited to 'model/utils.go') diff --git a/model/utils.go b/model/utils.go index 4ebd23939..457b64c09 100644 --- a/model/utils.go +++ b/model/utils.go @@ -253,58 +253,15 @@ func IsValidEmail(email string) bool { } var reservedName = []string{ - "www", - "web", + "signup", + "login", "admin", - "support", - "notify", - "test", - "demo", - "mail", - "team", "channel", - "internal", - "localhost", - "dockerhost", - "stag", "post", - "cluster", "api", "oauth", } -var wwwStart = regexp.MustCompile(`^www`) -var betaStart = regexp.MustCompile(`^beta`) -var ciStart = regexp.MustCompile(`^ci`) - -func GetSubDomain(s string) (string, string) { - s = strings.Replace(s, "http://", "", 1) - s = strings.Replace(s, "https://", "", 1) - - match := wwwStart.MatchString(s) - if match { - return "", "" - } - - match = betaStart.MatchString(s) - if match { - return "", "" - } - - match = ciStart.MatchString(s) - if match { - return "", "" - } - - parts := strings.Split(s, ".") - - if len(parts) != 3 { - return "", "" - } - - return parts[0], parts[1] -} - func IsValidChannelIdentifier(s string) bool { if !IsValidAlphaNum(s, true) { -- cgit v1.2.3-1-g7c22