Hydrogen/Solian
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

♻️ Refactored auth system

Browse Source
This commit is contained in:
LittleSheep 2024-07-25 01:18:47 +08:00
parent ef58430060
commit 6d92a16a62
38 changed files with 444 additions and 523 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/main.dart
View File

@ -106,9 +106,11 @@ class SolianApp extends StatelessWidget {
Get.lazyPut(() => ChatCallProvider());
final AuthProvider auth = Get.find();
if (await auth.isAuthorized) {
Get.find<WebSocketProvider>().connect();
auth.refreshAuthorizeStatus().then((_) {
if (auth.isAuthorized.isFalse) return;
Get.find<WebSocketProvider>().connect();
Get.find<ChannelProvider>().refreshAvailableChannel();
try {
@ -118,6 +120,6 @@ class SolianApp extends StatelessWidget {
'pushNotifyRegisterFailed'.trParams({'reason': err.toString()}),
);
}
}
});
}
}

6
lib/providers/account_status.dart
View File

@ -33,7 +33,7 @@ class StatusProvider extends GetConnect {
Future<Response> getCurrentStatus() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) throw Exception('unauthorized');
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
final client = auth.configureClient('auth');
@ -53,7 +53,7 @@ class StatusProvider extends GetConnect {
DateTime? clearAt,
}) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) throw Exception('unauthorized');
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
final client = auth.configureClient('auth');
@ -82,7 +82,7 @@ class StatusProvider extends GetConnect {
Future<Response> clearStatus() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) throw Exception('unauthorized');
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
final client = auth.configureClient('auth');

35
lib/providers/auth.dart
View File

