Skip to content

Commit 6388c62

Browse files
authored
fix(core, web): fix wrong toString js interop in TrustedTypes (#10476)
1 parent 0300445 commit 6388c62

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

packages/firebase_core/firebase_core_web/lib/firebase_core_web.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ library firebase_core_web;
88
import 'dart:async';
99
import 'dart:html';
1010
import 'dart:js';
11+
import 'dart:js_util';
1112

1213
import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart';
1314
import 'package:firebase_core_web/src/interop/js.dart';

packages/firebase_core/firebase_core_web/lib/src/firebase_core_web.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ class FirebaseCoreWeb extends FirebasePlatform {
128128
script.crossOrigin = 'anonymous';
129129
script.text = '''
130130
window.ff_trigger_$windowVar = async (callback) => {
131-
callback(await import("${trustedUrl?.toString() ?? src}"));
131+
console.debug("Initializing Firebase $windowVar");
132+
callback(await import("${trustedUrl != null ? callMethod(trustedUrl, 'toString', []) : src}"));
132133
};
133134
''';
134135

0 commit comments

Comments
 (0)