Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,30 @@ class FirebaseAppCheckWeb extends FirebaseAppCheckPlatform {
final instance = FirebaseAppCheckWeb(
app: Firebase.app(firebaseApp.name),
);
var recaptchaType = web.window.localStorage.getItem(
_sessionKeyRecaptchaType(firebaseApp.name),
);
var recaptchaSiteKey = web.window.localStorage.getItem(
_sessionKeyRecaptchaSiteKey(firebaseApp.name),
);

// For backwards compatibility, with previously used session storage
if (recaptchaType == null || recaptchaSiteKey == null) {
recaptchaType = web.window.sessionStorage.getItem(
String? recaptchaType;
String? recaptchaSiteKey;
try {
recaptchaType = web.window.localStorage.getItem(
_sessionKeyRecaptchaType(firebaseApp.name),
);
recaptchaSiteKey = web.window.sessionStorage.getItem(
recaptchaSiteKey = web.window.localStorage.getItem(
_sessionKeyRecaptchaSiteKey(firebaseApp.name),
);

// For backwards compatibility, with previously used session storage
if (recaptchaType == null || recaptchaSiteKey == null) {
recaptchaType = web.window.sessionStorage.getItem(
_sessionKeyRecaptchaType(firebaseApp.name),
);
recaptchaSiteKey = web.window.sessionStorage.getItem(
_sessionKeyRecaptchaSiteKey(firebaseApp.name),
);
}
} catch (_) {
// Accessing web storage throws a SecurityError when the user blocks
// site data. Nothing can have been persisted then.
recaptchaType = null;
recaptchaSiteKey = null;
}

if (recaptchaType != null) {
Expand Down Expand Up @@ -141,16 +150,21 @@ class FirebaseAppCheckWeb extends FirebaseAppCheckPlatform {
} else {
throw Exception('Invalid web provider: $providerWeb');
}
web.window.localStorage.setItem(
_sessionKeyRecaptchaType(app.name),
recaptchaType,
);
web.window.localStorage.setItem(
_sessionKeyRecaptchaSiteKey(app.name),
providerWeb is WebDebugProvider
? providerWeb.debugToken ?? ''
: providerWeb.siteKey,
);
try {
web.window.localStorage.setItem(
_sessionKeyRecaptchaType(app.name),
recaptchaType,
);
web.window.localStorage.setItem(
_sessionKeyRecaptchaSiteKey(app.name),
providerWeb is WebDebugProvider
? providerWeb.debugToken ?? ''
: providerWeb.siteKey,
);
} catch (_) {
// Accessing web storage throws a SecurityError when the user blocks
// site data. Persisting is only for the next startup, so continue.
}
}

// activate API no longer exists, recaptcha key has to be passed on initialization of app-check instance.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
// Copyright 2026 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

@TestOn('browser')
library;

import 'dart:js_interop';

import 'package:firebase_app_check_platform_interface/firebase_app_check_platform_interface.dart';
import 'package:firebase_app_check_web/firebase_app_check_web.dart';
import 'package:firebase_core/firebase_core.dart';
import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart';
import 'package:firebase_core_web/firebase_core_web.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_web_plugins/flutter_web_plugins.dart';

@JS('eval')
external JSAny? _eval(String code);

/// Makes `window.sessionStorage` and `window.localStorage` throw like they do
/// when the user has blocked site data for the origin.
void _blockWebStorage() {
_eval(r'''
window.__savedWebStorage = {};
for (const name of ['sessionStorage', 'localStorage']) {
window.__savedWebStorage[name] =
Object.getOwnPropertyDescriptor(window, name);
Object.defineProperty(window, name, {
configurable: true,
get() {
throw new DOMException(
`Failed to read the '${name}' property from 'Window': ` +
'Access is denied for this document.',
'SecurityError',
);
},
});
}
''');
}

void _restoreWebStorage() {
_eval('''
for (const [name, descriptor] of Object.entries(window.__savedWebStorage)) {
Object.defineProperty(window, name, descriptor);
}
delete window.__savedWebStorage;
''');
}
Comment thread
LasseLegarth marked this conversation as resolved.
Resolved

void main() {
group('FirebaseAppCheckWeb with web storage blocked', () {
setUpAll(() {
FirebasePlatform.instance = FirebaseCoreWeb();
FirebaseAppCheckWeb.registerWith(webPluginRegistrar);
});

setUp(_blockWebStorage);

tearDown(_restoreWebStorage);

test('initializeApp with App Check succeeds', () async {
const options = FirebaseOptions(
apiKey: 'fake-api-key',
appId: '1:1234567890:web:fake',
messagingSenderId: '1234567890',
projectId: 'fake-project',
);

await expectLater(
FirebasePlatform.instance.initializeApp(options: options),
completes,
);
});

test('activate succeeds', () async {
final appCheck = FirebaseAppCheckWeb(app: Firebase.app());

await expectLater(
appCheck.activate(
providerWeb: WebDebugProvider(debugToken: 'fake-debug-token'),
),
completes,
);
});
});
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
// Copyright 2026 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

@TestOn('browser')
library;

import 'dart:js_interop';

import 'package:firebase_auth_web/firebase_auth_web.dart';
import 'package:firebase_core/firebase_core.dart';
import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart';
import 'package:firebase_core_web/firebase_core_web.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_web_plugins/flutter_web_plugins.dart';

@JS('eval')
external JSAny? _eval(String code);

/// Makes `window.sessionStorage` and `window.localStorage` throw like they do
/// when the user has blocked site data for the origin.
void _blockWebStorage() {
_eval(r'''
window.__savedWebStorage = {};
for (const name of ['sessionStorage', 'localStorage']) {
window.__savedWebStorage[name] =
Object.getOwnPropertyDescriptor(window, name);
Object.defineProperty(window, name, {
configurable: true,
get() {
throw new DOMException(
`Failed to read the '${name}' property from 'Window': ` +
'Access is denied for this document.',
'SecurityError',
);
},
});
}
''');
}

void _restoreWebStorage() {
_eval('''
for (const [name, descriptor] of Object.entries(window.__savedWebStorage)) {
Object.defineProperty(window, name, descriptor);
}
delete window.__savedWebStorage;
''');
}
Comment thread
LasseLegarth marked this conversation as resolved.
Resolved

void main() {
group('FirebaseAuthWeb with web storage blocked', () {
setUpAll(() {
FirebasePlatform.instance = FirebaseCoreWeb();
FirebaseAuthWeb.registerWith(webPluginRegistrar);
});

setUp(_blockWebStorage);

tearDown(_restoreWebStorage);

test('initializeApp with Auth succeeds', () async {
const options = FirebaseOptions(
apiKey: 'fake-api-key',
appId: '1:1234567890:web:fake',
messagingSenderId: '1234567890',
projectId: 'fake-project',
authDomain: 'fake-project.firebaseapp.com',
);

await expectLater(
FirebasePlatform.instance.initializeApp(options: options),
completes,
);
});

test('useAuthEmulator succeeds', () async {
final auth = FirebaseAuthWeb(app: Firebase.app());

await expectLater(auth.useAuthEmulator('localhost', 9099), completes);
});
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,15 @@ class FirebaseCoreWeb extends FirebasePlatform {
String packageVersion,
) {
final sessionKey = 'flutterfire-$libraryName-$packageVersion';
final sessionItem = web.window.sessionStorage.getItem(sessionKey);
if (sessionItem == null) {
try {
if (web.window.sessionStorage.getItem(sessionKey) != null) return;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Optional, could be a follow-up. The JS SDK already ignores a second registerVersion for the same library (it logs at debug level and returns); the new core test registers flutter-fire-core twice with storage blocked (registerLibraryVersion, then _registerAllLibraryVersions in initializeApp) and passes. This cache also drops registrations: sessionStorage survives a reload but the JS SDK doesn't, so on later loads in the same tab the FlutterFire versions are not registered. With flutterfire-flutter-fire-core-5.1.0 already in sessionStorage before initializeApp, the platform string was fire-core/0.16.6 fire-core-esm2020/0.16.6 fire-js/ fire-js-all-cdn/13.3.0, with no flutter-fire-core. Calling firebase.registerVersion directly would fix that and remove the storage access here. firebase_ai and firebase_data_connect have their own copy of this cache.

web.window.sessionStorage.setItem(sessionKey, packageVersion);
firebase.registerVersion(libraryName, packageVersion);
} catch (_) {
// Accessing `window.sessionStorage` throws a SecurityError when the user
// blocks site data. The cache only avoids duplicate registrations, so
// register anyway instead of failing `initializeApp`.
}
firebase.registerVersion(libraryName, packageVersion);
}

static void registerLibraryVersion(String libraryName, String version) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
// Copyright 2026 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

@TestOn('browser')
library;

import 'dart:js_interop';
import 'dart:js_interop_unsafe';

import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart';
import 'package:firebase_core_web/firebase_core_web.dart';
import 'package:flutter_test/flutter_test.dart';

@JS('eval')
external JSAny? _eval(String code);

/// Makes `window.sessionStorage` and `window.localStorage` throw like they do
/// when the user has blocked site data for the origin.
void _blockWebStorage() {
_eval(r'''
window.__savedWebStorage = {};
for (const name of ['sessionStorage', 'localStorage']) {
window.__savedWebStorage[name] =
Object.getOwnPropertyDescriptor(window, name);
Object.defineProperty(window, name, {
configurable: true,
get() {
throw new DOMException(
`Failed to read the '${name}' property from 'Window': ` +
'Access is denied for this document.',
'SecurityError',
);
},
});
}
''');
}

void _restoreWebStorage() {
_eval('''
for (const [name, descriptor] of Object.entries(window.__savedWebStorage)) {
Object.defineProperty(window, name, descriptor);
}
delete window.__savedWebStorage;
''');
}
Comment thread
LasseLegarth marked this conversation as resolved.
Resolved

String _getPlatformInfoString() {
final core = globalContext.getProperty<JSObject>('firebase_core'.toJS);
final jsApp = core.callMethod<JSObject>('getApp'.toJS);
final container = jsApp.getProperty<JSObject>('container'.toJS);
final provider = container.callMethod<JSObject>(
'getProvider'.toJS,
'platform-logger'.toJS,
);
final logger = provider.callMethod<JSObject>('getImmediate'.toJS);
return logger.callMethod<JSString>('getPlatformInfoString'.toJS).toDart;
}

void main() {
group('FirebaseCoreWeb with web storage blocked', () {
setUp(() {
FirebasePlatform.instance = FirebaseCoreWeb();
_blockWebStorage();
});

tearDown(_restoreWebStorage);

test(
'initializeApp succeeds and still registers library versions',
() async {
const options = FirebaseOptions(
apiKey: 'fake-api-key',
appId: '1:1234567890:web:fake',
messagingSenderId: '1234567890',
projectId: 'fake-project',
);

await FirebasePlatform.instance.initializeApp(options: options);
expect(_getPlatformInfoString(), contains('flutter-fire-core/'));

FirebaseCoreWeb.registerLibraryVersion('flutter-fire-blocked', '1.0.0');
expect(
_getPlatformInfoString(),
contains('flutter-fire-blocked/1.0.0'),
);
},
);
});
}
Loading