novaburst/funquail
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fetch all user info on startup

Browse source
This commit is contained in:
wvffle 2022-07-21 23:19:16 +00:00 • committed by Georg Krause
commit 4c02478470
10 changed files with 85 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

71
front/src/store/auth.ts
View file

@ -1,6 +1,7 @@
import type { User } from '~/types'
import type { Module } from 'vuex'
import type { RootState } from '~/store/index'
import type { RouteLocationRaw } from 'vue-router'
import axios from 'axios'
import useLogger from '~/composables/useLogger'
@ -147,20 +148,12 @@ const store: Module<State, RootState> = {
},
actions: {
// Send a request to the login URL and save the returned JWT
login ({ dispatch }, { next, credentials, onError }) {
async login ({ dispatch }, { credentials }) {
const form = useFormData(credentials)
return axios.post('users/login', form).then(() => {
logger.info('Successfully logged in as', credentials.username)
dispatch('fetchUser').then(() => {
// Redirect to a specified route
import('~/router').then((router) => {
return router.default.push(next)
})
})
}, response => {
logger.error('Error while logging in', response.data)
onError(response)
})
await axios.post('users/login', form)
logger.info('Successfully logged in as', credentials.username)
await dispatch('fetchUser')
},
async logout ({ commit }) {
try {
@ -181,36 +174,40 @@ const store: Module<State, RootState> = {
})
logger.info('Log out, goodbye!')
},
fetchUser ({ dispatch }) {
return new Promise((resolve, reject) => {
axios.get('users/me/').then((response) => {
logger.info('Successfully fetched user profile')
dispatch('updateUser', response.data)
dispatch('ui/fetchUnreadNotifications', null, { root: true })
if (response.data.permissions.library) {
dispatch('ui/fetchPendingReviewEdits', null, { root: true })
}
if (response.data.permissions.moderation) {
dispatch('ui/fetchPendingReviewReports', null, { root: true })
dispatch('ui/fetchPendingReviewRequests', null, { root: true })
}
dispatch('favorites/fetch', null, { root: true })
dispatch('channels/fetchSubscriptions', null, { root: true })
dispatch('libraries/fetchFollows', null, { root: true })
async fetchNotifications ({ dispatch, state }) {
return Promise.all([
dispatch('ui/fetchUnreadNotifications', null, { root: true }),
state.availablePermissions.library && dispatch('ui/fetchPendingReviewEdits', null, { root: true }),
state.availablePermissions.moderation && dispatch('ui/fetchPendingReviewReports', null, { root: true }),
state.availablePermissions.moderation && dispatch('ui/fetchPendingReviewRequests', null, { root: true })
])
},
async fetchUser ({ dispatch }) {
try {
const response = await axios.get('users/me/')
logger.info('Successfully fetched user profile')
dispatch('updateUser', response.data)
await Promise.all([
dispatch('fetchNotifications'),
dispatch('favorites/fetch', null, { root: true }),
dispatch('playlists/fetchOwn', null, { root: true }),
dispatch('libraries/fetchFollows', null, { root: true }),
dispatch('channels/fetchSubscriptions', null, { root: true }),
dispatch('moderation/fetchContentFilters', null, { root: true })
dispatch('playlists/fetchOwn', null, { root: true })
resolve(response.data)
}, () => {
logger.info('Error while fetching user profile')
reject(new Error('Error while fetching user profile'))
})
})
])
} catch (error) {
logger.error('Error while fetching user profile', error)
}
},
updateUser ({ commit }, data) {
commit('authenticated', true)
commit('profile', data)
commit('username', data.username)
commit('fullUsername', data.full_username)
if (data.tokens) {
commit('scopedTokens', data.tokens)
}
@ -220,7 +217,7 @@ const store: Module<State, RootState> = {
commit('permission', { key: permission, status: hasPermission })
}
},
async oauthLogin ({ state, rootState, commit }, next) {
async oauthLogin ({ state, rootState, commit }, next: RouteLocationRaw) {
const app = await createOauthApp()
commit('oauthApp', app)
const redirectUri = encodeURIComponent(`${location.origin}/auth/callback`)

12
front/src/store/channels.ts
View file

@ -103,13 +103,11 @@ const store: Module<State, RootState> = {
toggle ({ getters, dispatch }, uuid) {
dispatch('set', { uuid, value: !getters.isSubscribed(uuid) })
},
fetchSubscriptions ({ commit }) {
const promise = axios.get('subscriptions/all/')
return promise.then((response) => {
response.data.results.forEach((result: { channel: unknown }) => {
commit('subscriptions', { uuid: result.channel, value: true })
})
})
async fetchSubscriptions ({ commit }) {
const response = await axios.get('subscriptions/all/')
for (const result of response.data.results) {
commit('subscriptions', { uuid: result.channel, value: true })
}
}
}
}

16
front/src/store/favorites.ts
View file

@ -64,20 +64,20 @@ const store: Module<State, RootState> = {
toggle ({ getters, dispatch }, id) {
dispatch('set', { id, value: !getters.isFavorite(id) })
},
fetch ({ commit, rootState }) {
async fetch ({ commit, rootState }) {
// will fetch favorites by batches from API to have them locally
const params = {
user: rootState.auth.profile?.id,
page_size: 50,
ordering: '-creation_date'
}
const promise = axios.get('favorites/tracks/all/', { params })
return promise.then((response) => {
logger.info('Fetched a batch of ' + response.data.results.length + ' favorites')
response.data.results.forEach((result: { track: string }) => {
commit('track', { id: result.track, value: true })
})
})
const response = await axios.get('favorites/tracks/all/', { params })
logger.info('Fetched a batch of ' + response.data.results.length + ' favorites')
for (const result of response.data.results) {
commit('track', { id: result.track, value: true })
}
}
}
}

12
front/src/store/libraries.ts
View file

@ -67,13 +67,11 @@ const store: Module<State, RootState> = {
toggle ({ getters, dispatch }, uuid) {
dispatch('set', { uuid, value: !getters.follow(uuid) })
},
fetchFollows ({ dispatch, state, commit, rootState }, url) {
const promise = axios.get('federation/follows/library/all/')
return promise.then((response) => {
response.data.results.forEach((result: { library: string }) => {
commit('follows', { library: result.library, follow: result })
})
})
async fetchFollows ({ dispatch, state, commit, rootState }, url) {
const response = await axios.get('federation/follows/library/all/')
for (const result of response.data.results) {
commit('follows', { library: result.library, follow: result })
}
}
}
}

42
front/src/store/moderation.ts
View file

@ -128,30 +128,28 @@ const store: Module<State, RootState> = {
commit('reportModalTarget', payload)
commit('showReportModal', true)
},
fetchContentFilters ({ dispatch, commit }, url) {
let params = {}
let promise
if (url) {
promise = axios.get(url)
} else {
commit('empty')
params = {
page_size: 100,
ordering: '-creation_date'
}
promise = axios.get('moderation/content-filters/', { params })
async fetchContentFilters ({ dispatch, commit }, url) {
const params = url
? {}
: {
page_size: 100,
ordering: '-creation_date'
}
if (!url) commit('empty')
const response = await axios.get(url ?? 'moderation/content-filters/', { params })
logger.info(`Fetched a batch of ${response.data.results.length} filters`)
for (const result of response.data.results) {
commit('contentFilter', result)
}
if (response.data.next) {
await dispatch('fetchContentFilters', response.data.next)
}
return promise.then((response) => {
logger.info('Fetched a batch of ' + response.data.results.length + ' filters')
if (response.data.next) {
dispatch('fetchContentFilters', response.data.next)
}
response.data.results.forEach((result: ContentFilter) => {
commit('contentFilter', result)
})
})
},
deleteContentFilter ({ commit }, uuid) {
async deleteContentFilter ({ commit }, uuid) {
return axios.delete(`moderation/content-filters/${uuid}/`).then(() => {
commit('deleteContentFilter', uuid)
})

2
front/src/store/playlists.ts
View file

@ -41,7 +41,7 @@ const store: Module<State, RootState> = {
const playlists = []
let url = 'playlists/'
while (url != null) {
while (url !== null) {
const response = await axios.get(url, { params: { scope: 'me' } })
playlists.push(...response.data.results)
url = response.data.next