Changes requested by @lsirac

This commit is contained in:
Ryan Kohler
2022-04-21 08:28:25 -07:00
parent 1c93c2e4af
commit 13e7453c5b
2 changed files with 12 additions and 22 deletions

View File

@@ -63,8 +63,8 @@ type executableResponse struct {
ExpirationTime *int64 `json:"expiration_time"`
IdToken *string `json:"id_token"`
SamlResponse *string `json:"saml_response"`
Code *string `json:"code"`
Message *string `json:"message"`
Code string `json:"code"`
Message string `json:"message"`
}
func parseSubjectToken(response []byte) (string, error) {
@@ -82,20 +82,10 @@ func parseSubjectToken(response []byte) (string, error) {
}
if !*result.Success {
details := ""
if result.Code != nil {
details += fmt.Sprintf("(%v)", *result.Code)
if result.Code == "" || result.Message == "" {
return "", errors.New("oauth2/google: Response must include `error` and `message` fields when unsuccessful.")
}
if result.Message != nil {
if details != "" {
details += " "
}
details += *result.Message
}
if details == "" {
details = "Unknown Error"
}
return "", fmt.Errorf("oauth2/google: Executable returned unsuccessful response: %v.", details)
return "", fmt.Errorf("oauth2/google: Executable returned unsuccessful response: (%v) %v.", result.Code, result.Message)
}
if *result.Version > EXECUTABLE_SUPPORTED_MAX_VERSION {