Merge pull request #101 from BingAds/v12-13-2

support AAD credentials etc

Author: Eric Urban

src/Auth/IOAuthService.php

@@ -11,5 +11,5 @@ abstract class IOAuthService
      * Implementations of this abstract method must call the authorization server with the oauthRequestParameters passed in, 
      * deserialize the response, and return back OAuth tokens.
      */
-    abstract function GetAccessTokens(OAuthRequestParameters $oauthParameters, $environment);
+    abstract function GetAccessTokens(OAuthRequestParameters $oauthParameters, $environment, $requireLiveConnect);
 }

src/Auth/LiveComOAuthService.php

@@ -27,6 +27,11 @@ abstract class OAuthAuthorization extends Authentication
      */
     public $Environment = ApiEnvironment::Production;
 
+    /** 
+     * Determines whether or not to require Live Connect instead of MS Identity in production.
+     */
+    public $RequireLiveConnect = false;
+
     public function __construct() {}
 
     /** 
@@ -81,6 +86,19 @@ public function withOAuthTokens($oauthTokens) {
      */
     public function withEnvironment($environment) {
         $this->Environment = $environment;
+        $this->RedirectUri=UriOAuthService::GetRedirectUrl($environment, $this->RequireLiveConnect);
+        return $this;
+    }
+
+    /** 
+     * Includes the require Live Connect flag. 
+     *
+     * @param string $requireLiveConnect
+     * @return OAuthAuthorization this builder
+     */
+    public function withRequireLiveConnect($requireLiveConnect) {
+        $this->RequireLiveConnect = $requireLiveConnect;
+        $this->RedirectUri=UriOAuthService::GetRedirectUrl($this->Environment, $requireLiveConnect);
         return $this;
     }
 

src/Auth/OAuthAuthorization.php

@@ -30,19 +30,6 @@ public function withState($state) {
         return $this;
     }
 
-
-    /** 
-     * Includes the environment. 
-     *
-     * @param string $environment
-     * @return OAuthDesktopMobileImplicitGrant this builder
-     */
-    public function withEnvironment($environment) {
-        $this->Environment = $environment;
-        $this->RedirectUri=LiveComOAuthService::GetRedirectUrl($environment);
-        return $this;
-    }
-
     /** 
      * Gets the Microsoft Account authorization endpoint where the user should be navigated to give their consent.
      */
@@ -54,7 +41,7 @@ public function GetAuthorizationEndpoint(){
             ->withRedirectUri($this->RedirectUri)
             ->withState($this->State);
 
-        return LiveComOAuthService::GetAuthorizationEndpoint($oauthUrlParameters, $this->Environment);
+        return UriOAuthService::GetAuthorizationEndpoint($oauthUrlParameters, $this->Environment, $this->RequireLiveConnect);
     }
 
     /** 

src/Auth/OAuthDesktopMobileImplicitGrant.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Microsoft\BingAds\Auth;
+
+/** 
+ * Represents the endpoint type to use for OAuth.
+ */
+final class OAuthEndpointType
+{
+    /** 
+     * Production for MS Identity V2 
+     */
+    const ProductionMSIdentityV2 = 'ProductionMSIdentityV2';
+    
+    /** 
+     * Production for Live Connect
+     */
+    const ProductionLiveConnect = 'ProductionLiveConnect';
+
+    /** 
+     * Sandbox for Live Connect
+     */
+    const SandboxLiveConnect = 'SandboxLiveConnect';
+}

src/Auth/OAuthEndpointType.php

@@ -20,7 +20,7 @@ abstract class OAuthWithAuthorizationCode extends OAuthAuthorization {
     public function __construct() {
         parent::__construct();
 
-        $this->oauthService = new LiveComOAuthService(null);
+        $this->oauthService = new UriOAuthService(null);
     }    
 
     /** 
@@ -34,18 +34,6 @@ public function withClientSecret($clientSecret) {
         return $this;
     }
 
-    /** 
-     * Includes the environment. 
-     *
-     * @param string $environment
-     * @return OAuthWithAuthorizationCode this builder
-     */
-    public function withEnvironment($environment) {
-        $this->Environment = $environment;
-        $this->RedirectUri=LiveComOAuthService::GetRedirectUrl($environment);
-        return $this;
-    }
-
     /** 
      * Includes the state. 
      *
@@ -67,7 +55,7 @@ public function GetAuthorizationEndpoint(){
         $oauthUrlParameters->RedirectUri = $this->RedirectUri;
         $oauthUrlParameters->State = $this->State;
 
-        return LiveComOAuthService::GetAuthorizationEndpoint($oauthUrlParameters, $this->Environment);
+        return UriOAuthService::GetAuthorizationEndpoint($oauthUrlParameters, $this->Environment, $this->RequireLiveConnect);
     }
 
     /** 
@@ -109,7 +97,7 @@ public function RequestOAuthTokensByResponseUri($responseUri)
             ->withGrantParamName("code")
             ->withGrantValue($code);
 
-        $this->OAuthTokens = $this->oauthService->GetAccessTokens($oauthRequestParameters, $this->Environment); 
+        $this->OAuthTokens = $this->oauthService->GetAccessTokens($oauthRequestParameters, $this->Environment, $this->RequireLiveConnect); 
 
         return $this->OAuthTokens; 
     }
@@ -128,12 +116,11 @@ public function RequestOAuthTokensByRefreshToken($refreshToken)
         $oauthRequestParameters = (new OAuthRequestParameters())
             ->withClientId($this->ClientId)
             ->withClientSecret($this->ClientSecret)
-            ->withRedirectUri($this->RedirectUri)
             ->withGrantType("refresh_token")
             ->withGrantParamName("refresh_token")
             ->withGrantValue($refreshToken);
 
-        $this->OAuthTokens = $this->oauthService->GetAccessTokens($oauthRequestParameters, $this->Environment); 
+        $this->OAuthTokens = $this->oauthService->GetAccessTokens($oauthRequestParameters, $this->Environment, $this->RequireLiveConnect); 
 
         return $this->OAuthTokens; 
     }