Merge branch 'master' into dl-no-todo

Author: taeold

spec/logger.spec.ts

@@ -118,6 +118,50 @@ describe("logger", () => {
           });
         });
 
+        it("should not detect duplicate object as circular", () => {
+          const obj: any = { a: "foo" };
+          const entry: logger.LogEntry = {
+            severity: "ERROR",
+            message: "testing circular",
+            a: obj,
+            b: obj,
+          };
+          logger.write(entry);
+          expectStderr({
+            severity: "ERROR",
+            message: "testing circular",
+            a: { a: "foo" },
+            b: { a: "foo" },
+          });
+        });
+
+        it("should not detect duplicate object in array as circular", () => {
+          const obj: any = { a: "foo" };
+          const arr: any = [
+            { a: obj, b: obj },
+            { a: obj, b: obj },
+          ];
+          const entry: logger.LogEntry = {
+            severity: "ERROR",
+            message: "testing circular",
+            a: arr,
+            b: arr,
+          };
+          logger.write(entry);
+          expectStderr({
+            severity: "ERROR",
+            message: "testing circular",
+            a: [
+              { a: { a: "foo" }, b: { a: "foo" } },
+              { a: { a: "foo" }, b: { a: "foo" } },
+            ],
+            b: [
+              { a: { a: "foo" }, b: { a: "foo" } },
+              { a: { a: "foo" }, b: { a: "foo" } },
+            ],
+          });
+        });
+
         it("should not break on objects that override toJSON", () => {
           const obj: any = { a: new Date("August 26, 1994 12:24:00Z") };
 

src/common/providers/database.ts

@@ -126,6 +126,9 @@ export class DataSnapshot implements database.DataSnapshot {
   val(): any {
     const parts = pathParts(this._childPath);
     let source = this._data;
+    if (source === null) {
+      return null;
+    }
     if (parts.length) {
       for (const part of parts) {
         if (source[part] === undefined) {

src/logger/index.ts

@@ -78,6 +78,7 @@ function removeCircular(obj: any, refs: any[] = []): any {
       returnObj[k] = removeCircular(obj[k], refs);
     }
   }
+  refs.pop();
   return returnObj;
 }
 

src/v1/cloud-functions.ts

@@ -104,8 +104,8 @@ export interface EventContext<Params = Record<string, string>> {
    * does not exist.
    */
   auth?: {
-    token: object;
     uid: string;
+    token: EventContextAuthToken;
   };
 
   /**
@@ -207,6 +207,29 @@ export interface EventContext<Params = Record<string, string>> {
   timestamp: string;
 }
 
+/**
+ * https://firebase.google.com/docs/reference/security/database#authtoken
+ */
+export interface EventContextAuthToken {
+  iss: string;
+  aud: string;
+  auth_time: number;
+  iat: number;
+  exp: number;
+  sub: string;
+  email?: string;
+  email_verified?: boolean;
+  phone_number?: string;
+  name?: string;
+  firebase?: {
+    identities?: {
+      [key: string]: string[];
+    };
+    sign_in_provider?: string;
+    tenant?: string;
+  };
+}
+
 /**
  * Resource is a standard format for defining a resource
  * (google.rpc.context.AttributeContext.Resource). In Cloud Functions, it is the

src/v2/providers/tasks.ts

@@ -282,7 +282,6 @@ export function onTaskDispatched<Args = any>(
     convertInvoker
   );
   convertIfPresent(func.__endpoint.taskQueueTrigger, opts, "invoker", "invoker", convertInvoker);
-  copyIfPresent(func.__endpoint.taskQueueTrigger, opts, "retry", "retry");
 
   func.__requiredAPIs = [
     {