Merge pull request #60 from nicholasM95/develop

Develop

Author: nicholasM95

README.md

@@ -17,7 +17,7 @@ Add the Maven Dependency to your `pom.xml`
 <dependency>
     <groupId>be.nicholasmeyers.vwgroup-connector</groupId>
     <artifactId>vwgroup-connector</artifactId>
-    <version>1.3.3</version>
+    <version>2.0.0</version>
 </dependency>
 ```
 
@@ -40,7 +40,5 @@ The following applications are available, choose the correct client for your imp
 
 ```
 Client.CONNECT
-Client.SKODA
-Client.SMARTLINK
 Client.VWG
 ```

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>be.nicholasmeyers.vwgroup-connector</groupId>
     <artifactId>vwgroup-connector</artifactId>
-    <version>1.3.5</version>
+    <version>2.0.0-SNAPSHOT</version>
 
     <name>vwgroup-connector</name>
     <description>vwgroup-connector</description>

src/main/java/be/nicholasmeyers/vwgroupconnector/resource/Client.java

@@ -2,7 +2,5 @@
 
 public enum Client {
     CONNECT,
-    SKODA,
-    SMARTLINK,
     VWG
 }

src/main/java/be/nicholasmeyers/vwgroupconnector/service/ConnectorService.java

@@ -39,8 +39,8 @@ public Tokens getTokens(Client client, String email, String password) {
             return cache.get(client);
         }
         log.info("Get new tokens from vw group.");
-        Map<String, String> clientConfig = getClientConfig(client.name().toLowerCase());
-        String redirectUri = "skodaconnect://oidc.login/";
+        Map<String, String> clientConfig = getClientConfig();
+        String redirectUri = clientConfig.get("redirect_uri");
         String clientId = clientConfig.get("client_id");
         String scope = clientConfig.get("scope");
         String responseType = clientConfig.get("token_types");

src/main/java/be/nicholasmeyers/vwgroupconnector/utils/ClientUtils.java

@@ -7,42 +7,13 @@ public class ClientUtils {
     private ClientUtils() {
     }
 
-    public static Map<String, String> getClientConfig(String client) {
-        if (getClients().containsKey(client)) {
-            return getClients().get(client);
-        }
-        return getClients().get("connect");
-    }
-
-    private static Map<String, Map<String, String>> getClients() {
+    public static Map<String, String> getClientConfig() {
         Map<String, String> connect = new HashMap<>();
         connect.put("client_id", "7f045eee-7003-4379-9968-9355ed2adb06@apps_vw-dilab_com");
         connect.put("scope", "openid profile address cars email birthdate badge mbb phone driversLicense nationalIdentifier dealers mileage profession vin");
         connect.put("token_types", "code id_token");
-
-        Map<String, String> vwg = new HashMap<>();
-        vwg.put("client_id", "7f045eee-7003-4379-9968-9355ed2adb06@apps_vw-dilab_com");
-        vwg.put("scope", "openid profile address cars email birthdate badge mbb phone driversLicense nationalIdentifier dealers mileage profession vin");
-        vwg.put("token_types", "code id_token");
-
-        Map<String, String> skoda = new HashMap<>();
-        skoda.put("client_id", "f9a2359a-b776-46d9-bd0c-db1904343117@apps_vw-dilab_com");
-        skoda.put("scope", "openid mbb profile");
-        skoda.put("token_types", "code id_token");
-
-        Map<String, String> smartlink = new HashMap<>();
-        smartlink.put("client_id", "72f9d29d-aa2b-40c1-bebe-4c7683681d4c@apps_vw-dilab_com");
-        smartlink.put("scope", "openid dealers profile email cars address");
-        smartlink.put("token_types", "code id_token");
-
-        Map<String, Map<String, String>> clients = new HashMap<>();
-        clients.put("connect", connect);
-        clients.put("vwg", vwg);
-        clients.put("skoda", skoda);
-        clients.put("smartlink", smartlink);
-
-        return clients;
+        connect.put("redirect_uri", "myskoda://redirect/login/");
+        return connect;
     }
 
-
 }

src/test/java/be/nicholasmeyers/vwgroupconnector/service/ConnectorServiceTest.java

@@ -26,22 +26,6 @@ public void testConnect() {
         Assertions.assertNotNull(tokens.getRefreshToken());
     }
 
-    @Test
-    public void testSkoda() {
-        Tokens tokens = connectorService.getTokens(Client.SKODA, getEmail(), getPassword());
-        Assertions.assertNotNull(tokens.getAccessToken());
-        Assertions.assertNotNull(tokens.getIdToken());
-        Assertions.assertNotNull(tokens.getRefreshToken());
-    }
-
-    @Test
-    public void testSmartlink() {
-        Tokens tokens = connectorService.getTokens(Client.SMARTLINK, getEmail(), getPassword());
-        Assertions.assertNotNull(tokens.getAccessToken());
-        Assertions.assertNotNull(tokens.getIdToken());
-        Assertions.assertNotNull(tokens.getRefreshToken());
-    }
-
     @Test
     public void testVWG() {
         Tokens tokens = connectorService.getTokens(Client.VWG, getEmail(), getPassword());