Merge lp:~diogobaeder/ubuntu-push/auth into lp:ubuntu-push

[Diogo Baeder]

Adding authorization field to the ConnectMsg struct

Adding authorization field to the ConnectMsg struct

[lp:~diogobaeder/ubuntu-push/auth]

82. By Samuele Pedroni on 2014-03-20

[r=chipaca] vendor the go 1.3 development net/http bits which properly/better support timeouts for requests; see _using.txt and Makefile for the recipe in http13client

83. By Samuele Pedroni on 2014-03-20

[r=chipaca] add timeing out to webhecker using the vendorized go 1.3 net/http in http13client

[Samuele Pedroni (pedronis)]

review: Approve

[lp:~diogobaeder/ubuntu-push/auth]

84. By Diogo Baeder on 2014-03-20

[r=pedronis] Adding authorization field to the ConnectMsg struct

=== modified file 'client/session/session.go'
--- client/session/session.go	2014-02-21 16:17:28 +0000
+++ client/session/session.go	2014-03-19 23:47:19 +0000
@@ -250,7 +250,9 @@
 	err = proto.WriteMessage(protocol.ConnectMsg{
 		Type:     "connect",
 		DeviceId: sess.DeviceId,
-		Levels:   levels,
+		// xxx get the SSO Authorization string from the phone
+		Authorization: "",
+		Levels:        levels,
 	})
 	if err != nil {
 		sess.setState(Error)
 
=== modified file 'protocol/messages.go'
--- protocol/messages.go	2014-02-26 16:04:57 +0000
+++ protocol/messages.go	2014-03-19 23:47:19 +0000
@@ -27,10 +27,11 @@
 
 // CONNECT message
 type ConnectMsg struct {
-	Type      string `json:"T"`
-	ClientVer string
-	DeviceId  string
-	Info      map[string]interface{} `json:",omitempty"` // platform etc...
+	Type          string `json:"T"`
+	ClientVer     string
+	DeviceId      string
+	Authorization string
+	Info          map[string]interface{} `json:",omitempty"` // platform etc...
 	// maps channel ids (hex encoded UUIDs) to known client channel levels
 	Levels map[string]int64
 }