From 6f27525ec21fe2afab3e877f447cd8c434c00c74 Mon Sep 17 00:00:00 2001 From: zeppi Date: Thu, 16 Sep 2021 16:01:54 -0400 Subject: [PATCH] cleanup --- package.json | 2 +- ui/index.jsx | 3 +-- ui/redux/actions/user.js | 6 ++---- yarn.lock | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index f703a11ea..9d47fb283 100644 --- a/package.json +++ b/package.json @@ -156,7 +156,7 @@ "json-loader": "^0.5.4", "lbry-format": "https://github.com/lbryio/lbry-format.git", "lbry-redux": "lbryio/lbry-redux#32b578707116d45f5b51b7ab523d200e75668676", - "lbryinc": "lbryio/lbryinc#783d7d2d73668a2b96afa9d95d30d29bb580281a", + "lbryinc": "lbryio/lbryinc#22906b5857863b0ff393e07f92846cb09f48366b", "lint-staged": "^7.0.2", "localforage": "^1.7.1", "lodash-es": "^4.17.14", diff --git a/ui/index.jsx b/ui/index.jsx index 1a2ccbed4..97df008b4 100644 --- a/ui/index.jsx +++ b/ui/index.jsx @@ -116,7 +116,6 @@ if (getTokens().auth_token) { // We interact with ipcRenderer to get the auth key from a users keyring // We keep a local variable for authToken because `ipcRenderer.send` does not // contain a response, so there is no way to know when it's been set -// let authToken; // deleting Lbryio.setOverride('setAuthToken', (authToken) => { setAuthToken(authToken); // set the cookie to auth_token= return authToken; @@ -268,7 +267,7 @@ function AppWrapper() { app.store.dispatch(doFetchLanguage(DEFAULT_LANGUAGE)); } app.store.dispatch(doUpdateIsNightAsync()); - app.store.dispatch(doLbryReady()); // + app.store.dispatch(doLbryReady()); // get tokens, users, startup stuff app.store.dispatch(doBlackListedOutpointsSubscribe()); app.store.dispatch(doFilteredOutpointsSubscribe()); diff --git a/ui/redux/actions/user.js b/ui/redux/actions/user.js index 2d7f70628..9bb284e17 100644 --- a/ui/redux/actions/user.js +++ b/ui/redux/actions/user.js @@ -112,10 +112,8 @@ function checkAuthBusy() { * @param callInstall * @returns {Function} * - * Does Lbryio.authenticate, i.e. call Authenticate() then update redux with auth token. - * Authenticate does getAuthToken then getCurrentUser, and if !user, call userNew and return the user - * telling redux the auth token is probably dumb. we will - * keycloak = useKeycloak(), keycloak.token whenever we want that + * Lbryio.fetchUser: + * getTokens then getCurrentUser, and if !user, call userNew and return the user * */ export function doAuthenticate( diff --git a/yarn.lock b/yarn.lock index f20270aab..191d6c2e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10148,9 +10148,9 @@ lbry-redux@lbryio/lbry-redux#32b578707116d45f5b51b7ab523d200e75668676: reselect "^3.0.0" uuid "^8.3.1" -lbryinc@lbryio/lbryinc#783d7d2d73668a2b96afa9d95d30d29bb580281a: +lbryinc@lbryio/lbryinc#22906b5857863b0ff393e07f92846cb09f48366b: version "0.0.1" - resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/783d7d2d73668a2b96afa9d95d30d29bb580281a" + resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/22906b5857863b0ff393e07f92846cb09f48366b" dependencies: reselect "^3.0.0"