Merge branch 'master' into fei-storage-compat

Author: Feiyang1

packages-exp/auth-exp/src/platform_browser/recaptcha/recaptcha_loader.test.ts

@@ -67,9 +67,9 @@ describe('platform_browser/recaptcha/recaptcha_loader', () => {
       triggerNetworkTimeout = stubSingleTimeout(networkTimeoutId);
 
       sinon.stub(jsHelpers, '_loadJS').callsFake(() => {
-        return new Promise((resolve, reject) => {
+        return (new Promise<void>((resolve, reject) => {
           jsLoader = { resolve, reject };
-        });
+        }) as unknown) as Promise<Event>;
       });
 
       loader = new ReCaptchaLoaderImpl();

packages-exp/functions-compat/src/register.ts

@@ -24,10 +24,13 @@ import {
   Component,
   ComponentType,
   InstanceFactory,
-  ComponentContainer
+  ComponentContainer,
+  InstanceFactoryOptions
 } from '@firebase/component';
 import { Functions as FunctionsServiceExp } from '@firebase/functions-exp';
 
+const DEFAULT_REGION = 'us-central1';
+
 declare module '@firebase/component' {
   interface NameServiceMapping {
     'app-compat': FirebaseApp;
@@ -38,14 +41,14 @@ declare module '@firebase/component' {
 
 const factory: InstanceFactory<'functions-compat'> = (
   container: ComponentContainer,
-  regionOrCustomDomain?: string
+  { instanceIdentifier: regionOrCustomDomain }: InstanceFactoryOptions
 ) => {
   // Dependencies
   const app = container.getProvider('app-compat').getImmediate();
   const functionsServiceExp = container
     .getProvider('functions-exp')
     .getImmediate({
-      identifier: regionOrCustomDomain
+      identifier: regionOrCustomDomain ?? DEFAULT_REGION
     });
 
   return new FunctionsService(app, functionsServiceExp);

packages-exp/functions-exp/src/config.ts

@@ -25,8 +25,6 @@ import {
 } from '@firebase/component';
 import { FUNCTIONS_TYPE } from './constants';
 
-export const DEFAULT_REGION = 'us-central1';
-
 export function registerFunctions(fetchImpl: typeof fetch): void {
   const factory: InstanceFactory<'functions'> = (
     container: ComponentContainer,

packages/auth/src/autheventmanager.js

@@ -388,7 +388,7 @@ fireauth.AuthEventManager.prototype.unsubscribe = function(handler) {
 fireauth.AuthEventManager.prototype.hasProcessedAuthEvent_ =
     function(authEvent) {
   // Prevent duplicate event tracker from growing too large.
-  if (goog.now() - this.lastProcessedEventTime_ >=
+  if (Date.now() - this.lastProcessedEventTime_ >=
       fireauth.AuthEventManager.EVENT_DUPLICATION_CACHE_DURATION) {
     this.processedEvents_ = {};
     this.lastProcessedEventTime_ = 0;
@@ -417,7 +417,7 @@ fireauth.AuthEventManager.prototype.saveProcessedAuthEvent_ =
     this.processedEvents_[
         /** @type {string} */ (authEvent.getUid())] = true;
     // Save last processing time.
-    this.lastProcessedEventTime_ = goog.now();
+    this.lastProcessedEventTime_ = Date.now();
   }
 };
 

packages/auth/src/cacherequest.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * 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.
@@ -42,7 +42,7 @@ fireauth.CacheRequest = function() {
   /** @private {?goog.Promise} The cached returned promise result. */
   this.cachedResult_ = null;
   /** @private {number} The expiration timestamp of the cached result. */
-  this.expirationTime_ = goog.now();
+  this.expirationTime_ = Date.now();
   /** @private {number} The time to live from the caching point in time. */
   this.ttl_ = 0;
   /** @private {boolean} Whether to cache errors too. */
@@ -62,7 +62,7 @@ fireauth.CacheRequest.prototype.cache =
   this.func_ = func;
   this.self_ = self;
   this.arguments_ = args;
-  this.expirationTime_ = goog.now();
+  this.expirationTime_ = Date.now();
   this.ttl_ = ttl;
   this.cacheErrors_ = !!opt_cacheErrors;
 
@@ -79,9 +79,9 @@ fireauth.CacheRequest.prototype.run = function() {
     throw new Error('No available configuration cached!');
   }
   // If the result is not cached or the cache result is outdated.
-  if (!this.cachedResult_ || goog.now() >= this.expirationTime_) {
+  if (!this.cachedResult_ || Date.now() >= this.expirationTime_) {
     // Set expiration of current request.
-    this.expirationTime_ = goog.now() + this.ttl_;
+    this.expirationTime_ = Date.now() + this.ttl_;
     // Get new result and cache it.
     this.cachedResult_ =
         this.func_.apply(this.self_, this.arguments_).then(function(result) {
@@ -93,7 +93,7 @@ fireauth.CacheRequest.prototype.run = function() {
           if (!self.cacheErrors_) {
             // Do not cache errors if errors are not to be cached.
             // This will bust the cached result. Otherwise the error is cached.
-            self.expirationTime_ = goog.now();
+            self.expirationTime_ = Date.now();
           }
           // Throw the returned error.
           throw error;
@@ -108,5 +108,5 @@ fireauth.CacheRequest.prototype.run = function() {
 fireauth.CacheRequest.prototype.purge = function() {
   // Purge the cached results.
   this.cachedResult_ = null;
-  this.expirationTime_ = goog.now();
+  this.expirationTime_ = Date.now();
 };

packages/auth/src/rpchandler.js

@@ -905,7 +905,7 @@ fireauth.RpcHandler.prototype.requestAuthEndpoint_ = function(
   uri.setParameterValue('key', this.getApiKey());
   // Check whether to append cachebuster to request.
   if (opt_cachebuster) {
-    uri.setParameterValue('cb', goog.now().toString());
+    uri.setParameterValue('cb', Date.now().toString());
   }
   // Firebase allows GET endpoints.
   var isGet = httpMethod == fireauth.RpcHandler.HttpMethod.GET;

packages/auth/test/proactiverefresh_test.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * 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.
@@ -71,7 +71,7 @@ function setUp() {
   // Operation to practively refresh.
   operation = goog.testing.recordFunction(function() {
     // Record last run time.
-    lastTimestamp = goog.now();
+    lastTimestamp = Date.now();
     if (!forceRetryError) {
       // Do not force error retry. Resolve successfully.
       return goog.Promise.resolve();
@@ -84,7 +84,7 @@ function setUp() {
   // Operation which throws an unrecoverable error.
   unrecoverableOperation = goog.testing.recordFunction(function() {
     // Record last run time.
-    lastTimestamp = goog.now();
+    lastTimestamp = Date.now();
     // Throw unrecoverable error.
     return goog.Promise.reject(
         new fireauth.AuthError(fireauth.authenum.Error.INTERNAL_ERROR));