jellyfin/jellyfin-vue
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-vue.git synced 2024-10-07 03:23:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #504 from jellyfin/fix-logout

Browse Source 
Fix logout
This commit is contained in:
Julien Machiels 2021-01-06 09:21:13 +01:00 committed by GitHub
commit 7657a31826
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 53 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/Buttons/FilterButton.vue
View File

@ -293,7 +293,7 @@ export default Vue.extend({
try {
const response = (
await this.$api.filter.getQueryFiltersLegacy({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
parentId: this.$route.params.viewId,
includeItemTypes: [this.itemsType]
})

2
components/Buttons/UserButton.vue
View File

@ -7,7 +7,7 @@
v-on="on"
>
<user-image />
<h1 class="font-weight-light pb-1 text-truncate">
<h1 v-if="$auth.user" class="font-weight-light pb-1 text-truncate">
{{ $auth.user.Name }}
</h1>
<v-icon>mdi-chevron-down</v-icon>

2
components/Item/ItemMenu.vue
View File

@ -48,7 +48,7 @@ export default Vue.extend({
items: {
get(): MenuItem[] {
const menuItems = [] as MenuItem[];
if (this.$auth.$state.user.Policy.IsAdministrator) {
if (this.$auth.user?.Policy?.IsAdministrator) {
menuItems.push({
title: this.$t('editMetadata'),
action: () => {

4
components/Item/Metadata/MetadataEditor.vue
View File

@ -277,14 +277,14 @@ export default Vue.extend({
await this.fetchItemInfo();
const ancestors = await this.$api.library.getAncestors({
itemId: this.metadata.Id as string,
userId: this.$auth.user.Id
userId: this.$auth.user?.Id
});
const libraryInfo =
ancestors.data.find((i) => i.Type === 'CollectionFolder') || {};
this.getGenres(libraryInfo.Id);
},
async fetchItemInfo(): Promise<void> {
const userId = this.$auth.user.Id;
const userId = this.$auth.user?.Id;
const itemInfo = (
await this.$api.userLibrary.getItem({
userId,

2
components/Item/RelatedItems.vue
View File

@ -149,7 +149,7 @@ export default Vue.extend({
if (this.item.Id) {
const response = await this.$api.library.getSimilarItems({
itemId: this.item.Id,
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
limit: this.vertical ? 5 : 12
});

4
components/Layout/HomeHeader/HomeHeader.vue
View File

@ -40,7 +40,7 @@ export default Vue.extend({
async beforeMount() {
this.items = (
await this.$api.userLibrary.getLatestMedia({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
limit: this.pages,
fields: [ItemFields.Overview],
enableImageTypes: [ImageType.Backdrop, ImageType.Logo],
@ -65,7 +65,7 @@ export default Vue.extend({
const itemData = (
await this.$api.userLibrary.getItem({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
itemId: id
})
).data;

5
components/Layout/HomeHeader/HomeHeaderWelcome.vue
View File

@ -9,7 +9,10 @@
class="mx-md-10 mt-md-5 mt-10 py-0 py-md-4 align-start justify-center text-center text-md-left justify-md-start"
>
<v-col cols="12" sm="8" md="6" xl="5" class="py-0 py-md-4">
<p class="text-h6 text-sm-h4 text-md-h2 text-lg-h2 text-xl-h2">
<p
v-if="$auth.user"
class="text-h6 text-sm-h4 text-md-h2 text-lg-h2 text-xl-h2"
>
{{
$t('homeHeader.welcome.helloUser', {
userName: $auth.user.Name

6
components/Layout/Images/UserImage.vue
View File

@ -32,7 +32,11 @@ export default Vue.extend({
computed: {
userImage: {
get(): string | undefined {
if (!this.id && this.$auth.user.Id && this.$auth.user.PrimaryImageTag) {
if (
!this.id &&
this.$auth.user?.Id &&
this.$auth.user?.PrimaryImageTag
) {
return `${this.$axios.defaults.baseURL}/Users/${this.$auth.user.Id}/Images/Primary/?tag=${this.$auth.user.PrimaryImageTag}&quality=${this.quality}`;
} else if (this.id) {
return `${this.$axios.defaults.baseURL}/Users/${this.id}/Images/Primary/?tag=${this.$auth.user.PrimaryImageTag}&quality=${this.quality}`;

2
components/Players/AudioPlayer.vue
View File

@ -140,7 +140,7 @@ export default Vue.extend({
this.playbackInfo = (
await this.$api.mediaInfo.getPostedPlaybackInfo({
itemId: this.getCurrentItem?.Id || '',
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
playbackInfoDto: { DeviceProfile: this.$playbackProfile }
})
).data;

2
components/Players/TrackList.vue
View File

@ -108,7 +108,7 @@ export default Vue.extend({
async beforeMount() {
const tracks = (
await this.$api.items.getItems({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
parentId: this.item.Id,
sortBy: 'SortName',
sortOrder: 'Ascending'

2
components/Players/VideoPlayer.vue
View File

@ -146,7 +146,7 @@ export default Vue.extend({
this.playbackInfo = (
await this.$api.mediaInfo.getPostedPlaybackInfo({
itemId: this.getCurrentItem?.Id || '',
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
playbackInfoDto: { DeviceProfile: this.$playbackProfile }
})
).data;

4
pages/artist/_itemId/index.vue
View File

@ -133,7 +133,7 @@ export default Vue.extend({
async beforeMount() {
const item = (
await this.$api.userLibrary.getItem({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
itemId: this.$route.params.itemId
})
).data;
@ -145,7 +145,7 @@ export default Vue.extend({
const appearances = (
await this.$api.items.getItems({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
parentId: this.$route.params.itemId,
sortBy: 'PremiereDate',
sortOrder: 'Descending'

6
pages/genre/_itemId/index.vue
View File

@ -75,7 +75,7 @@ export default Vue.extend({
try {
this.genre = (
await this.$api.userLibrary.getItem({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
itemId: this.$route.params.itemId
})
).data;
@ -86,8 +86,8 @@ export default Vue.extend({
this.items = (
await this.$api.items.getItems({
uId: this.$auth.user.Id,
userId: this.$auth.user.Id,
uId: this.$auth.user?.Id,
userId: this.$auth.user?.Id,
genreIds: this.$route.params.itemId,
includeItemTypes: type,
recursive: true,

2
pages/index.vue
View File

@ -79,7 +79,7 @@ export default Vue.extend({
const latestMediaSections = [];
const userViewsRequest = await this.$api.userViews.getUserViews({
userId: this.$auth.user.Id
userId: this.$auth.user?.Id
});
if (userViewsRequest.data.Items) {

2
pages/item/_itemId/index.vue
View File

@ -502,7 +502,7 @@ export default Vue.extend({
async beforeMount() {
this.item = (
await this.$api.userLibrary.getItem({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
itemId: this.$route.params.itemId
})
).data;

18
pages/library/_viewId.vue
View File

@ -124,8 +124,8 @@ export default Vue.extend({
this.loading = true;
this.collectionInfo = (
await this.$api.items.getItems({
uId: this.$auth.user.Id,
userId: this.$auth.user.Id,
uId: this.$auth.user?.Id,
userId: this.$auth.user?.Id,
ids: this.$route.params.viewId
})
).data.Items[0];
@ -232,7 +232,7 @@ export default Vue.extend({
case 'MusicArtist':
itemsResponse = (
await this.$api.artists.getAlbumArtists({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
parentId: this.$route.params.viewId
})
).data;
@ -240,7 +240,7 @@ export default Vue.extend({
case 'Actor':
itemsResponse = (
await this.$api.persons.getPersons({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
parentId: this.$route.params.viewId,
personTypes: 'Actor'
})
@ -249,7 +249,7 @@ export default Vue.extend({
case 'Genre':
itemsResponse = (
await this.$api.genres.getGenres({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
parentId: this.$route.params.viewId
})
).data;
@ -257,7 +257,7 @@ export default Vue.extend({
case 'MusicGenre':
itemsResponse = (
await this.$api.musicGenres.getMusicGenres({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
parentId: this.$route.params.viewId
})
).data;
@ -265,7 +265,7 @@ export default Vue.extend({
case 'Studio':
itemsResponse = (
await this.$api.studios.getStudios({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
parentId: this.$route.params.viewId
})
).data;
@ -273,8 +273,8 @@ export default Vue.extend({
default:
itemsResponse = (
await this.$api.items.getItems({
uId: this.$auth.user.Id,
userId: this.$auth.user.Id,
uId: this.$auth.user?.Id,
userId: this.$auth.user?.Id,
parentId: this.$route.params.viewId,
includeItemTypes: this.viewType,
sortBy:

2
pages/metadata/index.vue
View File

@ -50,7 +50,7 @@ export default Vue.extend({
async fetchItems(node: ITreeNode): Promise<void> {
const libItems = (((
await this.$api.userLibrary.getItem(
{ userId: this.$auth.user.Id, itemId: '' },
{ userId: this.$auth.user?.Id, itemId: '' },
{
query: {
ParentId: node.id,

4
pages/person/_itemId/index.vue
View File

@ -202,7 +202,7 @@ export default Vue.extend({
async beforeMount() {
const item = (
await this.$api.userLibrary.getItem({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
itemId: this.$route.params.itemId
})
).data;
@ -214,7 +214,7 @@ export default Vue.extend({
const appearances = (
await this.$api.items.getItems({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
personIds: [this.$route.params.itemId],
recursive: true,
collapseBoxSetItems: false

2
pages/settings/index.vue
View File

@ -246,7 +246,7 @@ export default Vue.extend({
this.setAppBarOpacity({ opaqueAppBar: true });
this.setPageTitle({ title: this.$t('settings') });
if (this.$auth.user.Policy.IsAdministrator) {
if (this.$auth.user?.Policy?.IsAdministrator) {
this.systemInfo = (await this.$api.system.getSystemInfo()).data;
}
},

5
schemes/jellyfinScheme.ts
View File

@ -15,7 +15,6 @@ export default class JellyfinScheme {
$auth: NuxtAuth;
name = 'jellyfin';
options: Record<string, unknown>;
rawToken: '';
constructor(auth: NuxtAuth, options: Record<string, unknown>) {
this.$auth = auth;
@ -133,6 +132,10 @@ export default class JellyfinScheme {
}
async logout(): Promise<never> {
// We set the 'loggedIn' variable to false as soon as possible in the logout chain, as nuxt/auth
// doesn't set it until 'this.$auth.setUser(undefined)' is called. At that point, component relying
// on $auth.user will fail, breaking the logout flow completely.
this.$auth.$storage.setState('loggedIn', false);
await this.$auth.ctx.app.$api.session.reportSessionEnded();
this.$auth.ctx.app.store.dispatch('displayPreferences/resetState');

4
store/displayPreferences.ts
View File

@ -121,7 +121,7 @@ export const actions: ActionTree<
const response = await this.$api.displayPreferences.getDisplayPreferences(
{
displayPreferencesId: 'usersettings',
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
client: 'vue'
}
);
@ -179,7 +179,7 @@ export const actions: ActionTree<
const response = await this.$api.displayPreferences.updateDisplayPreferences(
{
displayPreferencesId: 'usersettings',
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
client: 'vue',
displayPreferencesDto: state
}

8
store/homeSection.ts
View File

@ -104,7 +104,7 @@ export const actions: ActionTree<HomeSectionState, AppState> = {
async getAudioResumes({ dispatch }) {
try {
const { data } = await this.$api.items.getResumeItems({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
limit: 12,
fields: [ItemFields.PrimaryImageAspectRatio],
imageTypeLimit: 1,
@ -142,7 +142,7 @@ export const actions: ActionTree<HomeSectionState, AppState> = {
async getVideoResumes({ dispatch }) {
try {
const { data } = await this.$api.items.getResumeItems({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
limit: 12,
fields: [ItemFields.PrimaryImageAspectRatio],
imageTypeLimit: 1,
@ -180,7 +180,7 @@ export const actions: ActionTree<HomeSectionState, AppState> = {
async getUpNext({ dispatch }, { parentId }: { parentId: string }) {
try {
const { data } = await this.$api.tvShows.getNextUp({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
limit: 12,
fields: [ItemFields.PrimaryImageAspectRatio],
imageTypeLimit: 1,
@ -217,7 +217,7 @@ export const actions: ActionTree<HomeSectionState, AppState> = {
async getLatestMedia({ dispatch }, { parentId }: { parentId: string }) {
try {
const { data } = await this.$api.userLibrary.getLatestMedia({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
limit: 12,
fields: [ItemFields.PrimaryImageAspectRatio],
imageTypeLimit: 1,

4
store/tvShows.ts
View File

@ -75,7 +75,7 @@ export const actions: ActionTree<TvShowsState, AppState> = {
async getTvShows({ dispatch }, { itemId }: { itemId: string }) {
try {
const { data } = await this.$api.tvShows.getSeasons({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
seriesId: itemId
});
@ -123,7 +123,7 @@ export const actions: ActionTree<TvShowsState, AppState> = {
async getTvShowsSeasonEpisodes({ dispatch }, { season, itemId }) {
try {
const { data } = await this.$api.items.getItems({
userId: this.$auth.user.Id,
userId: this.$auth.user?.Id,
parentId: season.Id,
fields: [ItemFields.Overview]
});

2
store/userViews.ts
View File

@ -35,7 +35,7 @@ export const mutations: MutationTree<UserViewsState> = {
export const actions: ActionTree<UserViewsState, UserViewsState> = {
async refreshUserViews({ commit }) {
const userViewsResponse = await this.$api.userViews.getUserViews({
userId: this.$auth.user.Id
userId: this.$auth.user?.Id
});
const userViews = userViewsResponse.data.Items;