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

Keycloak sso #7203

Closed
jessopb wants to merge 4 commits from keycloak-sso into master
pull from: keycloak-sso
merge into: LBRYCommunity:master
Conversation 1 Commits 4 Files changed 16 +1 -7
3 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 5e4ea29e1b - Show all commits

3
ui/component/router/view.jsx
View file

@ -22,8 +22,6 @@ const BackupPage = lazyImport(() => import('page/backup' /* webpackChunkName: "b
const Code2257Page = lazyImport(() => import('web/page/code2257' /* webpackChunkName: "code2257" */)); const Code2257Page = lazyImport(() => import('web/page/code2257' /* webpackChunkName: "code2257" */));
// @endif // @endif
console.log('keycloak', keycloak)
// Chunk: "secondary" // Chunk: "secondary"
const SignInPage = lazyImport(() => import('page/signIn' /* webpackChunkName: "secondary" */)); const SignInPage = lazyImport(() => import('page/signIn' /* webpackChunkName: "secondary" */));
const SignInWalletPasswordPage = lazyImport(() => const SignInWalletPasswordPage = lazyImport(() =>
@ -130,7 +128,6 @@ function PrivateRoute(props: PrivateRouteProps) {
const { component: Component, isAuthenticated, ...rest } = props; const { component: Component, isAuthenticated, ...rest } = props;
const urlSearchParams = new URLSearchParams(props.location.search); const urlSearchParams = new URLSearchParams(props.location.search);
const redirectUrl = urlSearchParams.get('redirect'); const redirectUrl = urlSearchParams.get('redirect');
// const { keycloak } = useKeycloak();
return ( return (
<Route <Route
{...rest} {...rest}

3
ui/index.jsx
View file

@ -234,7 +234,6 @@ function AppWrapper() {
const [persistDone, setPersistDone] = useState(false); const [persistDone, setPersistDone] = useState(false);
const [keycloakReady, setKeycloakReady] = useState(false); const [keycloakReady, setKeycloakReady] = useState(false);
// init?
useEffect(() => { useEffect(() => {
// @if TARGET='app' // @if TARGET='app'
moment.locale(remote.app.getLocale()); moment.locale(remote.app.getLocale());
@ -283,8 +282,6 @@ function AppWrapper() {
} }
}, [keycloakReady]); }, [keycloakReady]);
// initKeycloak();
useEffect(() => { useEffect(() => {
if (persistDone) { if (persistDone) {
app.store.dispatch(doToggle3PAnalytics(null, true)); app.store.dispatch(doToggle3PAnalytics(null, true));

2
ui/redux/reducers/user.js
View file

@ -25,7 +25,7 @@ const defaultState = {
referralLink: undefined, referralLink: undefined,
referralCode: undefined, referralCode: undefined,
user: { has_verified_email: false }, user: { has_verified_email: false },
accessToken: undefined, // rename this accessToken: undefined, // rename this to authToken if keeping.
youtubeChannelImportPending: false, youtubeChannelImportPending: false,
youtubeChannelImportErrorMessage: '', youtubeChannelImportErrorMessage: '',
referrerSetIsPending: false, referrerSetIsPending: false,