More integration tests

Author: ybizeul

internal/handlers/handlers.go

@@ -71,8 +71,26 @@ type ApiHandler struct {
 }
 
 type APIConfig struct {
-	NotificationSettings NotificationSettings `json:"notification,omitempty"`
+	NotificationSettings *NotificationSettings `json:"notification,omitempty"`
 }
+
+func APIConfigFromFile(p string) (*APIConfig, error) {
+	var config = &APIConfig{}
+	d, err := os.ReadFile(path.Join(p))
+	if err != nil {
+		if os.IsNotExist(err) {
+			return config, nil
+		} else {
+			return nil, err
+		}
+	}
+	err = json.Unmarshal(d, config)
+	if err != nil {
+		return nil, err
+	}
+	return config, nil
+}
+
 type NotificationSettings struct {
 	VAPIDPublicKey  string
 	VAPIDPrivateKey string
@@ -82,27 +100,21 @@ func NewApiHandler(basePath string) (*ApiHandler, error) {
 	os.MkdirAll(basePath, 0700)
 
 	// Check configuration
-	var config = &APIConfig{}
-	d, err := os.ReadFile(path.Join(basePath, "config.json"))
+	var config, err = APIConfigFromFile(path.Join(basePath, "config.json"))
 	if err != nil {
-		if !os.IsNotExist(err) {
-			return nil, err
-		} else {
-			privateKey, publicKey, err := webpush.GenerateVAPIDKeys()
-			if err != nil {
-				return nil, err
-			}
-			config.NotificationSettings = NotificationSettings{
-				VAPIDPublicKey:  publicKey,
-				VAPIDPrivateKey: privateKey,
-			}
-		}
-	} else {
-		err = json.Unmarshal(d, config)
+		return nil, err
+	}
+	if config.NotificationSettings == nil {
+		privateKey, publicKey, err := webpush.GenerateVAPIDKeys()
 		if err != nil {
 			return nil, err
 		}
+		config.NotificationSettings = &NotificationSettings{
+			VAPIDPublicKey:  publicKey,
+			VAPIDPrivateKey: privateKey,
+		}
 	}
+
 	result := &ApiHandler{
 		BasePath: basePath,
 		Config:   *config,

internal/handlers/handlers_test.go

@@ -11,23 +11,13 @@ import (
 	"path"
 	"testing"
 
+	"github.com/Appboy/webpush-go"
 	"github.com/davecgh/go-spew/spew"
 	"github.com/ybizeul/ybfeed/internal/feed"
 )
 
 const baseDir = "../../test/"
 const dataDir = "./data"
-
-func TestIndexHtml(t *testing.T) {
-	req := httptest.NewRequest(http.MethodGet, "/", nil)
-	w := httptest.NewRecorder()
-	RootHandlerFunc(w, req)
-	res := w.Result()
-	if res.StatusCode != 200 {
-		t.Errorf("Expect code 200 but got %d", res.StatusCode)
-	}
-}
-
 const testFeedName = "test"
 
 type APITestRequest struct {
@@ -98,6 +88,50 @@ func (t APITestRequest) performRequest() (*http.Response, error) {
 	return w.Result(), nil
 }
 
+func TestFirstStart(t *testing.T) {
+	newDir := "FOO"
+	t.Cleanup(func() {
+		os.RemoveAll(path.Join(baseDir, newDir))
+	})
+
+	_, err := NewApiHandler(path.Join(baseDir, newDir))
+
+	if err != nil {
+		t.Error(err)
+	}
+
+	c, err := APIConfigFromFile(path.Join(baseDir, dataDir, "config.json"))
+	if err != nil {
+		t.Error(err)
+	}
+
+	if c.NotificationSettings == nil ||
+		len(c.NotificationSettings.VAPIDPrivateKey) == 0 ||
+		len(c.NotificationSettings.VAPIDPrivateKey) == 0 {
+		t.Error("Invalid config file")
+	}
+
+}
+func TestIndexHtml(t *testing.T) {
+	req := httptest.NewRequest(http.MethodGet, "/", nil)
+	w := httptest.NewRecorder()
+	RootHandlerFunc(w, req)
+	res := w.Result()
+	if res.StatusCode != 200 {
+		t.Errorf("Expect code 200 but got %d", res.StatusCode)
+	}
+}
+
+func TestServiceWorker(t *testing.T) {
+	req := httptest.NewRequest(http.MethodGet, "/service-worker.js", nil)
+	w := httptest.NewRecorder()
+	RootHandlerFunc(w, req)
+	res := w.Result()
+	if res.StatusCode != 200 {
+		t.Errorf("Expect code 200 but got %d", res.StatusCode)
+	}
+}
+
 func TestCreateFeed(t *testing.T) {
 	const feedName = "6ff1146b6830 #86b8f59f550189a8f91f"
 
@@ -465,3 +499,48 @@ func TestRemoveItemNonExistentFeed(t *testing.T) {
 		t.Errorf("Expect code 404 but got %d (%s)", res.StatusCode, string(b))
 	}
 }
+
+func TestSubscribeFeedNotifications(t *testing.T) {
+	body := `{"endpoint":"http://test.com","keys":{"auth":"AUTH","p256dh":"P256DH"}}`
+	b := bytes.NewBuffer([]byte(body))
+
+	t.Cleanup(func() {
+		f, _ := feed.GetFeed(path.Join(baseDir, dataDir, testFeedName))
+		f.Config.Subscriptions = []webpush.Subscription{}
+		f.Config.Write()
+	})
+
+	res, _ := APITestRequest{
+		method:         http.MethodPost,
+		feed:           testFeedName,
+		item:           "subscription",
+		cookieAuthType: AuthTypeAuth,
+		body:           b,
+	}.performRequest()
+
+	if res.StatusCode != 200 {
+		t.Errorf("Expected 200 but got %d", res.StatusCode)
+	}
+	f, err := feed.GetFeed(path.Join(baseDir, dataDir, testFeedName))
+
+	if err != nil {
+		t.Error(err)
+	}
+
+	if len(f.Config.Subscriptions) == 0 {
+		t.Error("No subscriptions found")
+		return
+	}
+
+	if f.Config.Subscriptions[0].Endpoint != "http://test.com" {
+		t.Errorf("Bad endpoint, got %s", f.Config.Subscriptions[0].Endpoint)
+	}
+
+	if f.Config.Subscriptions[0].Keys.Auth != "AUTH" {
+		t.Errorf("Bad auth, got %s", f.Config.Subscriptions[0].Keys.Auth)
+	}
+
+	if f.Config.Subscriptions[0].Keys.P256dh != "P256DH" {
+		t.Errorf("Bad p256dh, got %s", f.Config.Subscriptions[0].Keys.P256dh)
+	}
+}

test/data/test/config.json

@@ -1 +1 @@
-{"secret":"b90e516e-b256-41ff-a84e-a9e8d5b6fe30","Subscriptions":null}
+{"secret":"b90e516e-b256-41ff-a84e-a9e8d5b6fe30","Subscriptions":[]}