Merge pull request #209 from krawieck/fix/another-user-id-fix

LemmurOrg · Apr 12, 2021 · 1f2c808 · 1f2c808
2 parents 6df8394 + 4a93944
commit 1f2c808
Show file tree

Hide file tree

Showing 17 changed files with 97 additions and 58 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,10 @@
 - Text of a post is now selectable
 - Tapping outside of a text input hides the keyboard
 
+### Fixed
+
+- Actually fixed the thing that v0.4.1 supposedly fixed
+
 ## v0.4.1 - 2021-04-06
 
 ### Fixed

diff --git a/lib/hooks/logged_in_action.dart b/lib/hooks/logged_in_action.dart
@@ -30,7 +30,7 @@ VoidCallback Function(
         ));
       };
     }
-    return () => action(store.defaultToken!);
+    return () => action(store.defaultUserData!.jwt);
   };
 }
 
@@ -52,7 +52,7 @@ VoidCallback Function(
         ));
       };
     }
-    final token = store.defaultTokenFor(instanceHost)!;
+    final token = store.defaultUserDataFor(instanceHost)!.jwt;
     return () => action(token);
   };
 }
diff --git a/lib/pages/communities_tab.dart b/lib/pages/communities_tab.dart
@@ -53,8 +53,8 @@ class CommunitiesTab extends HookWidget {
                   sort: SortType.active,
                   savedOnly: false,
                   personId:
-                      accountsStore.defaultTokenFor(instanceHost)!.payload.sub,
-                  auth: accountsStore.defaultTokenFor(instanceHost)!.raw,
+                      accountsStore.defaultUserDataFor(instanceHost)!.userId,
+                  auth: accountsStore.defaultUserDataFor(instanceHost)!.jwt.raw,
                 ))
                 .then((e) => e.follows),
           )

