Merge pull request #55 from pusher/remove-pn

Remove push notifications from go lib

Author: kn100

client.go

@@ -38,20 +38,16 @@ If you wish to set a time-limit for each HTTP request, set the `Timeout` propert
 Changing the `pusher.Client`'s `Host` property will make sure requests are sent to your specified host.
 
 	client.Host = "foo.bar.com" // by default this is "api.pusherapp.com".
-
-If you wish to use push notifications, you need to define the Client.PushNotificationHost,
-please see Pusher docs for more details: https://pusher.com/docs/push_notifications
 */
 type Client struct {
-	AppId                string
-	Key                  string
-	Secret               string
-	Host                 string // host or host:port pair
-	PushNotificationHost string
-	Secure               bool // true for HTTPS
-	Cluster              string
-	HttpClient           *http.Client
-	EncryptionMasterKey  string //for E2E
+	AppId               string
+	Key                 string
+	Secret              string
+	Host                string // host or host:port pair
+	Secure              bool   // true for HTTPS
+	Cluster             string
+	HttpClient          *http.Client
+	EncryptionMasterKey string //for E2E
 }
 
 /*
@@ -490,48 +486,3 @@ func (c *Client) Webhook(header http.Header, body []byte) (*Webhook, error) {
 	}
 	return nil, errors.New("Invalid webhook")
 }
-
-/*
-Notify is used to send native push notifications via Apple APNS or Google GCM/FCM systems. Please make sure that
-you have provided a Client.PushNotificationHost, please see Pusher docs for details: https://pusher.com/docs/push_notifications
-*/
-func (c *Client) Notify(interests []string, pushNotification PushNotification) (*NotifyResponse, error) {
-	pNRequest := notificationRequest{
-		interests,
-		&pushNotification,
-	}
-
-	err := pNRequest.validate()
-	if err != nil {
-		return nil, err
-	}
-
-	if c.PushNotificationHost == "" {
-		return nil, errors.New("PushNotificationHost not provided")
-	}
-
-	requestBody, err := json.Marshal(pNRequest)
-	if err != nil {
-		return nil, err
-	}
-
-	path := fmt.Sprintf("/%s/%s/apps/%s/notifications", PushNotifAPIPrefixDefault, PushNotifAPIVersionDefault, c.AppId)
-
-	url, err := createRequestURL("POST", c.PushNotificationHost, path, c.Key, c.Secret, authTimestamp(), c.Secure, requestBody, nil, c.Cluster)
-	if err != nil {
-		return nil, err
-	}
-
-	byteResponse, err := c.request("POST", url, requestBody)
-	if err != nil {
-		return nil, err
-	}
-
-	var response *NotifyResponse
-	err = json.Unmarshal(byteResponse, &response)
-	if err != nil {
-		return nil, err
-	}
-
-	return response, err
-}

client_test.go

@@ -341,99 +341,3 @@ func TestInitialisationFromENV(t *testing.T) {
 	expectedClient := &Client{Key: "feaf18a411d3cb9216ee", Secret: "fec81108d90e1898e17a", AppId: "104060", Host: "api.pusherapp.com"}
 	assert.Equal(t, expectedClient, client)
 }
-
-func TestNotifySuccess(t *testing.T) {
-	server := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-		res.WriteHeader(http.StatusOK)
-		res.Write([]byte(`{"number_of_subscribers": 10}`))
-	}))
-	defer server.Close()
-
-	u, _ := url.Parse(server.URL)
-	client := Client{AppId: "id", Key: "key", Secret: "secret", PushNotificationHost: u.Host, HttpClient: &http.Client{Timeout: time.Millisecond * 100}}
-	testPN := PushNotification{
-		WebhookURL: "testURL",
-		GCM:        []byte(`hello`),
-	}
-	interests := []string{"testInterest"}
-	response, err := client.Notify(interests, testPN)
-
-	assert.Equal(t, 10, response.NumSubscribers, "returned response.NumSubscribers should be equal to the server response body amount")
-	assert.NoError(t, err)
-}
-
-func TestNotifySuccessNoSubscribers(t *testing.T) {
-	server := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-		res.WriteHeader(http.StatusAccepted)
-		res.Write([]byte(`{"number_of_subscribers":0}`))
-	}))
-	defer server.Close()
-
-	u, _ := url.Parse(server.URL)
-	client := Client{AppId: "id", Key: "key", Secret: "secret", PushNotificationHost: u.Host, HttpClient: &http.Client{Timeout: time.Millisecond * 100}}
-	testPN := PushNotification{
-		WebhookURL: "testURL",
-		GCM:        []byte(`hello`),
-	}
-	interests := []string{"testInterest"}
-	response, err := client.Notify(interests, testPN)
-
-	assert.Equal(t, 0, response.NumSubscribers, "returned response.NumSubscribers should be equal to the server response body amount")
-	assert.NoError(t, err)
-}
-
-func TestNotifyServerError(t *testing.T) {
-	server := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-		res.WriteHeader(http.StatusInternalServerError)
-	}))
-	defer server.Close()
-
-	u, _ := url.Parse(server.URL)
-	client := Client{AppId: "id", Key: "key", Secret: "secret", PushNotificationHost: u.Host, HttpClient: &http.Client{Timeout: time.Millisecond * 100}}
-	testPN := PushNotification{
-		WebhookURL: "testURL",
-		GCM:        []byte(`hello`),
-	}
-
-	interests := []string{"testInterest"}
-	response, err := client.Notify(interests, testPN)
-
-	assert.Nil(t, response, "response should return nil on error")
-	assert.Error(t, err)
-	assert.EqualError(t, err, "Status Code: 500 - ")
-}
-
-func TestNotifyInvalidPushNotification(t *testing.T) {
-	server := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-		res.WriteHeader(http.StatusInternalServerError)
-	}))
-	defer server.Close()
-
-	u, _ := url.Parse(server.URL)
-	client := Client{AppId: "id", Key: "key", Secret: "secret", PushNotificationHost: u.Host, HttpClient: &http.Client{Timeout: time.Millisecond * 100}}
-	testPN := PushNotification{
-		WebhookURL: "testURL",
-	}
-	interests := []string{"testInterest"}
-	response, err := client.Notify(interests, testPN)
-
-	assert.Nil(t, response, "response should return nil on error")
-	assert.Error(t, err)
-}
-
-func TestNotifyNoPushNotificationHost(t *testing.T) {
-	server := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-		res.WriteHeader(http.StatusInternalServerError)
-	}))
-	defer server.Close()
-
-	client := Client{AppId: "id", Key: "key", Secret: "secret", HttpClient: &http.Client{Timeout: time.Millisecond * 100}}
-	testPN := PushNotification{
-		WebhookURL: "testURL",
-	}
-	interests := []string{"testInterest"}
-	response, err := client.Notify(interests, testPN)
-
-	assert.Nil(t, response, "response should return nil on error")
-	assert.Error(t, err)
-}