Merge pull request #26 from hatamiarash7/new-api-format

pjfa · web-flow · commit f83af2ea24c2 · 2023-05-09T20:37:21.000+03:30
Support new API key format
diff --git a/pkg/paas/login.go b/pkg/paas/login.go
@@ -130,7 +130,7 @@ func getApiKey(in io.Reader, writer io.Writer) string {
 }
 
 func apiKeyValidator(input string) (bool, error) {
-	var validApiKey = regexp.MustCompile(`^Apikey [a-z0-9\-]+$$`)
+	var validApiKey = regexp.MustCompile(`^(A|a)pikey [a-z0-9\-]+$$`)
 	if !validApiKey.MatchString(input) {
 		return false, errors.New("API token should be in format: 'Apikey xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'")
 	}

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ func getApiKey(in io.Reader, writer io.Writer) string {`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`func apiKeyValidator(input string) (bool, error) {`
`133`		- var validApiKey = regexp.MustCompile(`^Apikey [a-z0-9\-]+$$`)
	`133`	+ var validApiKey = regexp.MustCompile(`^(A\|a)pikey [a-z0-9\-]+$$`)
`134`	`134`	`if !validApiKey.MatchString(input) {`
`135`	`135`	`return false, errors.New("API token should be in format: 'Apikey xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'")`
`136`	`136`	`}`