Merge pull request #91 from uio-bmi/cega_nss_users

Changes to match the new users end point from cega NSS

src/main/java/no/uio/ifi/ltp/authentication/CEGACredentialsProvider.java

@@ -1,7 +1,6 @@
 package no.uio.ifi.ltp.authentication;
 
 import no.uio.ifi.ltp.dto.Credentials;
-import no.uio.ifi.ltp.dto.ResponseHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.Cacheable;
@@ -49,8 +48,10 @@ public Credentials getCredentials(String username) throws MalformedURLException,
         URL url = new URL(String.format(cegaAuthURL + "%s?idType=username", username));
         org.springframework.http.HttpHeaders headers = new org.springframework.http.HttpHeaders();
         headers.set(HttpHeaders.AUTHORIZATION, "Basic " + Base64.getEncoder().encodeToString((cegaUsername + ":" + cegaPassword).getBytes()));
-        ResponseEntity<ResponseHolder> response = restTemplate.exchange(url.toURI(), HttpMethod.GET, new HttpEntity<>(headers), ResponseHolder.class);
-        return Objects.requireNonNull(response.getBody()).getResultsHolder().getCredentials().iterator().next();
+        ResponseEntity<Credentials> response = restTemplate.exchange(url.toURI(), HttpMethod.GET,
+                new HttpEntity<>(headers),
+                Credentials.class);
+        return Objects.requireNonNull(response.getBody());
     }
 
 }

src/main/java/no/uio/ifi/ltp/dto/Credentials.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.ToString;
+import java.util.List;
 
 /**
  * POJO for CEGA credentials.
@@ -15,6 +16,6 @@ public class Credentials {
     private String passwordHash;
 
     @JsonProperty("sshPublicKey")
-    private String publicKey;
+    private List<String> publicKey;
 
 }