Skip to content

Commit 1663bab

Browse files
authored
Merge pull request #267 from anusii/tony/263_add_get_key_to_solidlogin
Tony/263 add get key to solidlogin
2 parents 7b0c95c + 44a8ac9 commit 1663bab

File tree

4 files changed

+16
-1
lines changed

4 files changed

+16
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ au](https://solidcommunity.au/docs/solidui)
1515

1616
## 0.4.0 Refine and Tune
1717

18+
+ Add get key if required to login [0.3.10 20260406 tonypioneer]
1819
+ List files/folder count in FileBrowser, not just file count [0.3.9 20260402 gjw]
1920
+ Add keep login and other webid to SolidLogin() [0.3.8 20260326 tonypioneer]
2021
+ Adds additional layout width checks [0.3.7 20260326 tonypioneer]

lib/src/widgets/solid_login.dart

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ import 'package:solidpod/solidpod.dart'
5151
import 'package:solidui/src/constants/solid_config.dart';
5252
import 'package:solidui/src/handlers/solid_auth_handler.dart';
5353
import 'package:solidui/src/models/snackbar_config.dart';
54+
import 'package:solidui/src/utils/solid_pod_helpers.dart'
55+
show getKeyFromUserIfRequired;
5456
import 'package:solidui/src/widgets/solid_animation_dialog.dart';
5557
import 'package:solidui/src/widgets/solid_login_asset_helper.dart';
5658
import 'package:solidui/src/widgets/solid_login_auth_handler.dart';
@@ -499,6 +501,12 @@ class _SolidLoginState extends State<SolidLogin> with WidgetsBindingObserver {
499501

500502
if (!context.mounted) return;
501503

504+
// Ensure security key has been fetched once logged in
505+
if (isLoggedIn) {
506+
await getKeyFromUserIfRequired(context, widget.child);
507+
if (!context.mounted) return;
508+
}
509+
502510
await pushReplacement(context, widget.child);
503511
}
504512

lib/src/widgets/solid_login_auth_handler.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ import 'package:solidpod/solidpod.dart'
4646
solidAuthenticate;
4747

4848
import 'package:solidui/src/screens/initial_setup_screen.dart';
49+
import 'package:solidui/src/utils/solid_pod_helpers.dart'
50+
show getKeyFromUserIfRequired;
4951
import 'package:solidui/src/widgets/solid_animation_dialog.dart';
5052
import 'package:solidui/src/widgets/solid_login_helper.dart';
5153

@@ -149,6 +151,8 @@ class SolidLoginAuthHandler {
149151
}
150152

151153
if (!context.mounted) return false;
154+
await getKeyFromUserIfRequired(context, childWidget);
155+
if (!context.mounted) return true;
152156
await pushReplacement(context, childWidget);
153157
}
154158

@@ -351,6 +355,8 @@ class SolidLoginAuthHandler {
351355
}
352356

353357
if (!context.mounted) return false;
358+
await getKeyFromUserIfRequired(context, childWidget);
359+
if (!context.mounted) return true;
354360
await pushReplacement(context, childWidget);
355361
}
356362

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: solidui
22
description: 'A UI library for building Solid applications with Flutter.'
3-
version: 0.3.9
3+
version: 0.3.10
44
homepage: https://github.com/anusii/solidui
55

66
environment:

0 commit comments

Comments
 (0)