fix regular service creation

Author: alan-nettica

core/service.go

@@ -108,6 +108,7 @@ func CreateService(service *model.Service) (*model.Service, error) {
 				Updated:     &u,
 				CreatedBy:   service.CreatedBy,
 				UpdatedBy:   service.CreatedBy,
+				Default:     &model.Settings{},
 			}
 			net.Default.Address = []string{service.DefaultSubnet}
 			net.Default.Dns = service.Net.Default.Dns
@@ -157,7 +158,7 @@ func CreateService(service *model.Service) (*model.Service, error) {
 		}
 	} // otherwise it was created remotely
 
-	if service.VPN == nil {
+	if service.VPN == nil || service.VPN.Id == "" {
 
 		// create a default vpn using the net
 		var c time.Time = time.Now().UTC()

core/vpn.go

@@ -200,15 +200,20 @@ func GetAllReservedNetIps(netId string) ([]string, error) {
 	for _, client := range clients {
 		if client.NetId == netId {
 			for _, cidr := range client.Current.Address {
-				ip, err := util.GetIpFromCidr(cidr)
-				if err != nil {
+				parts := strings.Split(cidr, "/")
+				if len(parts) == 1 {
 					reservedIps = append(reservedIps, cidr)
-					log.WithFields(log.Fields{
-						"err":  err,
-						"cidr": cidr,
-					}).Error("failed to ip from cidr")
 				} else {
-					reservedIps = append(reservedIps, ip)
+					ip, err := util.GetIpFromCidr(cidr)
+					if err != nil {
+						reservedIps = append(reservedIps, cidr)
+						log.WithFields(log.Fields{
+							"err":  err,
+							"cidr": cidr,
+						}).Error("failed to ip from cidr")
+					} else {
+						reservedIps = append(reservedIps, ip)
+					}
 				}
 			}
 		}

ui/src/components/Services.vue

@@ -715,50 +715,62 @@ export default {
             // switch to the wilderness
             ApiService.setWildServer();
             ApiService.setWildHeader();
-            ApiService.post("/device", device)
-                .then( d => {
-                this.errorService(`Device created: ${d.name}`);
-                console.log("device created: ", d);
-                vpn.deviceid = d.id;
-
-                ApiService.setWildServer();
-                ApiService.setWildHeader();
-                ApiService.post("/vpn", vpn)
-                    .then( v => {
-                        console.log("vpn created: ", v);
-                        this.errorService(`VPN created: ${v.name}`);
-
-                    this.service.device = d;   
-                    this.service.vpn = v;  
-
-                    ApiService.setServer();
-                    ApiService.setHeader();
-                    ApiService.post("/service", this.service)
-                        .then( s => {
-                            console.log("service created: ", s);
-                            this.errorService(`Service created: ${s.name}`);
-                            this.Refreshing();
+
+            ApiService.get("/net/" + this.wildList.selected.value)
+                .then( n => {
+                    console.log("net: ", n);
+                    service.net = n;
+                    
+                    ApiService.post("/device", device)
+                    .then( d => {
+                    this.errorService(`Device created: ${d.name}`);
+                    console.log("device created: ", d);
+                    vpn.deviceid = d.id;
+
+                    ApiService.post("/vpn", vpn)
+                        .then( v => {
+                            console.log("vpn created: ", v);
+                            this.errorService(`VPN created: ${v.name}`);
+
+                        this.service.device = d;   
+                        this.service.vpn = v;  
+
+                        ApiService.setServer();
+                        ApiService.setHeader();
+                        ApiService.post("/service", this.service)
+                            .then( s => {
+                                console.log("service created: ", s);
+                                this.errorService(`Service created: ${s.name}`);
+                                this.Refreshing();
+                            })
+                            .catch(error => {
+                                console.log("error: ", error)
+                                if (error.response) {
+                                    this.errorService(error.response.data.error)
+                                }
+                            });
                         })
                         .catch(error => {
                             console.log("error: ", error)
                             if (error.response) {
                                 this.errorService(error.response.data.error)
                             }
                         });
-                    })
-                    .catch(error => {
-                        console.log("error: ", error)
-                        if (error.response) {
-                            this.errorService(error.response.data.error)
-                        }
-                    });
+                })
+                .catch(error => {
+                    console.log("error: ", error)
+                    if (error.response) {
+                    this.errorService(error.response.data.error)
+                    }
+                });
             })
             .catch(error => {
                 console.log("error: ", error)
                 if (error.response) {
-                this.errorService(error.response.data.error)
+                    this.errorService(error.response.data.error)
                 }
             });
+        
             this.dialogWilderness = false;
         },