From ef8e37804b6390400bbae2edbc0bc7d834626ae8 Mon Sep 17 00:00:00 2001
From: Ray Tsang <rayt@google.com>
Date: Fri, 22 Aug 2014 15:51:04 -0400
Subject: [PATCH] Preparing src for release 5.5.1

---
 ChangeLog.md                                  |   6 +
 .../Auth/CreateAdWordsUserWithoutIniFile.php  |   4 +-
 .../Auth/GetRefreshTokenWithoutIniFile.php    |   3 +-
 .../AdvancedOperations/AddAdCustomizer.php    | 354 ++++++++++++++++++
 .../Api/Ads/AdWords/Lib/AdWordsSoapClient.php |   5 +-
 .../Api/Ads/AdWords/Lib/AdWordsUser.php       | 108 +-----
 .../Api/Ads/AdWords/Util/ReportUtils.php      |  11 +-
 src/Google/Api/Ads/AdWords/auth.ini           |  10 -
 src/Google/Api/Ads/AdWords/settings.ini       |   5 -
 src/Google/Api/Ads/Common/Lib/build.ini       |   2 +-
 .../Api/Ads/AdWords/Lib/AdWordsUserTest.php   |  19 +-
 11 files changed, 383 insertions(+), 144 deletions(-)
 create mode 100755 examples/AdWords/v201406/AdvancedOperations/AddAdCustomizer.php

diff --git a/ChangeLog.md b/ChangeLog.md
index 447a2a1a4..1906ffad3 100755
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,9 @@
+### 5.5.1
+
+AdWords:
+  - Removed ClientLogin support.
+  - Added example for using ad customizers.
+
 ### 5.5.0
 
 DFP:
diff --git a/examples/AdWords/Auth/CreateAdWordsUserWithoutIniFile.php b/examples/AdWords/Auth/CreateAdWordsUserWithoutIniFile.php
index 43189f2ae..74b0333f5 100755
--- a/examples/AdWords/Auth/CreateAdWordsUserWithoutIniFile.php
+++ b/examples/AdWords/Auth/CreateAdWordsUserWithoutIniFile.php
@@ -61,8 +61,8 @@ function RunExample(AdWordsUser $user) {
   );
 
   // See AdWordsUser constructor
-  $user = new AdWordsUser(NULL, NULL, NULL, DEVELOPER_TOKEN, NULL, USER_AGENT,
-      NULL, NULL, NULL, $oauth2Info);
+  $user = new AdWordsUser(NULL, DEVELOPER_TOKEN, NULL, USER_AGENT, NULL, NULL,
+      $oauth2Info);
 
   $user->LogAll();
 
diff --git a/examples/AdWords/Auth/GetRefreshTokenWithoutIniFile.php b/examples/AdWords/Auth/GetRefreshTokenWithoutIniFile.php
index 6c8815224..1cef20b9a 100755
--- a/examples/AdWords/Auth/GetRefreshTokenWithoutIniFile.php
+++ b/examples/AdWords/Auth/GetRefreshTokenWithoutIniFile.php
@@ -92,8 +92,7 @@ function GetOAuth2Credential(AdWordsUser $user) {
   );
 
   // See AdWordsUser constructor
-  $user = new AdWordsUser(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-      NULL, $oauth2Info);
+  $user = new AdWordsUser(NULL, NULL, NULL, NULL, NULL, NULL, $oauth2Info);
 
   $user->LogAll();
 
