refactor(deps): opn -> open (#1778)

* refactor(deps): `opn` -> `open` The package has been renamed * chore: Copyright headers * revert: Unrelated change * chore: lint fixes
googleapis · Mar 27, 2024 · 847caa0 · 847caa0
1 parent fc8dfe9
commit 847caa0
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 39 deletions.
diff --git a/samples/oauth2-codeVerifier.js b/samples/oauth2-codeVerifier.js
@@ -1,4 +1,4 @@
-// Copyright 2017, Google, Inc.
+// Copyright 2017 Google LLC
 // 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
@@ -16,7 +16,7 @@
 const {OAuth2Client} = require('google-auth-library');
 const http = require('http');
 const url = require('url');
-const opn = require('opn');
+const open = require('open');
 const destroyer = require('server-destroy');
 
 // Download your OAuth2 configuration from the Google Developer Console.
@@ -95,7 +95,7 @@ async function getAuthenticatedClient() {
       })
       .listen(3000, () => {
         // open the browser to the authorize url to start the workflow
-        opn(authorizeUrl, {wait: false}).then(cp => cp.unref());
+        open(authorizeUrl, {wait: false}).then(cp => cp.unref());
       });
     destroyer(server);
   });

diff --git a/samples/oauth2.js b/samples/oauth2.js
@@ -1,4 +1,4 @@
-// Copyright 2017, Google, Inc.
+// Copyright 2017 Google LLC
 // 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
@@ -16,7 +16,7 @@
 const {OAuth2Client} = require('google-auth-library');
 const http = require('http');
 const url = require('url');
-const opn = require('opn');
+const open = require('open');
 const destroyer = require('server-destroy');
 
 // Download your OAuth2 configuration from the Google
@@ -88,7 +88,7 @@ function getAuthenticatedClient() {
       })
       .listen(3000, () => {
         // open the browser to the authorize url to start the workflow
-        opn(authorizeUrl, {wait: false}).then(cp => cp.unref());
+        open(authorizeUrl, {wait: false}).then(cp => cp.unref());
       });
     destroyer(server);
   });

diff --git a/samples/package.json b/samples/package.json
@@ -17,7 +17,7 @@
     "@googleapis/iam": "^15.0.0",
     "google-auth-library": "^9.7.0",
     "node-fetch": "^2.3.0",
-    "opn": "^6.0.0",
+    "open": "^6.0.0",
     "server-destroy": "^1.0.1"
   },
   "devDependencies": {

diff --git a/samples/verifyIdToken.js b/samples/verifyIdToken.js
@@ -1,4 +1,4 @@
-// Copyright 2017, Google, Inc.
+// Copyright 2017 Google LLC
 // 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
@@ -16,7 +16,7 @@
 const {OAuth2Client} = require('google-auth-library');
 const http = require('http');
 const url = require('url');
-const opn = require('opn');
+const open = require('open');
 const destroyer = require('server-destroy');
 
 // Download your OAuth2 configuration from the Google
@@ -87,7 +87,7 @@ function getAuthenticatedClient() {
       })
       .listen(3000, () => {
         // open the browser to the authorize url to start the workflow
-        opn(authorizeUrl, {wait: false}).then(cp => cp.unref());
+        open(authorizeUrl, {wait: false}).then(cp => cp.unref());
       });
     destroyer(server);
   });

