Using ngsiv2 client

.editorconfig

@@ -5,11 +5,11 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 4
+indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = false
 insert_final_newline = false
 
-[*.xml]
-indent_size = 2
+[*.java]
+indent_size = 4

.github/workflows/test.yml

@@ -0,0 +1,24 @@
+name: Java CI with Maven
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: "17"
+          distribution: "temurin"
+          cache: maven
+
+      - name: Run tests with Maven
+        run: mvn -B test --file pom.xml

README.md

@@ -0,0 +1,4 @@
+# MoC Java
+MoC client for Java
+
+[![Java CI with Maven](https://github.com/makeOurCity/moc-java/actions/workflows/test.yml/badge.svg)](https://github.com/makeOurCity/moc-java/actions/workflows/test.yml)

pom.xml

@@ -3,6 +3,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
 
   <groupId>city.makeour</groupId>
   <artifactId>moc</artifactId>
@@ -14,22 +15,57 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
   </properties>
 
+  <repositories>
+    <repository>
+      <id>jitpack.io</id>
+      <url>https://jitpack.io</url>
+    </repository>
+  </repositories>
+
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>5.9.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-api</artifactId>
+        <version>5.10.1</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-engine</artifactId>
+        <version>5.10.1</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-junit-jupiter</artifactId>
+        <version>5.3.1</version>
+        <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
-      <artifactId>aws-sdk-java</artifactId>
+      <artifactId>cognitoidentityprovider</artifactId>
       <version>2.31.20</version>
     </dependency>
+    <dependency>
+      <groupId>com.github.makeOurCity</groupId>
+      <artifactId>ngsiv2-java</artifactId>
+      <version>0.0.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk15on</artifactId>
+      <version>1.70</version> 
+    </dependency>
   </dependencies>
 
   <build>
@@ -51,7 +87,12 @@
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.1</version>
+          <version>3.5.3</version>
+          <configuration>
+            <includes>
+              <include>**/*Test.java</include>
+            </includes>
+          </configuration>
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
@@ -77,4 +118,4 @@
       </plugins>
     </pluginManagement>
   </build>
-</project>
+</project>

src/main/java/city/makeour/moc/FetchCognitoToken.java

@@ -0,0 +1,96 @@
+package city.makeour.moc;
+
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.HashMap;
+import java.util.Map;
+
+import city.makeour.moc.auth.srp.SrpAuthenticationHelper;
+import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.cognitoidentityprovider.CognitoIdentityProviderClient;
+import software.amazon.awssdk.services.cognitoidentityprovider.model.AuthFlowType;
+import software.amazon.awssdk.services.cognitoidentityprovider.model.AuthenticationResultType;
+import software.amazon.awssdk.services.cognitoidentityprovider.model.ChallengeNameType;
+import software.amazon.awssdk.services.cognitoidentityprovider.model.InitiateAuthRequest;
+import software.amazon.awssdk.services.cognitoidentityprovider.model.InitiateAuthResponse;
+import software.amazon.awssdk.services.cognitoidentityprovider.model.RespondToAuthChallengeRequest;
+import software.amazon.awssdk.services.cognitoidentityprovider.model.RespondToAuthChallengeResponse;
+
+public class FetchCognitoToken implements TokenFetcherInterface {
+
+    private String cognitoUserPoolId;
+    private String cognitoClientId;
+    private String username;
+    private String password;
+    private Region region = Region.AP_NORTHEAST_1;
+
+    private SrpAuthenticationHelper helper;
+    private CognitoIdentityProviderClient cognitoClient;
+
+    public FetchCognitoToken(String cognitoUserPoolId, String cognitoClientId) {
+        this(Region.AP_NORTHEAST_1, cognitoUserPoolId, cognitoClientId);
+    }
+
+    public FetchCognitoToken(Region region, String cognitoUserPoolId, String cognitoClientId) {
+        this.cognitoUserPoolId = cognitoUserPoolId;
+        this.cognitoClientId = cognitoClientId;
+        this.region = region;
+
+        this.helper = new SrpAuthenticationHelper(this.cognitoUserPoolId);
+
+        this.cognitoClient = CognitoIdentityProviderClient.builder()
+                .region(this.region)
+                .credentialsProvider(DefaultCredentialsProvider.create())
+                .build();
+    }
+
+    public void setAuthParameters(String username, String password) {
+        this.username = username;
+        this.password = password;
+    }
+
+    public Token fetchTokenWithSrpAuth() throws InvalidKeyException, NoSuchAlgorithmException {
+        InitiateAuthRequest initiateAuthRequest = InitiateAuthRequest.builder()
+                .authFlow(AuthFlowType.USER_SRP_AUTH)
+                .clientId(this.cognitoClientId)
+                .authParameters(Map.of(
+                        "USERNAME", this.username,
+                        "SRP_A", helper.getA()))
+                .build();
+        InitiateAuthResponse initiateAuthResponse = cognitoClient.initiateAuth(initiateAuthRequest);
+        Map<String, String> challengeParameters = initiateAuthResponse.challengeParameters();
+
+        String userIdForSrp = challengeParameters.get("USER_ID_FOR_SRP");
+        String salt = challengeParameters.get("SALT");
+        String srpB = challengeParameters.get("SRP_B");
+        String secretBlock = challengeParameters.get("SECRET_BLOCK");
+
+        byte[] signatureKey = helper.getPasswordAuthenticationKey(userIdForSrp, password,
+                srpB, salt,
+                secretBlock);
+        String timestamp = helper.getCurrentFormattedTimestamp();
+        String signature = helper.calculateSignature(userIdForSrp, secretBlock, timestamp, signatureKey);
+
+        Map<String, String> challengeResponses = new HashMap<>();
+        challengeResponses.put("USERNAME", userIdForSrp);
+        challengeResponses.put("PASSWORD_CLAIM_SECRET_BLOCK", secretBlock);
+        challengeResponses.put("PASSWORD_CLAIM_SIGNATURE", signature);
+        challengeResponses.put("TIMESTAMP", timestamp);
+
+        RespondToAuthChallengeRequest respondRequest = RespondToAuthChallengeRequest.builder()
+                .challengeName(ChallengeNameType.PASSWORD_VERIFIER)
+                .clientId(this.cognitoClientId)
+                .challengeResponses(challengeResponses)
+                .build();
+
+        RespondToAuthChallengeResponse authChallengeResponse = cognitoClient.respondToAuthChallenge(respondRequest);
+        AuthenticationResultType authResult = authChallengeResponse.authenticationResult();
+
+        return new Token(authResult.idToken(), authResult.refreshToken());
+    }
+
+    public Token fetchToken() throws InvalidKeyException, NoSuchAlgorithmException {
+        return this.fetchTokenWithSrpAuth();
+    }
+}

src/main/java/city/makeour/moc/MocClient.java

@@ -0,0 +1,52 @@
+package city.makeour.moc;
+
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+
+import city.makeour.ngsi.v2.api.EntitiesApi;
+import city.makeour.ngsi.v2.invoker.ApiClient;
+
+public class MocClient {
+    protected ApiClient apiClient;
+
+    protected EntitiesApi entitiesApi;
+
+    protected TokenFetcherInterface tokenFetcher;
+
+    protected RefreshTokenStorageInterface refreshTokenStorage;
+
+    public MocClient() {
+        this("https://orion.sandbox.makeour.city");
+    }
+
+    public MocClient(String basePath) {
+        this.apiClient = new ApiClient();
+        this.apiClient.setBasePath(basePath);
+
+        this.entitiesApi = new EntitiesApi(this.apiClient);
+        this.refreshTokenStorage = new RefreshTokenStorage();
+    }
+
+    public EntitiesApi entities() {
+        return this.entitiesApi;
+    }
+
+    public void setMocAuthInfo(String cognitoUserPoolId, String cognitoClientId) {
+        this.tokenFetcher = new FetchCognitoToken(cognitoUserPoolId, cognitoClientId);
+    }
+
+    public void login(String username, String password) throws InvalidKeyException, NoSuchAlgorithmException {
+        if (this.tokenFetcher == null) {
+            throw new IllegalStateException("MocClient is not initialized with Cognito auth info.");
+        }
+
+        this.tokenFetcher.setAuthParameters(username, password);
+        Token token = this.tokenFetcher.fetchToken();
+        this.setToken(token.getIdToken());
+        this.refreshTokenStorage.setRefreshToken(token.getRefreshToken());
+    }
+
+    public void setToken(String token) {
+        this.apiClient.addDefaultHeader("Authorization", token);
+    }
+}

src/main/java/city/makeour/moc/RefreshTokenStorage.java

@@ -0,0 +1,22 @@
+package city.makeour.moc;
+
+public class RefreshTokenStorage implements RefreshTokenStorageInterface {
+
+    private String refreshToken;
+
+    public RefreshTokenStorage() {
+        this.refreshToken = null;
+    }
+
+    public String getRefreshToken() {
+        return refreshToken;
+    }
+
+    public void setRefreshToken(String refreshToken) {
+        this.refreshToken = refreshToken;
+    }
+
+    public boolean hasRefreshToken() {
+        return this.refreshToken != null;
+    }
+}

src/main/java/city/makeour/moc/RefreshTokenStorageInterface.java

@@ -0,0 +1,10 @@
+package city.makeour.moc;
+
+public interface RefreshTokenStorageInterface {
+
+    public String getRefreshToken();
+
+    public void setRefreshToken(String refreshToken);
+
+    public boolean hasRefreshToken();
+}