Fix baseUrl Bug (#183)

* fixed baseUrl bug

* added test and simplified logic

* removed extra file

* added fix

* added one more test and bumped the version

Author: gaokevin1

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.descope</groupId>
     <artifactId>java-sdk</artifactId>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.0.37</version>
+    <version>1.0.38</version>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Java library used to integrate with Descope.</description>
     <url>https://github.com/descope/descope-java</url>

src/main/java/com/descope/client/DescopeClient.java

@@ -64,7 +64,7 @@ private static Client getClient(Config config) {
       throw ClientSetupException.invalidProjectId();
     }
     final String region = projectId.substring(1, projectId.length() - 27);
-    final String baseUrl = DEFAULT_BASE_URL.replace(REGION_PLACEHOLDER, region.length() > 0 ? region + "." : "");
+    final String baseUrl = DEFAULT_BASE_URL.replace(REGION_PLACEHOLDER, region.length() > 3 ? region + "." : "");
     Client c = Client.builder()
         .uri(StringUtils.isBlank(config.getDescopeBaseUrl()) ? baseUrl : config.getDescopeBaseUrl())
         .projectId(projectId)

src/test/java/com/descope/client/DescopeClientTest.java

@@ -87,6 +87,36 @@ void testEmptyProjectID() throws Exception {
         });
   }
 
+  @Test
+  void testShortProjectID() throws Exception {
+    // Project ID too short (< 28 characters)
+    String shortProjectId = "P1234567890123456789012345";
+    EnvironmentVariables env = new EnvironmentVariables(PROJECT_ID_ENV_VAR, shortProjectId);
+    env.execute(() -> {
+      Assertions.assertThatThrownBy(DescopeClient::new)
+          .isInstanceOf(ClientSetupException.class)
+          .hasMessage("Invalid project ID - must be over 27 characters long");
+    });
+  }
+
+  @Test
+  void testProjectIDRegion() throws Exception {
+    String invalidRegionProjectId = "Pus11456789012345678901234567";
+    EnvironmentVariables env = new EnvironmentVariables(PROJECT_ID_ENV_VAR, invalidRegionProjectId);
+    env.execute(() -> {
+      DescopeClient descopeClient = new DescopeClient();
+      ApiProxy apiProxy = mock(ApiProxy.class);
+      UserResponseDetails userResponseDetails = mock(UserResponseDetails.class);
+      when(apiProxy.get(eq(new URI("https://api.descope.com/v1/mgmt/user?loginId=test")), any()))
+          .thenReturn(userResponseDetails);
+      try (MockedStatic<ApiProxyBuilder> mockedApiProxyBuilder = mockStatic(ApiProxyBuilder.class)) {
+        mockedApiProxyBuilder.when(() -> ApiProxyBuilder.buildProxy(any(), any())).thenReturn(apiProxy);
+        UserResponseDetails u = descopeClient.getManagementServices().getUserService().load("test");
+        Assertions.assertThat(u).isNotNull();
+      }
+    });
+  }
+
   @Test
   void testEmptyConfig() {
     Assertions.assertThatThrownBy(() -> new DescopeClient(null))