feat: add access token support (#673)

Co-authored-by: kakha urigashvili <kakuri@amazon.com>
alexa · Jan 8, 2021 · 9151628 · 9151628
1 parent 9522e94
commit 9151628
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 17 deletions.
diff --git a/ask-smapi-sdk/lib/smapiClientBuilder/AbstractSmapiClientBuilder.ts b/ask-smapi-sdk/lib/smapiClientBuilder/AbstractSmapiClientBuilder.ts
@@ -11,8 +11,9 @@
  * permissions and limitations under the License.
  */
 
-import { services } from 'ask-smapi-model';
-import { RefreshTokenConfig } from './authMethods/AuthMethods';
+import { runtime, services } from 'ask-smapi-model';
+import AuthenticationConfiguration = runtime.AuthenticationConfiguration;
+import { AccessTokenConfig, RefreshTokenConfig } from './authMethods/AuthMethods';
 
 /**
  * Abstract Builder class which should be implemented.
@@ -22,6 +23,7 @@ import { RefreshTokenConfig } from './authMethods/AuthMethods';
 export class SmapiClientBuilder {
 
     protected customUserAgent: string;
+    protected accessTokenConfig: AccessTokenConfig;
     protected refreshTokenConfig: RefreshTokenConfig;
 
     public withCustomUserAgent(userAgent: string): SmapiClientBuilder {
@@ -30,6 +32,12 @@ export class SmapiClientBuilder {
         return this;
     }
 
+    public withAccessTokenConfig(accessTokenConfig: AccessTokenConfig): SmapiClientBuilder {
+        this.accessTokenConfig = accessTokenConfig;
+
+        return this;
+    }
+
     public withRefreshTokenConfig(refreshTokenConfig: RefreshTokenConfig): SmapiClientBuilder {
         this.refreshTokenConfig = refreshTokenConfig;
 
@@ -39,4 +47,15 @@ export class SmapiClientBuilder {
     public client(): services.skillManagement.SkillManagementServiceClient {
         throw new Error('client function is not implemented');
     }
+
+    protected getAuthenticationConfiguration(): AuthenticationConfiguration {
+        const authenticationConfiguration: AuthenticationConfiguration = {
+            clientId: this.refreshTokenConfig ? this.refreshTokenConfig.clientId : this.accessTokenConfig.clientId,
+            clientSecret: this.refreshTokenConfig ? this.refreshTokenConfig.clientSecret : this.accessTokenConfig.clientSecret,
+            accessToken: this.accessTokenConfig ? this.accessTokenConfig.accessToken : undefined,
+            refreshToken: this.refreshTokenConfig ? this.refreshTokenConfig.refreshToken : undefined
+        };
+
+        return authenticationConfiguration;
+    }
 }
diff --git a/ask-smapi-sdk/lib/smapiClientBuilder/SmapiClientBuilder.ts b/ask-smapi-sdk/lib/smapiClientBuilder/SmapiClientBuilder.ts
@@ -31,22 +31,19 @@ export class StandardSmapiClientBuilder extends SmapiClientBuilder {
      */
     public client(): services.skillManagement.SkillManagementServiceClient {
 
-        if (this.refreshTokenConfig) {
+        if (this.refreshTokenConfig || this.accessTokenConfig) {
             const apiConfiguration: ApiConfiguration = {
                 apiClient: new DefaultApiClient(),
                 apiEndpoint: DEFAULT_API_ENDPOINT,
                 authorizationValue: null,
             };
-            const authenticationConfiguration: AuthenticationConfiguration = {
-                clientId: this.refreshTokenConfig.clientId,
-                clientSecret: this.refreshTokenConfig.clientSecret,
-                refreshToken: this.refreshTokenConfig.refreshToken,
-            };
+
+            const authenticationConfiguration: AuthenticationConfiguration = this.getAuthenticationConfiguration();
 
             return new services.skillManagement.SkillManagementServiceClient(apiConfiguration, authenticationConfiguration, this.customUserAgent);
         }
 
-        throw new Error('Please provide refreshToken Config to build smapi client');
+        throw new Error('Please provide accessToken or refreshToken Config to build smapi client');
     }
 }
 
@@ -87,22 +84,18 @@ export class CustomSmapiClientBuilder extends StandardSmapiClientBuilder {
             this.apiClient = new DefaultApiClient();
         }
 
-        if (this.refreshTokenConfig) {
+        if (this.refreshTokenConfig || this.accessTokenConfig) {
             const apiConfiguration: ApiConfiguration = {
                 apiClient: this.apiClient,
                 apiEndpoint: this.apiEndpoint,
                 authorizationValue: null,
             };
-            const authenticationConfiguration: AuthenticationConfiguration = {
-                clientId: this.refreshTokenConfig.clientId,
-                clientSecret: this.refreshTokenConfig.clientSecret,
-                refreshToken: this.refreshTokenConfig.refreshToken,
-                authEndpoint: this.authEndpoint,
-            };
+            const authenticationConfiguration: AuthenticationConfiguration = this.getAuthenticationConfiguration();
+            authenticationConfiguration.authEndpoint = this.authEndpoint;
 
             return new services.skillManagement.SkillManagementServiceClient(apiConfiguration, authenticationConfiguration, this.customUserAgent);
         }
 
-        throw new Error('Please provide refreshToken Config to build smapi client');
+        throw new Error('Please provide accessToken or refreshToken Config to build smapi client');
     }
 }
diff --git a/ask-smapi-sdk/lib/smapiClientBuilder/authMethods/AuthMethods.ts b/ask-smapi-sdk/lib/smapiClientBuilder/authMethods/AuthMethods.ts
@@ -16,3 +16,9 @@ export interface RefreshTokenConfig {
     clientSecret: string;
     refreshToken: string;
 }
+
+export interface AccessTokenConfig {
+    clientId: string;
+    clientSecret: string;
+    accessToken: string;
+}