notifier api

.dockerignore

@@ -13,3 +13,5 @@ vendor
 servers
 dev
 !build/alpine-linux-amd64
+config.yml
+statup.db

core/notifier/notifiers.go

@@ -38,27 +38,27 @@ var (
 type Notification struct {
 	Id          int64              `gorm:"primary_key;column:id" json:"id"`
 	Method      string             `gorm:"column:method" json:"method"`
-	Host        string             `gorm:"not null;column:host" json:"-"`
+	Host        string             `gorm:"not null;column:host" json:"host,omitempty"`
-	Port        int                `gorm:"not null;column:port" json:"-"`
+	Port        int                `gorm:"not null;column:port" json:"port,omitempty"`
-	Username    string             `gorm:"not null;column:username" json:"-"`
+	Username    string             `gorm:"not null;column:username" json:"username,omitempty"`
-	Password    string             `gorm:"not null;column:password" json:"-"`
+	Password    string             `gorm:"not null;column:password" json:"password,omitempty"`
-	Var1        string             `gorm:"not null;column:var1" json:"-"`
+	Var1        string             `gorm:"not null;column:var1" json:"var1,omitempty"`
-	Var2        string             `gorm:"not null;column:var2" json:"-"`
+	Var2        string             `gorm:"not null;column:var2" json:"var2,omitempty"`
-	ApiKey      string             `gorm:"not null;column:api_key" json:"-"`
+	ApiKey      string             `gorm:"not null;column:api_key" json:"api_key,omitempty"`
-	ApiSecret   string             `gorm:"not null;column:api_secret" json:"-"`
+	ApiSecret   string             `gorm:"not null;column:api_secret" json:"api_secret,omitempty"`
 	Enabled     bool               `gorm:"column:enabled;type:boolean;default:false" json:"enabled"`
-	Limits      int                `gorm:"not null;column:limits" json:"-"`
+	Limits      int                `gorm:"not null;column:limits" json:"limits"`
 	Removable   bool               `gorm:"column:removable" json:"-"`
 	CreatedAt   time.Time          `gorm:"column:created_at" json:"created_at"`
 	UpdatedAt   time.Time          `gorm:"column:updated_at" json:"updated_at"`
-	Form        []NotificationForm `gorm:"-" json:"-"`
+	Form        []NotificationForm `gorm:"-" json:"form"`
 	logs        []*NotificationLog `gorm:"-" json:"-"`
-	Title       string             `gorm:"-" json:"-"`
+	Title       string             `gorm:"-" json:"title"`
-	Description string             `gorm:"-" json:"-"`
+	Description string             `gorm:"-" json:"description"`
 	Author      string             `gorm:"-" json:"-"`
 	AuthorUrl   string             `gorm:"-" json:"-"`
 	Icon        string             `gorm:"-" json:"-"`
-	Delay       time.Duration      `gorm:"-" json:"-"`
+	Delay       time.Duration      `gorm:"-" json:"delay"`
 	Queue       []*QueueData       `gorm:"-" json:"-"`
 	Running     chan bool          `gorm:"-" json:"-"`
 	Online      bool               `gorm:"-" json:"-"`

dev/postman.json

@@ -450,6 +450,94 @@
 					}
 				}
 			]
+		},
+		{
+			"name": "Notifiers",
+			"item": [
+				{
+					"name": "View Notifier",
+					"request": {
+						"auth": {
+							"type": "bearer",
+							"bearer": [
+								{
+									"key": "token",
+									"value": "",
+									"type": "string"
+								}
+							]
+						},
+						"method": "GET",
+						"header": [],
+						"body": {
+							"mode": "raw",
+							"raw": ""
+						},
+						"url": {
+							"raw": "{{endpoint}}/api/notifier/mobile",
+							"host": [
+								"{{endpoint}}"
+							],
+							"path": [
+								"api",
+								"notifier",
+								"mobile"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Update Notifier",
+					"request": {
+						"auth": {
+							"type": "bearer",
+							"bearer": [
+								{
+									"key": "token",
+									"value": "",
+									"type": "string"
+								}
+							]
+						},
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"name": "Content-Type",
+								"value": "application/json",
+								"type": "text"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\n    \"method\": \"mobile\",\n    \"host\": \"\",\n    \"port\": 0,\n    \"username\": \"\",\n    \"var1\": \"ExponentPushToken[XmsQVgIxjgaMKCP5MBoOp9]\",\n    \"var2\": \"\",\n    \"api_key\": \"\",\n    \"api_secret\": \"\",\n    \"enabled\": true,\n    \"limits\": 3\n}"
+						},
+						"url": {
+							"raw": "{{endpoint}}/api/notifier/mobile",
+							"host": [
+								"{{endpoint}}"
+							],
+							"path": [
+								"api",
+								"notifier",
+								"mobile"
+							]
+						}
+					},
+					"response": []
+				}
+			],
+			"auth": {
+				"type": "bearer",
+				"bearer": [
+					{
+						"key": "token",
+						"value": "",
+						"type": "string"
+					}
+				]
+			}
 		}
 	]
 }