diff --git a/examples/AdWords/v201406/AdvancedOperations/AddAdCustomizer.php b/examples/AdWords/v201406/AdvancedOperations/AddAdCustomizer.php
new file mode 100755
index 000000000..d944117f6
--- /dev/null
+++ b/examples/AdWords/v201406/AdvancedOperations/AddAdCustomizer.php
@@ -0,0 +1,354 @@
+<?php
+/**
+ * This example adds an ad customizer feed and associates it with the customer.
+ * Then it adds an ad that uses the feed to populate dynamic data.
+ *
+ * Tags: CustomerFeedService.mutate
+ * Tags: FeedItemService.mutate
+ * Tags: FeedMappingService.mutate
+ * Tags: FeedService.mutate
+ * Tags: AdGroupAdService.mutate
+ * Restriction: adwords-only
+ *
+ * Copyright 2014, Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @package    GoogleApiAdsAdWords
+ * @subpackage v201406
+ * @category   WebServices
+ * @copyright  2014, Google Inc. All Rights Reserved.
+ * @license    http://www.apache.org/licenses/LICENSE-2.0 Apache License,
+ *             Version 2.0
+ * @author     Ray Tsang
+ */
+
+// Include the initialization file
+require_once dirname(dirname(__FILE__)) . '/init.php';
+
+// Enter parameters required by the code example.
+$adGroupIds = array('INSERT_AD_GROUP_ID_HERE', 'INSERT_AD_GROUP_ID_HERE');
+
+// See the Placeholder reference page for a list of all the placeholder types
+// and fields.
+// https://developers.google.com/adwords/api/docs/appendix/placeholders.html
+define('PLACEHOLDER_AD_CUSTOMIZER', 10);
+define('PLACEHOLDER_FIELD_PRICE', 3);
+define('PLACEHOLDER_FIELD_DATE', 4);
+define('PLACEHOLDER_FIELD_STRING', 5);
+
+/**
+ * Runs the example.
+ *
+ * @param AdWordsUser $user the user to run the example with
+ * @param array $adGroupIds the IDs of the ad groups to target with the FeedItem
+ */
+function AddAdCustomizerExample(AdWordsUser $user, $adGroupIds) {
+  // Create a customizer feed. One feed per account can be used for all ads.
+  $dataHolder = CreateCustomizerFeed($user);
+
+  // Create a feed mapping to map the fields with customizer IDs.
+  CreateFeedMapping($user, $dataHolder);
+
+  // Add feed items containing the values we'd like to place in ads.
+  CreateCustomizerFeedItems($user, $adGroupIds, $dataHolder);
+
+  // Create a customer (account-level) feed with a matching function that
+  // determines when to use this feed. For this case we use the "IDENTITY"
+  // matching function that is always true just to associate this feed with the
+  // customer. The targeting is done within the feed items using the
+  // campaignTargeting, adGroupTargeting, or keywordTargeting attributes.
+  CreateCustomerFeed($user, $dataHolder);
+
+  // All set! We can now create ads with customizations.
+  CreateAdsWithCustomizations($user, $adGroupIds);
+}
+
+/**
+ * Creates a new Feed for ad customizers.
+ *
+ * @param AdWordsUser $user the user to run the example with
+ */
+function CreateCustomizerFeed(AdWordsUser $user) {
+  // Map that holds IDs associated to the feeds metadata.
+  $dataHolder = array();
+
+  // Get the FeedService, which loads the required classes.
+  $feedService = $user->GetService('FeedService', ADWORDS_VERSION);
+
+  // Create attributes.
+  $nameAttribute = new FeedAttribute();
+  $nameAttribute->type = 'STRING';
+  $nameAttribute->name = 'Name';
+  $priceAttribute = new FeedAttribute();
+  $priceAttribute->type = 'STRING';
+  $priceAttribute->name = 'Price';
+  $dateAttribute = new FeedAttribute();
+  $dateAttribute->type = 'DATE_TIME';
+  $dateAttribute->name = 'Date';
+
+  // Create the feed.
+  $customizerFeed = new Feed();
+  $customizerFeed->name = 'CustomizerFeed';
+  $customizerFeed->attributes = array($nameAttribute, $priceAttribute,
+      $dateAttribute);
+  $customizerFeed->origin = 'USER';
+
+  // Create operation.
+  $operation = new FeedOperation();
+  $operation->operator = 'ADD';
+  $operation->operand = $customizerFeed;
+
+  $operations = array($operation);
+
+  // Add the feed.
+  $result = $feedService->mutate($operations);
+
+  $savedFeed = $result->value[0];
+  $dataHolder['feedId'] = $savedFeed->id;
+  $savedAttributes = $savedFeed->attributes;
+  $dataHolder['nameFeedAttributeId'] = $savedAttributes[0]->id;
+  $dataHolder['priceFeedAttributeId'] = $savedAttributes[1]->id;
+  $dataHolder['dateFeedAttributeId'] = $savedAttributes[2]->id;
+
+  printf('Feed with name "%s" and ID %d with nameAttributeId %d'
+      . ", priceAttributeId %d, and dateAttribute %d were created.\n",
+      $savedFeed->name,
+      $savedFeed->id,
+      $savedAttributes[0]->id,
+      $savedAttributes[1]->id,
+      $savedAttributes[2]->id);
+
+  return $dataHolder;
+}
+
+/**
+ * Creates a new FeedMapping that indicates how the data holder's feed should
+ * be interpreted in the context of ad customizers.
+ *
+ * @param AdWordsUser $user the user to run the example with
+ * @param array $dataHolder IDs associated to created customizer feed metadata
+ */
+function CreateFeedMapping($user, $dataHolder) {
+  // Get the FeedMappingService, which loads the required classes.
+  $feedMappingService = $user->GetService('FeedMappingService',
+      ADWORDS_VERSION);
+
+  // Map the FeedAttributeIds to the fieldId constants.
+  $nameFieldMapping = new AttributeFieldMapping();
+  $nameFieldMapping->feedAttributeId =
+      $dataHolder['nameFeedAttributeId'];
+  $nameFieldMapping->fieldId = PLACEHOLDER_FIELD_STRING;
+  $priceFieldMapping = new AttributeFieldMapping();
+  $priceFieldMapping->feedAttributeId =
+      $dataHolder['priceFeedAttributeId'];
+  $priceFieldMapping->fieldId = PLACEHOLDER_FIELD_PRICE;
+  $dateFieldMapping = new AttributeFieldMapping();
+  $dateFieldMapping->feedAttributeId = $dataHolder['dateFeedAttributeId'];
+  $dateFieldMapping->fieldId = PLACEHOLDER_FIELD_DATE;
+
+  // Create the FieldMapping and operation.
+  $feedMapping = new FeedMapping();
+  $feedMapping->placeholderType = PLACEHOLDER_AD_CUSTOMIZER;
+  $feedMapping->feedId = $dataHolder['feedId'];
+  $feedMapping->attributeFieldMappings =
+      array($nameFieldMapping, $priceFieldMapping, $dateFieldMapping);
+  $operation = new FeedMappingOperation();
+  $operation->operand = $feedMapping;
+  $operation->operator = 'ADD';
+
+  $operations = array($operation);
+
+  // Save the field mapping.
+  $result = $feedMappingService->mutate($operations);
+  foreach ($result->value as $feedMapping) {
+    printf('Feed mapping with ID %d and placeholderType %d was saved for ' .
+        "feed with ID %d.\n",
+        $feedMapping->feedMappingId,
+        $feedMapping->placeholderType,
+        $feedMapping->feedId);
+  }
+}
+
+/**
+ * Creates FeedItems with the values to use in ad customizations for each ad
+ * group in adGroupIds
+ *
+ * @param AdWordsUser $user the user to run the example with
+ * @param array $adGroupIds the IDs of the ad groups to target with the FeedItem
+ * @param array $dataHolder IDs associated to created customizer feed metadata
+ */
+function CreateCustomizerFeedItems(AdWordsUser $user, $adGroupIds,
+    $dataHolder) {
+  // Get the FeedItemService, which loads the required classes.
+  $feedItemService = $user->GetService('FeedItemService', ADWORDS_VERSION);
+
+  $operations = array();
+
+  // Create operations to add FeedItems.
+  $operations[] = CreateFeedItemAddOperation('Mars', '$1234.56',
+      '20140601 000000', $adGroupIds[0], $dataHolder);
+  $operations[] = CreateFeedItemAddOperation('Venus', '$1450.00',
+      '20140615 120000', $adGroupIds[1], $dataHolder);
+
+  $result = $feedItemService->mutate($operations);
+
+  foreach ($result->value as $feedItem) {
+    printf("FeedItem with feedItemId %d was added.\n", $feedItem->feedItemId);
+  }
+
+  return $dataHolder;
+}
+
+/**
+ * Creates a FeedItemOperation that will create a FeedItem with the specified
+ * values and ad group target when sent to FeedItemService.mutate.
+ *
+ * @param string $name the value for the name attribute of the FeedItem
+ * @param string $price the value for the price attribute of the FeedItem
+ * @param string $date the value for the date attribute of the FeedItem
+ * @param string $adGroupId the ID of the ad group to target with the FeedItem
+ * @param array $dataHolder IDs associated to created customizer feed metadata
+ */
+function CreateFeedItemAddOperation($name, $price, $date, $adGroupId,
+    $dataHolder) {
+  // Create the FeedItemAttributeValues for our text values.
+  $nameAttributeValue = new FeedItemAttributeValue();
+  $nameAttributeValue->feedAttributeId =
+      $dataHolder['nameFeedAttributeId'];
+  $nameAttributeValue->stringValue = $name;
+  $priceAttributeValue = new FeedItemAttributeValue();
+  $priceAttributeValue->feedAttributeId =
+      $dataHolder['priceFeedAttributeId'];
+  $priceAttributeValue->stringValue = $price;
+  $dateAttributeValue = new FeedItemAttributeValue();
+  $dateAttributeValue->feedAttributeId = $dataHolder['dateFeedAttributeId'];
+  $dateAttributeValue->stringValue = $date;
+
+  // Create the feed item and operation.
+  $item = new FeedItem();
+  $item->feedId = $dataHolder['feedId'];
+  $item->attributeValues =
+      array($nameAttributeValue, $priceAttributeValue, $dateAttributeValue);
+
+  $adGroupTargeting = new FeedItemAdGroupTargeting();
+  $adGroupTargeting->TargetingAdGroupId = $adGroupId;
+  $item->adGroupTargeting = $adGroupTargeting;
+
+  $operation = new FeedItemOperation();
+  $operation->operand = $item;
+  $operation->operator = 'ADD';
+  return $operation;
+}
+
+/**
+ * Creates a CustomerFeed that will associate the Feed with the ad customizers
+ * placeholder type.
+ *
+ * @param AdWordsUser $user the user to run the example with
+ * @param map $dataHolder IDs associated to created customizer feed metadata
+ */
+function CreateCustomerFeed($user, $dataHolder) {
+  // Get the CustomerFeedService, which loads the required classes.
+  $customerFeedService = $user->GetService('CustomerFeedService',
+      ADWORDS_VERSION);
+
+  $customerFeed = new CustomerFeed();
+  $customerFeed->feedId = $dataHolder['feedId'];
+  $customerFeed->placeholderTypes = array(PLACEHOLDER_AD_CUSTOMIZER);
+
+  // Create a matching function that will always evaluate to true.
+  $customerMatchingFunction = new FeedFunction();
+  $constOperand = new ConstantOperand();
+  $constOperand->type = 'BOOLEAN';
+  $constOperand->booleanValue = 'TRUE';
+  $customerMatchingFunction->lhsOperand = array($constOperand);
+  $customerMatchingFunction->operator = 'IDENTITY';
+  $customerFeed->matchingFunction = $customerMatchingFunction;
+
+  // Create an operation to add the customer feed.
+  $customerFeedOperation = new CustomerFeedOperation();
+  $customerFeedOperation->operand = $customerFeed;
+  $customerFeedOperation->operator = 'ADD';
+
+  $operations = array($customerFeedOperation);
+
+  $result = $customerFeedService->mutate($operations);
+  foreach ($result->value as $savedCustomerFeed) {
+    printf("Created a new CustomerFeed that's associated with feed ID %d.\n",
+        $savedCustomerFeed->feedId);
+  }
+}
+
+/**
+ * Creates text ads that use ad customizations for the specified ad group IDs.
+ *
+ * @param AdWordsUser $user the user to run the example with
+ * @param array $adGroupIds the IDs of the ad groups to target with the FeedItem
+ */
+function CreateAdsWithCustomizations(AdWordsUser $user, $adGroupIds) {
+  // Get the service, which loads the required classes.
+  $adGroupAdService = $user->GetService('AdGroupAdService', ADWORDS_VERSION);
+
+  $textAd = new TextAd();
+  $textAd->headline = 'Luxury Cruise to {=CustomizerFeed.Name}';
+  $textAd->description1 = 'Only {=CustomizerFeed.Price}';
+  $textAd->description2 = 'Offer ends in {=countdown(CustomizerFeed.Date)}!';
+  $textAd->url = 'http://www.example.com';
+  $textAd->displayUrl = 'www.example.com';
+
+  // We add the same ad to both ad groups. When they serve, they will show
+  // different values, since they match different feed items.
+  $operations = array();
+
+  foreach ($adGroupIds as $adGroupId) {
+    // Create ad group ad.
+    $adGroupAd = new AdGroupAd();
+    $adGroupAd->adGroupId = $adGroupId;
+    $adGroupAd->ad = $textAd;
+
+    // Create operation.
+    $operation = new AdGroupAdOperation();
+    $operation->operand = $adGroupAd;
+    $operation->operator = 'ADD';
+    $operations[] = $operation;
+  }
+
+  // Make the mutate request.
+  $result = $adGroupAdService->mutate($operations);
+
+  // Display results.
+  foreach ($result->value as $adGroupAd) {
+    printf("Text ad with headline '%s' and ID '%s' was added.\n",
+        $adGroupAd->ad->headline, $adGroupAd->ad->id);
+  }
+}
+
+// Don't run the example if the file is being included.
+if (__FILE__ != realpath($_SERVER['PHP_SELF'])) {
+  return;
+}
+
+try {
+  // Get AdWordsUser from credentials in "../auth.ini"
+  // relative to the AdWordsUser.php file's directory.
+  $user = new AdWordsUser();
+
+  // Log every SOAP XML request and response.
+  $user->LogAll();
+
+  // Run the example.
+  AddAdCustomizerExample($user, $adGroupIds);
+} catch (Exception $e) {
+  printf("An error has occurred: %s\n", $e->getMessage());
+}
diff --git a/src/Google/Api/Ads/AdWords/Lib/AdWordsSoapClient.php b/src/Google/Api/Ads/AdWords/Lib/AdWordsSoapClient.php
index 4ab41c96e..910823460 100755
--- a/src/Google/Api/Ads/AdWords/Lib/AdWordsSoapClient.php
+++ b/src/Google/Api/Ads/AdWords/Lib/AdWordsSoapClient.php
@@ -190,7 +190,6 @@ public function GetLastUnits() {
   /**
    * Generates the request info message containing:
    * <ul>
-   * <li>email</li>
    * <li>effectiveUser</li>
    * <li>service</li>
    * <li>method</li>
@@ -207,8 +206,8 @@ public function GetLastUnits() {
    * @access protected
    */
   protected function GenerateRequestInfoMessage() {
-    return 'email=' . $this->GetEmail() . ' effectiveUser='
-        . $this->GetEffectiveUser() . ' service=' . $this->GetServiceName()
+    return 'effectiveUser=' . $this->GetEffectiveUser()
+        . ' service=' . $this->GetServiceName()
         . ' method=' . $this->GetLastMethodName() . ' operators='
         . $this->GetLastOperators() . ' responseTime='
         . $this->GetLastResponseTime() . ' requestId='
diff --git a/src/Google/Api/Ads/AdWords/Lib/AdWordsUser.php b/src/Google/Api/Ads/AdWords/Lib/AdWordsUser.php
index 1a7c85caf..2f2799bdd 100755
--- a/src/Google/Api/Ads/AdWords/Lib/AdWordsUser.php
+++ b/src/Google/Api/Ads/AdWords/Lib/AdWordsUser.php
@@ -49,7 +49,6 @@ class AdWordsUser extends AdsUser {
 
   const OAUTH2_SCOPE = 'https://www.googleapis.com/auth/adwords';
   const OAUTH2_HANDLER_CLASS = 'SimpleOAuth2Handler';
-  const FINAL_CLIENT_LOGIN_VERSION = "v201309";
 
   /**
    * The name of the SOAP header that represents the user agent making API
@@ -66,8 +65,6 @@ class AdWordsUser extends AdsUser {
   private $defaultVersion;
   private $defaultServer;
 
-  private $email;
-  private $password;
   private $userAgent;
 
   /**
@@ -89,10 +86,6 @@ class AdWordsUser extends AdsUser {
    *     authentication INI or relative to the current directory (cwd). If
    *     <var>NULL</var>, the default authentication INI file will attempt to be
    *     loaded
-   * @param string $email the email of the user (required header). Will
-   *     overwrite the email entry loaded from any INI file
-   * @param string $password the password of the user (required header). Will
-   *     overwrite the password entry loaded from any INI file
    * @param string $developerToken the developer token (required header). Will
    *     overwrite the developer token entry loaded from any INI file
    * @param string $applicationToken the application token (required header).
@@ -105,13 +98,12 @@ class AdWordsUser extends AdsUser {
    *     loaded from any INI file
    * @param string $settingsIniPath the path to the settings INI file. If
    *     <var>NULL</var>, the default settings INI file will be loaded
-   * @param string $authToken the authToken to use for requests
    * @param array $oauth2Info the OAuth 2.0 information to use for requests
    */
-  public function __construct($authenticationIniPath = NULL, $email = NULL,
-      $password = NULL, $developerToken = NULL, $applicationToken = NULL,
+  public function __construct($authenticationIniPath = NULL,
+      $developerToken = NULL, $applicationToken = NULL,
       $userAgent = NULL, $clientCustomerId = NULL, $settingsIniPath = NULL,
-      $authToken = NULL, $oauth2Info = NULL) {
+      $oauth2Info = NULL) {
     parent::__construct();
 
     $buildIniAw = parse_ini_file(dirname(__FILE__) . '/build.ini',
@@ -135,9 +127,6 @@ public function __construct($authenticationIniPath = NULL, $email = NULL,
           parse_ini_file(dirname(__FILE__) . '/../auth.ini', TRUE);
     }
 
-    $email = $this->GetAuthVarValue($email, 'email', $authenticationIni);
-    $password = $this->GetAuthVarValue($password, 'password',
-        $authenticationIni);
     $developerToken = $this->GetAuthVarValue($developerToken, 'developerToken',
         $authenticationIni);
     $applicationToken = $this->GetAuthVarValue($applicationToken,
@@ -146,8 +135,6 @@ public function __construct($authenticationIniPath = NULL, $email = NULL,
         self::USER_AGENT_HEADER_NAME, $authenticationIni);
     $clientCustomerId = $this->GetAuthVarValue($clientCustomerId,
         'clientCustomerId', $authenticationIni);
-    $authToken = $this->GetAuthVarValue($authToken, 'authToken',
-        $authenticationIni);
     $oauth2Info = $this->GetAuthVarValue($oauth2Info, 'OAUTH2',
         $authenticationIni);
 
@@ -158,9 +145,6 @@ public function __construct($authenticationIniPath = NULL, $email = NULL,
           . ' "clientCustomerId", please use that instead.');
     }
 
-    $this->SetEmail($email);
-    $this->SetPassword($password);
-    $this->SetAuthToken($authToken);
     $this->SetOAuth2Info($oauth2Info);
     $this->SetUserAgent($userAgent);
     $this->SetClientLibraryUserAgent($userAgent);
@@ -249,9 +233,6 @@ public function GetService($serviceName, $version = NULL, $server = NULL,
         $validateOnly, $partialFailure);
     }
 
-    DeprecationUtils::CheckUsingClientLoginWithUnsupportedVersion($this,
-        self::FINAL_CLIENT_LOGIN_VERSION, $version);
-
     return parent::GetServiceSoapClient($serviceName, $serviceFactory);
   }
 
@@ -271,42 +252,6 @@ public function LoadService($serviceName, $version = NULL) {
     $serviceFactory->DoRequireOnce($serviceName);
   }
 
-  /**
-   * Regenerates the authentication token and sets it for this user.
-   * @param string $server the server to retrieve the token from
-   * @return string the newly generated auth token
-   */
-  public function RegenerateAuthToken($server = NULL) {
-    if (!isset($server)) {
-      $server = $this->GetAuthServer();
-    }
-    $authTokenClient = new AuthToken($this->email, $this->password, 'adwords',
-        $this->GetClientLibraryUserAgent(), 'GOOGLE', $server);
-    $authToken = $authTokenClient->GetAuthToken();
-    $this->SetAuthToken($authToken);
-    return $authToken;
-  }
-
-  /**
-   * Gets the authentication token.
-   * @return string the auth token
-   */
-  public function GetAuthToken() {
-    $authToken = $this->GetHeaderValue('authToken');
-    if (!isset($authToken) && isset($this->email) && isset($this->password)) {
-      $authToken = $this->RegenerateAuthToken();
-    }
-    return $authToken;
-  }
-
-  /**
-   * Sets the authentication token.
-   * @param string $authToken the auth token to set
-   */
-  public function SetAuthToken($authToken) {
-    $this->SetHeaderValue('authToken', $authToken);
-  }
-
   /**
    * Gets the developer token for this user.
    * @return string the developer token
@@ -401,38 +346,6 @@ public function GetClientLibraryNameAndVersion() {
     return array($this->libName, $this->libVersion);
   }
 
-  /**
-   * Gets the email address of the user login.
-   * @return string the user login email
-   */
-  public function GetEmail() {
-    return $this->email;
-  }
-
-  /**
-   * Sets the email address of the user login.
-   * @param string $email the user login email
-   */
-  public function SetEmail($email) {
-    $this->email = $email;
-  }
-
-  /**
-   * Gets the password for this user.
-   * @return string the password for this user
-   */
-  public function GetPassword() {
-    return $this->password;
-  }
-
-  /**
-   * Sets the password for this user.
-   * @param string $password the password for this user
-   */
-  public function SetPassword($password) {
-    $this->password = $password;
-  }
-
   /**
    * Validates the user and throws a validation error if there are any errors.
    * @throws ValidationException if there are any validation errors
@@ -440,18 +353,9 @@ public function SetPassword($password) {
   public function ValidateUser() {
     if ($this->GetOAuth2Info() !== NULL) {
       parent::ValidateOAuth2Info();
-    } else if ($this->GetAuthToken() === NULL) {
-      if (!isset($this->email)) {
-        throw new ValidationException('email', NULL,
-            'email is required and cannot be NULL.');
-      }
-
-      if (!isset($this->password)) {
-        throw new ValidationException('password', NULL,
-            'password is required and cannot be NULL.');
-      }
-      // Generate an authToken.
-      $this->RegenerateAuthToken();
+    } else {
+      throw new ValidationException('OAuth2Info', NULL,
+          'OAuth 2.0 configuration is required.');
     }
 
     if ($this->GetUserAgent() === NULL
diff --git a/src/Google/Api/Ads/AdWords/Util/ReportUtils.php b/src/Google/Api/Ads/AdWords/Util/ReportUtils.php
index 2389f573f..36d28c01f 100755
--- a/src/Google/Api/Ads/AdWords/Util/ReportUtils.php
+++ b/src/Google/Api/Ads/AdWords/Util/ReportUtils.php
@@ -314,26 +314,19 @@ private static function GetHeaders($user, $url, array $options = NULL) {
       $user->SetOAuth2Info($oAuth2Info);
       $authHeader = $oAuth2Handler->FormatCredentialsForHeader($oAuth2Info);
     } else {
-      DeprecationUtils::CheckUsingClientLoginWithUnsupportedVersion($user,
-        AdWordsUser::FINAL_CLIENT_LOGIN_VERSION, $version);
-      $authHeader = sprintf(self::CLIENT_LOGIN_FORMAT, $user->GetAuthToken());
+      throw new ServiceException('OAuth 2.0 authentication is required.');
     }
     $headers['Authorization'] = $authHeader;
 
     // Developer token.
     $headers['developerToken'] = $user->GetDeveloperToken();
     // Target client.
-    $email = $user->GetEmail();
     $clientCustomerId = $user->GetClientCustomerId();
     if (isset($clientCustomerId)) {
       $headers['clientCustomerId'] = $clientCustomerId;
     } else {
-      if ($version < 'v201109' && isset($email)) {
-        $headers['clientEmail'] = $email;
-      } else {
-          throw new ReportDownloadException('The client customer ID must be '
+      throw new ReportDownloadException('The client customer ID must be '
           . 'specified for report downloads.');
-      }
     }
     // Flags.
     if (isset($options['returnMoneyInMicros'])) {
diff --git a/src/Google/Api/Ads/AdWords/auth.ini b/src/Google/Api/Ads/AdWords/auth.ini
index 6fc472ebd..4bd4a1232 100755
--- a/src/Google/Api/Ads/AdWords/auth.ini
+++ b/src/Google/Api/Ads/AdWords/auth.ini
@@ -23,13 +23,3 @@ client_secret = "INSERT_OAUTH2_CLIENT_SECRET_HERE"
 ; If you already have a refresh token, enter it below. Otherwise run
 ; GetRefreshToken.php.
 refresh_token = "INSERT_OAUTH2_REFRESH_TOKEN_HERE"
-
-; (DEPRECATED) Uncomment the following to use ClientLogin.
-; For more information, see:
-; https://developers.google.com/accounts/docs/AuthForInstalledApps
-
-; email = "INSERT_EMAIL_ADDRESS_HERE"
-; password = "INSERT_PASSWORD_HERE"
-; Uncomment the following to use an existing ClientLogin AuthToken (optional).
-; authToken = "INSERT_AUTH_TOKEN_HERE"
-
diff --git a/src/Google/Api/Ads/AdWords/settings.ini b/src/Google/Api/Ads/AdWords/settings.ini
index 1f9d02355..3e9c8e4af 100755
--- a/src/Google/Api/Ads/AdWords/settings.ini
+++ b/src/Google/Api/Ads/AdWords/settings.ini
@@ -52,11 +52,6 @@ WSDL_CACHE = 0
 ; PASSWORD = "<PASSWORD>"
 
 [AUTH]
-; The server to use when making ClientLogin or OAuth2 requests.
-; This normally doesn't need to be changed from the default value
-; "https://accounts.google.com".
-; AUTH_SERVER = "<SERVER>"
-
 ; The OAuth2Handler class to use for OAuth2 flow.
 ; OAUTH2_HANDLER_CLASS = "SimpleOAuth2Handler"
 
diff --git a/src/Google/Api/Ads/Common/Lib/build.ini b/src/Google/Api/Ads/Common/Lib/build.ini
index 107da2c42..f20e3380d 100755
--- a/src/Google/Api/Ads/Common/Lib/build.ini
+++ b/src/Google/Api/Ads/Common/Lib/build.ini
@@ -1,3 +1,3 @@
-LIB_VERSION = 5.5.0
+LIB_VERSION = 5.5.1
 LIB_NAME = "Common-PHP"
 
diff --git a/tests/Google/Api/Ads/AdWords/Lib/AdWordsUserTest.php b/tests/Google/Api/Ads/AdWords/Lib/AdWordsUserTest.php
index dcfdc8f7e..0b258dddf 100755
--- a/tests/Google/Api/Ads/AdWords/Lib/AdWordsUserTest.php
+++ b/tests/Google/Api/Ads/AdWords/Lib/AdWordsUserTest.php
@@ -53,8 +53,8 @@ public function
     $COMMON_NAME = 'Common-PHP';
     $VERSION_REGEX = '\d{1,2}\.\d{1,2}\.\d{1,2}';
 
-    $user = new AdWordsUser($this->authIniFilePath, null, null, 'devToken',
-        null, $USER_AGENT, null, null, null, $this->mockOAuth2Credential);
+    $user = new AdWordsUser($this->authIniFilePath, 'devToken', null,
+        $USER_AGENT, null, null, $this->mockOAuth2Credential);
 
     // Example: "AdWordsApiPhpClient-test (AwApi-PHP/4.1.1, Common-PHP/5.0.0,
     // PHP/5.4.8)"
@@ -77,8 +77,8 @@ public function
    */
   public function
       testValidateUserWithNullUserAgentFailsWithValidationException() {
-    $user = new AdWordsUser($this->authIniFilePath, null, null, 'devToken',
-        null, null, null, null, null, $this->mockOAuth2Credential);
+    $user = new AdWordsUser($this->authIniFilePath, 'devToken', null, null,
+        null, null, $this->mockOAuth2Credential);
     $user->validateUser();
   }
 
@@ -88,8 +88,8 @@ public function
    */
   public function
       testValidateUserWithEmptyUserAgentFailsWithValidationException() {
-    $user = new AdWordsUser($this->authIniFilePath, null, null, 'devToken',
-        null, '', null, null, null, $this->mockOAuth2Credential);
+    $user = new AdWordsUser($this->authIniFilePath, 'devToken', null, '', null,
+        null, $this->mockOAuth2Credential);
     $user->validateUser();
   }
 
@@ -99,8 +99,8 @@ public function
    */
   public function
       testValidateUserWithDefaultUserAgentFailsWithValidationException() {
-    $user = new AdWordsUser($this->authIniFilePath, null, null, 'devToken',
-        null, 'INSERT_COMPANY_NAME_HERE', null, null, null,
+    $user = new AdWordsUser($this->authIniFilePath, 'devToken',
+        null, 'INSERT_COMPANY_NAME_HERE', null, null,
         $this->mockOAuth2Credential);
     $user->validateUser();
   }
@@ -118,8 +118,7 @@ public function testConstructWithClientIdFailsWithValidationException() {
     fwrite($authIniFile, 'clientId = "12345678"');
     fclose($authIniFile);
 
-    new AdWordsUser($this->authIniFilePath, null, null, null, null, null, null,
-        null);
+    new AdWordsUser($this->authIniFilePath, null, null, null, null);
   }
 }