From 0bf8b7a6e08e01da3e2a43f8e0d624f1d87d19a2 Mon Sep 17 00:00:00 2001
From: Lei Nelissen <lei@codified.nl>
Date: Thu, 25 Jul 2024 23:16:20 +0200
Subject: [PATCH] fix: rename credentials and save credentials type

---
 src/screens/Onboarding/index.tsx                 |  2 +-
 src/screens/Settings/stacks/Library.tsx          |  8 ++++----
 .../components/CredentialGenerator.tsx           |  3 ++-
 src/screens/modals/SetJellyfinServer/index.tsx   |  2 +-
 src/store/index.ts                               | 16 ++++++++++++++++
 src/store/settings/actions.ts                    |  2 +-
 src/store/settings/index.ts                      |  5 +++--
 src/utility/JellyfinApi/lib.ts                   |  6 +++---
 src/utility/JellyfinApi/playback.ts              |  1 +
 src/utility/JellyfinApi/playlist.ts              |  2 +-
 src/utility/JellyfinApi/track.ts                 |  2 +-
 11 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/screens/Onboarding/index.tsx b/src/screens/Onboarding/index.tsx
index feb0f44..1321a6c 100644
--- a/src/screens/Onboarding/index.tsx
+++ b/src/screens/Onboarding/index.tsx
@@ -38,7 +38,7 @@ const Logo = styled.Image`
 
 function Onboarding() {
     // Get account from Redux and dispatcher
-    const account = useTypedSelector(state => state.settings.jellyfin);
+    const account = useTypedSelector(state => state.settings.credentials);
     const dispatch = useAppDispatch();
 
     // Also retrieve the navigation handler so that we can open the modal in
diff --git a/src/screens/Settings/stacks/Library.tsx b/src/screens/Settings/stacks/Library.tsx
index 674fbf0..e24dc8c 100644
--- a/src/screens/Settings/stacks/Library.tsx
+++ b/src/screens/Settings/stacks/Library.tsx
@@ -11,7 +11,7 @@ import { InputContainer, Input } from '../components/Input';
 
 export default function LibrarySettings() {
     const defaultStyles = useDefaultStyles();
-    const { jellyfin } = useTypedSelector(state => state.settings);
+    const { credentials } = useTypedSelector(state => state.settings);
     const navigation = useNavigation<NavigationProp>();
     const handleSetLibrary = useCallback(() => navigation.navigate('SetJellyfinServer'), [navigation]);
 
@@ -19,15 +19,15 @@ export default function LibrarySettings() {
         <Container>
             <InputContainer>
                 <Paragraph style={defaultStyles.text}>{t('jellyfin-server-url')}</Paragraph>
-                <Input placeholder="https://jellyfin.yourserver.com/" value={jellyfin?.uri} editable={false} style={defaultStyles.input} />
+                <Input placeholder="https://jellyfin.yourserver.com/" value={credentials?.uri} editable={false} style={defaultStyles.input} />
             </InputContainer>
             <InputContainer>
                 <Paragraph style={defaultStyles.text}>{t('jellyfin-access-token')}</Paragraph>
-                <Input placeholder="deadbeefdeadbeefdeadbeef" value={jellyfin?.access_token} editable={false} style={defaultStyles.input} />
+                <Input placeholder="deadbeefdeadbeefdeadbeef" value={credentials?.access_token} editable={false} style={defaultStyles.input} />
             </InputContainer>
             <InputContainer>
                 <Paragraph style={defaultStyles.text}>{t('jellyfin-user-id')}</Paragraph>
-                <Input placeholder="deadbeefdeadbeefdeadbeef" value={jellyfin?.user_id} editable={false} style={defaultStyles.input} />
+                <Input placeholder="deadbeefdeadbeefdeadbeef" value={credentials?.user_id} editable={false} style={defaultStyles.input} />
             </InputContainer>
             <Button title={t('set-jellyfin-server')} onPress={handleSetLibrary} />
         </Container>
diff --git a/src/screens/modals/SetJellyfinServer/components/CredentialGenerator.tsx b/src/screens/modals/SetJellyfinServer/components/CredentialGenerator.tsx
index 44fbc84..c9d045b 100644
--- a/src/screens/modals/SetJellyfinServer/components/CredentialGenerator.tsx
+++ b/src/screens/modals/SetJellyfinServer/components/CredentialGenerator.tsx
@@ -5,7 +5,7 @@ import { AppState } from '@/store';
 
 interface Props {
     serverUrl: string;
-    onCredentialsRetrieved: (credentials: AppState['settings']['jellyfin']) => void;
+    onCredentialsRetrieved: (credentials: AppState['settings']['credentials']) => void;
 }
 
 type CredentialEventData = {
@@ -148,6 +148,7 @@ class CredentialGenerator extends Component<Props> {
             user_id: userId,
             access_token: accessToken,
             device_id: deviceId,
+            type: data.type,
         });
     };
 
diff --git a/src/screens/modals/SetJellyfinServer/index.tsx b/src/screens/modals/SetJellyfinServer/index.tsx
index 9edba61..6ad6355 100644
--- a/src/screens/modals/SetJellyfinServer/index.tsx
+++ b/src/screens/modals/SetJellyfinServer/index.tsx
@@ -22,7 +22,7 @@ export default function SetJellyfinServer() {
     const navigation = useNavigation();
 
     // Save creedentials to store and close the modal
-    const saveCredentials = useCallback((credentials: AppState['settings']['jellyfin']) => {
+    const saveCredentials = useCallback((credentials: AppState['settings']['credentials']) => {
         if (credentials) {
             dispatch(setJellyfinCredentials(credentials));
             navigation.dispatch(StackActions.popToTop());    
diff --git a/src/store/index.ts b/src/store/index.ts
index 0a900d8..2a5d4e9 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -64,6 +64,22 @@ const persistConfig: PersistConfig<Omit<AppState, '_persist'>> = {
                 }
             };
         },
+        // @ts-expect-error migrations are poorly typed
+        5: (state: AppState) => {
+            // @ts-expect-error
+            const credentials = state.settings.jellyfin && { 
+                // @ts-expect-error
+                ...(state.settings.jellyfin as AppState['settings']['credentials']),
+                type: 'jellyfin',
+            };
+
+            return {
+                ...state,
+                settings: {
+                    credentials,
+                },
+            };
+        }
     })
 };
 
diff --git a/src/store/settings/actions.ts b/src/store/settings/actions.ts
index 7a5bcad..84acb5c 100644
--- a/src/store/settings/actions.ts
+++ b/src/store/settings/actions.ts
@@ -1,7 +1,7 @@
 import { createAction } from '@reduxjs/toolkit';
 import { ColorScheme } from './types';
 
-export const setJellyfinCredentials = createAction<{ access_token: string, user_id: string, uri: string, device_id: string; }>('SET_JELLYFIN_CREDENTIALS');
+export const setJellyfinCredentials = createAction<{ access_token: string, user_id: string, uri: string, device_id: string; type: 'jellyfin' | 'emby' }>('SET_JELLYFIN_CREDENTIALS');
 export const setBitrate = createAction<number>('SET_BITRATE');
 export const setOnboardingStatus = createAction<boolean>('SET_ONBOARDING_STATUS');
 export const setReceivedErrorReportingAlert = createAction<void>('SET_RECEIVED_ERROR_REPORTING_ALERT');
diff --git a/src/store/settings/index.ts b/src/store/settings/index.ts
index fd7a183..4fbfa9f 100644
--- a/src/store/settings/index.ts
+++ b/src/store/settings/index.ts
@@ -3,11 +3,12 @@ import { setReceivedErrorReportingAlert, setBitrate, setJellyfinCredentials, set
 import { ColorScheme } from './types';
 
 interface State {
-    jellyfin?: {
+    credentials?: {
         uri: string;
         user_id: string;
         access_token: string;
         device_id: string;
+        type: 'jellyfin' | 'emby';
     }
     bitrate: number;
     isOnboardingComplete: boolean;
@@ -27,7 +28,7 @@ const initialState: State = {
 const settings = createReducer(initialState, builder => {
     builder.addCase(setJellyfinCredentials, (state, action) => ({
         ...state,
-        jellyfin: action.payload,
+        credentials: action.payload,
     }));
     builder.addCase(setBitrate, (state, action) => ({
         ...state,
diff --git a/src/utility/JellyfinApi/lib.ts b/src/utility/JellyfinApi/lib.ts
index 406b44f..acecaa4 100644
--- a/src/utility/JellyfinApi/lib.ts
+++ b/src/utility/JellyfinApi/lib.ts
@@ -2,7 +2,7 @@ import type { AppState, Store } from '@/store';
 import { Platform } from 'react-native';
 import { version } from '../../../package.json';
 
-type Credentials = AppState['settings']['jellyfin'];
+type Credentials = AppState['settings']['credentials'];
 
 /**
  * This is a convenience function that converts a set of Jellyfin credentials
@@ -38,7 +38,7 @@ export async function fetchApi<T>(
     parseResponse = true
 ) { 
     // Retrieve the latest credentials from the Redux store
-    const credentials = asyncFetchStore().getState().settings.jellyfin;
+    const credentials = asyncFetchStore().getState().settings.credentials;
 
     // GUARD: Check that the credentials are present
     if (!credentials) {
@@ -97,7 +97,7 @@ export async function fetchApi<T>(
  * Retrieve an image URL for a given ItemId
  */
 export function getImage(ItemId: string): string {
-    const credentials = asyncFetchStore().getState().settings.jellyfin;
+    const credentials = asyncFetchStore().getState().settings.credentials;
     const uri = encodeURI(`${credentials?.uri}/Items/${ItemId}/Images/Primary?format=jpeg`);
     return uri;
 }
diff --git a/src/utility/JellyfinApi/playback.ts b/src/utility/JellyfinApi/playback.ts
index 542d735..727dcba 100644
--- a/src/utility/JellyfinApi/playback.ts
+++ b/src/utility/JellyfinApi/playback.ts
@@ -48,6 +48,7 @@ export async function sendPlaybackEvent(
         ItemId: activeTrack.backendId,
         CanSeek: true,
         PlaybackStartTimeTicks: null,
+        PlaySessionId: activeTrack?.backendId || 'fintunes',
     };
 
     // Generate a config from the credentials and dispatch the request
diff --git a/src/utility/JellyfinApi/playlist.ts b/src/utility/JellyfinApi/playlist.ts
index a055614..109cf2d 100644
--- a/src/utility/JellyfinApi/playlist.ts
+++ b/src/utility/JellyfinApi/playlist.ts
@@ -27,7 +27,7 @@ export async function retrieveAllPlaylists() {
  * Retrieve all albums that are available on the Jellyfin server
  */
 export async function retrievePlaylistTracks(ItemId: string) {
-    const credentials = asyncFetchStore().getState().settings.jellyfin;
+    const credentials = asyncFetchStore().getState().settings.credentials;
     const singlePlaylistOptions = {
         SortBy: 'IndexNumber,SortName',
         UserId: credentials?.user_id || '',
diff --git a/src/utility/JellyfinApi/track.ts b/src/utility/JellyfinApi/track.ts
index 8fa218f..3fb71ae 100644
--- a/src/utility/JellyfinApi/track.ts
+++ b/src/utility/JellyfinApi/track.ts
@@ -30,7 +30,7 @@ const baseTrackOptions: Record<string, string> = {
  * Generate the track streaming url from the trackId
  */
 export function generateTrackUrl(trackId: string) {
-    const credentials = store.getState().settings.jellyfin;
+    const credentials = store.getState().settings.credentials;
     const trackOptions = {
         ...baseTrackOptions,
         UserId: credentials?.user_id || '',