handlers/api.go

@@ -335,15 +335,49 @@ func apiNotifierGetHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	vars := mux.Vars(r)
-	notify, notifierObj, err := notifier.SelectNotifier(vars["notifier"])
+	_, notifierObj, err := notifier.SelectNotifier(vars["notifier"])
 	if err != nil {
 		http.Error(w, fmt.Sprintf("%v notifier was not found", vars["notifier"]), http.StatusInternalServerError)
 		return
 	}
-	fmt.Println(notify)
-	fmt.Println(notifierObj)
 	w.Header().Set("Content-Type", "application/json")
-	json.NewEncoder(w).Encode(notify)
+	json.NewEncoder(w).Encode(notifierObj.Select())
+}
+
+func apiNotifierUpdateHandler(w http.ResponseWriter, r *http.Request) {
+	if !isAPIAuthorized(r) {
+		http.Error(w, http.StatusText(http.StatusUnauthorized), http.StatusUnauthorized)
+		return
+	}
+	vars := mux.Vars(r)
+	var notification *notifier.Notification
+	decoder := json.NewDecoder(r.Body)
+	decoder.Decode(&notification)
+
+	notif, not, err := notifier.SelectNotifier(vars["notifier"])
+	if err != nil {
+		http.Error(w, fmt.Sprintf("%v notifier was not found", vars["notifier"]), http.StatusInternalServerError)
+		return
+	}
+
+	notif.Var1 = notification.Var1
+	notif.Var2 = notification.Var2
+	notif.Host = notification.Host
+	notif.Port = notification.Port
+	notif.Password = notification.Password
+	notif.Username = notification.Username
+	notif.Enabled = notification.Enabled
+	notif.ApiKey = notification.ApiKey
+	notif.ApiSecret = notification.ApiSecret
+
+	_, err = notifier.Update(not, notif)
+	if err != nil {
+		utils.Log(3, fmt.Sprintf("issue updating notifier: %v", err))
+	}
+	notifier.OnSave(notif.Method)
+
+	w.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(w).Encode(notif)
 }
 
 func isAPIAuthorized(r *http.Request) bool {

handlers/routes.go

@@ -116,7 +116,7 @@ func Router() *mux.Router {
 
 	// API Notifier Routes
 	r.Handle("/api/notifier/{notifier}", http.HandlerFunc(apiNotifierGetHandler)).Methods("GET")
-	r.Handle("/api/notifier/{notifier}", http.HandlerFunc(apiNotifierGetHandler)).Methods("POST")
+	r.Handle("/api/notifier/{notifier}", http.HandlerFunc(apiNotifierUpdateHandler)).Methods("POST")
 
 	r.Handle("/metrics", http.HandlerFunc(prometheusHandler))
 	r.Handle("/health", http.HandlerFunc(healthCheckHandler))

notifiers/mobile.go

@@ -86,9 +86,9 @@ func (u *mobilePush) OnSuccess(s *types.Service) {
 // OnSave triggers when this notifier has been saved
 func (u *mobilePush) OnSave() error {
 	msg := &expo.PushMessage{
-		Body:     "This is a test notification",
+		Body:     "The Mobile Notifier has been saved",
 		Sound:    "default",
-		Title:    "Notification Test",
+		Title:    "Notification Saved",
 		Priority: expo.DefaultPriority,
 	}
 	u.AddQueue(0, msg)

source/source.go

@@ -184,6 +184,7 @@ func DeleteAllAssets(folder string) error {
 	return err
 }
 
+// CopyAllToPublic will copy all the files in a rice box into a local folder
 func CopyAllToPublic(box *rice.Box, folder string) error {
 	err := box.Walk("/", func(path string, info os.FileInfo, err error) error {
 		if info.Name() == "" {