mirrors/owncast
1
0
Fork 0
mirror of https://github.com/owncast/owncast.git synced 2024-11-23 21:28:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

Handle auth + cors

Browse source
This commit is contained in:
Gabe Kangas 2020-10-03 23:07:37 -07:00
parent 43f861fcc0
commit 12487011d2
2 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
web/pages/index2.tsx
View file

@ -3,7 +3,7 @@ import { BROADCASTER, fetchData } from './utils/apis';
export default function Admin() {
const [broadcasterStatus, setBroadcasterStatus] = useState({});
let getStatusIntervalId = null;
const getStatusIntervalId = null;
const getBroadcastStatus = async () => {
@ -12,7 +12,8 @@ export default function Admin() {
const active = !!result.broadcaster;
setBroadcasterStatus({ ...result, active });
} catch(error) {
} catch (error) {
setBroadcasterStatus({ ...broadcasterStatus, message: error.message });
};
@ -22,7 +23,6 @@ export default function Admin() {
useEffect(() => { getBroadcastStatus(); }, []);
console.log("============",broadcasterStatus)
// getStatusIntervalId = setInterval(getBroadcastStatus, 15000);
return (
<div>

38
web/pages/utils/apis.ts
View file

@ -31,29 +31,31 @@ export const HARDWARE_STATS = `${API_LOCATION}hardwarestats`;
// export const STREAM_STATUS = '/api/status';
export async function fetchData(url) {
const headers = new Headers();
const encoded = btoa(`${ADMIN_USERNAME}:${ADMIN_STREAMKEY}`);
// headers.set('Authorization', `Basic ${encoded}`);
console.log({encoded}, `${ADMIN_USERNAME}:${ADMIN_STREAMKEY}`)
try {
const response = await fetch(url, {
headers: {
'Authorization': `Basic ${encoded}`,
},
mode: 'cors',
credentials: 'include',
});
// waits until the request completes...
// console.log(response);
const response = await fetch(url, {
headers: {
'Authorization': `Basic ${encoded}`,
'Credentials': 'include',
},
mode: 'no-cors',
});
// waits until the request completes...
// console.log(response);
if (!response.ok) {
console.log(response)
const message = `An error has occured: ${response.status}`;
throw new Error(message);
}
if (!response.ok) {
const message = `An error has occured: ${response.status}`;
throw new Error(message);
const json = await response.json();
console.log(json)
return json;
} catch (error) {
console.log(error)
}
const json = await response.json();
return json;
}
// fetch error cases