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

Proposed by Diogo Baeder
Status: Merged
Approved by: Diogo Baeder
Approved revision: no longer in the source branch.
Merged at revision: 84
Proposed branch: lp:~diogobaeder/ubuntu-push/auth
Merge into: lp:ubuntu-push
Diff against target: 34 lines (+8/-5)
2 files modified
client/session/session.go (+3/-1)
protocol/messages.go (+5/-4)
To merge this branch: bzr merge lp:~diogobaeder/ubuntu-push/auth
Reviewer Review Type Date Requested Status
Samuele Pedroni Approve
Review via email: mp+211836@code.launchpad.net

Commit message

Adding authorization field to the ConnectMsg struct

Description of the change

Adding authorization field to the ConnectMsg struct

To post a comment you must log in.
lp:~diogobaeder/ubuntu-push/auth updated
82. By Samuele Pedroni

[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

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

Revision history for this message
Samuele Pedroni (pedronis) :
review: Approve
lp:~diogobaeder/ubuntu-push/auth updated
84. By Diogo Baeder

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'client/session/session.go'
2--- client/session/session.go 2014-02-21 16:17:28 +0000
3+++ client/session/session.go 2014-03-19 23:47:19 +0000
4@@ -250,7 +250,9 @@
5 err = proto.WriteMessage(protocol.ConnectMsg{
6 Type: "connect",
7 DeviceId: sess.DeviceId,
8- Levels: levels,
9+ // xxx get the SSO Authorization string from the phone
10+ Authorization: "",
11+ Levels: levels,
12 })
13 if err != nil {
14 sess.setState(Error)
15
16=== modified file 'protocol/messages.go'
17--- protocol/messages.go 2014-02-26 16:04:57 +0000
18+++ protocol/messages.go 2014-03-19 23:47:19 +0000
19@@ -27,10 +27,11 @@
20
21 // CONNECT message
22 type ConnectMsg struct {
23- Type string `json:"T"`
24- ClientVer string
25- DeviceId string
26- Info map[string]interface{} `json:",omitempty"` // platform etc...
27+ Type string `json:"T"`
28+ ClientVer string
29+ DeviceId string
30+ Authorization string
31+ Info map[string]interface{} `json:",omitempty"` // platform etc...
32 // maps channel ids (hex encoded UUIDs) to known client channel levels
33 Levels map[string]int64
34 }

Subscribers

People subscribed via source and target branches