Neutralized id value from client in device routes for creation.

Reconfigured Springfox for authentication in device and room routes.

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/SpringFoxConfig.java

@@ -1,6 +1,5 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.config;
 
-import static springfox.documentation.builders.PathSelectors.regex;
 
 import java.util.List;
 import java.util.function.Predicate;
@@ -10,10 +9,9 @@ import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.ApiKey;
-import springfox.documentation.service.SecurityScheme;
+import springfox.documentation.service.*;
 import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.service.contexts.SecurityContext;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
@@ -39,7 +37,8 @@ public class SpringFoxConfig {
                 .paths(paths()::test)
                 .build()
                 .apiInfo(apiInfo())
-                .securitySchemes(securitySchemes());
+                .securitySchemes(securitySchemes())
+                .securityContexts(List.of(securityContext()));
     }
 
     /**
@@ -51,14 +50,32 @@ public class SpringFoxConfig {
         return List.of(new ApiKey("Bearer", "Authorization", "header"));
     }
 
-    /**
-     * Return a Java functional API predicate for regex matches
-     *
-     * @param regex the regex to match on
-     * @return a Java functional API predicate
-     */
-    private Predicate<String> regexPredicate(final String regex) {
-        return regex(regex)::apply;
+    private SecurityContext securityContext() {
+        return SecurityContext.builder()
+                .securityReferences(defaultAuth())
+                .forPaths(authenticatedPaths()::test)
+                .build();
+    }
+
+    private List<SecurityReference> defaultAuth() {
+        final AuthorizationScope authorizationScope =
+                new AuthorizationScope("global", "accessEverything");
+        return List.of(
+                new SecurityReference("Bearer", new AuthorizationScope[] {authorizationScope}));
+    }
+
+    private Predicate<String> authenticatedPaths() {
+        return ((Predicate<String>) PathSelectors.regex("/auth/update")::apply)
+                .or(PathSelectors.regex("/room.*")::apply)
+                .or(PathSelectors.regex("/device.*")::apply)
+                .or(PathSelectors.regex("/buttonDimmer.*")::apply)
+                .or(PathSelectors.regex("/dimmableLight.*")::apply)
+                .or(PathSelectors.regex("/knobDimmer.*")::apply)
+                .or(PathSelectors.regex("/regularLight.*")::apply)
+                .or(PathSelectors.regex("/sensor.*")::apply)
+                .or(PathSelectors.regex("/smartPlug.*")::apply)
+                .or(PathSelectors.regex("/switch.*")::apply)
+                .or(PathSelectors.regex("/motionSensor.*")::apply);
     }
 
     /**

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DeviceController.java

@@ -0,0 +1,44 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.DeviceSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.BadDataException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Device;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DeviceRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RoomRepository;
+import javax.validation.Valid;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@EnableAutoConfiguration
+@RequestMapping("/device")
+public class DeviceController {
+
+    @Autowired private DeviceRepository<Device> deviceRepository;
+    @Autowired private RoomRepository roomRepository;
+
+    @PutMapping
+    public Device update(@Valid @RequestBody DeviceSaveRequest deviceSaveRequest)
+            throws NotFoundException, BadDataException {
+        final Device d =
+                deviceRepository
+                        .findById(deviceSaveRequest.getId())
+                        .orElseThrow(NotFoundException::new);
+
+        // check if roomId is valid
+        roomRepository
+                .findById(deviceSaveRequest.getRoomId())
+                .orElseThrow(() -> new BadDataException("roomId is not a valid room id"));
+
+        d.setRoomId(deviceSaveRequest.getRoomId());
+        d.setName(deviceSaveRequest.getName());
+
+        deviceRepository.save(d);
+        return d;
+    }
+}

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java

@@ -42,6 +42,7 @@ public class DimmableLightController {
 
     @PutMapping
     public DimmableLight update(@Valid @RequestBody DimmableLightSaveRequest dl) {
+        dl.setId(0);
         return this.create(dl);
     }
 

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java

@@ -42,6 +42,7 @@ public class KnobDimmerController {
 
     @PutMapping
     public KnobDimmer update(@Valid @RequestBody KnobDimmerSaveRequest kd) {
+        kd.setId(0);
         return this.create(kd);
     }
 

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/MotionSensorController.java

@@ -42,6 +42,7 @@ public class MotionSensorController {
 
     @PutMapping
     public MotionSensor update(@Valid @RequestBody MotionSensorSaveRequest ms) {
+        ms.setId(0);
         return this.create(ms);
     }
 

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java

@@ -49,6 +49,7 @@ public class RegularLightController {
 
     @PutMapping
     public RegularLight update(@Valid @RequestBody RegularLightSaveRequest rl) {
+        rl.setId(0);
         return this.create(rl);
     }
 

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomController.java

@@ -44,12 +44,12 @@ public class RoomController {
         newRoom.setUserId(userId);
         newRoom.setName(r.getName());
         if (img != null) {
-            newRoom.setImage(img.getBytes());
+            newRoom.setImage(img);
         } else if (setWhenNull) {
             newRoom.setImage(null);
         }
         if (icon != null) {
-            newRoom.setIcon(icon.getBytes());
+            newRoom.setIcon(icon);
         } else if (setWhenNull) {
             newRoom.setIcon(null);
         }

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java

@@ -43,6 +43,7 @@ public class SensorController {
 
     @PutMapping
     public Sensor update(@Valid @RequestBody SensorSaveRequest s) {
+        s.setId(0);
         return this.create(s);
     }
 

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugController.java

@@ -42,6 +42,7 @@ public class SmartPlugController {
 
     @PutMapping
     public SmartPlug update(@Valid @RequestBody SmartPlugSaveRequest sp) {
+        sp.setId(0);
         return this.create(sp);
     }
 

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java

@@ -42,6 +42,7 @@ public class SwitchController {
 
     @PutMapping
     public Switch update(@Valid @RequestBody SwitchSaveRequest s) {
+        s.setId(0);
         return this.create(s);
     }
 

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/WelcomeController.java

@@ -1,15 +0,0 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
-
-import org.springframework.boot.autoconfigure.*;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@EnableAutoConfiguration
-public class WelcomeController {
-
-    @GetMapping
-    ResponseEntity<Void> testConnection() {
-        return ResponseEntity.ok(null);
-    }
-}

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ButtonDimmerSaveRequest.java

@@ -60,4 +60,8 @@ public class ButtonDimmerSaveRequest {
     public String getName() {
         return name;
     }
+
+    public void setId(long id) {
+        this.id = id;
+    }
 }

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/DeviceSaveRequest.java

@@ -0,0 +1,42 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+public class DeviceSaveRequest {
+    /** Device identifier */
+    private long id;
+
+    /**
+     * The room this device belongs in, as a foreign key id. To use when updating and inserting from
+     * a REST call.
+     */
+    @NotNull private Long roomId;
+
+    /** The name of the device as assigned by the user (e.g. 'Master bedroom light') */
+    @NotNull @NotEmpty private String name;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public Long getRoomId() {
+        return roomId;
+    }
+
+    public void setRoomId(Long roomId) {
+        this.roomId = roomId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/DimmableLightSaveRequest.java

@@ -66,4 +66,8 @@ public class DimmableLightSaveRequest {
         }
         this.intensity = intensity;
     }
+
+    public void setId(long id) {
+        this.id = id;
+    }
 }

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/KnobDimmerSaveRequest.java

