Use Login V3

Author: Markus-Malkusch

pom.xml

@@ -26,11 +26,11 @@
 			<artifactId>jackson-databind</artifactId>
 			<version>2.18.3</version>
 		</dependency>
-		<dependency>
-			<groupId>com.auth0</groupId>
-			<artifactId>java-jwt</artifactId>
-			<version>4.5.0</version>
-		</dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.18.3</version>
+        </dependency>
 		<dependency>
 			<groupId>dev.failsafe</groupId>
 			<artifactId>failsafe</artifactId>

src/main/java/de/malkusch/niu/Authentication.java

@@ -1,32 +1,47 @@
 package de.malkusch.niu;
 
-import static java.util.Objects.requireNonNull;
 
 import java.io.IOException;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.time.Duration;
 import java.time.Instant;
 
-import com.auth0.jwt.JWT;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Objects.requireNonNull;
 
 final class Authentication {
 
     private final String account;
     private final String password;
     private final String countryCode;
     private final Client client;
+    private final static String APP_ID = "niu_8xt1afu6";
 
     public Authentication(String account, String password, String countryCode, Duration expirationWindow, Client client)
             throws IOException {
 
         this.account = assertNotEmpty(account, "account must not be empty");
-        this.password = assertNotEmpty(password, "password must not be empty");
+        this.password = hashedPassword(assertNotEmpty(password, "password must not be empty"));
         this.countryCode = assertNotEmpty(countryCode, "countryCode must not be empty");
         this.expirationWindow = requireNonNull(expirationWindow);
         this.client = requireNonNull(client);
 
         refreshToken();
     }
 
+    private static String hashedPassword(String password) {
+        try {
+            var md5 = MessageDigest.getInstance("MD5");
+            md5.update(UTF_8.encode(password));
+            return String.format("%032x", new BigInteger(1, md5.digest()));
+
+        } catch (NoSuchAlgorithmException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
     private static String assertNotEmpty(String value, String errorMessage) {
         requireNonNull(value);
         if (value.isEmpty()) {
@@ -51,29 +66,36 @@ public Token token() throws IOException {
     }
 
     private final Duration expirationWindow;
-    private static final String LOGIN_URI = "https://account-fk.niu.com/appv2/login";
+    private static final String LOGIN_URI = "https://account-fk.niu.com/v3/api/oauth2/token";
     private static Duration EXPIRES_AT_FALLBACK = Duration.ofHours(1);
 
     private void refreshToken() throws IOException {
 
+        // Todo Use refresh token
+
         record Response(Data data, String desc, int status) {
-            record Data(String token) {
+            record Data(Token token) {
+                record Token(String access_token, Instant token_expires_in) {
+                }
             }
         }
-        var response = client.post(Response.class, LOGIN_URI, new Field("countryCode", countryCode),
-                new Field("account", account), new Field("password", password));
+        var response = client.post(Response.class, LOGIN_URI,
+                new Field("countryCode", countryCode),
+                new Field("app_id", APP_ID),
+                new Field("grant_type", "password"),
+                new Field("account", account),
+                new Field("password", password));
 
         if (response.status != 0) {
             throw new IOException(String.format("Can't authenticate: [%d] %s", response.status, response.desc));
         }
 
-        var token = response.data.token;
+        var token = response.data.token.access_token;
 
         Instant expiresAt;
         try {
-            var jwt = JWT.decode(token);
             var now = Instant.now();
-            expiresAt = jwt.getExpiresAtAsInstant();
+            expiresAt = response.data.token.token_expires_in;
             if (expiresAt == null) {
                 expiresAt = now.plus(EXPIRES_AT_FALLBACK);
             }

src/main/java/de/malkusch/niu/Client.java

@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.core.JacksonException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import de.malkusch.niu.Authentication.Token;
 
 record Field(String name, String value) {
@@ -59,7 +60,7 @@ public Client(Duration timeout, Retry<String> retry, String userAgent) {
             throw new IllegalArgumentException("userAgent must not be empty");
         }
 
-        mapper = new ObjectMapper();
+        mapper = new ObjectMapper().registerModule(new JavaTimeModule());
         mapper.configure(FAIL_ON_UNKNOWN_PROPERTIES, false);
     }