1
=== modified file 'usso.go'
2
--- usso.go	2013-02-22 11:55:13 +0000
3
+++ usso.go	2013-02-27 15:17:29 +0000
4
@@ -17,7 +17,7 @@
5
17
17
6
18
// tokenURL returns the URL where the Ubuntu SSO tokens can be requested.
18
// tokenURL returns the URL where the Ubuntu SSO tokens can be requested.
7
19
func (server UbuntuSSOServer) tokenURL() string {
19
func (server UbuntuSSOServer) tokenURL() string {
9
20
	return server.baseUrl + "/api/v2/tokens"
20
	return server.baseUrl + "/api/v2/tokens/oauth"
10
21
}
21
}
11
22
22
12
23
// AccountURL returns the URL where the Ubuntu SSO account information can be 
23
// AccountURL returns the URL where the Ubuntu SSO account information can be 
13
@@ -58,7 +58,7 @@
14
58
	if response.StatusCode == 404 {
58
	if response.StatusCode == 404 {
15
59
		return nil, errors.New("Wrong credentials.")
59
		return nil, errors.New("Wrong credentials.")
16
60
	}
60
	}
18
61
	if response.StatusCode != 200 {
61
	if response.StatusCode != 200 && response.StatusCode != 201 {
19
62
		return nil, fmt.Errorf("SSO Error: %s\n", response.Status)
62
		return nil, fmt.Errorf("SSO Error: %s\n", response.Status)
20
63
	}
63
	}
21
64
	body, err := ioutil.ReadAll(response.Body)
64
	body, err := ioutil.ReadAll(response.Body)
22
65
65
23
=== modified file 'usso_test.go'
24
--- usso_test.go	2013-02-22 12:47:56 +0000
25
+++ usso_test.go	2013-02-27 15:17:29 +0000
26
@@ -35,13 +35,13 @@
27
35
// TestProductionUbuntuSSOServerURLs tests the URLs of the production server.
35
// TestProductionUbuntuSSOServerURLs tests the URLs of the production server.
28
36
func (suite *USSOTestSuite) TestProductionUbuntuSSOServerURLs(c *C) {
36
func (suite *USSOTestSuite) TestProductionUbuntuSSOServerURLs(c *C) {
29
37
	tokenURL := ProductionUbuntuSSOServer.tokenURL()
37
	tokenURL := ProductionUbuntuSSOServer.tokenURL()
31
38
	c.Assert(tokenURL, Equals, "https://login.ubuntu.com/api/v2/tokens")
38
	c.Assert(tokenURL, Equals, "https://login.ubuntu.com/api/v2/tokens/oauth")
32
39
}
39
}
33
40
40
34
41
// TestStagingUbuntuSSOServerURLs tests the URLs of the staging server.
41
// TestStagingUbuntuSSOServerURLs tests the URLs of the staging server.
35
42
func (suite *USSOTestSuite) TestStagingUbuntuSSOServerURLs(c *C) {
42
func (suite *USSOTestSuite) TestStagingUbuntuSSOServerURLs(c *C) {
36
43
	tokenURL := StagingUbuntuSSOServer.tokenURL()
43
	tokenURL := StagingUbuntuSSOServer.tokenURL()
38
44
	c.Assert(tokenURL, Equals, "https://login.staging.ubuntu.com/api/v2/tokens")
44
	c.Assert(tokenURL, Equals, "https://login.staging.ubuntu.com/api/v2/tokens/oauth")
39
45
}
45
}
40
46
46
41
47
// newSingleServingServer create a single-serving test http server which will
47
// newSingleServingServer create a single-serving test http server which will
42
@@ -87,7 +87,7 @@
43
87
	if err != nil {
87
	if err != nil {
44
88
		panic(err)
88
		panic(err)
45
89
	}
89
	}
47
90
	server := newSingleServingServer("/api/v2/tokens",
90
	server := newSingleServingServer("/api/v2/tokens/oauth",
48
91
		string(jsonServerResponseData), 200)
91
		string(jsonServerResponseData), 200)
49
92
	var testSSOServer = &UbuntuSSOServer{server.URL}
92
	var testSSOServer = &UbuntuSSOServer{server.URL}
50
93
	defer server.Close()
93
	defer server.Close()
