@adobe/spacecat-shared-google-client 1.2.1 → 1.2.2

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [@adobe/spacecat-shared-google-client-v1.2.2](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-google-client-v1.2.1...@adobe/spacecat-shared-google-client-v1.2.2) (2024-08-26)
+
+
+### Bug Fixes
+
+* authentication token refresh ([#344](https://github.com/adobe/spacecat-shared/issues/344)) ([37cb442](https://github.com/adobe/spacecat-shared/commit/37cb442c7837241780af3fede345db6be66e72e2))
+
 # [@adobe/spacecat-shared-google-client-v1.2.1](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-google-client-v1.2.0...@adobe/spacecat-shared-google-client-v1.2.1) (2024-08-24)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-shared-google-client",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Shared modules of the Spacecat Services - Google Client",
   "type": "module",
   "engines": {

package/src/index.js

@@ -24,19 +24,54 @@ import {
 import { fetch as httpFetch } from './utils.js';
 
 export default class GoogleClient {
+  constructor(config, log = console) {
+    this.log = log;
+    this.authClient = new OAuth2Client(
+      config.clientId,
+      config.clientSecret,
+      config.redirectUri,
+    );
+
+    this.authClient.setCredentials({
+      access_token: config.accessToken,
+      refresh_token: config.refreshToken,
+      token_type: config.tokenType,
+      expiry_date: config.expiryDate,
+    });
+
+    this.expiryDate = config.expiryDate;
+    this.siteUrl = config.siteUrl;
+    this.baseUrl = config.baseUrl;
+  }
+
+  async #refreshTokenIfExpired() {
+    if (this.authClient.credentials.expiry_date < Date.now()) {
+      try {
+        const { credentials } = await this.authClient.refreshAccessToken();
+        this.authClient.setCredentials({
+          access_token: credentials.access_token,
+          expiry_date: credentials.expiry_date,
+        });
+      } catch (error) {
+        this.log.error('Failed to refresh token:', error);
+        throw error;
+      }
+    }
+  }
+
   static async createFrom(context, baseURL) {
     if (!isValidUrl(baseURL)) {
       throw new Error('Error creating GoogleClient: Invalid base URL');
     }
 
+    const customerSecret = resolveCustomerSecretsName(baseURL, context);
+    const client = new SecretsManagerClient({});
+
     try {
-      const customerSecret = resolveCustomerSecretsName(baseURL, context);
-      const client = new SecretsManagerClient({});
-      const command = new GetSecretValueCommand({
-        SecretId: customerSecret,
-      });
+      const command = new GetSecretValueCommand({ SecretId: customerSecret });
       const response = await client.send(command);
       const secrets = JSON.parse(response.SecretString);
+
       const config = {
         accessToken: secrets.access_token,
         refreshToken: secrets.refresh_token,
@@ -48,45 +83,13 @@ export default class GoogleClient {
         clientSecret: context.env.GOOGLE_CLIENT_SECRET,
         redirectUri: context.env.GOOGLE_REDIRECT_URI,
       };
-      return new GoogleClient(config, context.log);
-    } catch (error) {
-      throw new Error(`Error creating GoogleClient: ${error.message}`);
-    }
-  }
-
-  constructor(config, log = console) {
-    const authClient = new OAuth2Client(
-      config.clientId,
-      config.clientSecret,
-      config.redirectUri,
-    );
-
-    if (!config.accessToken) {
-      throw new Error('Missing access token in secret');
-    }
-
-    if (!config.refreshToken) {
-      throw new Error('Missing refresh token in secret');
-    }
 
-    authClient.setCredentials({
-      access_token: config.accessToken,
-      refresh_token: config.refreshToken,
-      token_type: config.tokenType,
-    });
-    this.authClient = authClient;
-    this.expiryDate = config.expiryDate;
-    this.siteUrl = config.siteUrl;
-    this.baseUrl = config.baseUrl;
-    this.log = log;
-  }
+      const googleClient = new GoogleClient(config, context.log);
+      await googleClient.#refreshTokenIfExpired();
 
-  async #refreshTokenIfExpired() {
-    if (new Date(this.expiryDate).getTime() < Date.now()) {
-      const { credentials } = await this.authClient.refreshAccessToken();
-      this.authClient.setCredentials({
-        access_token: credentials.access_token,
-      });
+      return googleClient;
+    } catch (error) {
+      throw new Error(`Error creating GoogleClient: ${error.message}`);
     }
   }