Merge pull request #135 from srvrguy/misc-updates

Misc updates
hkamel · Aug 2, 2022 · f110ad7 · f110ad7
2 parents 6789da6 + 9768383
commit f110ad7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 32 deletions.
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
     <licenses>
         <license>
             <name>The MIT License (MIT)</name>
-            <url>http://www.opensource.org/licenses/mit-license.php</url>
+            <url>https://opensource.org/licenses/mit-license.php</url>
             <distribution>repo</distribution>
         </license>
     </licenses>
@@ -100,7 +100,7 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20210307</version>
+            <version>20220320</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -124,7 +124,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.21.0</version>
+            <version>3.23.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -136,7 +136,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.12.4</version>
+            <version>4.6.1</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -148,7 +148,7 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>
-            <version>4.9.2</version>
+            <version>4.10.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/java/org/almrangers/auth/aad/AadSettings.java b/src/main/java/org/almrangers/auth/aad/AadSettings.java
@@ -48,7 +48,6 @@ public class AadSettings {
   protected static final String DIRECTORY_LOCATION = "sonar.auth.aad.directoryLocation";
   protected static final String DIRECTORY_LOC_GLOBAL = "Azure AD (Global)";
   protected static final String DIRECTORY_LOC_USGOV = "Azure AD for US Government";
-  protected static final String DIRECTORY_LOC_DE = "Azure AD for Germany";
   protected static final String DIRECTORY_LOC_CN = "Azure AD China";
   protected static final String ENABLE_GROUPS_SYNC = "sonar.auth.aad.enableGroupsSync";
   protected static final String ENABLE_CLIENT_CRED = "sonar.auth.aad.enableClientCredential";
@@ -65,15 +64,13 @@ public class AadSettings {
 
   protected static final String LOGIN_URL = "https://login.microsoftonline.com";
   protected static final String LOGIN_URL_USGOV = "https://login.microsoftonline.us";
-  protected static final String LOGIN_URL_DE = "https://login.microsoftonline.de";
   protected static final String LOGIN_URL_CN = "https://login.chinacloudapi.cn";
   protected static final String AUTHORIZATION_URL = "oauth2/authorize";
   protected static final String AUTHORITY_URL = "oauth2/token";
   protected static final String COMMON_URL = "common";
 
   protected static final String GRAPH_URL = "https://graph.microsoft.com";
   protected static final String GRAPH_URL_USGOV = "https://graph.microsoft.com";
-  protected static final String GRAPH_URL_DE = "https://graph.microsoft.de";
   protected static final String GRAPH_URL_CN = "https://microsoftgraph.chinacloudapi.cn";
   protected static final String AUTH_REQUEST_FORMAT = "%s?client_id=%s&response_type=code&redirect_uri=%s&state=%s&scope=openid";
   protected static final String GROUPS_REQUEST_FORMAT = "/v1.0/%s/users/%s/transitiveMemberOf";
@@ -144,7 +141,7 @@ public static List<PropertyDefinition> definitions() {
         .subCategory(SUBCATEGORY_ADVANCED)
         .type(SINGLE_SELECT_LIST)
         .defaultValue(DIRECTORY_LOC_GLOBAL)
-        .options(DIRECTORY_LOC_GLOBAL, DIRECTORY_LOC_USGOV, DIRECTORY_LOC_DE, DIRECTORY_LOC_CN)
+        .options(DIRECTORY_LOC_GLOBAL, DIRECTORY_LOC_USGOV, DIRECTORY_LOC_CN)
         .index(3)
         .build(),
       PropertyDefinition.builder(ENABLE_CLIENT_CRED)
@@ -201,14 +198,9 @@ private String getLoginHost() {
     Optional<String> directoryLocation = config.get(DIRECTORY_LOCATION);
 
     if(directoryLocation.isPresent()) {
-      switch (directoryLocation.get()) {
-        case DIRECTORY_LOC_USGOV:
-          return LOGIN_URL_USGOV;
-
-        case DIRECTORY_LOC_DE:
-          return LOGIN_URL_DE;
-
-        case DIRECTORY_LOC_CN:
+      if (directoryLocation.get().equals(DIRECTORY_LOC_USGOV)) {
+        return LOGIN_URL_USGOV;
+      } else if (directoryLocation.get().equals(DIRECTORY_LOC_CN)) {
           return LOGIN_URL_CN;
       }
     }
@@ -229,15 +221,10 @@ public String getGraphURL() {
     Optional<String> directoryLocation = config.get(DIRECTORY_LOCATION);
 
     if(directoryLocation.isPresent()) {
-      switch (directoryLocation.get()) {
-        case DIRECTORY_LOC_USGOV:
-          return GRAPH_URL_USGOV;
-
-        case DIRECTORY_LOC_DE:
-          return GRAPH_URL_DE;
-
-        case DIRECTORY_LOC_CN:
-          return GRAPH_URL_CN;
+      if (directoryLocation.get().equals(DIRECTORY_LOC_USGOV)) {
+        return GRAPH_URL_USGOV;
+      } else if (directoryLocation.get().equals(DIRECTORY_LOC_CN)) {
+        return GRAPH_URL_CN;
       }
     }
 

diff --git a/src/test/java/org/almrangers/auth/aad/AadSettingsTest.java b/src/test/java/org/almrangers/auth/aad/AadSettingsTest.java
@@ -78,17 +78,12 @@ public void return_correct_urls() {
     assertThat(underTest.authorizationUrl()).startsWith("https://login.microsoftonline.us");
     assertThat(underTest.getGraphURL()).startsWith("https://graph.microsoft.com");
 
-    //Azure Germany
-    settings.setProperty("sonar.auth.aad.directoryLocation", DIRECTORY_LOC_DE);
-    assertThat(underTest.authorizationUrl()).startsWith("https://login.microsoftonline.de");
-    assertThat(underTest.getGraphURL()).startsWith("https://graph.microsoft.de");
-
     //Azure China
     settings.setProperty("sonar.auth.aad.directoryLocation", DIRECTORY_LOC_CN);
     assertThat(underTest.authorizationUrl()).startsWith("https://login.chinacloudapi.cn");
     assertThat(underTest.getGraphURL()).startsWith("https://microsoftgraph.chinacloudapi.cn");
   }
-  
+
   @Test
   public void return_graph_membership_url() {
     settings.setProperty("sonar.auth.aad.directoryLocation", DIRECTORY_LOC_GLOBAL);