diff --git a/src/auth/computeclient.ts b/src/auth/computeclient.ts
@@ -55,8 +55,8 @@ export class Compute extends OAuth2Client {
     this.scopes = Array.isArray(options.scopes)
       ? options.scopes
       : options.scopes
-      ? [options.scopes]
-      : [];
+        ? [options.scopes]
+        : [];
   }
 
   /**

diff --git a/src/transporters.ts b/src/transporters.ts
@@ -64,9 +64,8 @@ export class DefaultTransporter implements Transporter {
       if (!uaValue) {
         opts.headers['User-Agent'] = DefaultTransporter.USER_AGENT;
       } else if (!uaValue.includes(`${PRODUCT_NAME}/`)) {
-        opts.headers[
-          'User-Agent'
-        ] = `${uaValue} ${DefaultTransporter.USER_AGENT}`;
+        opts.headers['User-Agent'] =
+          `${uaValue} ${DefaultTransporter.USER_AGENT}`;
       }
       // track google-auth-library-nodejs version:
       if (!opts.headers['x-goog-api-client']) {

diff --git a/test/test.downscopedclient.ts b/test/test.downscopedclient.ts
@@ -54,11 +54,11 @@ class TestAuthClient extends AuthClient {
     this.credentials.expiry_date = expirationTime;
   }
 
-  async getRequestHeaders(url?: string): Promise<Headers> {
+  async getRequestHeaders(): Promise<Headers> {
     throw new Error('Not implemented.');
   }
 
-  request<T>(opts: GaxiosOptions): GaxiosPromise<T> {
+  request<T>(): GaxiosPromise<T> {
     throw new Error('Not implemented.');
   }
 }

diff --git a/test/test.jwt.ts b/test/test.jwt.ts
@@ -28,7 +28,6 @@ describe('jwt', () => {
   const keypair = require('keypair');
   const PEM_PATH = './test/fixtures/private.pem';
   const PEM_CONTENTS = fs.readFileSync(PEM_PATH, 'utf8');
-  const P12_PATH = './test/fixtures/key.p12';
 
   nock.disableNetConnect();
 

diff --git a/test/test.oauth2common.ts b/test/test.oauth2common.ts
@@ -104,9 +104,8 @@ describe('OAuthClientAuthHandler', () => {
     };
     const actualOptions = Object.assign({}, originalOptions);
     const expectedOptions = Object.assign({}, originalOptions);
-    (
-      expectedOptions.headers as Headers
-    ).Authorization = `Basic ${expectedBase64EncodedCred}`;
+    (expectedOptions.headers as Headers).Authorization =
+      `Basic ${expectedBase64EncodedCred}`;
 
     handler.testApplyClientAuthenticationOptions(actualOptions);
     assert.deepStrictEqual(expectedOptions, actualOptions);
@@ -127,9 +126,8 @@ describe('OAuthClientAuthHandler', () => {
     };
     const actualOptions = Object.assign({}, originalOptions);
     const expectedOptions = Object.assign({}, originalOptions);
-    (
-      expectedOptions.headers as Headers
-    ).Authorization = `Basic ${expectedBase64EncodedCredNoSecret}`;
+    (expectedOptions.headers as Headers).Authorization =
+      `Basic ${expectedBase64EncodedCredNoSecret}`;
 
     handler.testApplyClientAuthenticationOptions(actualOptions);
     assert.deepStrictEqual(expectedOptions, actualOptions);
@@ -146,9 +144,8 @@ describe('OAuthClientAuthHandler', () => {
     };
     const actualOptions = Object.assign({}, originalOptions);
     const expectedOptions = Object.assign({}, originalOptions);
-    (
-      expectedOptions.headers as Headers
-    ).Authorization = `Basic ${expectedBase64EncodedCred}`;
+    (expectedOptions.headers as Headers).Authorization =
+      `Basic ${expectedBase64EncodedCred}`;
 
     handler.testApplyClientAuthenticationOptions(actualOptions);
     assert.deepStrictEqual(expectedOptions, actualOptions);
@@ -349,9 +346,8 @@ describe('OAuthClientAuthHandler', () => {
     };
     const actualOptions = Object.assign({}, originalOptions);
     const expectedOptions = Object.assign({}, originalOptions);
-    (
-      expectedOptions.headers as Headers
-    ).Authorization = `Bearer ${bearerToken}`;
+    (expectedOptions.headers as Headers).Authorization =
+      `Bearer ${bearerToken}`;
 
     handler.testApplyClientAuthenticationOptions(actualOptions, bearerToken);
     assert.deepStrictEqual(expectedOptions, actualOptions);
@@ -374,9 +370,8 @@ describe('OAuthClientAuthHandler', () => {
     const actualOptions = Object.assign({}, originalOptions);
     // Expected options should have bearer token in header.
     const expectedOptions = Object.assign({}, originalOptions);
-    (
-      expectedOptions.headers as Headers
-    ).Authorization = `Bearer ${bearerToken}`;
+    (expectedOptions.headers as Headers).Authorization =
+      `Bearer ${bearerToken}`;
 
     handler.testApplyClientAuthenticationOptions(actualOptions, bearerToken);
     assert.deepStrictEqual(expectedOptions, actualOptions);
@@ -399,9 +394,8 @@ describe('OAuthClientAuthHandler', () => {
     const actualOptions = Object.assign({}, originalOptions);
     // Expected options should have bearer token in header.
     const expectedOptions = Object.assign({}, originalOptions);
-    (
-      expectedOptions.headers as Headers
-    ).Authorization = `Bearer ${bearerToken}`;
+    (expectedOptions.headers as Headers).Authorization =
+      `Bearer ${bearerToken}`;
 
     handler.testApplyClientAuthenticationOptions(actualOptions, bearerToken);
     assert.deepStrictEqual(expectedOptions, actualOptions);

diff --git a/test/test.pluggableauthclient.ts b/test/test.pluggableauthclient.ts
@@ -17,7 +17,7 @@ import {
   ExecutableError,
   PluggableAuthClient,
 } from '../src/auth/pluggable-auth-client';
-import {BaseExternalAccountClient, IdentityPoolClient} from '../src';
+import {BaseExternalAccountClient} from '../src';
 import {
   assertGaxiosResponsePresent,
   getAudience,

diff --git a/test/test.transporters.ts b/test/test.transporters.ts
@@ -155,9 +155,9 @@ describe('transporters', () => {
         assert.strictEqual(res!.status, 200);
         done();
       },
-      _error => {
+      error => {
         scope.done();
-        done('Unexpected promise failure');
+        done(error);
       }
     );
   });