@ -60,7 +60,10 @@ class AuthProvider extends GetConnect {
@override
void onInit() {
httpClient.baseUrl = ServiceFinder.buildUrl('auth', null);
refreshAuthorizeStatus().then((_) {
loadCredentials();
refreshUserProfile();
});
}
Future<void> refreshCredentials() async {
@ -116,7 +119,7 @@ class AuthProvider extends GetConnect {
}
Future<void> ensureCredentials() async {
if (!await isAuthorized) throw Exception('unauthorized');
if (isAuthorized.isFalse) throw Exception('unauthorized');
if (credentials == null) await loadCredentials();
if (credentials!.isExpired) {
@ -126,7 +129,7 @@ class AuthProvider extends GetConnect {
}
Future<void> loadCredentials() async {
if (await isAuthorized) {
if (isAuthorized.isTrue) {
final content = await storage.read(key: 'auth_credentials');
credentials = TokenSet.fromJson(jsonDecode(content!));
}
@ -137,7 +140,7 @@ class AuthProvider extends GetConnect {
String username,
String password,
) async {
_cachedUserProfileResponse = null;
userProfile.value = null;
final client = ServiceFinder.configureClient('auth');
@ -172,6 +175,8 @@ class AuthProvider extends GetConnect {
value: jsonEncode(credentials!.toJson()),
);
await refreshUserProfile();
Get.find<WebSocketProvider>().connect();
Get.find<WebSocketProvider>().notifyPrefetch();
@ -179,7 +184,8 @@ class AuthProvider extends GetConnect {
}
void signout() {
_cachedUserProfileResponse = null;
isAuthorized.value = false;
userProfile.value = null;
Get.find<WebSocketProvider>().disconnect();
Get.find<WebSocketProvider>().notifications.clear();
@ -195,30 +201,21 @@ class AuthProvider extends GetConnect {
// Data Layer
Response? _cachedUserProfileResponse;
RxBool isAuthorized = false.obs;
Rx<Map<String, dynamic>?> userProfile = Rx(null);
Future<bool> get isAuthorized => storage.containsKey(key: 'auth_credentials');
Future<Response> getProfile({noCache = false}) async {
if (!noCache && _cachedUserProfileResponse != null) {
return _cachedUserProfileResponse!;
Future<void> refreshAuthorizeStatus() async {
isAuthorized.value = await storage.containsKey(key: 'auth_credentials');
}
Future<void> refreshUserProfile() async {
final client = configureClient('auth');
final resp = await client.get('/users/me');
if (resp.statusCode != 200) {
throw Exception(resp.bodyString);
} else {
_cachedUserProfileResponse = resp;
}
return resp;
}
Future<Response?> getProfileWithCheck({noCache = false}) async {
if (!await isAuthorized) return null;
return await getProfile(noCache: noCache);
userProfile.value = resp.body;
}
}

2
lib/providers/call.dart
View File

@ -55,7 +55,7 @@ class ChatCallProvider extends GetxController {
Future<(String, String)> getRoomToken() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) throw Exception('unauthorized');
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
final client = auth.configureClient('messaging');

6
lib/providers/content/attachment.dart
View File

@ -86,7 +86,7 @@ class AttachmentProvider extends GetConnect {
Map<String, dynamic>? metadata,
) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) throw Exception('unauthorized');
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
final client = auth.configureClient(
'files',
@ -130,7 +130,7 @@ class AttachmentProvider extends GetConnect {
bool isMature = false,
}) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) throw Exception('unauthorized');
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
final client = auth.configureClient('files');
@ -152,7 +152,7 @@ class AttachmentProvider extends GetConnect {
Future<Response> deleteAttachment(int id) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) throw Exception('unauthorized');
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
final client = auth.configureClient('files');

22
lib/providers/content/channel.dart
View File

@ -16,7 +16,7 @@ class ChannelProvider extends GetxController {
Future<void> refreshAvailableChannel() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) throw Exception('unauthorized');
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
isLoading.value = true;
final resp = await listAvailableChannel();
@ -29,7 +29,7 @@ class ChannelProvider extends GetxController {
Future<Response> getChannel(String alias, {String realm = 'global'}) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) throw Exception('unauthorized');
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
final client = auth.configureClient('messaging');
@ -44,7 +44,7 @@ class ChannelProvider extends GetxController {
Future<Response> getMyChannelProfile(String alias,
{String realm = 'global'}) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) throw Exception('unauthorized');
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
final client = auth.configureClient('messaging');
@ -59,7 +59,7 @@ class ChannelProvider extends GetxController {
Future<Response?> getChannelOngoingCall(String alias,
{String realm = 'global'}) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) throw Exception('unauthorized');
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
final client = auth.configureClient('messaging');
@ -75,7 +75,7 @@ class ChannelProvider extends GetxController {
Future<Response> listChannel({String scope = 'global'}) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) throw Exception('unauthorized');
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
final client = auth.configureClient('messaging');
@ -89,7 +89,7 @@ class ChannelProvider extends GetxController {
Future<Response> listAvailableChannel({String realm = 'global'}) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) throw Exception('unauthorized');
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
final client = auth.configureClient('messaging');
@ -103,7 +103,7 @@ class ChannelProvider extends GetxController {
Future<Response> createChannel(String scope, dynamic payload) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) throw Exception('unauthorized');
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
final client = auth.configureClient('messaging');
@ -118,7 +118,7 @@ class ChannelProvider extends GetxController {
Future<Response?> createDirectChannel(
BuildContext context, String scope) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) throw Exception('unauthorized');
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
final related = await showModalBottomSheet(
useRootNavigator: true,
@ -129,14 +129,14 @@ class ChannelProvider extends GetxController {
);
if (related == null) return null;
final prof = await auth.getProfile();
final prof = auth.userProfile.value!;
final client = auth.configureClient('messaging');
final resp = await client.post('/channels/$scope/dm', {
'alias': const Uuid().v4().replaceAll('-', '').substring(0, 12),
'name': 'DM',
'description':
'A direct message channel between @${prof.body['name']} and @${related.name}',
'A direct message channel between @${prof['name']} and @${related.name}',
'related_user': related.id,
'is_encrypted': false,
});
@ -149,7 +149,7 @@ class ChannelProvider extends GetxController {
Future<Response> updateChannel(String scope, int id, dynamic payload) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) throw Exception('unauthorized');
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
final client = auth.configureClient('messaging');

2
lib/providers/content/posts.dart
View File

@ -27,7 +27,7 @@ class PostProvider extends GetConnect {
Future<Response> listDraft(int page) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) throw Exception('unauthorized');
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
final queries = [
'take=${10}',

4
lib/providers/content/realm.dart
View File

@ -4,7 +4,7 @@ import 'package:solian/providers/auth.dart';
class RealmProvider extends GetxController {
Future<Response> getRealm(String alias) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) throw Exception('unauthorized');
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
final client = auth.configureClient('auth');
@ -18,7 +18,7 @@ class RealmProvider extends GetxController {
Future<Response> listAvailableRealm() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) throw Exception('unauthorized');
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
final client = auth.configureClient('auth');

4
lib/providers/message/adaptor.dart
View File

@ -18,7 +18,7 @@ Future<MessageHistoryDb> createHistoryDb() async {
Future<Event?> getRemoteEvent(int id, Channel channel, String scope) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return null;
if (auth.isAuthorized.isFalse) return null;
final client = auth.configureClient('messaging');
@ -48,7 +48,7 @@ Future<(List<Event>, int)?> getRemoteEvents(
}
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return null;
if (auth.isAuthorized.isFalse) return null;
final client = auth.configureClient('messaging');

4
lib/providers/websocket.dart
View File

@ -102,7 +102,7 @@ class WebSocketProvider extends GetxController {
Future<void> notifyPrefetch() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
final client = auth.configureClient('auth');
@ -119,7 +119,7 @@ class WebSocketProvider extends GetxController {
Future<void> registerPushNotifications() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
late final String? token;
late final String provider;

44
lib/screens/account.dart
View File

@ -29,19 +29,13 @@ class _AccountScreenState extends State<AccountScreen> {
(const Icon(Icons.info_outline), 'about'.tr, 'about'),
];
final AuthProvider provider = Get.find();
final AuthProvider auth = Get.find();
return Material(
color: Theme.of(context).colorScheme.surface,
child: SafeArea(
child: FutureBuilder(
future: provider.isAuthorized,
builder: (context, snapshot) {
if (!snapshot.hasData) {
return const Center(child: CircularProgressIndicator());
}
if (snapshot.hasData && snapshot.data == false) {
child: Obx(() {
if (auth.isAuthorized.isFalse) {
return Center(
child: Column(
mainAxisSize: MainAxisSize.min,
@ -59,8 +53,7 @@ class _AccountScreenState extends State<AccountScreen> {
builder: (context) => const SignInPopup(),
).then((val) async {
if (val == true) {
await provider.getProfile(noCache: true);
setState(() {});
await auth.refreshUserProfile();
}
});
},
@ -107,15 +100,14 @@ class _AccountScreenState extends State<AccountScreen> {
leading: const Icon(Icons.logout),
title: Text('signout'.tr),
onTap: () {
provider.signout();
auth.signout();
setState(() {});
},
),
],
),
);
},
),
}),
),
);
}
@ -139,24 +131,18 @@ class _AccountHeadingState extends State<AccountHeading> {
@override
Widget build(BuildContext context) {
final AuthProvider provider = Get.find();
final AuthProvider auth = Get.find();
return FutureBuilder(
future: provider.getProfile(),
builder: (context, snapshot) {
if (!snapshot.hasData) {
return const LinearProgressIndicator();
}
final prof = auth.userProfile.value!;
final prof = snapshot.data!;
return AccountHeadingWidget(
avatar: prof.body['avatar'],
banner: prof.body['banner'],
name: prof.body['name'],
nick: prof.body['nick'],
desc: prof.body['description'],
avatar: prof['avatar'],
banner: prof['banner'],
name: prof['name'],
nick: prof['nick'],
desc: prof['description'],
status: _status,
badges: prof.body['badges']
badges: prof['badges']
?.map((e) => AccountBadge.fromJson(e))
.toList()
.cast<AccountBadge>(),
@ -166,8 +152,6 @@ class _AccountHeadingState extends State<AccountHeading> {
});
},
);
},
);
}
}

4
lib/screens/account/notification.dart
View File

@ -18,7 +18,7 @@ class _NotificationScreenState extends State<NotificationScreen> {
Future<void> markAllRead() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
setState(() => _isBusy = true);
@ -42,7 +42,7 @@ class _NotificationScreenState extends State<NotificationScreen> {
Future<void> markOneRead(notify.Notification element, int index) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
final WebSocketProvider provider = Get.find();

24
lib/screens/account/personalize.dart
View File

@ -53,17 +53,17 @@ class _PersonalizeScreenState extends State<PersonalizeScreen> {
setState(() => _isBusy = true);
final AuthProvider auth = Get.find();
final prof = await auth.getProfile(noCache: true);
final prof = auth.userProfile.value!;
setState(() {
_usernameController.text = prof.body['name'];
_nicknameController.text = prof.body['nick'];
_descriptionController.text = prof.body['description'];
_firstNameController.text = prof.body['profile']['first_name'];
_lastNameController.text = prof.body['profile']['last_name'];
_avatar = prof.body['avatar'];
_banner = prof.body['banner'];
if (prof.body['profile']['birthday'] != null) {
_birthday = DateTime.parse(prof.body['profile']['birthday']);
_usernameController.text = prof['name'];
_nicknameController.text = prof['nick'];
_descriptionController.text = prof['description'];
_firstNameController.text = prof['profile']['first_name'];
_lastNameController.text = prof['profile']['last_name'];
_avatar = prof['avatar'];
_banner = prof['banner'];
if (prof['profile']['birthday'] != null) {
_birthday = DateTime.parse(prof['profile']['birthday']);
_birthdayController.text =
DateFormat('yyyy-MM-dd').format(_birthday!.toLocal());
}
@ -74,7 +74,7 @@ class _PersonalizeScreenState extends State<PersonalizeScreen> {
Future<void> updateImage(String position) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
final image = await _imagePicker.pickImage(source: ImageSource.gallery);
if (image == null) return;
@ -120,7 +120,7 @@ class _PersonalizeScreenState extends State<PersonalizeScreen> {
void updatePersonalize() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
setState(() => _isBusy = true);

24
lib/screens/channel/channel_chat.dart
View File

@ -44,7 +44,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
bool _isBusy = false;
int? _accountId;
String? _overrideAlias;
String? _newAlias;
Channel? _channel;
Call? _ongoingCall;
@ -53,26 +53,20 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
late final ChatEventController _chatController;
getProfile() async {
final AuthProvider auth = Get.find();
final prof = await auth.getProfile();
_accountId = prof.body['id'];
}
getChannel({String? overrideAlias}) async {
getChannel({String? alias}) async {
final ChannelProvider provider = Get.find();
setState(() => _isBusy = true);
if (overrideAlias != null) _overrideAlias = overrideAlias;
if (alias != null) _newAlias = alias;
try {
final resp = await provider.getChannel(
_overrideAlias ?? widget.alias,
_newAlias ?? widget.alias,
realm: widget.realm,
);
final respProfile = await provider.getMyChannelProfile(
_overrideAlias ?? widget.alias,
_newAlias ?? widget.alias,
realm: widget.realm,
);
setState(() {
@ -93,7 +87,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
try {
final resp = await provider.getChannelOngoingCall(
_overrideAlias ?? widget.alias,
_newAlias ?? widget.alias,
realm: widget.realm,
);
if (resp != null) {
@ -150,16 +144,16 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
@override
void initState() {
_accountId = Get.find<AuthProvider>().userProfile.value!['id'];
_chatController = ChatEventController();
_chatController.initialize();
getChannel().then((_) {
_chatController.getEvents(_channel!, widget.realm);
listenMessages();
});
getProfile();
getOngoingCall();
super.initState();
@ -225,7 +219,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
if (value == false) AppRouter.instance.pop();
if (value != null) {
final resp = Channel.fromJson(value as Map<String, dynamic>);
getChannel(overrideAlias: resp.alias);
getChannel(alias: resp.alias);
}
});
},

10
lib/screens/channel/channel_detail.dart
View File

@ -41,9 +41,9 @@ class _ChannelDetailScreenState extends State<ChannelDetailScreen> {
void checkOwner() async {
final AuthProvider auth = Get.find();
final prof = await auth.getProfile();
setState(() {
_isOwned = prof.body['id'] == widget.channel.account.externalId;
_isOwned =
auth.userProfile.value!['id'] == widget.channel.account.externalId;
});
}
@ -75,14 +75,14 @@ class _ChannelDetailScreenState extends State<ChannelDetailScreen> {
void applyProfileChanges() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
setState(() => _isBusy = true);
final client = auth.configureClient('messaging');
final resp = await client.put(
'/channels/${widget.realm}/${widget.channel.alias}/members/me', {
final resp = await client
.put('/channels/${widget.realm}/${widget.channel.alias}/members/me', {
'nick': null,
'notify_level': _notifyLevel,
});

2
lib/screens/channel/channel_organize.dart
View File

@ -39,7 +39,7 @@ class _ChannelOrganizeScreenState extends State<ChannelOrganizeScreen> {
void applyChannel() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
if (_aliasController.value.text.isEmpty) randomizeAlias();

15
lib/screens/chat.dart
View File

@ -97,20 +97,14 @@ class _ChatScreenState extends State<ChatScreen> {
),
],
),
body: FutureBuilder(
future: auth.getProfileWithCheck(),
builder: (context, snapshot) {
if (!snapshot.hasData) {
return const Center(
child: CircularProgressIndicator(),
);
} else if (snapshot.data == null) {
body: Obx(() {
if (auth.isAuthorized.isFalse) {
return SigninRequiredOverlay(
onSignedIn: () => _channels.refreshAvailableChannel(),
);
}
final selfId = snapshot.data!.body['id'];
final selfId = auth.userProfile.value!['id'];
return Column(
children: [
@ -138,8 +132,7 @@ class _ChatScreenState extends State<ChatScreen> {
),
],
);
},
),
}),
),
);
}

11
lib/screens/home.dart
View File

@ -107,10 +107,10 @@ class FeedCreationButton extends StatelessWidget {
Widget build(BuildContext context) {
final AuthProvider auth = Get.find();
return FutureBuilder(
future: auth.isAuthorized,
builder: (context, snapshot) {
if (snapshot.hasData && snapshot.data == true) {
if (auth.isAuthorized.isFalse) {
return const SizedBox();
}
return PopupMenuButton(
icon: const Icon(Icons.edit_square),
itemBuilder: (BuildContext context) => [
@ -142,7 +142,4 @@ class FeedCreationButton extends StatelessWidget {
],
);
}
return const SizedBox();
});
}
}

2
lib/screens/posts/post_editor.dart
View File

@ -69,7 +69,7 @@ class _PostPublishScreenState extends State<PostPublishScreen> {
void applyPost() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
if (_contentController.value.text.isEmpty) return;
setState(() => _isBusy = true);

19
lib/screens/realms.dart
View File

@ -28,7 +28,7 @@ class _RealmListScreenState extends State<RealmListScreen> {
getRealms() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
setState(() => _isBusy = true);
@ -81,18 +81,10 @@ class _RealmListScreenState extends State<RealmListScreen> {
),
],
),
body: FutureBuilder(
future: auth.isAuthorized,
builder: (context, snapshot) {
if (!snapshot.hasData) {
return const Center(
child: CircularProgressIndicator(),
);
} else if (snapshot.data == false) {
body: Obx(() {
if (auth.isAuthorized.isFalse) {
return SigninRequiredOverlay(
onSignedIn: () {
getRealms();
},
onSignedIn: () => getRealms(),
);
}
@ -115,8 +107,7 @@ class _RealmListScreenState extends State<RealmListScreen> {
),
],
);
},
),
}),
),
);
}

3
lib/screens/realms/realm_detail.dart
View File

@ -26,9 +26,8 @@ class _RealmDetailScreenState extends State<RealmDetailScreen> {
void checkOwner() async {
final AuthProvider auth = Get.find();
final prof = await auth.getProfile();
setState(() {
_isOwned = prof.body['id'] == widget.realm.accountId;
_isOwned = auth.userProfile.value!['id'] == widget.realm.accountId;
});
}

2
lib/screens/realms/realm_organize.dart
View File

@ -37,7 +37,7 @@ class _RealmOrganizeScreenState extends State<RealmOrganizeScreen> {
void applyRealm() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
if (_aliasController.value.text.isEmpty) randomizeAlias();

10
lib/screens/realms/realm_view.dart
View File

@ -244,9 +244,6 @@ class RealmChannelListWidget extends StatelessWidget {
Widget build(BuildContext context) {
final AuthProvider auth = Get.find();
return FutureBuilder(
future: auth.getProfile(),
builder: (context, snapshot) {
return RefreshIndicator(
onRefresh: onRefresh,
child: Column(
@ -257,8 +254,7 @@ class RealmChannelListWidget extends StatelessWidget {
tileColor: Theme.of(context).colorScheme.surfaceContainer,
title: Text('channelNew'.tr),
subtitle: Text(
'channelNewInRealmHint'
.trParams({'realm': '#${realm.alias}'}),
'channelNewInRealmHint'.trParams({'realm': '#${realm.alias}'}),
),
onTap: () {
AppRouter.instance
@ -274,14 +270,12 @@ class RealmChannelListWidget extends StatelessWidget {
Expanded(
child: ChannelListWidget(
channels: channels,
selfId: snapshot.data?.body['id'] ?? 0,
selfId: auth.userProfile.value!['id'],
noCategory: true,
),
)
],
),
);
},
);
}
}

3
lib/widgets/account/relative_select.dart
View File

@ -23,8 +23,7 @@ class _RelativeSelectorState extends State<RelativeSelector> {
getFriends() async {
final AuthProvider auth = Get.find();
final prof = await auth.getProfile();
_accountId = prof.body['id'];
_accountId = auth.userProfile.value!['id'];
final RelationshipProvider provider = Get.find();
final resp = await provider.listRelationWithStatus(1);

8
lib/widgets/attachments/attachment_publish.dart
View File

@ -44,7 +44,7 @@ class _AttachmentPublishPopupState extends State<AttachmentPublishPopup> {
Future<void> pickPhotoToUpload() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
final medias = await _imagePicker.pickMultiImage();
if (medias.isEmpty) return;
@ -73,7 +73,7 @@ class _AttachmentPublishPopupState extends State<AttachmentPublishPopup> {
Future<void> pickVideoToUpload() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
final media = await _imagePicker.pickVideo(source: ImageSource.gallery);
if (media == null) return;
@ -96,7 +96,7 @@ class _AttachmentPublishPopupState extends State<AttachmentPublishPopup> {
Future<void> pickFileToUpload() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
FilePickerResult? result = await FilePicker.platform.pickFiles(
allowMultiple: true,
@ -121,7 +121,7 @@ class _AttachmentPublishPopupState extends State<AttachmentPublishPopup> {
Future<void> takeMediaToUpload(bool isVideo) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
XFile? media;
if (isVideo) {

4
lib/widgets/channel/channel_deletion.dart
View File

@ -25,7 +25,7 @@ class _ChannelDeletionDialogState extends State<ChannelDeletionDialog> {
Future<void> deleteChannel() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
setState(() => _isBusy = true);
@ -44,7 +44,7 @@ class _ChannelDeletionDialogState extends State<ChannelDeletionDialog> {
Future<void> leaveChannel() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
setState(() => _isBusy = true);

9
lib/widgets/channel/channel_member.dart
View File

@ -31,10 +31,9 @@ class _ChannelMemberListPopupState extends State<ChannelMemberListPopup> {
void getProfile() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
final prof = await auth.getProfile();
setState(() => _accountId = prof.body['id']);
setState(() => _accountId = auth.userProfile.value!['id']);
}
void getMembers() async {
@ -72,7 +71,7 @@ class _ChannelMemberListPopupState extends State<ChannelMemberListPopup> {
void addMember(String username) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
setState(() => _isBusy = true);
@ -93,7 +92,7 @@ class _ChannelMemberListPopupState extends State<ChannelMemberListPopup> {
void removeMember(ChannelMember item) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
setState(() => _isBusy = true);

2
lib/widgets/chat/call/call_prejoin.dart
View File

@ -28,7 +28,7 @@ class _ChatCallPrejoinPopupState extends State<ChatCallPrejoinPopup> {
void performJoin() async {
final AuthProvider auth = Get.find();
final ChatCallProvider provider = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
setState(() => _isBusy = true);

4
lib/widgets/chat/call/chat_call_action.dart
View File

@ -31,7 +31,7 @@ class _ChatCallButtonState extends State<ChatCallButton> {
Future<void> makeCall() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
final client = auth.configureClient('messaging');
@ -55,7 +55,7 @@ class _ChatCallButtonState extends State<ChatCallButton> {
Future<void> endsCall() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
final client = auth.configureClient('messaging');

9
lib/widgets/chat/chat_event_action.dart
View File

@ -35,15 +35,14 @@ class _ChatEventActionState extends State<ChatEventAction> {
void checkAbleToModifyContent() async {
if (!['messages.new'].contains(widget.item.type)) return;
final AuthProvider provider = Get.find();
if (!await provider.isAuthorized) return;
final AuthProvider auth = Get.find();
if (auth.isAuthorized.isFalse) return;
setState(() => _isBusy = true);
final prof = await provider.getProfile();
setState(() {
_canModifyContent =
prof.body?['id'] == widget.item.sender.account.externalId;
_canModifyContent = auth.userProfile.value!['id'] ==
widget.item.sender.account.externalId;
_isBusy = false;
});
}

2
lib/widgets/chat/chat_event_deletion.dart
View File

@ -28,7 +28,7 @@ class _ChatEventDeletionDialogState extends State<ChatEventDeletionDialog> {
void performAction() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
final client = auth.configureClient('messaging');

8
lib/widgets/chat/chat_message_input.dart
View File

@ -59,8 +59,8 @@ class _ChatMessageInputState extends State<ChatMessageInput> {
_focusNode.requestFocus();
final AuthProvider auth = Get.find();
final prof = await auth.getProfile();
if (!await auth.isAuthorized) return;
final prof = auth.userProfile.value!;
if (auth.isAuthorized.isFalse) return;
final client = auth.configureClient('messaging');
@ -87,9 +87,9 @@ class _ChatMessageInputState extends State<ChatMessageInput> {
id: 0,
createdAt: DateTime.now(),
updatedAt: DateTime.now(),
account: Account.fromJson(prof.body),
account: Account.fromJson(prof),
channelId: widget.channel.id,
accountId: prof.body['id'],
accountId: prof['id'],
notify: 0,
);
final message = Event(

27
lib/widgets/current_state_action.dart
View File

@ -17,14 +17,8 @@ class BackgroundStateWidget extends StatelessWidget {
final connecting = ws.isConnecting.isTrue;
return Row(children: [
if (disconnected && !connecting)
FutureBuilder(
future: auth.isAuthorized,
builder: (context, snapshot) {
if (!snapshot.hasData || snapshot.data == false) {
return const SizedBox();
}
return IconButton(
if (auth.isAuthorized.isTrue && disconnected && !connecting)
IconButton(
tooltip: [
if (ws.isConnected.isFalse)
'Lost Connection with Solar Network...',
@ -37,27 +31,16 @@ class BackgroundStateWidget extends StatelessWidget {
onPressed: () {
if (ws.isConnected.isFalse) ws.connect();
},
);
},
),
if (connecting)
FutureBuilder(
future: auth.isAuthorized,
builder: (context, snapshot) {
if (!snapshot.hasData || snapshot.data == false) {
return const SizedBox();
}
return IconButton(
if (auth.isAuthorized.isTrue && connecting)
IconButton(
tooltip: [
if (ws.isConnecting.isTrue)
'Waiting Solar Network Connection...',
if (ws.isConnecting.isTrue) 'Waiting Solar Network Connection...',
].join('\n'),
icon: const Icon(Icons.sync)
.animate(onPlay: (c) => c.repeat())
.rotate(duration: 1850.ms, begin: 1, end: 0),
onPressed: () {},
);
},
),
]);
});

32
lib/widgets/navigation/app_navigation_drawer.dart
View File

@ -27,7 +27,6 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
AccountStatus? _accountStatus;
late final AuthProvider _auth;
late final ChannelProvider _channels;
void getStatus() async {
@ -57,7 +56,6 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
@override
void initState() {
super.initState();
_auth = Get.find();
_channels = Get.find();
detectSelectedIndex();
getStatus();
@ -83,10 +81,8 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
closeDrawer();
},
children: [
FutureBuilder(
future: auth.getProfileWithCheck(),
builder: (context, snapshot) {
if (snapshot.data == null) {
Obx(() {
if (auth.isAuthorized.isFalse) {
return ListTile(
contentPadding: const EdgeInsets.symmetric(horizontal: 28),
leading: const Icon(Icons.account_circle),
@ -103,7 +99,7 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
return ListTile(
contentPadding: const EdgeInsets.symmetric(horizontal: 24),
title: Text(
snapshot.data!.body['nick'],
auth.userProfile.value!['nick'],
maxLines: 1,
overflow: TextOverflow.fade,
),
@ -137,7 +133,7 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
end: -2,
),
child: AccountAvatar(
content: snapshot.data!.body['avatar'],
content: auth.userProfile.value!['avatar'],
),
);
}),
@ -161,8 +157,7 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
closeDrawer();
},
);
},
).paddingOnly(top: 8),
}).paddingOnly(top: 8),
const Divider(thickness: 0.3, height: 1).paddingOnly(
bottom: 12,
top: 8,
@ -176,19 +171,18 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
const Divider(thickness: 0.3, height: 1).paddingOnly(
top: 12,
),
FutureBuilder(
future: _auth.getProfileWithCheck(),
builder: (context, snapshot) {
if (!snapshot.hasData || snapshot.data == null) {
Obx(() {
if (auth.isAuthorized.isFalse) {
return const SizedBox();
}
final selfId = snapshot.data!.body['id'];
final selfId = auth.userProfile.value!['id'];
return Column(
children: [
Theme(
data: Theme.of(context).copyWith(dividerColor: Colors.transparent),
data: Theme.of(context)
.copyWith(dividerColor: Colors.transparent),
child: ExpansionTile(
title: Text('channels'.tr),
tilePadding: const EdgeInsets.symmetric(horizontal: 24),
@ -197,8 +191,7 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
() => SizedBox(
height: 360,
child: RefreshIndicator(
onRefresh: () =>
_channels.refreshAvailableChannel(),
onRefresh: () => _channels.refreshAvailableChannel(),
child: ChannelListWidget(
channels: _channels.groupChannels,
selfId: selfId,
@ -217,8 +210,7 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
),
],
);
},
),
}),
],
);
}

9
lib/widgets/posts/post_action.dart
View File

@ -25,14 +25,13 @@ class _PostActionState extends State<PostAction> {
bool _canModifyContent = false;
void checkAbleToModifyContent() async {
final AuthProvider provider = Get.find();
if (!await provider.isAuthorized) return;
final AuthProvider auth = Get.find();
if (auth.isAuthorized.isFalse) return;
setState(() => _isBusy = true);
final prof = await provider.getProfile();
setState(() {
_canModifyContent = prof.body?['id'] == widget.item.author.externalId;
_canModifyContent = auth.userProfile.value!['id'] == widget.item.author.externalId;
_isBusy = false;
});
}
@ -153,7 +152,7 @@ class _PostDeletionDialogState extends State<PostDeletionDialog> {
void performAction() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
final client = auth.configureClient('interactive');

2
lib/widgets/posts/post_quick_action.dart
View File

@ -47,7 +47,7 @@ class _PostQuickActionState extends State<PostQuickAction> {
final AuthProvider auth = Get.find();
if (_isSubmitting) return;
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
final client = auth.configureClient('interactive');

4
lib/widgets/realms/realm_deletion.dart
View File

@ -23,7 +23,7 @@ class _RealmDeletionDialogState extends State<RealmDeletionDialog> {
Future<void> deleteRealm() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
setState(() => _isBusy = true);
@ -41,7 +41,7 @@ class _RealmDeletionDialogState extends State<RealmDeletionDialog> {
Future<void> leaveRealm() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
setState(() => _isBusy = true);

9
lib/widgets/realms/realm_member.dart
View File

@ -29,10 +29,9 @@ class _RealmMemberListPopupState extends State<RealmMemberListPopup> {
void getProfile() async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
final prof = await auth.getProfile();
setState(() => _accountId = prof.body['id']);
setState(() => _accountId = auth.userProfile.value!['id']);
}
void getMembers() async {
@ -69,7 +68,7 @@ class _RealmMemberListPopupState extends State<RealmMemberListPopup> {
void addMember(String username) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
setState(() => _isBusy = true);
@ -90,7 +89,7 @@ class _RealmMemberListPopupState extends State<RealmMemberListPopup> {
void removeMember(RealmMember item) async {
final AuthProvider auth = Get.find();
if (!await auth.isAuthorized) return;
if (auth.isAuthorized.isFalse) return;
setState(() => _isBusy = true);