Merge pull request #162 from leongersen/patch-1

JianyunZhao · web-flow · commit 0a48a9a14f56 · 2023-12-01T11:21:50.000+08:00
Tenant setting with msads.manage OAuth scope
diff --git a/src/Auth/UriOAuthService.php b/src/Auth/UriOAuthService.php
@@ -81,7 +81,7 @@ public function GetAccessTokens(OAuthRequestParameters $oauthRequestParameters,
         
         $OAuthTokenUrl = UriOAuthService::ENDPOINT_URLS[$endpointType]['OAuthTokenUrl'];
 
-        if ((strcmp($endpointType, OAuthEndpointType::ProductionMSIdentityV2) == 0) && (isset($tenant)))
+        if (in_array($endpointType, [OAuthEndpointType::ProductionMSIdentityV2, OAuthEndpointType::ProductionMSIdentityV2_MSScope], true) && (isset($tenant)))
         {
             $OAuthTokenUrl = str_replace("common", $tenant, $OAuthTokenUrl);
         }
@@ -152,7 +152,7 @@ public static function GetAuthorizationEndpoint(OAuthUrlParameters $parameters,
 
         $authorizationEndpointUrl = UriOAuthService::ENDPOINT_URLS[$endpointType]['AuthorizationEndpointUrl'];
         
-        if ((strcmp($endpointType, OAuthEndpointType::ProductionMSIdentityV2) == 0) && (isset($tenant)))
+        if (in_array($endpointType, [OAuthEndpointType::ProductionMSIdentityV2, OAuthEndpointType::ProductionMSIdentityV2_MSScope], true) && (isset($tenant)))
         {
             $authorizationEndpointUrl = str_replace("common", $tenant, $authorizationEndpointUrl);
         }
@@ -202,7 +202,7 @@ public static function GetAuthTokenUrl($environment, $oauthScope, $tenant) {
 
         $OAuthTokenUrl = UriOAuthService::ENDPOINT_URLS[$endpointType]['OAuthTokenUrl'];
 
-        if ((strcmp($endpointType, OAuthEndpointType::ProductionMSIdentityV2) == 0) && (isset($tenant)))
+        if (in_array($endpointType, [OAuthEndpointType::ProductionMSIdentityV2, OAuthEndpointType::ProductionMSIdentityV2_MSScope], true) && (isset($tenant)))
         {
             $OAuthTokenUrl = str_replace("common", $tenant, $OAuthTokenUrl);
         }
@@ -215,7 +215,7 @@ public static function GetAuthorizeUrl($environment, $oauthScope, $tenant) {
 
         $authorizationEndpointUrl = UriOAuthService::ENDPOINT_URLS[$endpointType]['AuthorizationEndpointUrl'];
         
-        if ((strcmp($endpointType, OAuthEndpointType::ProductionMSIdentityV2) == 0) && (isset($tenant)))
+        if (in_array($endpointType, [OAuthEndpointType::ProductionMSIdentityV2, OAuthEndpointType::ProductionMSIdentityV2_MSScope], true) && (isset($tenant)))
         {
             $authorizationEndpointUrl = str_replace("common", $tenant, $authorizationEndpointUrl);
         }

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function GetAccessTokens(OAuthRequestParameters $oauthRequestParameters,`
`81`	`81`
`82`	`82`	`$OAuthTokenUrl = UriOAuthService::ENDPOINT_URLS[$endpointType]['OAuthTokenUrl'];`
`83`	`83`
`84`		`- if ((strcmp($endpointType, OAuthEndpointType::ProductionMSIdentityV2) == 0) && (isset($tenant)))`
	`84`	`+ if (in_array($endpointType, [OAuthEndpointType::ProductionMSIdentityV2, OAuthEndpointType::ProductionMSIdentityV2_MSScope], true) && (isset($tenant)))`
`85`	`85`	`{`
`86`	`86`	`$OAuthTokenUrl = str_replace("common", $tenant, $OAuthTokenUrl);`
`87`	`87`	`}`
`@@ -152,7 +152,7 @@ public static function GetAuthorizationEndpoint(OAuthUrlParameters $parameters,`
`152`	`152`
`153`	`153`	`$authorizationEndpointUrl = UriOAuthService::ENDPOINT_URLS[$endpointType]['AuthorizationEndpointUrl'];`
`154`	`154`
`155`		`- if ((strcmp($endpointType, OAuthEndpointType::ProductionMSIdentityV2) == 0) && (isset($tenant)))`
	`155`	`+ if (in_array($endpointType, [OAuthEndpointType::ProductionMSIdentityV2, OAuthEndpointType::ProductionMSIdentityV2_MSScope], true) && (isset($tenant)))`
`156`	`156`	`{`
`157`	`157`	`$authorizationEndpointUrl = str_replace("common", $tenant, $authorizationEndpointUrl);`
`158`	`158`	`}`
`@@ -202,7 +202,7 @@ public static function GetAuthTokenUrl($environment, $oauthScope, $tenant) {`
`202`	`202`
`203`	`203`	`$OAuthTokenUrl = UriOAuthService::ENDPOINT_URLS[$endpointType]['OAuthTokenUrl'];`
`204`	`204`
`205`		`- if ((strcmp($endpointType, OAuthEndpointType::ProductionMSIdentityV2) == 0) && (isset($tenant)))`
	`205`	`+ if (in_array($endpointType, [OAuthEndpointType::ProductionMSIdentityV2, OAuthEndpointType::ProductionMSIdentityV2_MSScope], true) && (isset($tenant)))`
`206`	`206`	`{`
`207`	`207`	`$OAuthTokenUrl = str_replace("common", $tenant, $OAuthTokenUrl);`
`208`	`208`	`}`
`@@ -215,7 +215,7 @@ public static function GetAuthorizeUrl($environment, $oauthScope, $tenant) {`
`215`	`215`
`216`	`216`	`$authorizationEndpointUrl = UriOAuthService::ENDPOINT_URLS[$endpointType]['AuthorizationEndpointUrl'];`
`217`	`217`
`218`		`- if ((strcmp($endpointType, OAuthEndpointType::ProductionMSIdentityV2) == 0) && (isset($tenant)))`
	`218`	`+ if (in_array($endpointType, [OAuthEndpointType::ProductionMSIdentityV2, OAuthEndpointType::ProductionMSIdentityV2_MSScope], true) && (isset($tenant)))`
`219`	`219`	`{`
`220`	`220`	`$authorizationEndpointUrl = str_replace("common", $tenant, $authorizationEndpointUrl);`
`221`	`221`	`}`