Add missing oauth1 prefix to errors

arseniy-panfilov · Sep 30, 2015 · d7535f8 · d7535f8
1 parent 80f769a
commit d7535f8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/config.go b/config.go
@@ -79,12 +79,12 @@ func (c *Config) RequestToken() (requestToken, requestSecret string, err error)
 		return "", "", err
 	}
 	if values.Get(oauthCallbackConfirmedParam) != "true" {
-		return "", "", errors.New("oauth_callback_confirmed was not true")
+		return "", "", errors.New("oauth1: oauth_callback_confirmed was not true")
 	}
 	requestToken = values.Get(oauthTokenParam)
 	requestSecret = values.Get(oauthTokenSecretParam)
 	if requestToken == "" || requestSecret == "" {
-		return "", "", errors.New("Response missing oauth_token or oauth_token_secret")
+		return "", "", errors.New("oauth1: Response missing oauth_token or oauth_token_secret")
 	}
 	return requestToken, requestSecret, nil
 }
@@ -118,7 +118,7 @@ func ParseAuthorizationCallback(req *http.Request) (requestToken, verifier strin
 	requestToken = req.Form.Get(oauthTokenParam)
 	verifier = req.Form.Get(oauthVerifierParam)
 	if requestToken == "" || verifier == "" {
-		return "", "", errors.New("Request missing oauth_token or oauth_verifier")
+		return "", "", errors.New("oauth1: Request missing oauth_token or oauth_verifier")
 	}
 	return requestToken, verifier, nil
 }
@@ -153,7 +153,7 @@ func (c *Config) AccessToken(requestToken, requestSecret, verifier string) (acce
 	accessToken = values.Get(oauthTokenParam)
 	accessSecret = values.Get(oauthTokenSecretParam)
 	if accessToken == "" || accessSecret == "" {
-		return "", "", errors.New("Response missing oauth_token or oauth_token_secret")
+		return "", "", errors.New("oauth1: Response missing oauth_token or oauth_token_secret")
 	}
 	return accessToken, accessSecret, nil
 }
diff --git a/config_test.go b/config_test.go
@@ -91,8 +91,8 @@ func newUnparseableBodyServer() *httptest.Server {
 }
 
 func TestConfigRequestToken(t *testing.T) {
-	expectedToken := "token"
-	expectedSecret := "secret"
+	expectedToken := "reqest_token"
+	expectedSecret := "request_secret"
 	data := url.Values{}
 	data.Add("oauth_token", expectedToken)
 	data.Add("oauth_token_secret", expectedSecret)
@@ -136,7 +136,7 @@ func TestConfigRequestToken_CallbackNotConfirmed(t *testing.T) {
 	}
 	requestToken, requestSecret, err := config.RequestToken()
 	if assert.Error(t, err) {
-		assert.Equal(t, "oauth_callback_confirmed was not true", err.Error())
+		assert.Equal(t, "oauth1: oauth_callback_confirmed was not true", err.Error())
 	}
 	assert.Equal(t, "", requestToken)
 	assert.Equal(t, "", requestSecret)
@@ -173,7 +173,7 @@ func TestConfigRequestToken_MissingTokenOrSecret(t *testing.T) {
 	}
 	requestToken, requestSecret, err := config.RequestToken()
 	if assert.Error(t, err) {
-		assert.Equal(t, "Response missing oauth_token or oauth_token_secret", err.Error())
+		assert.Equal(t, "oauth1: Response missing oauth_token or oauth_token_secret", err.Error())
 	}
 	assert.Equal(t, "", requestToken)
 	assert.Equal(t, "", requestSecret)
@@ -208,12 +208,11 @@ func TestAuthorizationURL_CannotParseAuthorizeURL(t *testing.T) {
 }
 
 func TestConfigAccessToken(t *testing.T) {
-	expectedToken := "token"
-	expectedSecret := "secret"
+	expectedToken := "access_token"
+	expectedSecret := "access_secret"
 	data := url.Values{}
 	data.Add("oauth_token", expectedToken)
 	data.Add("oauth_token_secret", expectedSecret)
-	data.Add("oauth_callback_confirmed", "true")
 	server := newAccessTokenServer(t, data)
 	defer server.Close()
 
@@ -270,7 +269,7 @@ func TestConfigAccessToken_MissingTokenOrSecret(t *testing.T) {
 	}
 	accessToken, accessSecret, err := config.AccessToken("request_token", "request_secret", expectedVerifier)
 	if assert.Error(t, err) {
-		assert.Equal(t, "Response missing oauth_token or oauth_token_secret", err.Error())
+		assert.Equal(t, "oauth1: Response missing oauth_token or oauth_token_secret", err.Error())
 	}
 	assert.Equal(t, "", accessToken)
 	assert.Equal(t, "", accessSecret)
@@ -325,7 +324,7 @@ func TestParseAuthorizationCallback_MissingTokenOrVerifier(t *testing.T) {
 		// logic under test
 		requestToken, verifier, err := ParseAuthorizationCallback(req)
 		if assert.Error(t, err) {
-			assert.Equal(t, "Request missing oauth_token or oauth_verifier", err.Error())
+			assert.Equal(t, "oauth1: Request missing oauth_token or oauth_verifier", err.Error())
 		}
 		assert.Equal(t, "", requestToken)
 		assert.Equal(t, "", verifier)