Skip to content

Support Safari Push and Mobile Device Management #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 13, 2015
Merged

Support Safari Push and Mobile Device Management #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
587351c
Support Safari Push and Mobile Device Management
nathany Nov 26, 2014
53f360a
Merge branch 'empty_alert' into safari
nathany Dec 17, 2014
3a34658
update README to use pointer to badge
nathany Jan 14, 2015
d2faf52
Merge branch 'master' into safari
nathany Jan 19, 2015
63c006b
Merge remote-tracking branch 'origin/master' into safari
nathany Jan 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ c, _ := apns.NewClient(apns.ProductionGateway, apnsCert, apnsKey)

p := apns.NewPayload()
p.APS.Alert.Body = "I am a push notification!"
p.APS.Badge = 5
badge := 5
p.APS.Badge = &badge
p.APS.Sound = "turn_down_for_what.aiff"

m := apns.NewNotification()
Expand All @@ -55,7 +56,8 @@ go func() {

p := apns.NewPayload()
p.APS.Alert.Body = "I am a push notification!"
p.APS.Badge = 5
badge := 5
p.APS.Badge = &badge
p.APS.Sound = "turn_down_for_what.aiff"
p.APS.ContentAvailable = 1

Expand Down
16 changes: 14 additions & 2 deletions notification.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ type NotificationResult struct {
type Alert struct {
// Do not add fields without updating the implementation of isZero.
Body string `json:"body,omitempty"`
Title string `json:"title,omitempty"`
Action string `json:"action,omitempty"`
LocKey string `json:"loc-key,omitempty"`
LocArgs []string `json:"loc-args,omitempty"`
ActionLocKey string `json:"action-loc-key,omitempty"`
Expand All @@ -55,6 +57,7 @@ type APS struct {
Badge *int // 0 to clear notifications, nil to leave as is.
Sound string
ContentAvailable int
URLArgs []string
Category string // requires iOS 8+
}

Expand All @@ -76,17 +79,26 @@ func (aps APS) MarshalJSON() ([]byte, error) {
if aps.Category != "" {
data["category"] = aps.Category
}
if aps.URLArgs != nil && len(aps.URLArgs) != 0 {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The need for this confuses me a bit, but it was crashing tests without both.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The first condition is redundant.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought so, but I was getting crashes later on after adding URLArgs in here. Weird. I can play with it a little more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's odd... I'm guessing it's something else. http://play.golang.org/p/lGAUCTAjGz

data["url-args"] = aps.URLArgs
}

return json.Marshal(data)
}

type Payload struct {
APS APS
APS APS
// MDM for mobile device management
MDM string
customValues map[string]interface{}
}

func (p *Payload) MarshalJSON() ([]byte, error) {
p.customValues["aps"] = p.APS
if len(p.MDM) != 0 {
p.customValues["mdm"] = p.MDM
} else {
p.customValues["aps"] = p.APS
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm still not sure it's worth writing an entire "APS isZero" for this.

}

return json.Marshal(p.customValues)
}
Expand Down
33 changes: 33 additions & 0 deletions notification_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,26 @@ var _ = Describe("Notifications", func() {
})
})

Describe("Safari", func() {
Describe("#MarshalJSON", func() {
Context("with complete payload", func() {
It("should marshal APS", func() {
p := apns.NewPayload()

p.APS.Alert.Title = "Hello World!"
p.APS.Alert.Body = "This is a body"
p.APS.Alert.Action = "Launch"
p.APS.URLArgs = []string{"hello", "world"}

b, err := json.Marshal(p)

Expect(err).To(BeNil())
Expect(b).To(Equal([]byte(`{"aps":{"alert":{"body":"This is a body","title":"Hello World!","action":"Launch"},"url-args":["hello","world"]}}`)))
})
})
})
})

Describe("Payload", func() {
Describe("#MarshalJSON", func() {
Context("no alert (as with Passbook)", func() {
Expand Down Expand Up @@ -129,6 +149,19 @@ var _ = Describe("Notifications", func() {
Expect(b).To(Equal([]byte(`{"aps":{"alert":{"body":"testing"}},"email":"[email protected]"}`)))
})
})

Context("with only MDM", func() {
It("should marshal MDM", func() {
p := apns.NewPayload()

p.MDM = "00000000-1111-3333-4444-555555555555"

b, err := json.Marshal(p)

Expect(err).To(BeNil())
Expect(b).To(Equal([]byte(`{"mdm":"00000000-1111-3333-4444-555555555555"}`)))
})
})
})
})

Expand Down