LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

pass x-lbry-auth-token to apis status call for email verified users

Browse source
This commit is contained in:
Sean Yesmunt 2020-12-10 17:31:20 -05:00
parent cffc70fb6b
commit b0026a562a
2 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ui/component/app/view.jsx
View file

@ -289,7 +289,7 @@ function App(props: Props) {
}, [hasVerifiedEmail, signIn, hasSignedIn]); }, [hasVerifiedEmail, signIn, hasSignedIn]);
// @if TARGET='web' // @if TARGET='web'
useDegradedPerformance(setLbryTvApiStatus); useDegradedPerformance(setLbryTvApiStatus, user);
// @endif // @endif
// @if TARGET='web' // @if TARGET='web'

48
web/effects/use-degraded-performance.js
View file

@ -1,7 +1,7 @@
import { SDK_API_PATH } from 'ui'; import { SDK_API_PATH } from 'ui';
import { useEffect } from 'react'; import { useEffect } from 'react';
// import { getAuthToken } from 'util/saved-passwords'; import { getAuthToken } from 'util/saved-passwords';
// import { X_LBRY_AUTH_TOKEN } from 'constants/token'; import { X_LBRY_AUTH_TOKEN } from 'constants/token';
import fetchWithTimeout from 'util/fetch'; import fetchWithTimeout from 'util/fetch';
@ -11,31 +11,35 @@ export const STATUS_DEGRADED = 'degraded';
export const STATUS_FAILING = 'failing'; export const STATUS_FAILING = 'failing';
export const STATUS_DOWN = 'down'; export const STATUS_DOWN = 'down';
const getParams = () => { const getParams = user => {
const headers = {}; const headers = {};
// const token = getAuthToken(); const token = getAuthToken();
// if (token) { if (token && user.has_verified_email) {
// headers[X_LBRY_AUTH_TOKEN] = token; headers[X_LBRY_AUTH_TOKEN] = token;
// } }
const params = { headers }; const params = { headers };
return params; return params;
}; };
export function useDegradedPerformance(onDegradedPerformanceCallback) { export function useDegradedPerformance(onDegradedPerformanceCallback, user) {
useEffect(() => { const hasUser = user !== undefined;
// The status endpoint is the only endpoint at "v2" currently
// This should be moved into the config once more endpoints are using it
const STATUS_ENDPOINT = `${SDK_API_PATH}/status`.replace('v1', 'v2');
fetchWithTimeout(STATUS_TIMEOUT_LIMIT, fetch(STATUS_ENDPOINT, getParams())) useEffect(() => {
.then(response => response.json()) if (hasUser) {
.then(status => { // The status endpoint is the only endpoint at "v2" currently
if (status.general_state !== STATUS_OK) { // This should be moved into the config once more endpoints are using it
const STATUS_ENDPOINT = `${SDK_API_PATH}/status`.replace('v1', 'v2');
fetchWithTimeout(STATUS_TIMEOUT_LIMIT, fetch(STATUS_ENDPOINT, getParams(user)))
.then(response => response.json())
.then(status => {
if (status.general_state !== STATUS_OK) {
onDegradedPerformanceCallback(STATUS_FAILING);
}
})
.catch(() => {
onDegradedPerformanceCallback(STATUS_FAILING); onDegradedPerformanceCallback(STATUS_FAILING);
} });
}) }
.catch(() => { }, [hasUser]);
onDegradedPerformanceCallback(STATUS_FAILING);
});
}, []);
} }