mirrors/jellyseerr
1
0
Fork 0
mirror of https://github.com/fallenbagel/jellyseerr.git synced 2026-01-01 04:08:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: plex Login

Browse Source
This commit is contained in:
notfakie
2022-04-27 08:06:44 +12:00
parent 9fbc4074e4
commit 9d54776a2c
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/Setup/SetupLogin.tsx
View File

@@ -15,12 +15,12 @@ const messages = defineMessages({
}); });
interface LoginWithMediaServerProps { interface LoginWithMediaServerProps {
onComplete: () => void; onComplete: (onComplete: MediaServerType) => void;
} }
const SetupLogin: React.FC<LoginWithMediaServerProps> = ({ onComplete }) => { const SetupLogin: React.FC<LoginWithMediaServerProps> = ({ onComplete }) => {
const [authToken, setAuthToken] = useState<string | undefined>(undefined); const [authToken, setAuthToken] = useState<string | undefined>(undefined);
const [mediaServerType, setMediaServerType] = useState<number>( const [mediaServerType, setMediaServerType] = useState<MediaServerType>(
MediaServerType.NOT_CONFIGURED MediaServerType.NOT_CONFIGURED
); );
const { user, revalidate } = useUser(); const { user, revalidate } = useUser();
@@ -46,9 +46,9 @@ const SetupLogin: React.FC<LoginWithMediaServerProps> = ({ onComplete }) => {
useEffect(() => { useEffect(() => {
if (user) { if (user) {
onComplete(); onComplete(mediaServerType);
} }
}, [user, onComplete]); }, [user, mediaServerType, onComplete]);
return ( return (
<div> <div>

17
src/components/Setup/index.tsx
View File

@@ -3,6 +3,7 @@ import { useRouter } from 'next/router';
import React, { useState } from 'react'; import React, { useState } from 'react';
import { defineMessages, useIntl } from 'react-intl'; import { defineMessages, useIntl } from 'react-intl';
import useSWR, { mutate } from 'swr'; import useSWR, { mutate } from 'swr';
import { MediaServerType } from '../../../server/constants/server';
import useLocale from '../../hooks/useLocale'; import useLocale from '../../hooks/useLocale';
import AppDataWarning from '../AppDataWarning'; import AppDataWarning from '../AppDataWarning';
import Badge from '../Common/Badge'; import Badge from '../Common/Badge';
@@ -35,7 +36,9 @@ const Setup: React.FC = () => {
const [currentStep, setCurrentStep] = useState(1); const [currentStep, setCurrentStep] = useState(1);
const [mediaServerSettingsComplete, setMediaServerSettingsComplete] = const [mediaServerSettingsComplete, setMediaServerSettingsComplete] =
useState(false); useState(false);
const [mediaServerType, setMediaServerType] = useState(''); const [mediaServerType, setMediaServerType] = useState(
MediaServerType.NOT_CONFIGURED
);
const router = useRouter(); const router = useRouter();
const { locale } = useLocale(); const { locale } = useLocale();
@@ -54,11 +57,6 @@ const Setup: React.FC = () => {
} }
}; };
const getMediaServerType = async () => {
const MainSettings = await axios.get('/api/v1/settings/main');
setMediaServerType(MainSettings.data.mediaServerType);
return;
};
const { data: backdrops } = useSWR<string[]>('/api/v1/backdrops', { const { data: backdrops } = useSWR<string[]>('/api/v1/backdrops', {
refreshInterval: 0, refreshInterval: 0,
refreshWhenHidden: false, refreshWhenHidden: false,
@@ -113,16 +111,15 @@ const Setup: React.FC = () => {
<div className="mt-10 w-full rounded-md border border-gray-600 bg-gray-800 bg-opacity-50 p-4 text-white"> <div className="mt-10 w-full rounded-md border border-gray-600 bg-gray-800 bg-opacity-50 p-4 text-white">
{currentStep === 1 && ( {currentStep === 1 && (
<SetupLogin <SetupLogin
onComplete={() => { onComplete={(mServerType) => {
getMediaServerType().then(() => { setMediaServerType(mServerType);
setCurrentStep(2); setCurrentStep(2);
});
}} }}
/> />
)} )}
{currentStep === 2 && ( {currentStep === 2 && (
<div> <div>
{mediaServerType == 'PLEX' ? ( {mediaServerType === MediaServerType.PLEX ? (
<SettingsPlex <SettingsPlex
onComplete={() => setMediaServerSettingsComplete(true)} onComplete={() => setMediaServerSettingsComplete(true)}
/> />