This commit is contained in:
zeppi 2021-09-16 16:01:54 -04:00
parent 7f9c51b143
commit 6f27525ec2
4 changed files with 6 additions and 9 deletions

View file

@ -156,7 +156,7 @@
"json-loader": "^0.5.4", "json-loader": "^0.5.4",
"lbry-format": "https://github.com/lbryio/lbry-format.git", "lbry-format": "https://github.com/lbryio/lbry-format.git",
"lbry-redux": "lbryio/lbry-redux#32b578707116d45f5b51b7ab523d200e75668676", "lbry-redux": "lbryio/lbry-redux#32b578707116d45f5b51b7ab523d200e75668676",
"lbryinc": "lbryio/lbryinc#783d7d2d73668a2b96afa9d95d30d29bb580281a", "lbryinc": "lbryio/lbryinc#22906b5857863b0ff393e07f92846cb09f48366b",
"lint-staged": "^7.0.2", "lint-staged": "^7.0.2",
"localforage": "^1.7.1", "localforage": "^1.7.1",
"lodash-es": "^4.17.14", "lodash-es": "^4.17.14",

View file

@ -116,7 +116,6 @@ if (getTokens().auth_token) {
// We interact with ipcRenderer to get the auth key from a users keyring // 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 // 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 // contain a response, so there is no way to know when it's been set
// let authToken; // deleting
Lbryio.setOverride('setAuthToken', (authToken) => { Lbryio.setOverride('setAuthToken', (authToken) => {
setAuthToken(authToken); // set the cookie to auth_token= setAuthToken(authToken); // set the cookie to auth_token=
return authToken; return authToken;
@ -268,7 +267,7 @@ function AppWrapper() {
app.store.dispatch(doFetchLanguage(DEFAULT_LANGUAGE)); app.store.dispatch(doFetchLanguage(DEFAULT_LANGUAGE));
} }
app.store.dispatch(doUpdateIsNightAsync()); app.store.dispatch(doUpdateIsNightAsync());
app.store.dispatch(doLbryReady()); // app.store.dispatch(doLbryReady()); // get tokens, users, startup stuff
app.store.dispatch(doBlackListedOutpointsSubscribe()); app.store.dispatch(doBlackListedOutpointsSubscribe());
app.store.dispatch(doFilteredOutpointsSubscribe()); app.store.dispatch(doFilteredOutpointsSubscribe());

View file

@ -112,10 +112,8 @@ function checkAuthBusy() {
* @param callInstall * @param callInstall
* @returns {Function} * @returns {Function}
* *
* Does Lbryio.authenticate, i.e. call Authenticate() then update redux with auth token. * Lbryio.fetchUser:
* Authenticate does getAuthToken then getCurrentUser, and if !user, call userNew and return the user * getTokens 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
* *
*/ */
export function doAuthenticate( export function doAuthenticate(

View file

@ -10148,9 +10148,9 @@ lbry-redux@lbryio/lbry-redux#32b578707116d45f5b51b7ab523d200e75668676:
reselect "^3.0.0" reselect "^3.0.0"
uuid "^8.3.1" uuid "^8.3.1"
lbryinc@lbryio/lbryinc#783d7d2d73668a2b96afa9d95d30d29bb580281a: lbryinc@lbryio/lbryinc#22906b5857863b0ff393e07f92846cb09f48366b:
version "0.0.1" 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: dependencies:
reselect "^3.0.0" reselect "^3.0.0"