make graphAPI endpoints customizable #3 (not tested!)

davidcoutadeur · rouazana · commit effb2f1bf566 · 2020-04-30T18:31:41.000+02:00
diff --git a/sample/msgraphapi-to-ldap-advanced/lsc.xml b/sample/msgraphapi-to-ldap-advanced/lsc.xml
@@ -22,6 +22,8 @@
             <username></username>
             <password></password>
             <msgraphapi:msGraphApiConnectionSettings>
+                <msgraphapi:authenticationURL>${MS_GRAPH_API_AUTHENTICATION_URL}</msgraphapi:authenticationURL>
+                <msgraphapi:usersURL>${MS_GRAPH_API_USERS_URL}</msgraphapi:usersURL>
                 <msgraphapi:clientId>${MS_GRAPH_API_CLIENT_ID}</msgraphapi:clientId>
                 <msgraphapi:clientSecret>${MS_GRAPH_API_CLIENT_SECRET}</msgraphapi:clientSecret>
                 <msgraphapi:tenant>${MS_GRAPH_API_TENANT}</msgraphapi:tenant>
diff --git a/sample/msgraphapi-to-ldap/lsc.xml b/sample/msgraphapi-to-ldap/lsc.xml
@@ -22,6 +22,8 @@
             <username></username>
             <password></password>
             <msgraphapi:msGraphApiConnectionSettings>
+                <msgraphapi:authenticationURL>${MS_GRAPH_API_AUTHENTICATION_URL}</msgraphapi:authenticationURL>
+                <msgraphapi:usersURL>${MS_GRAPH_API_USERS_URL}</msgraphapi:usersURL>
                 <msgraphapi:clientId>${MS_GRAPH_API_CLIENT_ID}</msgraphapi:clientId>
                 <msgraphapi:clientSecret>${MS_GRAPH_API_CLIENT_SECRET}</msgraphapi:clientSecret>
                 <msgraphapi:tenant>${MS_GRAPH_API_TENANT}</msgraphapi:tenant>
