Hard code authorization scope for all ADT instances. (Azure#17226)

* Hard code authorization scope for all ADT instances.

* Update CHANGELOG.md

* Release preparation

* Update README.md

Author: azabbasi

eng/jacoco-test-coverage/pom.xml

@@ -526,7 +526,7 @@
 	<dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-digitaltwins-core</artifactId>
-      <version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-digitaltwins-core;current} -->
+      <version>1.0.1</version> <!-- {x-version-update;com.azure:azure-digitaltwins-core;current} -->
     </dependency>
   </dependencies>
   <build>

eng/versioning/version_client.txt

@@ -56,7 +56,7 @@ com.azure:azure-data-appconfiguration;1.1.6;1.2.0-beta.1
 com.azure:azure-data-schemaregistry;1.0.0-beta.4;1.0.0-beta.5
 com.azure:azure-data-schemaregistry-avro;1.0.0-beta.4;1.0.0-beta.5
 com.azure:azure-data-tables;12.0.0-beta.2;12.0.0-beta.3
-com.azure:azure-digitaltwins-core;1.0.0;1.1.0-beta.1
+com.azure:azure-digitaltwins-core;1.0.0;1.0.1
 com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-identity;1.1.3;1.2.0-beta.3
 com.azure:azure-identity-perf;1.0.0-beta.1;1.0.0-beta.1

sdk/digitaltwins/azure-digitaltwins-core/CHANGELOG.md

@@ -1,7 +1,10 @@
 # Release History
 
-## 1.1.0-beta.1 (Unreleased)
+## 1.0.1 (2020-11-05)
 
+### Fixes and improvements
+
+- Removed logic to determine authorization scope based on digital twins instance URI.
 
 ## 1.0.0 (2020-10-30)
 

sdk/digitaltwins/azure-digitaltwins-core/README.md

@@ -18,7 +18,7 @@ For the best development experience, developers should use the official Microsof
 <dependency>
   <groupId>com.azure</groupId>
   <artifactId>azure-digitaltwins-core</artifactId>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
 </dependency>
 ```
 

sdk/digitaltwins/azure-digitaltwins-core/pom.xml

@@ -13,7 +13,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-digitaltwins-core</artifactId>
-  <version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-digitaltwins-core;current} -->
+  <version>1.0.1</version> <!-- {x-version-update;com.azure:azure-digitaltwins-core;current} -->
 
   <name>Microsoft Azure client library for Digital Twins</name>
   <description>This package contains the Microsoft Azure DigitalTwins client library.</description>

sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinsClientBuilder.java

@@ -39,8 +39,6 @@
  */
 @ServiceClientBuilder(serviceClients = {DigitalTwinsClient.class, DigitalTwinsAsyncClient.class})
 public final class DigitalTwinsClientBuilder {
-
-    private static final Pattern ADT_PUBLIC_SCOPE_VALIDATION_PATTERN = Pattern.compile("(ppe|azure)\\.net");
     private static final String[] ADT_PUBLIC_SCOPE = new String[]{"https://digitaltwins.azure.net" + "/.default"};
 
     // This is the name of the properties file in this repo that contains the default properties
@@ -124,7 +122,7 @@ private static HttpPipeline buildPipeline(TokenCredential tokenCredential,
         policies.add(new AddDatePolicy());
 
         // Add authentication policy so that each HTTP request has authorization header
-        HttpPipelinePolicy credentialPolicy = new BearerTokenAuthenticationPolicy(tokenCredential, getAuthorizationScopes(endpoint));
+        HttpPipelinePolicy credentialPolicy = new BearerTokenAuthenticationPolicy(tokenCredential, ADT_PUBLIC_SCOPE);
         policies.add(credentialPolicy);
 
         policies.addAll(additionalPolicies);
@@ -153,16 +151,6 @@ private static HttpPipeline buildPipeline(TokenCredential tokenCredential,
             .build();
     }
 
-    private static String[] getAuthorizationScopes(String endpoint) {
-        // If the endpoint is in Azure public cloud, the suffix will have "azure.net" or "ppe.net".
-        // Once ADT becomes available in other clouds, their corresponding scope has to be matched and set.
-        if (ADT_PUBLIC_SCOPE_VALIDATION_PATTERN.matcher(endpoint).find()) {
-            return ADT_PUBLIC_SCOPE;
-        }
-
-        throw new IllegalArgumentException(String.format("Azure digital twins instance endpoint %s is not valid.", endpoint));
-    }
-
     /**
      * Create a {@link DigitalTwinsClient} based on the builder settings.
      *