Merge branch 'master' of github.com:kiebitz-oss/services

Author: adewes

servers/app_book_appointment.go

@@ -74,6 +74,13 @@ func (c *Appointments) bookAppointment(context *jsonrpc.Context, params *service
 		return context.Error(400, "invalid signature", nil)
 	}
 
+	// test if provider of the appointment is still active
+	if res, isActive := c.isActiveProviderID(context, params.Data.ProviderID); res != nil {
+		return res
+	} else if !isActive {
+		return context.Error(404, "invalid provider id", nil)
+	}
+
 	appointmentsByID := c.db.Map("appointmentsByID", params.Data.ProviderID)
 
 	if date, err := appointmentsByID.Get(params.Data.ID); err != nil {

servers/appointments.go

@@ -278,6 +278,19 @@ func (c *Appointments) isProvider(context *jsonrpc.Context, data, signature, pub
 	return c.isOnKeyList(context, data, signature, publicKey, keys.Providers)
 }
 
+func (c *Appointments) isActiveProviderID(context *jsonrpc.Context, publicKey []byte) (*jsonrpc.Response, bool) {
+	activeProvider, err := c.db.Map("keys", []byte("providers")).Get([]byte(publicKey))
+
+	if len(activeProvider) == 0 {
+		return context.Error(404, "provider not found", nil), false
+	} else if err != nil {
+		services.Log.Error(err)
+		return context.InternalError(), false
+	}
+
+	return nil, true
+}
+
 func (c *Appointments) isOnKeyList(context *jsonrpc.Context, data, signature, publicKey []byte, keyList []*services.ActorKey) (*jsonrpc.Response, *services.ActorKey) {
 
 	actorKey, err := findActorKey(keyList, publicKey)