diff --git a/App.tsx b/App.tsx index 94cb55d2..d68eb69f 100644 --- a/App.tsx +++ b/App.tsx @@ -14,7 +14,6 @@ import { Colors, } from 'react-native/Libraries/NewAppScreen'; import { NavigationContainer } from '@react-navigation/native'; -import { createStackNavigator } from '@react-navigation/stack'; import { usePlayer } from './player/queries'; import Login from './components/Login/component'; import Player from './components/Player/component'; @@ -60,9 +59,6 @@ function App(): React.JSX.Element { backgroundColor: isDarkMode ? Colors.darker : Colors.lighter, }; - -const RootStack = createStackNavigator(); - return ( @@ -70,14 +66,9 @@ const RootStack = createStackNavigator(); barStyle={isDarkMode ? 'light-content' : 'dark-content'} backgroundColor={backgroundStyle.backgroundColor} /> - - - - - - - - + isAuthenticated ? ( + + ) ? ); diff --git a/api/mutators/auth.ts b/api/mutators/auth.ts new file mode 100644 index 00000000..8f76f0fd --- /dev/null +++ b/api/mutators/auth.ts @@ -0,0 +1,12 @@ +import { useMutation } from "@tanstack/react-query"; +import { usePublicApi } from "../queries"; +import { useServerUrl } from "../queries/storage"; +import { JellyfinCredentials } from "../types/jellyfin-credentials"; +import { MutationKeys } from "../../enums/mutation-keys"; + +export const authenticateWithCredentials = useMutation({ + mutationKey: [MutationKeys.AuthenticationWithCredentials], + mutationFn: (credentials: JellyfinCredentials) => { + return usePublicApi(useServerUrl.data!).data!.authenticateUserByName(credentials.username, credentials.password!); + }, +}) \ No newline at end of file diff --git a/api/mutators/storage.ts b/api/mutators/storage.ts index ea3eb2e0..36d7ae81 100644 --- a/api/mutators/storage.ts +++ b/api/mutators/storage.ts @@ -27,6 +27,6 @@ export const serverUrl = useMutation({ export const credentials = useMutation({ mutationKey: [MutationKeys.Credentials], mutationFn: (credentials: JellyfinCredentials) => { - return Keychain.setInternetCredentials(useServerUrl.data!, credentials.username, credentials.accessToken); + return Keychain.setInternetCredentials(useServerUrl.data!, credentials.username, credentials.accessToken!); }, }); \ No newline at end of file diff --git a/api/queries.ts b/api/queries.ts index d285e17c..91c1c792 100644 --- a/api/queries.ts +++ b/api/queries.ts @@ -18,6 +18,13 @@ export const client : Jellyfin = new Jellyfin({ } }); +export const usePublicApi = (serverUrl: string) => useQuery({ + queryKey: [QueryKeys.PublicApi, serverUrl], + queryFn: ({ queryKey }) => { + return client.createApi(serverUrl); + } +}) + export const useApi = useQuery({ queryKey: [QueryKeys.Api], queryFn: () => { diff --git a/api/queries/public.ts b/api/queries/public.ts new file mode 100644 index 00000000..df58a2b9 --- /dev/null +++ b/api/queries/public.ts @@ -0,0 +1,11 @@ +import { useQuery } from "@tanstack/react-query"; +import { QueryKeys } from "../../enums/query-keys"; +import { usePublicApi } from "../queries"; +import { getSystemApi } from "@jellyfin/sdk/lib/utils/api/system-api"; + +export const usePublicSystemInfo = (serverUrl: string) => useQuery({ + queryKey: [QueryKeys.PublicSystemInfo, serverUrl], + queryFn: ({ queryKey }) => { + return getSystemApi(usePublicApi(queryKey[1]).data!).getPublicSystemInfo() + } +}); \ No newline at end of file diff --git a/api/types/jellyfin-credentials.ts b/api/types/jellyfin-credentials.ts index ab817afd..aeeaeb6c 100644 --- a/api/types/jellyfin-credentials.ts +++ b/api/types/jellyfin-credentials.ts @@ -1,10 +1,12 @@ export class JellyfinCredentials { username: string; - accessToken: string; + password?: string | undefined; + accessToken?: string | undefined; - constructor(username: string, accessToken: string) { + constructor(username: string, password?: string | undefined, accessToken?: string | undefined) { this.username = username; + this.password = password; this.accessToken = accessToken; } } \ No newline at end of file diff --git a/components/Login/component.tsx b/components/Login/component.tsx index 201e811f..762a2659 100644 --- a/components/Login/component.tsx +++ b/components/Login/component.tsx @@ -1,8 +1,22 @@ +import { createStackNavigator } from "@react-navigation/stack"; import { Text } from "react-native"; +import SignIn from "./helpers/sign-in"; + export default function Login(): React.JSX.Element { + const Stack = createStackNavigator(); + return ( - + ); } \ No newline at end of file diff --git a/components/Login/helpers/quick-connect.tsx b/components/Login/helpers/quick-connect.tsx new file mode 100644 index 00000000..e69de29b diff --git a/components/Login/helpers/server-address.tsx b/components/Login/helpers/server-address.tsx new file mode 100644 index 00000000..e69de29b diff --git a/components/Login/helpers/server-authentication.tsx b/components/Login/helpers/server-authentication.tsx new file mode 100644 index 00000000..a5dccc51 --- /dev/null +++ b/components/Login/helpers/server-authentication.tsx @@ -0,0 +1,30 @@ +import React from "react"; +import { View, TextInput, Button } from "react-native"; +import { authenticateWithCredentials } from "../../../api/mutators/auth"; + + +export default function ServerAuthentication(): React.JSX.Element { + const [username, setUsername] = React.useState(''); + const [password, setPassword] = React.useState(''); + + return ( + + + +