diff --git a/lib/pages/community.dart b/lib/pages/community.dart
@@ -55,7 +55,7 @@ class CommunityPage extends HookWidget {
     final scrollController = useScrollController();
 
     final fullCommunitySnap = useMemoFuture(() {
-      final token = accountsStore.defaultTokenFor(instanceHost);
+      final token = accountsStore.defaultUserDataFor(instanceHost)?.jwt;
 
       if (communityId != null) {
         return LemmyApiV3(instanceHost).run(GetCommunity(
@@ -196,8 +196,9 @@ class CommunityPage extends HookWidget {
                       LemmyApiV3(community.instanceHost).run(GetComments(
                         communityId: community.community.id,
                         auth: accountsStore
-                            .defaultTokenFor(community.instanceHost)
-                            ?.raw,
+                            .defaultUserDataFor(community.instanceHost)
+                            ?.jwt
+                            .raw,
                         type: CommentListingType.community,
                         sort: sortType,
                         limit: batchSize,

diff --git a/lib/pages/create_post.dart b/lib/pages/create_post.dart
@@ -75,7 +75,7 @@ class CreatePostPage extends HookWidget {
         type: PostListingType.all,
         sort: SortType.hot,
         limit: 9999,
-        auth: accStore.defaultTokenFor(selectedInstance.value)?.raw,
+        auth: accStore.defaultUserDataFor(selectedInstance.value)?.jwt.raw,
       ))
           .then(
         (value) {

diff --git a/lib/pages/full_post.dart b/lib/pages/full_post.dart
@@ -36,7 +36,7 @@ class FullPostPage extends HookWidget {
     final fullPostRefreshable =
         useRefreshable(() => LemmyApiV3(instanceHost).run(GetPost(
               id: id,
-              auth: accStore.defaultTokenFor(instanceHost)?.raw,
+              auth: accStore.defaultUserDataFor(instanceHost)?.jwt.raw,
             )));
     final loggedInAction = useLoggedInAction(instanceHost);
     final newComments = useState(const <CommentView>[]);

diff --git a/lib/pages/home_tab.dart b/lib/pages/home_tab.dart
@@ -293,7 +293,7 @@ class InfiniteHomeList extends HookWidget {
             page: page,
             limit: limit,
             savedOnly: false,
-            auth: accStore.defaultTokenFor(instanceHost)?.raw,
+            auth: accStore.defaultUserDataFor(instanceHost)?.jwt.raw,
           ))
       ];
       final instancePosts = await Future.wait(futures);
@@ -316,7 +316,7 @@ class InfiniteHomeList extends HookWidget {
               page: page,
               limit: batchSize,
               savedOnly: false,
-              auth: accStore.defaultTokenFor(instanceHost)?.raw,
+              auth: accStore.defaultUserDataFor(instanceHost)?.jwt.raw,
             ));
 
     return InfinitePostList(

diff --git a/lib/pages/inbox.dart b/lib/pages/inbox.dart
@@ -109,7 +109,7 @@ class InboxPage extends HookWidget {
               defaultSort: SortType.new_,
               fetcher: (page, batchSize, sortType) =>
                   LemmyApiV3(selectedInstance).run(GetReplies(
-                auth: accStore.defaultTokenFor(selectedInstance)!.raw,
+                auth: accStore.defaultUserDataFor(selectedInstance)!.jwt.raw,
                 sort: sortType,
                 limit: batchSize,
                 page: page,
@@ -127,7 +127,7 @@ class InboxPage extends HookWidget {
               defaultSort: SortType.new_,
               fetcher: (page, batchSize, sortType) =>
                   LemmyApiV3(selectedInstance).run(GetPersonMentions(
-                auth: accStore.defaultTokenFor(selectedInstance)!.raw,
+                auth: accStore.defaultUserDataFor(selectedInstance)!.jwt.raw,
                 sort: sortType,
                 limit: batchSize,
                 page: page,
@@ -146,7 +146,7 @@ class InboxPage extends HookWidget {
               controller: isc,
               fetcher: (page, batchSize) => LemmyApiV3(selectedInstance).run(
                 GetPrivateMessages(
-                  auth: accStore.defaultTokenFor(selectedInstance)!.raw,
+                  auth: accStore.defaultUserDataFor(selectedInstance)!.jwt.raw,
                   limit: batchSize,
                   page: page,
                   unreadOnly: unreadOnly.value,
@@ -190,7 +190,7 @@ class PrivateMessageTile extends HookWidget {
     final toMe = useMemoized(() =>
         pmv.value.recipient.originInstanceHost == pmv.value.instanceHost &&
         pmv.value.recipient.id ==
-            accStore.defaultTokenFor(pmv.value.instanceHost)?.payload.sub);
+            accStore.defaultUserDataFor(pmv.value.instanceHost)?.userId);
 
     final otherSide =
         useMemoized(() => toMe ? pmv.value.creator : pmv.value.recipient);
@@ -240,7 +240,7 @@ class PrivateMessageTile extends HookWidget {
           instanceHost: pmv.value.instanceHost,
           query: DeletePrivateMessage(
             privateMessageId: pmv.value.privateMessage.id,
-            auth: accStore.defaultTokenFor(pmv.value.instanceHost)!.raw,
+            auth: accStore.defaultUserDataFor(pmv.value.instanceHost)!.jwt.raw,
             deleted: !deleted.value,
           ),
           onSuccess: (val) => deleted.value = val.privateMessage.deleted,
@@ -252,7 +252,7 @@ class PrivateMessageTile extends HookWidget {
           instanceHost: pmv.value.instanceHost,
           query: MarkPrivateMessageAsRead(
             privateMessageId: pmv.value.privateMessage.id,
-            auth: accStore.defaultTokenFor(pmv.value.instanceHost)!.raw,
+            auth: accStore.defaultUserDataFor(pmv.value.instanceHost)!.jwt.raw,
             read: !read.value,
           ),
           // TODO: add notification for notifying parent list

diff --git a/lib/pages/instance.dart b/lib/pages/instance.dart
@@ -184,7 +184,8 @@ class InstancePage extends HookWidget {
                         limit: batchSize,
                         page: page,
                         savedOnly: false,
-                        auth: accStore.defaultTokenFor(instanceHost)?.raw,
+                        auth:
+                            accStore.defaultUserDataFor(instanceHost)?.jwt.raw,
                       ))),
               InfiniteCommentList(
                   fetcher: (page, batchSize, sort) =>
@@ -194,7 +195,8 @@ class InstancePage extends HookWidget {
                         limit: batchSize,
                         page: page,
                         savedOnly: false,
-                        auth: accStore.defaultTokenFor(instanceHost)?.raw,
+                        auth:
+                            accStore.defaultUserDataFor(instanceHost)?.jwt.raw,
                       ))),
               _AboutTab(site,
                   communitiesFuture: communitiesFuture,
@@ -244,7 +246,7 @@ class _AboutTab extends HookWidget {
               sort: sortType,
               limit: batchSize,
               page: page,
-              auth: accStore.defaultTokenFor(instanceHost)?.raw,
+              auth: accStore.defaultUserDataFor(instanceHost)?.jwt.raw,
             ),
           ),
           title: 'Communities of ${site.siteView?.site.name}',

diff --git a/lib/pages/manage_account.dart b/lib/pages/manage_account.dart
@@ -28,8 +28,8 @@ class ManageAccountPage extends HookWidget {
     final accountStore = useAccountsStore();
 
     final userFuture = useMemoized(() async {
-      final site = await LemmyApiV3(instanceHost).run(
-          GetSite(auth: accountStore.tokenFor(instanceHost, username)!.raw));
+      final site = await LemmyApiV3(instanceHost).run(GetSite(
+          auth: accountStore.userDataFor(instanceHost, username)!.jwt.raw));
 
       return site.myUser!;
     });
@@ -98,7 +98,8 @@ class _ManageAccount extends HookWidget {
     final verifyPasswordFocusNode = useFocusNode();
     final oldPasswordFocusNode = useFocusNode();
 
-    final token = accountsStore.tokenFor(user.instanceHost, user.person.name)!;
+    final token =
+        accountsStore.userDataFor(user.instanceHost, user.person.name)!.jwt;
 
     handleSubmit() async {
       saveDelayedLoading.start();
@@ -434,7 +435,8 @@ class _ImagePicker extends HookWidget {
           final upload = await PictrsApi(user.instanceHost).upload(
             filePath: pic.path,
             auth: accountsStore
-                .tokenFor(user.instanceHost, user.person.name)!
+                .userDataFor(user.instanceHost, user.person.name)!
+                .jwt
                 .raw,
           );
           pictrsDeleteToken.value = upload.files[0];

diff --git a/lib/pages/profile_tab.dart b/lib/pages/profile_tab.dart
@@ -91,7 +91,7 @@ class UserProfileTab extends HookWidget {
         actions: actions,
       ),
       body: UserProfile(
-        userId: accountsStore.defaultToken!.payload.sub,
+        userId: accountsStore.defaultUserData!.userId,
         instanceHost: accountsStore.defaultInstanceHost!,
       ),
     );

diff --git a/lib/pages/saved_page.dart b/lib/pages/saved_page.dart
@@ -45,7 +45,7 @@ class SavedPage extends HookWidget {
                   savedOnly: true,
                   page: page,
                   limit: batchSize,
-                  auth: accountStore.defaultToken!.raw,
+                  auth: accountStore.defaultUserData!.jwt.raw,
                 ),
               ),
             ),
@@ -58,7 +58,7 @@ class SavedPage extends HookWidget {
                   savedOnly: true,
                   page: page,
                   limit: batchSize,
-                  auth: accountStore.defaultToken!.raw,
+                  auth: accountStore.defaultUserData!.jwt.raw,
                 ),
               ),
             ),

diff --git a/lib/pages/search_results.dart b/lib/pages/search_results.dart
@@ -81,7 +81,7 @@ class _SearchResultsList extends HookWidget {
           q: query,
           sort: sort,
           type: type,
-          auth: accStore.defaultTokenFor(instanceHost)?.raw,
+          auth: accStore.defaultUserDataFor(instanceHost)?.jwt.raw,
           page: page,
           limit: batchSize,
         ));