fix: feature detection to check for browser (#738)

Author: JustinBeckwith

package.json

@@ -24,8 +24,7 @@
  "gcp-metadata": "^2.0.0",
  "gtoken": "^3.0.0",
  "jws": "^3.1.5",
- "lru-cache": "^5.0.0",
- "semver": "^6.0.0"
+ "lru-cache": "^5.0.0"
  },
  "devDependencies": {
  "@compodoc/compodoc": "^1.1.7",
@@ -39,7 +38,6 @@
  "@types/ncp": "^2.0.1",
  "@types/nock": "^10.0.3",
  "@types/node": "^10.5.1",
- "@types/semver": "^6.0.0",
  "@types/sinon": "^7.0.0",
  "@types/tmp": "^0.1.0",
  "assert-rejects": "^1.0.0",
@@ -68,7 +66,7 @@
  "ncp": "^2.0.0",
  "nock": "^10.0.0",
  "null-loader": "^3.0.0",
- "nyc": "^14.0.0",
+ "nyc": "^14.1.1",
  "prettier": "^1.13.4",
  "puppeteer": "^1.11.0",
  "sinon": "^7.0.0",

src/auth/authclient.ts

@@ -18,7 +18,6 @@ import {EventEmitter} from 'events';
 import {GaxiosOptions, GaxiosPromise} from 'gaxios';
 
 import {DefaultTransporter} from '../transporters';
-
 import {Credentials} from './credentials';
 
 export declare interface AuthClient {

src/auth/googleauth.ts

@@ -23,7 +23,6 @@ import * as path from 'path';
 import * as stream from 'stream';
 
 import {createCrypto} from '../crypto/crypto';
-import {isBrowser} from '../isbrowser';
 import * as messages from '../messages';
 import {DefaultTransporter, Transporter} from '../transporters';
 

src/auth/jwtaccess.ts

@@ -19,7 +19,6 @@ import * as LRU from 'lru-cache';
 import * as stream from 'stream';
 
 import * as messages from '../messages';
-
 import {JWTInput} from './credentials';
 import {Headers, RequestMetadataResponse} from './oauth2client';
 

src/auth/oauth2client.ts

@@ -23,8 +23,7 @@ import {
 import * as querystring from 'querystring';
 import * as stream from 'stream';
 
-import {createCrypto, JwkCertificate} from '../crypto/crypto';
-import {isBrowser} from '../isbrowser';
+import {createCrypto, JwkCertificate, hasBrowserCrypto} from '../crypto/crypto';
 import * as messages from '../messages';
 import {BodyResponseCallback} from '../transporters';
 
@@ -1015,7 +1014,7 @@ export class OAuth2Client extends AuthClient {
 
  async getFederatedSignonCertsAsync(): Promise<FederatedSignonCertsResponse> {
  const nowTime = new Date().getTime();
- const format: CertificateFormat = isBrowser()
+ const format = hasBrowserCrypto()
  ? CertificateFormat.JWK
  : CertificateFormat.PEM;
  if (

src/crypto/browser/crypto.ts

@@ -19,13 +19,10 @@
 
 import * as base64js from 'base64-js';
 
-import {isBrowser} from '../../isbrowser';
-import {CryptoSigner} from '../crypto';
-
 // Not all browsers support `TextEncoder`. The following `require` will
 // provide a fast UTF8-only replacement for those browsers that don't support
 // text encoding natively.
-if (isBrowser() && typeof TextEncoder === 'undefined') {
+if (typeof TextEncoder === 'undefined') {
  require('fast-text-encoding');
 }
 

src/crypto/crypto.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import {isBrowser} from '../isbrowser';
 import {BrowserCrypto} from './browser/crypto';
 import {NodeCrypto} from './node/crypto';
 
@@ -56,8 +55,16 @@ export interface Crypto {
 }
 
 export function createCrypto(): Crypto {
- if (isBrowser()) {
+ if (hasBrowserCrypto()) {
  return new BrowserCrypto();
  }
  return new NodeCrypto();
 }
+
+export function hasBrowserCrypto() {
+ return (
+ typeof window !== 'undefined' &&
+ typeof window.crypto !== 'undefined' &&
+ typeof window.crypto.subtle !== 'undefined'
+ );
+}

src/crypto/node/crypto.ts

@@ -15,7 +15,7 @@
  */
 
 import * as crypto from 'crypto';
-import {Crypto, CryptoSigner} from '../crypto';
+import {Crypto} from '../crypto';
 
 export class NodeCrypto implements Crypto {
  async sha256DigestBase64(str: string): Promise<string> {

src/isbrowser.ts

@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-import * as semver from 'semver';
-import {isBrowser} from './isbrowser';
-
 export enum WarningTypes {
  WARNING = 'Warning',
  DEPRECATION = 'DeprecationWarning',
@@ -28,18 +25,14 @@ export function warn(warning: Warning) {
  return;
  }
  warning.warned = true;
- if (isBrowser()) {
- console.warn(warning.message);
- } else if (semver.satisfies(process.version, '>=8')) {
+ if (typeof process !== 'undefined' && process.emitWarning) {
  // @types/node doesn't recognize the emitWarning syntax which
  // accepts a config object, so `as any` it is
  // https://nodejs.org/docs/latest-v8.x/api/process.html#process_process_emitwarning_warning_options
  // tslint:disable-next-line no-any
  process.emitWarning(warning.message, warning as any);
  } else {
- // This path can be removed once we drop support for Node 6.
- // https://nodejs.org/docs/latest-v6.x/api/process.html#process_process_emitwarning_warning_name_ctor
- process.emitWarning(warning.message, warning.type);
+ console.warn(warning.message);
  }
 }