docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3077 from jlhawn/3076-handle-inactive-user-login 

Adjusted handling of inactive user login
This commit is contained in:
Guillaume J. Charmes 2013-12-06 14:40:35 -08:00
parent 07f7643bbc 6720bfb243
commit 04ffa53ba8
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
auth/auth.go
View File

@ -192,13 +192,6 @@ func Login(authConfig *AuthConfig, factory *utils.HTTPRequestFactory) (string, e
} else { } else {
status = "Account created. Please see the documentation of the registry " + serverAddress + " for instructions how to activate it." status = "Account created. Please see the documentation of the registry " + serverAddress + " for instructions how to activate it."
} }
} else if reqStatusCode == 403 {
if loginAgainstOfficialIndex {
return "", fmt.Errorf("Login: Your account hasn't been activated. " +
"Please check your e-mail for a confirmation link.")
}
return "", fmt.Errorf("Login: Your account hasn't been activated. " +
"Please see the documentation of the registry " + serverAddress + " for instructions how to activate it.")
} else if reqStatusCode == 400 { } else if reqStatusCode == 400 {
if string(reqBody) == "\"Username or email already exists\"" { if string(reqBody) == "\"Username or email already exists\"" {
req, err := factory.NewRequest("GET", serverAddress+"users/", nil) req, err := factory.NewRequest("GET", serverAddress+"users/", nil)
@ -216,9 +209,13 @@ func Login(authConfig *AuthConfig, factory *utils.HTTPRequestFactory) (string, e
status = "Login Succeeded" status = "Login Succeeded"
} else if resp.StatusCode == 401 { } else if resp.StatusCode == 401 {
return "", fmt.Errorf("Wrong login/password, please try again") return "", fmt.Errorf("Wrong login/password, please try again")
} else if resp.StatusCode == 403 {
if loginAgainstOfficialIndex {
return "", fmt.Errorf("Login: Account is not Active. Please check your e-mail for a confirmation link.")
}
return "", fmt.Errorf("Login: Account is not Active. Please see the documentation of the registry %s for instructions how to activate it.", serverAddress)
} else { } else {
return "", fmt.Errorf("Login: %s (Code: %d; Headers: %s)", body, return "", fmt.Errorf("Login: %s (Code: %d; Headers: %s)", body, resp.StatusCode, resp.Header)
resp.StatusCode, resp.Header)
} }
} else { } else {
return "", fmt.Errorf("Registration: %s", reqBody) return "", fmt.Errorf("Registration: %s", reqBody)
@ -236,7 +233,7 @@ func Login(authConfig *AuthConfig, factory *utils.HTTPRequestFactory) (string, e
body, err := ioutil.ReadAll(resp.Body) body, err := ioutil.ReadAll(resp.Body)
if err != nil { if err != nil {
return "", err return "", err
} }
if resp.StatusCode == 200 { if resp.StatusCode == 200 {
status = "Login Succeeded" status = "Login Succeeded"
} else if resp.StatusCode == 401 { } else if resp.StatusCode == 401 {