Merge lp:~vds/usso/wrong_credential_return_error into lp:usso

[Vincenzo Di Somma]

USSO needs to return also a go error when wrong login or password are provided.

USSO needs to return also a go error when wrong login or password are provided.

[Graham Binns (gmb)]

Hey Vincenzo,

Thanks for this branch. Just one tweak needed, then r=me

[1]

51 +func (suite *USSOTestSuite) TestGetTokenFails(c *C) {

This is lacking documentation. What's the expected behaviour that it tests?

review: Approve (code)

[lp:~vds/usso/wrong_credential_return_error]

28. By Vincenzo Di Somma on 2013-02-22

Improving docs.

[Domas Monkus (tasdomas)]

review: Approve

[Andrew W. Deane (andrew-w-deane)]

review: Approve

=== modified file 'usso.go'
--- usso.go	2013-02-14 22:12:30 +0000
+++ usso.go	2013-02-22 12:49:20 +0000
@@ -3,6 +3,7 @@
 import (
 	"bytes"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"log"
@@ -54,6 +55,12 @@
 	if err != nil {
 		return nil, err
 	}
+	if response.StatusCode == 404 {
+		return nil, errors.New("Wrong credentials.")
+	}
+	if response.StatusCode != 200 {
+		return nil, fmt.Errorf("SSO Error: %s\n", response.Status)
+	}
 	body, err := ioutil.ReadAll(response.Body)
 	if err != nil {
 		log.Println(err)
 
=== modified file 'usso_test.go'
--- usso_test.go	2013-01-25 15:47:22 +0000
+++ usso_test.go	2013-02-22 12:49:20 +0000
@@ -7,6 +7,7 @@
 	. "launchpad.net/gocheck"
 	"net/http"
 	"net/http/httptest"
+	"strings"
 	"testing"
 )
 
@@ -58,7 +59,7 @@
 			panic(err)
 		}
 		requestContent = string(res)
-		if r.URL.String() != uri {
+		if r.URL.String() != uri || strings.Contains(requestContent, "WRONG") {
 			http.Error(w, "404 page not found", http.StatusNotFound)
 		} else {
 			w.WriteHeader(code)
@@ -110,3 +111,14 @@
 	}
 	c.Assert(*server.requestContent, Equals, string(expectedRequestContent))
 }
+
+// GetToken should return empty credentials and an error, if wrong account is provided.
+func (suite *USSOTestSuite) TestGetTokenFails(c *C) {
+	server := newSingleServingServer("/api/v2/tokens", "{}", 200)
+	var testSSOServer = &UbuntuSSOServer{server.URL}
+	defer server.Close()
+	ssodata, err := testSSOServer.GetToken(email, "WRONG", tokenName)
+	fmt.Println(ssodata, err)
+	c.Assert(err, NotNil)
+	c.Assert(ssodata, IsNil)
+}