Page MenuHomePhorge
Files F85651026

No OneTemporary
Actions

Size
6 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/src/stores/notifications.js b/src/stores/notifications.js
index c69e9c164c..bed0596ea5 100644
--- a/src/stores/notifications.js
+++ b/src/stores/notifications.js
@@ -81,13 +81,15 @@ export const useNotificationsStore = defineStore('notifications', {
pause() {
this.paused = true
if (this.fetcher && this.fetching) {
- this.stopFetching('Notifications paused')
+ console.debug('[Notifications] Pausing notifications')
+ this.fetcher.stopFetching()
}
},
resume() {
this.paused = false
if (this.fetcher && this.fetching) {
- this.startFetching('Notifications resumed')
+ console.debug('[Notifications] Resuming notifications')
+ this.fetcher.startFetching()
}
},
activate() {
diff --git a/src/stores/users.js b/src/stores/users.js
index 1c32ab679a..81d7269355 100644
--- a/src/stores/users.js
+++ b/src/stores/users.js
@@ -718,6 +718,8 @@ export const useUsersStore = defineStore('users', {
useAnnouncementsStore().stopFetching()
useListsStore().stopFetching()
useBookmarkFoldersStore().stopFetching()
+ useChatsStore().stopFetching()
+
store?.dispatch('stopFetchingFollowRequests')
// NOTE: No need to verify the app still exists, because if it doesn't,
@@ -743,7 +745,6 @@ export const useUsersStore = defineStore('users', {
// Full reset on logout success
useTimelinesStore().deactivateAll()
useStatusesStore().resetStatuses()
- useChatsStore().stopFetching()
useChatsStore().resetChats()
this.users = new Map()
diff --git a/test/unit/specs/stores/users.spec.js b/test/unit/specs/stores/users.spec.js
index 2709d680a6..ed74fbbde7 100644
--- a/test/unit/specs/stores/users.spec.js
+++ b/test/unit/specs/stores/users.spec.js
@@ -740,19 +740,24 @@ describe('Users store', () => {
const spies = [
// Misc initialization
- vi.spyOn(useStatusesStore(), 'resetStatuses'),
- vi.spyOn(useInterfaceStore(), 'onLogout'),
+ /* 0 */ vi.spyOn(useStatusesStore(), 'resetStatuses'),
+ /* 1 */ vi.spyOn(useInterfaceStore(), 'onLogout'),
// Timeline / Notifications
- vi.spyOn(useNotificationsStore(), 'deactivate'),
- vi.spyOn(useTimelinesStore(), 'deactivateAll'),
+ /* 2 */ vi.spyOn(useNotificationsStore(), 'deactivate'),
+ /* 3 */ vi.spyOn(useNotificationsStore(), 'pause'),
+ /* 4 */ vi.spyOn(useNotificationsStore(), 'resume'),
+ /* 5 */ vi.spyOn(useTimelinesStore(), 'deactivateAll'),
+ /* 6 */ vi.spyOn(useTimelinesStore(), 'pauseAll'),
+ /* 7 */ vi.spyOn(useTimelinesStore(), 'resumeAll'),
// Fetchers
- vi.spyOn(useChatsStore(), 'resetChats'),
- vi.spyOn(useListsStore(), 'stopFetching'),
- vi.spyOn(useAnnouncementsStore(), 'stopFetching'),
- vi.spyOn(useBookmarkFoldersStore(), 'stopFetching'),
- vi.spyOn(useStreamingStore(), 'stopSocket'),
+ /* 8 */ vi.spyOn(useChatsStore(), 'resetChats'),
+ /* 9 */ vi.spyOn(useChatsStore(), 'stopFetching'),
+ /* 10 */ vi.spyOn(useListsStore(), 'stopFetching'),
+ /* 11 */ vi.spyOn(useAnnouncementsStore(), 'stopFetching'),
+ /* 12 */ vi.spyOn(useBookmarkFoldersStore(), 'stopFetching'),
+ /* 13 */ vi.spyOn(useStreamingStore(), 'stopSocket'),
]
spies.forEach((spy) => {
@@ -791,6 +796,88 @@ describe('Users store', () => {
expect(spy, `Spy ${index} has failed`).to.have.been.called
})
})
+
+ it('failed logout', async () => {
+ const revokeApi = vi
+ .fn()
+ .mockResolvedValueOnce(
+ // Ensure APP
+ new Response(JSON.stringify('ok'), {
+ headers: { 'Content-Type': 'application/json' },
+ }),
+ )
+ .mockResolvedValueOnce(
+ // Revoke Token
+ new Response(JSON.stringify('Oopsie-woopsie pleroma made a fucky-wucky'), {
+ status: 500,
+ statusText: 'Internal Server Error',
+ headers: { 'Content-Type': 'application/json' },
+ }),
+ )
+
+ vi.stubGlobal('fetch', revokeApi)
+
+ // NOTE: Order is not checked for!
+ const spies = [
+ // ## PAUSE ##
+ // Timeline / Notifications
+ /* 0 */ vi.spyOn(useTimelinesStore(), 'pauseAll'),
+ /* 1 */ vi.spyOn(useNotificationsStore(), 'pause'),
+
+ // Fetchers (Pauseless)
+ /* 2 */ vi.spyOn(useListsStore(), 'stopFetching'),
+ /* 3 */ vi.spyOn(useChatsStore(), 'stopFetching'),
+ /* 4 */ vi.spyOn(useAnnouncementsStore(), 'stopFetching'),
+ /* 5 */ vi.spyOn(useBookmarkFoldersStore(), 'stopFetching'),
+
+ // ## RESUME ##
+ // Timeline / Notifications
+ /* 6 */ vi.spyOn(useNotificationsStore(), 'resume'),
+ /* 7 */ vi.spyOn(useTimelinesStore(), 'resumeAll'),
+
+ // Fetchers (Pauseless)
+ /* 8 */ vi.spyOn(useListsStore(), 'startFetching'),
+ /* 9 */ vi.spyOn(useChatsStore(), 'startFetching'),
+ /* 10 */ vi.spyOn(useAnnouncementsStore(), 'startFetching'),
+ /* 11 */ vi.spyOn(useBookmarkFoldersStore(), 'startFetching'),
+ ]
+
+ spies.forEach((spy) => {
+ spy.mockImplementation(async () => {
+ /* no-op */
+ })
+ })
+
+ useInstanceCapabilitiesStore().pleromaChatMessagesAvailable = true
+ useMergedConfigStore().mergedConfig = { useStreamingApi: true }
+
+ const store = useUsersStore()
+ store.currentUser = mockUser()
+
+ // Adding some users to verify they are getting cleaned afterwards
+ store.addNewUsers({
+ data: [
+ mockUser(),
+ {
+ ...mockUser({ name: 'John', screen_name: 'snake' }),
+ relationship: { id: userId, following: true },
+ },
+ { ...mockUser({ name: 'David Oh', screen_name: 'zero' }) },
+ ],
+ timestamp: 2000,
+ })
+ expect(store.loggedIn).to.eql(true)
+ await store.logout()
+ expect(store.loggedIn).to.eql(true)
+ expect(revokeApi).to.have.been.called
+ expect(store.users).to.have.length(1)
+ expect(store.usersByName).to.have.length(1)
+ expect(store.usersByURL).to.have.length(1)
+ expect(store.relationships).to.have.length(1)
+ spies.forEach((spy, index) => {
+ expect(spy, `Spy ${index} has failed`).to.have.been.called
+ })
+ })
})
})

File Metadata

Mime Type
text/x-diff
Expires
Sun, Aug 30, 10:17 AM (1 d, 18 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1737909
Default Alt Text
(6 KB)

Event Timeline