Merge lp:~martin-hilton/usso/get-token-with-2fa into lp:usso

[Martin Hilton]

Add a method which will retrieve a token using two-factor authentication in addition to email and password.

[Uros Jovanovic (uros-jovanovic)]

LGTM

review: Approve

[Matthew Williams (mattyw)]

LGTM

review: Approve

[Casey Marshall (cmars)]

review: Approve

[Matthew Williams (mattyw)]

review: Needs Fixing

[lp:~martin-hilton/usso/get-token-with-2fa]

46. By Martin Hilton on 2015-07-23

review comment

[Matthew Williams (mattyw)]

review: Approve

Unmerged revisions

46. By Martin Hilton on 2015-07-23

review comment

45. By Martin Hilton on 2015-07-23

review comment

44. By Martin Hilton on 2015-07-22

support retrieving tokens using two-factor authentication

=== modified file 'usso.go'
--- usso.go	2014-02-27 16:30:55 +0000
+++ usso.go	2015-07-23 07:27:43 +0000
@@ -46,11 +46,22 @@
 // Giving user credentials and token name, retrieves oauth credentials
 // for the users, the oauth credentials can be used later to sign requests.
 func (server UbuntuSSOServer) GetToken(email string, password string, tokenName string) (*SSOData, error) {
+	return server.GetTokenWithOTP(email, password, "", tokenName)
+}
+
+// GetTokenWithOTP retrieves an oauth token from the Ubuntu SSO server.
+// Using the user credentials including two-factor authentication and the
+// token name, an oauth token is retrieved that can later be used to sign
+// requests. If otp is blank then this is identical to GetToken.
+func (server UbuntuSSOServer) GetTokenWithOTP(email, password, otp, tokenName string) (*SSOData, error) {
 	credentials := map[string]string{
 		"email":      email,
 		"password":   password,
 		"token_name": tokenName,
 	}
+	if otp != "" {
+		credentials["otp"] = otp
+	}
 	jsonCredentials, err := json.Marshal(credentials)
 	if err != nil {
 		return nil, err

=== modified file 'usso_test.go'
--- usso_test.go	2014-02-27 17:18:28 +0000
+++ usso_test.go	2015-07-23 07:27:43 +0000
@@ -26,6 +26,7 @@
 	consumerSecret = "rwDkQkkdfdfdeAslkmmxAOjOAT"
 	email          = "[e-mail]"
 	password       = "foobarpwd"
+	otp            = "000000"
 )
 
 // TestProductionUbuntuSSOServerURLs tests the URLs of the production server.
@@ -160,6 +161,45 @@
 	c.Assert(token_details, Equals, string(jsonTokenDetails))
 }
 
+func (suite *USSOTestSuite) TestGetTokenWithOTP(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,
+		"token_secret":    tokenSecret,
+		"consumer_key":    consumerKey,
+		"consumer_secret": consumerSecret,
+	}
+	jsonServerResponseData, err := json.Marshal(serverResponseData)
+	if err != nil {
+		panic(err)
+	}
+	server := newTestServer(string(jsonServerResponseData), "{}", 200)
+	var testSSOServer = &UbuntuSSOServer{server.URL, ""}
+	defer server.Close()
+
+	// The returned information is correct.
+	ssodata, err := testSSOServer.GetTokenWithOTP(email, password, otp, tokenName)
+	c.Assert(err, IsNil)
+	expectedSSOData := &SSOData{ConsumerKey: consumerKey,
+		ConsumerSecret: consumerSecret, Realm: realm, TokenKey: tokenKey,
+		TokenSecret: tokenSecret, TokenName: tokenName}
+	c.Assert(ssodata, DeepEquals, expectedSSOData)
+	// The request that the fake Ubuntu SSO Server has the credentials.
+	credentials := map[string]string{
+		"email":      email,
+		"password":   password,
+		"token_name": tokenName,
+		"otp":        otp,
+	}
+	expectedRequestContent, err := json.Marshal(credentials)
+	c.Assert(err, IsNil)
+	c.Assert(*server.requestContent, Equals, string(expectedRequestContent))
+}
+
 func (suite *USSOTestSuite) TestTokenValidity(c *C) {
 	// Simulate a valid Ubuntu SSO Server response.
 	serverResponseData := map[string]string{