[app-configuration] Remove manual instrumentation of each method for …

…syncToken and just use the policy correctly (it can handle requests _and_ responses) (#6466)
Azure · Dec 9, 2019 · f1552d7 · f1552d7
1 parent ad0bf9a
commit f1552d7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 25 deletions.
diff --git a/sdk/appconfiguration/app-configuration/src/appConfigurationClient.ts b/sdk/appconfiguration/app-configuration/src/appConfigurationClient.ts
@@ -51,7 +51,7 @@ import {
 import { tracingPolicy } from "@azure/core-http";
 import { Spanner } from "./internal/tracingHelpers";
 import { GetKeyValuesResponse, AppConfigurationOptions } from "./generated/src/models";
-import { syncTokenPolicy, SyncTokens, SyncTokenHeaderName } from './internal/synctokenpolicy';
+import { syncTokenPolicy, SyncTokens } from './internal/synctokenpolicy';
 
 const apiVersion = "1.0";
 const ConnectionStringRegex = /Endpoint=(.*);Id=(.*);Secret=(.*)/;
@@ -90,7 +90,6 @@ export interface InternalAppConfigurationClientOptions extends AppConfigurationC
 export class AppConfigurationClient {
   private client: AppConfiguration;
   private spanner: Spanner<AppConfigurationClient>;
-  private _syncTokens: SyncTokens;
 
   /**
    * Initializes a new instance of the AppConfigurationClient class.
@@ -112,17 +111,17 @@ export class AppConfigurationClient {
     options?:AppConfigurationClientOptions
   ) {
     if (isTokenCredential(tokenCredentialOrOptions)) {
-      this._syncTokens =
+      const syncTokens =
         (options && (options as InternalAppConfigurationClientOptions).syncTokens) ||
         new SyncTokens();
 
       this.client = new AppConfiguration(
         tokenCredentialOrOptions,
         apiVersion,
-        getAppConfigurationOptions(connectionStringOrEndpoint, this._syncTokens)
+        getAppConfigurationOptions(connectionStringOrEndpoint, syncTokens)
       );
     } else {
-      this._syncTokens =
+      const syncTokens =
         (tokenCredentialOrOptions &&
           (tokenCredentialOrOptions as InternalAppConfigurationClientOptions).syncTokens) ||
         new SyncTokens();
@@ -134,7 +133,7 @@ export class AppConfigurationClient {
         this.client = new AppConfiguration(
           appConfigCredential,
           apiVersion,
-          getAppConfigurationOptions(regexMatch[1], this._syncTokens)
+          getAppConfigurationOptions(regexMatch[1], syncTokens)
         );
       } else {
         throw new Error(
@@ -170,8 +169,6 @@ export class AppConfigurationClient {
         ...newOptions
       });
 
-      this._syncTokens.addSyncTokenFromHeaderValue(originalResponse._response.headers.get(SyncTokenHeaderName));
-
       return transformKeyValueResponse(originalResponse);
     });
   }
@@ -198,8 +195,6 @@ export class AppConfigurationClient {
         ...checkAndFormatIfAndIfNoneMatch(id, options)
       });
 
-      this._syncTokens.addSyncTokenFromHeaderValue(originalResponse._response.headers.get(SyncTokenHeaderName));
-
       return transformKeyValueResponseWithStatusCode(originalResponse);
     });
   }
@@ -228,8 +223,6 @@ export class AppConfigurationClient {
         ...checkAndFormatIfAndIfNoneMatch(id, options)
       });
 
-      this._syncTokens.addSyncTokenFromHeaderValue(originalResponse._response.headers.get(SyncTokenHeaderName));
-
       const response: GetConfigurationSettingResponse = transformKeyValueResponseWithStatusCode(
         originalResponse
       );
@@ -303,8 +296,6 @@ export class AppConfigurationClient {
           ...formatWildcards(newOptions)
         });
 
-        this._syncTokens.addSyncTokenFromHeaderValue(response._response.headers.get(SyncTokenHeaderName));
-
         return response;
       }
     );
@@ -323,8 +314,6 @@ export class AppConfigurationClient {
             after: extractAfterTokenFromNextLink(currentResponse.nextLink!)
           });
 
-          this._syncTokens.addSyncTokenFromHeaderValue(response._response.headers.get(SyncTokenHeaderName));
-
           return response;
         }
       );
@@ -395,8 +384,6 @@ export class AppConfigurationClient {
         ...formatWildcards(newOptions)
       });
 
-      this._syncTokens.addSyncTokenFromHeaderValue(response._response.headers.get(SyncTokenHeaderName));
-
       return response;
     });
 
@@ -451,8 +438,6 @@ export class AppConfigurationClient {
         ...checkAndFormatIfAndIfNoneMatch(configurationSetting, options)
       });
 
-      this._syncTokens.addSyncTokenFromHeaderValue(response._response.headers.get(SyncTokenHeaderName));
-
       return transformKeyValueResponse(response);
     });
   }
@@ -476,8 +461,6 @@ export class AppConfigurationClient {
           ...checkAndFormatIfAndIfNoneMatch(id, options)
         });
 
-        this._syncTokens.addSyncTokenFromHeaderValue(response._response.headers.get(SyncTokenHeaderName));
-
         return transformKeyValueResponse(response);
       } else {
         const response = await this.client.deleteLock(id.key, {
@@ -486,8 +469,6 @@ export class AppConfigurationClient {
           ...checkAndFormatIfAndIfNoneMatch(id, options)
         });
 
-        this._syncTokens.addSyncTokenFromHeaderValue(response._response.headers.get(SyncTokenHeaderName));
-
         return transformKeyValueResponse(response);
       }
     });

diff --git a/sdk/appconfiguration/app-configuration/src/internal/synctokenpolicy.ts b/sdk/appconfiguration/app-configuration/src/internal/synctokenpolicy.ts
@@ -39,7 +39,9 @@ class SyncTokenPolicy extends BaseRequestPolicy {
       webResource.headers.set(SyncTokenHeaderName, syncTokenHeaderValue);
     }
 
-    return this._nextPolicy.sendRequest(webResource);
+    const response = await this._nextPolicy.sendRequest(webResource);
+    this._syncTokens.addSyncTokenFromHeaderValue(response.headers.get(SyncTokenHeaderName));
+    return response;
   }
 }