Skip to content

Commit 1d22a8a

Browse files
fixup! TF-3940 Fix cozy browser back issue
1 parent 72d0e9f commit 1d22a8a

File tree

8 files changed

+11
-8
lines changed

8 files changed

+11
-8
lines changed

cozy/lib/cozy_config_manager/cozy_config_manager_stub.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class CozyConfigManager {
2-
Future<void> injectCozyScript() async {
2+
Future<void> injectCozyScript(String cozyExternalBridgeVersion) async {
33
throw UnimplementedError('Cannot use injectCozyScript in non-web environment');
44
}
55

cozy/lib/cozy_config_manager/cozy_config_manager_web.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import 'package:linagora_design_flutter/cozy_config_manager/cozy_config_manager.
55
class CozyConfigManager {
66
bool? _isInsideCozy;
77

8-
Future<void> injectCozyScript() async {
9-
await cozy.CozyConfigManager().injectCozyScript();
8+
Future<void> injectCozyScript(String cozyExternalBridgeVersion) async {
9+
await cozy.CozyConfigManager().injectCozyScript(cozyExternalBridgeVersion);
1010
}
1111

1212
Future<void> initialize() async {

cozy/pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ packages:
197197
description:
198198
path: "."
199199
ref: "fixbug/cozy-browser-back"
200-
resolved-ref: a53268955dac1802d1b48ab3c8348be22f285338
200+
resolved-ref: da545b60659a41f501ac8888a8e5f9cb295fec4e
201201
url: "https://github.com/linagora/linagora-design-flutter.git"
202202
source: git
203203
version: "0.0.1"

docs/adr/0061-cozy-integration-set-up.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ cozy-stack instances add tmail.localhost:8080 --passphrase cozy --apps home,stor
6464
2. On the tmail side
6565
- Config tmail to run on basic auth
6666
- isInsideCozy will be `false` if run on localhost, so in cozy_config_web.dart, return true on isInsideCozy
67-
- in `env.file`, COZY_INTEGRATION=true
67+
- in `env.file`, COZY_INTEGRATION=true and COZY_EXTERNAL_BRIDGE_VERSION=x.x.x (where x.x.x is the version of cozy-external-bridge)
6868
- `flutter run -d chrome --web-port 2023 --web-browser-flag "--disable-web-security" --profile`
6969

7070
3. Access Cozy

env.file

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ IOS_FCM=supported
88
FORWARD_WARNING_MESSAGE=
99
PLATFORM=other
1010
WS_ECHO_PING=
11-
COZY_INTEGRATION=
11+
COZY_INTEGRATION=
12+
COZY_EXTERNAL_BRIDGE_VERSION=

lib/main/utils/app_config.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,6 @@ class AppConfig {
7676
static bool get isWebSocketEchoPingEnabled => dotenv.get('WS_ECHO_PING', fallback: 'false') == 'true';
7777

7878
static bool get isCozyIntegrationEnabled => dotenv.get('COZY_INTEGRATION', fallback: 'false') == 'true';
79+
80+
static String get cozyExternalBridgeVersion => dotenv.get('COZY_EXTERNAL_BRIDGE_VERSION', fallback: '0.16.1');
7981
}

lib/main/utils/cozy_integration.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class CozyIntegration {
1111

1212
try {
1313
final cozyConfig = CozyConfigManager();
14-
await cozyConfig.injectCozyScript();
14+
await cozyConfig.injectCozyScript(AppConfig.cozyExternalBridgeVersion);
1515
await cozyConfig.initialize();
1616
} catch (e) {
1717
logError('CozyIntegration::integrateCozy:Exception = $e');

pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1430,7 +1430,7 @@ packages:
14301430
description:
14311431
path: "."
14321432
ref: "fixbug/cozy-browser-back"
1433-
resolved-ref: a53268955dac1802d1b48ab3c8348be22f285338
1433+
resolved-ref: da545b60659a41f501ac8888a8e5f9cb295fec4e
14341434
url: "https://github.com/linagora/linagora-design-flutter.git"
14351435
source: git
14361436
version: "0.0.1"

0 commit comments

Comments
 (0)