@@ -48,4 +48,8 @@ public class KnobDimmerSaveRequest {
     public Set<DimmableLight> getLights() {
         return lights;
     }
+
+    public void setId(long id) {
+        this.id = id;
+    }
 }

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/MotionSensorSaveRequest.java

@@ -44,4 +44,8 @@ public class MotionSensorSaveRequest {
     public void setDetected(boolean detected) {
         this.detected = detected;
     }
+
+    public void setId(long id) {
+        this.id = id;
+    }
 }

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RegularLightSaveRequest.java

@@ -45,4 +45,8 @@ public class RegularLightSaveRequest {
     public void setOn(boolean on) {
         this.on = on;
     }
+
+    public void setId(long id) {
+        this.id = id;
+    }
 }

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java

@@ -78,4 +78,8 @@ public class SensorSaveRequest {
     public void setValue(int newValue) {
         this.value = newValue;
     }
+
+    public void setId(long id) {
+        this.id = id;
+    }
 }

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SmartPlugSaveRequest.java

@@ -45,4 +45,8 @@ public class SmartPlugSaveRequest {
     public void setOn(boolean on) {
         this.on = on;
     }
+
+    public void setId(long id) {
+        this.id = id;
+    }
 }

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchSaveRequest.java

@@ -45,4 +45,8 @@ public class SwitchSaveRequest {
     public void setOn(boolean on) {
         this.on = on;
     }
+
+    public void setId(long id) {
+        this.id = id;
+    }
 }

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/error/BadDataException.java

@@ -0,0 +1,11 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.error;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(code = HttpStatus.BAD_REQUEST)
+public class BadDataException extends Exception {
+    public BadDataException(String message) {
+        super(message);
+    }
+}

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java

@@ -20,13 +20,11 @@ public class Room {
      * https://www.baeldung.com/java-base64-image-string
      * https://docs.oracle.com/javase/8/docs/api/java/util/Base64.html
      */
-    @Lob
-    @Column(name = "icon", columnDefinition = "TEXT")
-    private byte[] icon;
+    @Column private String icon;
 
     @Lob
     @Column(name = "image", columnDefinition = "TEXT")
-    private byte[] image;
+    private String image;
 
     /**
      * User that owns the house this room is in as a foreign key id. To use when updating and
@@ -65,19 +63,19 @@ public class Room {
         this.name = name;
     }
 
-    public byte[] getIcon() {
+    public String getIcon() {
         return icon;
     }
 
-    public void setIcon(byte[] icon) {
+    public void setIcon(String icon) {
         this.icon = icon;
     }
 
-    public byte[] getImage() {
+    public String getImage() {
         return image;
     }
 
-    public void setImage(byte[] image) {
+    public void setImage(String image) {
         this.image = image;
     }