diff --git a/src/main/java/org/lsc/plugins/connectors/msgraphapi/MsGraphApiAuthentication.java b/src/main/java/org/lsc/plugins/connectors/msgraphapi/MsGraphApiAuthentication.java
@@ -53,13 +53,18 @@
 import org.lsc.plugins.connectors.msgraphapi.beans.AuthenticationResponse;
 
 public class MsGraphApiAuthentication {
+    private static final String DEFAULT_AUTHENTICATION_URL = "https://login.microsoftonline.com/";
     private static final String GRAPH_DEFAULT_SCOPE = "https://graph.microsoft.com/.default";
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
-    public AuthenticationResponse authenticate(String tenant, String clientId, String clientSecret) throws AuthorizationException {
+    public AuthenticationResponse authenticate(String tenant, String authenticationURL, String clientId, String clientSecret) throws AuthorizationException {
+        if( authenticationURL == null || authenticationURL.isEmpty() )
+        {
+            authenticationURL = DEFAULT_AUTHENTICATION_URL;
+        }
         WebTarget authTarget = ClientBuilder.newClient()
             .register(JacksonFeature.class)
-            .target("https://login.microsoftonline.com/")
+            .target(authenticationURL)
             .path(tenant)
             .path("oauth2/v2.0/token");
         Form authForm = new Form("client_id", clientId)
diff --git a/src/main/java/org/lsc/plugins/connectors/msgraphapi/MsGraphApiDao.java b/src/main/java/org/lsc/plugins/connectors/msgraphapi/MsGraphApiDao.java
@@ -64,13 +64,15 @@
 import org.lsc.exception.LscServiceException;
 import org.lsc.plugins.connectors.msgraphapi.beans.User;
 import org.lsc.plugins.connectors.msgraphapi.beans.UsersListResponse;
+import org.lsc.plugins.connectors.msgraphapi.generated.MsGraphApiConnectionSettings;
 import org.lsc.plugins.connectors.msgraphapi.generated.MsGraphApiUsersService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class MsGraphApiDao {
     public static final String USER_PATH = "/users";
     public static final String DEFAULT_PIVOT = "mail";
+    public static final String DEFAULT_USERS_URL = "https://graph.microsoft.com";
     public static final String ID = "id";
     private static final Logger LOGGER = LoggerFactory.getLogger(MsGraphApiDao.class);
 
@@ -80,20 +82,22 @@ public class MsGraphApiDao {
 
     private final Optional<Integer> pageSize;
     private final String pivot;
+    private final String usersURL;
     private final Optional<String> filter;
     private final Optional<String> select;
 
-    public MsGraphApiDao(String token, MsGraphApiUsersService serviceConfiguration) {
+    public MsGraphApiDao(String token, MsGraphApiConnectionSettings settings, MsGraphApiUsersService serviceConfiguration) {
         authorizationBearer = "Bearer " + token;
         this.filter = getStringParameter(serviceConfiguration.getFilter());
         this.select = getStringParameter(serviceConfiguration.getSelect());
         this.pivot = getStringParameter(serviceConfiguration.getPivot()).orElse(DEFAULT_PIVOT);
+        this.usersURL = getStringParameter(settings.getUsersURL()).orElse(DEFAULT_USERS_URL);
         this.pageSize = Optional.ofNullable(serviceConfiguration.getPageSize()).filter(size -> size > 0);
         LOGGER.debug("bearer " + authorizationBearer);
         client = ClientBuilder.newClient()
             .register(JacksonFeature.class);
         usersClient = client
-            .target("https://graph.microsoft.com")
+            .target(this.usersURL)
             .path("v1.0")
             .path(USER_PATH);
     }
diff --git a/src/main/java/org/lsc/plugins/connectors/msgraphapi/MsGraphApiUsersSrcService.java b/src/main/java/org/lsc/plugins/connectors/msgraphapi/MsGraphApiUsersSrcService.java
@@ -101,10 +101,10 @@ public MsGraphApiUsersSrcService(TaskType task) throws LscServiceConfigurationEx
             settings = (MsGraphApiConnectionSettings) pluginConnectionType.getAny().get(0);
 
             String token = new MsGraphApiAuthentication()
-                .authenticate(settings.getTenant(), settings.getClientId(), settings.getClientSecret())
+                .authenticate(settings.getTenant(), settings.getAuthenticationURL(), settings.getClientId(), settings.getClientSecret())
                 .getAccessToken();
 
-            dao = new MsGraphApiDao(token, service);
+            dao = new MsGraphApiDao(token, settings, service);
 
         } catch (ClassNotFoundException | AuthorizationException e) {
             throw new LscServiceConfigurationException(e);
diff --git a/src/main/java/org/lsc/plugins/connectors/msgraphapi/generated/MsGraphApiConnectionSettings.java b/src/main/java/org/lsc/plugins/connectors/msgraphapi/generated/MsGraphApiConnectionSettings.java
@@ -25,6 +25,8 @@
  *   &lt;complexContent>
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
+ *         &lt;element name="authenticationURL" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="usersURL" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         &lt;element name="clientId" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         &lt;element name="clientSecret" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         &lt;element name="tenant" type="{http://www.w3.org/2001/XMLSchema}string"/>
@@ -38,20 +40,74 @@
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
+    "authenticationURL",
+    "usersURL",
     "clientId",
     "clientSecret",
     "tenant"
 })
 @XmlRootElement(name = "msGraphApiConnectionSettings", namespace = "http://lsc-project.org/XSD/lsc-microsoft-graph-api-plugin-1.0.xsd")
 public class MsGraphApiConnectionSettings {
 
+    @XmlElement(namespace = "http://lsc-project.org/XSD/lsc-microsoft-graph-api-plugin-1.0.xsd", required = true)
+    protected String authenticationURL;
+    @XmlElement(namespace = "http://lsc-project.org/XSD/lsc-microsoft-graph-api-plugin-1.0.xsd", required = true)
+    protected String usersURL;
     @XmlElement(namespace = "http://lsc-project.org/XSD/lsc-microsoft-graph-api-plugin-1.0.xsd", required = true)
     protected String clientId;
     @XmlElement(namespace = "http://lsc-project.org/XSD/lsc-microsoft-graph-api-plugin-1.0.xsd", required = true)
     protected String clientSecret;
     @XmlElement(namespace = "http://lsc-project.org/XSD/lsc-microsoft-graph-api-plugin-1.0.xsd", required = true)
     protected String tenant;
 
+    /**
+     * Gets the value of the authenticationURL property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getAuthenticationURL() {
+        return authenticationURL;
+    }
+
+    /**
+     * Sets the value of the authenticationURL property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAuthenticationURL(String value) {
+        this.authenticationURL = value;
+    }
+
+    /**
+     * Gets the value of the usersURL property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getUsersURL() {
+        return usersURL;
+    }
+
+    /**
+     * Sets the value of the usersURL property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setUsersURL(String value) {
+        this.usersURL = value;
+    }
+
     /**
      * Gets the value of the clientId property.
      * 
diff --git a/src/main/resources/schemas/lsc-microsoft-graph-api-plugin-1.0.xsd b/src/main/resources/schemas/lsc-microsoft-graph-api-plugin-1.0.xsd
@@ -9,6 +9,8 @@
 	<xsd:element name="msGraphApiConnectionSettings">
 		<xsd:complexType>
 			<xsd:sequence>
+				<xsd:element name="authenticationURL" type="xsd:string" />
+				<xsd:element name="usersURL" type="xsd:string" />
 				<xsd:element name="clientId" type="xsd:string" />
 				<xsd:element name="clientSecret" type="xsd:string" />
 				<xsd:element name="tenant" type="xsd:string" />
diff --git a/src/test/java/org/lsc/plugins/connectors/msgraphapi/MsGraphApiAuthenticationTest.java b/src/test/java/org/lsc/plugins/connectors/msgraphapi/MsGraphApiAuthenticationTest.java
@@ -59,6 +59,7 @@ class MsGraphApiAuthenticationTest {
     private final static String CLIENT_ID = System.getenv("TEST_MS_GRAPH_API_CLIENT_ID");
     private final static String CLIENT_SECRET = System.getenv("TEST_MS_GRAPH_API_CLIENT_SECRET");
     private final static String TENANT = System.getenv("TEST_MS_GRAPH_API_TENANT");
+    private final static String AUTHENTICATION_URL = System.getenv("TEST_MS_GRAPH_API_AUTHENTICATION_URL");
 
     private final MsGraphApiAuthentication msGraphApiAuthentication;
 
@@ -75,24 +76,24 @@ static void setup() {
 
     @Test
     void shouldObtainValidAccessToken() throws AuthorizationException {
-        AuthenticationResponse response = msGraphApiAuthentication.authenticate(TENANT, CLIENT_ID, CLIENT_SECRET);
+        AuthenticationResponse response = msGraphApiAuthentication.authenticate(TENANT, AUTHENTICATION_URL, CLIENT_ID, CLIENT_SECRET);
         assertThat(response.getAccessToken()).isNotBlank();
         assertThatCode(() -> JWT.decode(response.getAccessToken())).doesNotThrowAnyException();
     }
 
     @Test
     void shouldThrowIfInvalidTenant() {
-        assertThatThrownBy(() -> msGraphApiAuthentication.authenticate("NOT_A_TENANT", CLIENT_ID, CLIENT_SECRET)).isInstanceOf(AuthorizationException.class);
+        assertThatThrownBy(() -> msGraphApiAuthentication.authenticate("NOT_A_TENANT", AUTHENTICATION_URL, CLIENT_ID, CLIENT_SECRET)).isInstanceOf(AuthorizationException.class);
     }
 
     @Test
     void shouldThrowIfInvalidClientId() {
-        assertThatThrownBy(() -> msGraphApiAuthentication.authenticate(TENANT, "NOT_A_CLIENT_ID", CLIENT_SECRET)).isInstanceOf(AuthorizationException.class);
+        assertThatThrownBy(() -> msGraphApiAuthentication.authenticate(TENANT, AUTHENTICATION_URL, "NOT_A_CLIENT_ID", CLIENT_SECRET)).isInstanceOf(AuthorizationException.class);
     }
 
     @Test
     void shouldThrowIfInvalidClientSecret() {
-        assertThatThrownBy(() -> msGraphApiAuthentication.authenticate(TENANT, CLIENT_ID, "NOT_A_SECRET")).isInstanceOf(AuthorizationException.class);
+        assertThatThrownBy(() -> msGraphApiAuthentication.authenticate(TENANT, AUTHENTICATION_URL, CLIENT_ID, "NOT_A_SECRET")).isInstanceOf(AuthorizationException.class);
     }
 
 }
diff --git a/src/test/java/org/lsc/plugins/connectors/msgraphapi/MsGraphApiUsersServiceTest.java b/src/test/java/org/lsc/plugins/connectors/msgraphapi/MsGraphApiUsersServiceTest.java
@@ -86,7 +86,11 @@ static void setup() throws AuthorizationException {
         String clientId = System.getenv("TEST_MS_GRAPH_API_CLIENT_ID");
         String clientSecret = System.getenv("TEST_MS_GRAPH_API_CLIENT_SECRET");
         String tenant = System.getenv("TEST_MS_GRAPH_API_TENANT");
+        String authenticationURL = System.getenv("TEST_MS_GRAPH_API_AUTHENTICATION_URL");
+        String usersURL = System.getenv("TEST_MS_GRAPH_API_USERS_URL");
 
+        assumeTrue(StringUtils.isNotBlank(authenticationURL));
+        assumeTrue(StringUtils.isNotBlank(usersURL));
         assumeTrue(StringUtils.isNotBlank(clientId));
         assumeTrue(StringUtils.isNotBlank(clientSecret));
         assumeTrue(StringUtils.isNotBlank(tenant));
@@ -103,6 +107,8 @@ static void setup() throws AuthorizationException {
         when(connectionSettings.getClientId()).thenReturn(clientId);
         when(connectionSettings.getClientSecret()).thenReturn(clientSecret);
         when(connectionSettings.getTenant()).thenReturn(tenant);
+        when(connectionSettings.getAuthenticationURL()).thenReturn(authenticationURL);
+        when(connectionSettings.getUsersURL()).thenReturn(usersURL);
         when(task.getBean()).thenReturn("org.lsc.beans.SimpleBean");
         when(task.getPluginSourceService()).thenReturn(pluginSourceService);
     }

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ class MsGraphApiAuthenticationTest {`
`59`	`59`	`private final static String CLIENT_ID = System.getenv("TEST_MS_GRAPH_API_CLIENT_ID");`
`60`	`60`	`private final static String CLIENT_SECRET = System.getenv("TEST_MS_GRAPH_API_CLIENT_SECRET");`
`61`	`61`	`private final static String TENANT = System.getenv("TEST_MS_GRAPH_API_TENANT");`
	`62`	`+ private final static String AUTHENTICATION_URL = System.getenv("TEST_MS_GRAPH_API_AUTHENTICATION_URL");`
`62`	`63`
`63`	`64`	`private final MsGraphApiAuthentication msGraphApiAuthentication;`
`64`	`65`
`@@ -75,24 +76,24 @@ static void setup() {`
`75`	`76`
`76`	`77`	`@Test`
`77`	`78`	`void shouldObtainValidAccessToken() throws AuthorizationException {`
`78`		`- AuthenticationResponse response = msGraphApiAuthentication.authenticate(TENANT, CLIENT_ID, CLIENT_SECRET);`
	`79`	`+ AuthenticationResponse response = msGraphApiAuthentication.authenticate(TENANT, AUTHENTICATION_URL, CLIENT_ID, CLIENT_SECRET);`
`79`	`80`	`assertThat(response.getAccessToken()).isNotBlank();`
`80`	`81`	`assertThatCode(() -> JWT.decode(response.getAccessToken())).doesNotThrowAnyException();`
`81`	`82`	`}`
`82`	`83`
`83`	`84`	`@Test`
`84`	`85`	`void shouldThrowIfInvalidTenant() {`
`85`		`- assertThatThrownBy(() -> msGraphApiAuthentication.authenticate("NOT_A_TENANT", CLIENT_ID, CLIENT_SECRET)).isInstanceOf(AuthorizationException.class);`
	`86`	`+ assertThatThrownBy(() -> msGraphApiAuthentication.authenticate("NOT_A_TENANT", AUTHENTICATION_URL, CLIENT_ID, CLIENT_SECRET)).isInstanceOf(AuthorizationException.class);`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`@Test`
`89`	`90`	`void shouldThrowIfInvalidClientId() {`
`90`		`- assertThatThrownBy(() -> msGraphApiAuthentication.authenticate(TENANT, "NOT_A_CLIENT_ID", CLIENT_SECRET)).isInstanceOf(AuthorizationException.class);`
	`91`	`+ assertThatThrownBy(() -> msGraphApiAuthentication.authenticate(TENANT, AUTHENTICATION_URL, "NOT_A_CLIENT_ID", CLIENT_SECRET)).isInstanceOf(AuthorizationException.class);`
`91`	`92`	`}`
`92`	`93`
`93`	`94`	`@Test`
`94`	`95`	`void shouldThrowIfInvalidClientSecret() {`
`95`		`- assertThatThrownBy(() -> msGraphApiAuthentication.authenticate(TENANT, CLIENT_ID, "NOT_A_SECRET")).isInstanceOf(AuthorizationException.class);`
	`96`	`+ assertThatThrownBy(() -> msGraphApiAuthentication.authenticate(TENANT, AUTHENTICATION_URL, CLIENT_ID, "NOT_A_SECRET")).isInstanceOf(AuthorizationException.class);`
`96`	`97`	`}`
`97`	`98`
`98`	`99`	`}`