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

[Vincenzo Di Somma]

Adding support for getting token details.

Adding support for getting token details.

[Casey Marshall (cmars)]

I updated my usso_test app to evaluate the contents of the token details, and it seems to work well with the following test.

Using https://bazaar.launchpad.net/~cmars/+junk/usso_test/view/head:/main.go, I signed into usso, authorizing the test application token, "test-usso-token". The resulting auth string was valid when checked against USSO, token details were thus:

{
    "token_name": "test-usso-token",
    "date_updated": "2013-10-31T19:28:50.268",
    "token_key": "[redacted]",
    "href": "/api/v2/tokens/oauth/[redacted, same as token_key's value]",
    "date_created": "2013-10-31T19:28:50.268",
    "consumer_key": "[redacted]"
}

Then I went to the Applications tab on login.ubuntu.com and test-usso-token was listed as an authorized application. I deleted the authorization there, and a subsequent USSO query with the auth string came back with token details:

{"message": "Provided email/password is not correct.", "code": "INVALID_CREDENTIALS", "extra": {}}

This looks very good to me!

review: Approve

=== modified file 'example/usso_example.go'
--- example/usso_example.go	2013-02-05 12:37:03 +0000
+++ example/usso_example.go	2013-10-31 17:37:25 +0000
@@ -23,12 +23,9 @@
 
 func main() {
 	inputParams()
-
 	// Fetch the tokens using usso.GetToken.
 	fmt.Println("Fetching tokens from staging server...")
 	server := usso.StagingUbuntuSSOServer
-	// One would use server := usso.ProductionUbuntuSSOServer 
-	// to use the production Ubuntu SSO Server.
 	ssodata, err := server.GetToken(email, password, "usso")
 	if err != nil {
 		panic(err)
@@ -67,4 +64,6 @@
 	var b bytes.Buffer
 	b.Write(body)
 	fmt.Printf("response: %+v\n", b.String())
+	token_details, _ := server.GetTokenDetails(ssodata)
+	fmt.Printf("token details: %s\n", token_details)
 }

=== modified file 'usso.go'
--- usso.go	2013-02-27 15:14:29 +0000
+++ usso.go	2013-10-31 17:37:25 +0000
@@ -20,12 +20,18 @@
 	return server.baseUrl + "/api/v2/tokens/oauth"
 }
 
-// AccountURL returns the URL where the Ubuntu SSO account information can be 
+// AccountURL returns the URL where the Ubuntu SSO account information can be
 // requested.
 func (server UbuntuSSOServer) AccountsURL() string {
 	return server.baseUrl + "/api/v2/accounts/"
 }
 
+// TokenDetailURL returns the URL where the Ubuntu SSO token details can be
+// requested.
+func (server UbuntuSSOServer) TokenDetailsURL() string {
+	return server.baseUrl + "/api/v2/tokens/oauth/"
+}
+
 // ProductionUbuntuSSOServer represents the production Ubuntu SSO server
 // located at https://login.ubuntu.com.
 var ProductionUbuntuSSOServer = UbuntuSSOServer{"https://login.ubuntu.com"}
@@ -116,3 +122,32 @@
 	header, err := ssodata.GetAuthorizationHeader(rp)
 	return header, err
 }
+
+// Returns all the Ubuntu SSO information related to this token.
+func (server UbuntuSSOServer) GetTokenDetails(ssodata *SSOData) (string, error) {
+	rp := RequestParameters{
+		BaseURL:         server.TokenDetailsURL() + ssodata.TokenKey,
+		HTTPMethod:      "GET",
+		SignatureMethod: HMACSHA1{}}
+
+	request, err := http.NewRequest(rp.HTTPMethod, rp.BaseURL, nil)
+	if err != nil {
+		return "", err
+	}
+	err = SignRequest(ssodata, &rp, request)
+	if err != nil {
+		return "", err
+	}
+	client := &http.Client{}
+	response, err := client.Do(request)
+	if err != nil {
+		fmt.Printf("Error: %s\n", err)
+	}
+	body, err := ioutil.ReadAll(response.Body)
+	if err != nil {
+		fmt.Println(err)
+	}
+	var b bytes.Buffer
+	b.Write(body)
+	return fmt.Sprint(b.String()), nil
+}

=== modified file 'usso_test.go'
--- usso_test.go	2013-02-27 15:14:29 +0000
+++ usso_test.go	2013-10-31 17:37:25 +0000
@@ -99,7 +99,7 @@
 		ConsumerSecret: consumerSecret, TokenKey: tokenKey,
 		TokenSecret: tokenSecret, TokenName: tokenName}
 	c.Assert(ssodata, DeepEquals, expectedSSOData)
-	//The request that the fake Ubuntu SSO Server got contained the credentials.
+	// The request that the fake Ubuntu SSO Server has the credentials.
 	credentials := map[string]string{
 		"email":      email,
 		"password":   password,
@@ -122,3 +122,31 @@
 	c.Assert(err, NotNil)
 	c.Assert(ssodata, IsNil)
 }
+
+func (suite *USSOTestSuite) TestGetTokenDetails(c *C) {
+	// Simulate a valid Ubuntu SSO Server response.
+	serverResponseData := map[string]string{
+		"date_updated": "2013-01-16 14:03:36",
+		"date_created": "2013-01-16 14:03:36",
+		"href":         "/api/v2/tokens/" + tokenKey,
+		"token_name":   tokenName,
+		"token_key":    tokenKey,
+		"consumer_key": consumerKey,
+	}
+	jsonServerResponseData, err := json.Marshal(serverResponseData)
+	if err != nil {
+		panic(err)
+	}
+	server := newSingleServingServer("/api/v2/tokens/oauth",
+		string(jsonServerResponseData), 200)
+	var testSSOServer = &UbuntuSSOServer{server.URL}
+	defer server.Close()
+	ssodata, err := testSSOServer.GetToken(email, password, tokenName)
+
+	// The returned information is correct.
+	token_details, err := testSSOServer.GetTokenDetails(ssodata)
+	c.Assert(err, IsNil)
+
+	//The request that the fake Ubuntu SSO Server has the token details.
+	fmt.Printf("%s\n", token_details)
+}