51
@@ -114,7 +114,7 @@
52
114
114
53
115
// GetToken should return empty credentials and an error, if wrong account is provided.
115
// GetToken should return empty credentials and an error, if wrong account is provided.
54
116
func (suite *USSOTestSuite) TestGetTokenFails(c *C) {
116
func (suite *USSOTestSuite) TestGetTokenFails(c *C) {
56
117
	server := newSingleServingServer("/api/v2/tokens", "{}", 200)
117
	server := newSingleServingServer("/api/v2/tokens/oauth", "{}", 200)
57
118
	var testSSOServer = &UbuntuSSOServer{server.URL}
118
	var testSSOServer = &UbuntuSSOServer{server.URL}
58
119
	defer server.Close()
119
	defer server.Close()
59
120
	ssodata, err := testSSOServer.GetToken(email, "WRONG", tokenName)
120
	ssodata, err := testSSOServer.GetToken(email, "WRONG", tokenName)
Status:	Merged
Approved by:	Graham Binns on 2013-02-27
Approved revision:	29
Merged at revision:	29
Proposed branch:	lp:~vds/usso/fix_and_point_and_check_for_201_too
Merge into:	lp:usso
Diff against target:	59 lines (+6/-6) 2 files modified usso.go (+2/-2) usso_test.go (+4/-4)
To merge this branch:	bzr merge lp:~vds/usso/fix_and_point_and_check_for_201_too
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Domas Monkus (community)		Approve on 2013-02-27
Graham Binns (community)		Approve on 2013-02-27
Andrew W. Deane (community)	2013-02-27	Approve on 2013-02-27
Review via email: mp+150823@code.launchpad.net
1	=== modified file 'usso.go'
2	--- usso.go 2013-02-22 11:55:13 +0000
3	+++ usso.go 2013-02-27 15:17:29 +0000
4	@@ -17,7 +17,7 @@
5	17		17
6	18	// tokenURL returns the URL where the Ubuntu SSO tokens can be requested.	18	// tokenURL returns the URL where the Ubuntu SSO tokens can be requested.
7	19	func (server UbuntuSSOServer) tokenURL() string {	19	func (server UbuntuSSOServer) tokenURL() string {
9	20	return server.baseUrl + "/api/v2/tokens"	20	return server.baseUrl + "/api/v2/tokens/oauth"
10	21	}	21	}
11	22		22
12	23	// AccountURL returns the URL where the Ubuntu SSO account information can be	23	// AccountURL returns the URL where the Ubuntu SSO account information can be
13	@@ -58,7 +58,7 @@
14	58	if response.StatusCode == 404 {	58	if response.StatusCode == 404 {
15	59	return nil, errors.New("Wrong credentials.")	59	return nil, errors.New("Wrong credentials.")
16	60	}	60	}
18	61	if response.StatusCode != 200 {	61	if response.StatusCode != 200 && response.StatusCode != 201 {
19	62	return nil, fmt.Errorf("SSO Error: %s\n", response.Status)	62	return nil, fmt.Errorf("SSO Error: %s\n", response.Status)
20	63	}	63	}
21	64	body, err := ioutil.ReadAll(response.Body)	64	body, err := ioutil.ReadAll(response.Body)
22	65		65
23	=== modified file 'usso_test.go'
24	--- usso_test.go 2013-02-22 12:47:56 +0000
25	+++ usso_test.go 2013-02-27 15:17:29 +0000
26	@@ -35,13 +35,13 @@
27	35	// TestProductionUbuntuSSOServerURLs tests the URLs of the production server.	35	// TestProductionUbuntuSSOServerURLs tests the URLs of the production server.
28	36	func (suite USSOTestSuite) TestProductionUbuntuSSOServerURLs(c C) {	36	func (suite USSOTestSuite) TestProductionUbuntuSSOServerURLs(c C) {
29	37	tokenURL := ProductionUbuntuSSOServer.tokenURL()	37	tokenURL := ProductionUbuntuSSOServer.tokenURL()
31	38	c.Assert(tokenURL, Equals, "https://login.ubuntu.com/api/v2/tokens")	38	c.Assert(tokenURL, Equals, "https://login.ubuntu.com/api/v2/tokens/oauth")
32	39	}	39	}
33	40		40
34	41	// TestStagingUbuntuSSOServerURLs tests the URLs of the staging server.	41	// TestStagingUbuntuSSOServerURLs tests the URLs of the staging server.
35	42	func (suite USSOTestSuite) TestStagingUbuntuSSOServerURLs(c C) {	42	func (suite USSOTestSuite) TestStagingUbuntuSSOServerURLs(c C) {
36	43	tokenURL := StagingUbuntuSSOServer.tokenURL()	43	tokenURL := StagingUbuntuSSOServer.tokenURL()
38	44	c.Assert(tokenURL, Equals, "https://login.staging.ubuntu.com/api/v2/tokens")	44	c.Assert(tokenURL, Equals, "https://login.staging.ubuntu.com/api/v2/tokens/oauth")
39	45	}	45	}
40	46		46
41	47	// newSingleServingServer create a single-serving test http server which will	47	// newSingleServingServer create a single-serving test http server which will
42	@@ -87,7 +87,7 @@
43	87	if err != nil {	87	if err != nil {
44	88	panic(err)	88	panic(err)
45	89	}	89	}
47	90	server := newSingleServingServer("/api/v2/tokens",	90	server := newSingleServingServer("/api/v2/tokens/oauth",
48	91	string(jsonServerResponseData), 200)	91	string(jsonServerResponseData), 200)
49	92	var testSSOServer = &UbuntuSSOServer{server.URL}	92	var testSSOServer = &UbuntuSSOServer{server.URL}
50	93	defer server.Close()	93	defer server.Close()
51	@@ -114,7 +114,7 @@
52	114		114
53	115	// GetToken should return empty credentials and an error, if wrong account is provided.	115	// GetToken should return empty credentials and an error, if wrong account is provided.
54	116	func (suite USSOTestSuite) TestGetTokenFails(c C) {	116	func (suite USSOTestSuite) TestGetTokenFails(c C) {
56	117	server := newSingleServingServer("/api/v2/tokens", "{}", 200)	117	server := newSingleServingServer("/api/v2/tokens/oauth", "{}", 200)
57	118	var testSSOServer = &UbuntuSSOServer{server.URL}	118	var testSSOServer = &UbuntuSSOServer{server.URL}
58	119	defer server.Close()	119	defer server.Close()
59	120	ssodata, err := testSSOServer.GetToken(email, "WRONG", tokenName)	120	ssodata, err := testSSOServer.GetToken(email, "WRONG", tokenName)