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

Auth refactor #7112

Closed
jessopb wants to merge 6 commits from auth-refactor into master
pull from: auth-refactor
merge into: LBRYCommunity:master
Conversation 1 Commits 6 Files changed 10 +140 -157
10 changed files with 140 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
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#0b4e41ef90d6347819dd3453f2f9398a5c1b4f36", "lbryinc": "lbryio/lbryinc#c9ced4f226e06f4f188cb8dc31b561e1c27c5266",
"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",

14
ui/component/privacyAgreement/index.js
View file

@ -1,4 +1,3 @@
import { DOMAIN } from 'config';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { doSetDaemonSetting } from 'redux/actions/settings'; import { doSetDaemonSetting } from 'redux/actions/settings';
import { doSetWelcomeVersion, doToggle3PAnalytics, doSignOut } from 'redux/actions/app'; import { doSetWelcomeVersion, doToggle3PAnalytics, doSignOut } from 'redux/actions/app';
@ -10,17 +9,16 @@ import { version as appVersion } from 'package.json';
import PrivacyAgreement from './view'; import PrivacyAgreement from './view';
const select = state => ({ const select = (state) => ({
authenticated: selectUserVerifiedEmail(state), authenticated: selectUserVerifiedEmail(state),
}); });
const perform = dispatch => ({ const perform = (dispatch) => ({
setWelcomeVersion: version => dispatch(doSetWelcomeVersion(version || WELCOME_VERSION)), setWelcomeVersion: (version) => dispatch(doSetWelcomeVersion(version || WELCOME_VERSION)),
setShareDataInternal: share => dispatch(doSetDaemonSetting(DAEMON_SETTINGS.SHARE_USAGE_DATA, share)), setShareDataInternal: (share) => dispatch(doSetDaemonSetting(DAEMON_SETTINGS.SHARE_USAGE_DATA, share)),
setShareDataThirdParty: share => dispatch(doToggle3PAnalytics(share)), setShareDataThirdParty: (share) => dispatch(doToggle3PAnalytics(share)),
signOut: () => dispatch(doSignOut()), signOut: () => dispatch(doSignOut()),
authenticateIfSharingData: () => authenticateIfSharingData: () => dispatch(doAuthenticate(appVersion, undefined, undefined, true)), // appVersion, shareData?, shareCallback, callInstall
dispatch(doAuthenticate(appVersion, undefined, undefined, true, undefined, undefined, DOMAIN)),
}); });
export default connect(select, perform)(PrivacyAgreement); export default connect(select, perform)(PrivacyAgreement);

33
ui/index.jsx
View file

@ -14,7 +14,7 @@ import * as MODALS from 'constants/modal_types';
import React, { Fragment, useState, useEffect } from 'react'; import React, { Fragment, useState, useEffect } from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import { Provider } from 'react-redux'; import { Provider } from 'react-redux';
import { doDaemonReady, doAutoUpdate, doOpenModal, doHideModal, doToggle3PAnalytics } from 'redux/actions/app'; import { doLbryReady, doAutoUpdate, doOpenModal, doHideModal, doToggle3PAnalytics } from 'redux/actions/app';
import { Lbry, isURIValid, apiCall } from 'lbry-redux'; import { Lbry, isURIValid, apiCall } from 'lbry-redux';
import { setSearchApi } from 'redux/actions/search'; import { setSearchApi } from 'redux/actions/search';
import { doSetLanguage, doFetchLanguage, doUpdateIsNightAsync } from 'redux/actions/settings'; import { doSetLanguage, doFetchLanguage, doUpdateIsNightAsync } from 'redux/actions/settings';
@ -28,12 +28,7 @@ import { formatLbryUrlForWeb, formatInAppUrl } from 'util/url';
import { PersistGate } from 'redux-persist/integration/react'; import { PersistGate } from 'redux-persist/integration/react';
import analytics from 'analytics'; import analytics from 'analytics';
import { doToast } from 'redux/actions/notifications'; import { doToast } from 'redux/actions/notifications';
import { import { getAuthToken, setAuthToken, doAuthTokenRefresh, deleteAuthToken, getTokens } from 'util/saved-passwords';
getAuthToken,
setAuthToken,
doDeprecatedPasswordMigrationMarch2020,
doAuthTokenRefresh,
} from 'util/saved-passwords';
import { X_LBRY_AUTH_TOKEN } from 'constants/token'; import { X_LBRY_AUTH_TOKEN } from 'constants/token';
import { LBRY_WEB_API, DEFAULT_LANGUAGE, LBRY_API_URL, LBRY_WEB_PUBLISH_API } from 'config'; import { LBRY_WEB_API, DEFAULT_LANGUAGE, LBRY_API_URL, LBRY_WEB_PUBLISH_API } from 'config';
@ -112,28 +107,34 @@ if (process.env.SEARCH_API_URL) {
setSearchApi(process.env.SEARCH_API_URL); setSearchApi(process.env.SEARCH_API_URL);
} }
// Fix to make sure old users' cookies are set to the correct domain // TODO KEYCLOAK
// This can be removed after March 11th, 2021 if (getTokens().auth_token) {
// https://github.com/lbryio/lbry-desktop/pull/3830
doDeprecatedPasswordMigrationMarch2020();
doAuthTokenRefresh(); doAuthTokenRefresh();
}
// We need to override Lbryio for getting/setting the authToken // We need to override Lbryio for getting/setting the authToken
// 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;
Lbryio.setOverride('setAuthToken', (authToken) => { Lbryio.setOverride('setAuthToken', (authToken) => {
setAuthToken(authToken); setAuthToken(authToken); // set the cookie to auth_token=
return authToken; return authToken;
}); });
Lbryio.setOverride('deleteAuthToken', () => deleteAuthToken());
Lbryio.setOverride(
'getTokens',
() =>
new Promise((resolve) => {
resolve(getTokens());
})
);
Lbryio.setOverride( Lbryio.setOverride(
'getAuthToken', 'getAuthToken',
() => () =>
new Promise((resolve) => { new Promise((resolve) => {
const authTokenToReturn = authToken || getAuthToken(); resolve(getAuthToken());
resolve(authTokenToReturn);
}) })
); );
@ -266,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(doDaemonReady()); 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());

9
ui/redux/actions/app.js
View file

@ -6,7 +6,7 @@ import { ipcRenderer, remote } from 'electron';
import path from 'path'; import path from 'path';
import * as ACTIONS from 'constants/action_types'; import * as ACTIONS from 'constants/action_types';
import * as MODALS from 'constants/modal_types'; import * as MODALS from 'constants/modal_types';
import { DOMAIN, SIMPLE_SITE } from 'config'; import { SIMPLE_SITE } from 'config';
import { import {
Lbry, Lbry,
doBalanceSubscribe, doBalanceSubscribe,
@ -353,7 +353,7 @@ export function doAlertWaitingForSync() {
}; };
} }
export function doDaemonReady() { export function doLbryReady() {
return (dispatch, getState) => { return (dispatch, getState) => {
const state = getState(); const state = getState();
@ -363,8 +363,6 @@ export function doDaemonReady() {
dispatch( dispatch(
doAuthenticate( doAuthenticate(
appVersion, appVersion,
undefined,
undefined,
shareUsageData, shareUsageData,
(status) => { (status) => {
const trendingAlgorithm = const trendingAlgorithm =
@ -377,8 +375,7 @@ export function doDaemonReady() {
analytics.trendingAlgorithmEvent(trendingAlgorithm); analytics.trendingAlgorithmEvent(trendingAlgorithm);
} }
}, },
undefined, undefined
DOMAIN
) )
); );
dispatch({ type: ACTIONS.DAEMON_READY }); dispatch({ type: ACTIONS.DAEMON_READY });

80
ui/redux/actions/user.js
View file

@ -50,11 +50,8 @@ export function doFetchInviteStatus(shouldCallRewardList = true) {
}; };
} }
export function doInstallNew(appVersion, os = null, firebaseToken = null, callbackForUsersWhoAreSharingData, domain) { export function doInstallNew(appVersion, callbackForUsersWhoAreSharingData, domain) {
const payload = { app_version: appVersion, domain }; const payload = { app_version: appVersion, domain };
if (firebaseToken) {
payload.firebase_token = firebaseToken;
}
Lbry.status().then((status) => { Lbry.status().then((status) => {
payload.app_id = payload.app_id =
@ -64,7 +61,7 @@ export function doInstallNew(appVersion, os = null, firebaseToken = null, callba
payload.node_id = status.lbry_id; payload.node_id = status.lbry_id;
Lbry.version().then((version) => { Lbry.version().then((version) => {
payload.daemon_version = version.lbrynet_version; payload.daemon_version = version.lbrynet_version;
payload.operating_system = os || version.os_system; payload.operating_system = version.os_system;
payload.platform = version.platform; payload.platform = version.platform;
Lbryio.call('install', 'new', payload); Lbryio.call('install', 'new', payload);
@ -75,30 +72,6 @@ export function doInstallNew(appVersion, os = null, firebaseToken = null, callba
}); });
} }
export function doInstallNewWithParams(
appVersion,
installationId,
nodeId,
lbrynetVersion,
os,
platform,
firebaseToken = null
) {
return () => {
const payload = { app_version: appVersion };
if (firebaseToken) {
payload.firebase_token = firebaseToken;
}
payload.app_id = installationId;
payload.node_id = nodeId;
payload.daemon_version = lbrynetVersion;
payload.operating_system = os;
payload.platform = platform;
Lbryio.call('install', 'new', payload);
};
}
function checkAuthBusy() { function checkAuthBusy() {
let time = Date.now(); let time = Date.now();
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
@ -131,48 +104,59 @@ function checkAuthBusy() {
} }
// TODO: Call doInstallNew separately so we don't have to pass appVersion and os_system params? // TODO: Call doInstallNew separately so we don't have to pass appVersion and os_system params?
/**
*
* @param appVersion
* @param shareUsageData
* @param callbackForUsersWhoAreSharingData
* @param callInstall
* @returns {Function}
*
* Lbryio.fetchUser:
* getTokens then getCurrentUser, and if !user, call userNew and return the user
*
*/
export function doAuthenticate( export function doAuthenticate(
appVersion, appVersion,
os = null,
firebaseToken = null,
shareUsageData = true, shareUsageData = true,
callbackForUsersWhoAreSharingData, callbackForUsersWhoAreSharingData,
callInstall = true, callInstall = true
domain = null
) { ) {
return (dispatch) => { return async (dispatch) => {
dispatch({ dispatch({
type: ACTIONS.AUTHENTICATION_STARTED, type: ACTIONS.AUTHENTICATION_STARTED,
}); });
checkAuthBusy() try {
.then(() => { await checkAuthBusy();
return Lbryio.authenticate(DOMAIN, getDefaultLanguage()); const user = await Lbryio.fetchUser(DOMAIN, getDefaultLanguage());
}) console.log('USER', user);
.then((user) => {
if (sessionStorageAvailable) window.sessionStorage.removeItem(AUTH_IN_PROGRESS); if (sessionStorageAvailable) window.sessionStorage.removeItem(AUTH_IN_PROGRESS);
Lbryio.getAuthToken().then((token) => { // put this back: accessToken: tokens.access_token
if (user.error) {
throw new Error(user.error.message);
} else {
Lbryio.getTokens().then((tokens) => {
dispatch({ dispatch({
type: ACTIONS.AUTHENTICATION_SUCCESS, type: ACTIONS.AUTHENTICATION_SUCCESS,
data: { user, accessToken: token }, data: { user, accessToken: tokens.auth_token }, // rename 'accessToken' = authToken
}); });
if (shareUsageData) { if (shareUsageData) {
dispatch(doRewardList()); dispatch(doRewardList());
dispatch(doFetchInviteStatus(false)); dispatch(doFetchInviteStatus(false));
if (callInstall) { if (callInstall) {
doInstallNew(appVersion, os, firebaseToken, callbackForUsersWhoAreSharingData, domain); doInstallNew(appVersion, callbackForUsersWhoAreSharingData, DOMAIN);
} }
} }
}); });
}) }
.catch((error) => { } catch (error) {
if (sessionStorageAvailable) window.sessionStorage.removeItem(AUTH_IN_PROGRESS); if (sessionStorageAvailable) window.sessionStorage.removeItem(AUTH_IN_PROGRESS);
dispatch({ dispatch({
type: ACTIONS.AUTHENTICATION_FAILURE, type: ACTIONS.AUTHENTICATION_FAILURE,
data: { error }, data: { error },
}); });
}); }
}; };
} }
@ -183,7 +167,7 @@ export function doUserFetch() {
type: ACTIONS.USER_FETCH_STARTED, type: ACTIONS.USER_FETCH_STARTED,
}); });
Lbryio.getCurrentUser() Lbryio.fetchCurrentUser()
.then((user) => { .then((user) => {
dispatch({ dispatch({
type: ACTIONS.USER_FETCH_SUCCESS, type: ACTIONS.USER_FETCH_SUCCESS,
@ -204,7 +188,7 @@ export function doUserFetch() {
export function doUserCheckEmailVerified() { export function doUserCheckEmailVerified() {
// This will happen in the background so we don't need loading booleans // This will happen in the background so we don't need loading booleans
return (dispatch) => { return (dispatch) => {
Lbryio.getCurrentUser().then((user) => { Lbryio.fetchCurrentUser().then((user) => {
if (user.has_verified_email) { if (user.has_verified_email) {
dispatch(doRewardList()); dispatch(doRewardList());

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

@ -24,37 +24,44 @@ const defaultState = {
invitees: undefined, invitees: undefined,
referralLink: undefined, referralLink: undefined,
referralCode: undefined, referralCode: undefined,
user: undefined, user: { has_verified_email: false },
accessToken: undefined, accessToken: undefined, // rename this
youtubeChannelImportPending: false, youtubeChannelImportPending: false,
youtubeChannelImportErrorMessage: '', youtubeChannelImportErrorMessage: '',
referrerSetIsPending: false, referrerSetIsPending: false,
referrerSetError: '', referrerSetError: '',
}; };
reducers[ACTIONS.AUTHENTICATION_STARTED] = state => // does this do anything with user?
reducers[ACTIONS.AUTHENTICATION_STARTED] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
authenticationIsPending: true, authenticationIsPending: true,
userIsPending: true, userIsPending: true,
// distinguish accessToken from authToken
accessToken: defaultState.accessToken, accessToken: defaultState.accessToken,
}); });
reducers[ACTIONS.AUTHENTICATION_SUCCESS] = (state, action) => reducers[ACTIONS.AUTHENTICATION_SUCCESS] = (state, action) => {
const newUserState = Object.assign({}, state, {
authenticationIsPending: false,
userIsPending: false,
});
if (action.data && action.data.user) {
newUserState.user = action.data.user;
}
if (action.data && action.data.accessToken) {
newUserState.accessToken = action.data.accessToken;
}
return newUserState;
};
reducers[ACTIONS.AUTHENTICATION_FAILURE] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
authenticationIsPending: false, authenticationIsPending: false,
userIsPending: false, userIsPending: false,
accessToken: action.data.accessToken,
user: action.data.user,
}); });
reducers[ACTIONS.AUTHENTICATION_FAILURE] = state => reducers[ACTIONS.USER_FETCH_STARTED] = (state) =>
Object.assign({}, state, {
authenticationIsPending: false,
userIsPending: false,
user: null,
});
reducers[ACTIONS.USER_FETCH_STARTED] = state =>
Object.assign({}, state, { Object.assign({}, state, {
userIsPending: true, userIsPending: true,
}); });
@ -66,7 +73,7 @@ reducers[ACTIONS.USER_FETCH_SUCCESS] = (state, action) =>
emailToVerify: action.data.user.has_verified_email ? null : state.emailToVerify, emailToVerify: action.data.user.has_verified_email ? null : state.emailToVerify,
}); });
reducers[ACTIONS.USER_FETCH_FAILURE] = state => reducers[ACTIONS.USER_FETCH_FAILURE] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
userIsPending: true, userIsPending: true,
user: null, user: null,
@ -88,7 +95,7 @@ reducers[ACTIONS.USER_PHONE_NEW_SUCCESS] = (state, action) =>
phoneNewIsPending: false, phoneNewIsPending: false,
}); });
reducers[ACTIONS.USER_PHONE_RESET] = state => reducers[ACTIONS.USER_PHONE_RESET] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
phoneToVerify: null, phoneToVerify: null,
}); });
@ -99,7 +106,7 @@ reducers[ACTIONS.USER_PHONE_NEW_FAILURE] = (state, action) =>
phoneNewErrorMessage: action.data.error, phoneNewErrorMessage: action.data.error,
}); });
reducers[ACTIONS.USER_PHONE_VERIFY_STARTED] = state => reducers[ACTIONS.USER_PHONE_VERIFY_STARTED] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
phoneVerifyIsPending: true, phoneVerifyIsPending: true,
phoneVerifyErrorMessage: '', phoneVerifyErrorMessage: '',
@ -118,7 +125,7 @@ reducers[ACTIONS.USER_PHONE_VERIFY_FAILURE] = (state, action) =>
phoneVerifyErrorMessage: action.data.error, phoneVerifyErrorMessage: action.data.error,
}); });
reducers[ACTIONS.USER_EMAIL_NEW_STARTED] = state => reducers[ACTIONS.USER_EMAIL_NEW_STARTED] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
emailNewIsPending: true, emailNewIsPending: true,
emailNewErrorMessage: '', emailNewErrorMessage: '',
@ -136,12 +143,12 @@ reducers[ACTIONS.USER_EMAIL_NEW_SUCCESS] = (state, action) => {
}); });
}; };
reducers[ACTIONS.USER_EMAIL_NEW_EXISTS] = state => reducers[ACTIONS.USER_EMAIL_NEW_EXISTS] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
emailAlreadyExists: true, emailAlreadyExists: true,
}); });
reducers[ACTIONS.USER_EMAIL_NEW_DOES_NOT_EXIST] = state => reducers[ACTIONS.USER_EMAIL_NEW_DOES_NOT_EXIST] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
emailDoesNotExist: true, emailDoesNotExist: true,
}); });
@ -152,7 +159,7 @@ reducers[ACTIONS.USER_EMAIL_NEW_FAILURE] = (state, action) =>
emailNewErrorMessage: action.data.error, emailNewErrorMessage: action.data.error,
}); });
reducers[ACTIONS.USER_EMAIL_NEW_CLEAR_ENTRY] = state => { reducers[ACTIONS.USER_EMAIL_NEW_CLEAR_ENTRY] = (state) => {
const newUser = { ...state.user }; const newUser = { ...state.user };
delete newUser.primary_email; delete newUser.primary_email;
@ -166,7 +173,7 @@ reducers[ACTIONS.USER_EMAIL_NEW_CLEAR_ENTRY] = state => {
}); });
}; };
reducers[ACTIONS.USER_PASSWORD_SET_CLEAR] = state => reducers[ACTIONS.USER_PASSWORD_SET_CLEAR] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
passwordResetSuccess: false, passwordResetSuccess: false,
passwordResetPending: false, passwordResetPending: false,
@ -175,7 +182,7 @@ reducers[ACTIONS.USER_PASSWORD_SET_CLEAR] = state =>
passwordSetSuccess: false, passwordSetSuccess: false,
}); });
reducers[ACTIONS.USER_EMAIL_VERIFY_STARTED] = state => reducers[ACTIONS.USER_EMAIL_VERIFY_STARTED] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
emailVerifyIsPending: true, emailVerifyIsPending: true,
emailVerifyErrorMessage: '', emailVerifyErrorMessage: '',
@ -202,7 +209,7 @@ reducers[ACTIONS.USER_EMAIL_VERIFY_SET] = (state, action) =>
emailToVerify: action.data.email, emailToVerify: action.data.email,
}); });
reducers[ACTIONS.USER_IDENTITY_VERIFY_STARTED] = state => reducers[ACTIONS.USER_IDENTITY_VERIFY_STARTED] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
identityVerifyIsPending: true, identityVerifyIsPending: true,
identityVerifyErrorMessage: '', identityVerifyErrorMessage: '',
@ -229,7 +236,7 @@ reducers[ACTIONS.FETCH_ACCESS_TOKEN_SUCCESS] = (state, action) => {
}); });
}; };
reducers[ACTIONS.USER_INVITE_STATUS_FETCH_STARTED] = state => reducers[ACTIONS.USER_INVITE_STATUS_FETCH_STARTED] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
inviteStatusIsPending: true, inviteStatusIsPending: true,
}); });
@ -243,13 +250,13 @@ reducers[ACTIONS.USER_INVITE_STATUS_FETCH_SUCCESS] = (state, action) =>
referralCode: action.data.referralCode, referralCode: action.data.referralCode,
}); });
reducers[ACTIONS.USER_INVITE_NEW_STARTED] = state => reducers[ACTIONS.USER_INVITE_NEW_STARTED] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
inviteNewIsPending: true, inviteNewIsPending: true,
inviteNewErrorMessage: '', inviteNewErrorMessage: '',
}); });
reducers[ACTIONS.USER_INVITE_NEW_SUCCESS] = state => reducers[ACTIONS.USER_INVITE_NEW_SUCCESS] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
inviteNewIsPending: false, inviteNewIsPending: false,
inviteNewErrorMessage: '', inviteNewErrorMessage: '',
@ -261,14 +268,14 @@ reducers[ACTIONS.USER_INVITE_NEW_FAILURE] = (state, action) =>
inviteNewErrorMessage: action.data.error.message, inviteNewErrorMessage: action.data.error.message,
}); });
reducers[ACTIONS.USER_INVITE_STATUS_FETCH_FAILURE] = state => reducers[ACTIONS.USER_INVITE_STATUS_FETCH_FAILURE] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
inviteStatusIsPending: false, inviteStatusIsPending: false,
invitesRemaining: null, invitesRemaining: null,
invitees: null, invitees: null,
}); });
reducers[ACTIONS.USER_YOUTUBE_IMPORT_STARTED] = state => reducers[ACTIONS.USER_YOUTUBE_IMPORT_STARTED] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
youtubeChannelImportPending: true, youtubeChannelImportPending: true,
youtubeChannelImportErrorMessage: '', youtubeChannelImportErrorMessage: '',
@ -293,28 +300,28 @@ reducers[ACTIONS.USER_YOUTUBE_IMPORT_FAILURE] = (state, action) =>
youtubeChannelImportErrorMessage: action.data, youtubeChannelImportErrorMessage: action.data,
}); });
reducers[ACTIONS.USER_EMAIL_VERIFY_RETRY_STARTED] = state => reducers[ACTIONS.USER_EMAIL_VERIFY_RETRY_STARTED] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
resendingVerificationEmail: true, resendingVerificationEmail: true,
}); });
reducers[ACTIONS.USER_EMAIL_VERIFY_RETRY_SUCCESS] = state => reducers[ACTIONS.USER_EMAIL_VERIFY_RETRY_SUCCESS] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
resendingVerificationEmail: false, resendingVerificationEmail: false,
}); });
reducers[ACTIONS.USER_EMAIL_VERIFY_RETRY_FAILURE] = state => reducers[ACTIONS.USER_EMAIL_VERIFY_RETRY_FAILURE] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
resendingVerificationEmail: false, resendingVerificationEmail: false,
}); });
reducers[ACTIONS.USER_SET_REFERRER_STARTED] = state => reducers[ACTIONS.USER_SET_REFERRER_STARTED] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
referrerSetIsPending: true, referrerSetIsPending: true,
referrerSetError: defaultState.referrerSetError, referrerSetError: defaultState.referrerSetError,
}); });
reducers[ACTIONS.USER_SET_REFERRER_SUCCESS] = state => reducers[ACTIONS.USER_SET_REFERRER_SUCCESS] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
referrerSetIsPending: false, referrerSetIsPending: false,
referrerSetError: defaultState.referrerSetError, referrerSetError: defaultState.referrerSetError,
@ -326,25 +333,25 @@ reducers[ACTIONS.USER_SET_REFERRER_FAILURE] = (state, action) =>
referrerSetError: action.data.error.message, referrerSetError: action.data.error.message,
}); });
reducers[ACTIONS.USER_SET_REFERRER_RESET] = state => reducers[ACTIONS.USER_SET_REFERRER_RESET] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
referrerSetIsPending: false, referrerSetIsPending: false,
referrerSetError: defaultState.referrerSetError, referrerSetError: defaultState.referrerSetError,
}); });
reducers[ACTIONS.USER_PASSWORD_EXISTS] = state => reducers[ACTIONS.USER_PASSWORD_EXISTS] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
passwordExistsForUser: true, passwordExistsForUser: true,
}); });
reducers[ACTIONS.USER_PASSWORD_RESET_STARTED] = state => reducers[ACTIONS.USER_PASSWORD_RESET_STARTED] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
passwordResetPending: true, passwordResetPending: true,
passwordResetSuccess: defaultState.passwordResetSuccess, passwordResetSuccess: defaultState.passwordResetSuccess,
passwordResetError: null, passwordResetError: null,
}); });
reducers[ACTIONS.USER_PASSWORD_RESET_SUCCESS] = state => reducers[ACTIONS.USER_PASSWORD_RESET_SUCCESS] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
passwordResetPending: false, passwordResetPending: false,
passwordResetSuccess: true, passwordResetSuccess: true,
@ -356,13 +363,13 @@ reducers[ACTIONS.USER_PASSWORD_RESET_FAILURE] = (state, action) =>
passwordResetError: action.data.error, passwordResetError: action.data.error,
}); });
reducers[ACTIONS.USER_PASSWORD_SET_STARTED] = state => reducers[ACTIONS.USER_PASSWORD_SET_STARTED] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
passwordSetPending: true, passwordSetPending: true,
passwordSetSuccess: defaultState.passwordSetSuccess, passwordSetSuccess: defaultState.passwordSetSuccess,
}); });
reducers[ACTIONS.USER_PASSWORD_SET_SUCCESS] = state => reducers[ACTIONS.USER_PASSWORD_SET_SUCCESS] = (state) =>
Object.assign({}, state, { Object.assign({}, state, {
passwordSetPending: false, passwordSetPending: false,
passwordSetSuccess: true, passwordSetSuccess: true,

16
ui/store.js
View file

@ -11,7 +11,7 @@ import { routerMiddleware } from 'connected-react-router';
import createRootReducer from './reducers'; import createRootReducer from './reducers';
import { Lbry, buildSharedStateMiddleware, ACTIONS as LBRY_REDUX_ACTIONS } from 'lbry-redux'; import { Lbry, buildSharedStateMiddleware, ACTIONS as LBRY_REDUX_ACTIONS } from 'lbry-redux';
import { doSyncLoop } from 'redux/actions/sync'; import { doSyncLoop } from 'redux/actions/sync';
import { getAuthToken } from 'util/saved-passwords'; import { getTokens } from 'util/saved-passwords';
import { generateInitialUrl } from 'util/url'; import { generateInitialUrl } from 'util/url';
import { X_LBRY_AUTH_TOKEN } from 'constants/token'; import { X_LBRY_AUTH_TOKEN } from 'constants/token';
@ -189,12 +189,14 @@ const sharedStateCb = ({ dispatch, getState }) => {
const populateAuthTokenHeader = () => { const populateAuthTokenHeader = () => {
return (next) => (action) => { return (next) => (action) => {
if ( if (action.type === ACTIONS.USER_FETCH_SUCCESS || action.type === ACTIONS.AUTHENTICATION_SUCCESS) {
(action.type === ACTIONS.USER_FETCH_SUCCESS || action.type === ACTIONS.AUTHENTICATION_SUCCESS) && if (action.data) {
action.data.user.has_verified_email === true }
) { const tokens = getTokens();
const authToken = getAuthToken(); // if (tokens.access_token) {
Lbry.setApiHeader(X_LBRY_AUTH_TOKEN, authToken); // Lbry.setApiHeader('Authorization', 'Bearer ' + tokens.access_token);
// }
Lbry.setApiHeader(X_LBRY_AUTH_TOKEN, tokens.auth_token);
} }
return next(action); return next(action);

26
ui/util/saved-passwords.js
View file

@ -1,4 +1,4 @@
const { DOMAIN } = require('../../config.js'); const { DOMAIN } = require('config.js');
const AUTH_TOKEN = 'auth_token'; const AUTH_TOKEN = 'auth_token';
const SAVED_PASSWORD = 'saved_password'; const SAVED_PASSWORD = 'saved_password';
const DEPRECATED_SAVED_PASSWORD = 'saved-password'; const DEPRECATED_SAVED_PASSWORD = 'saved-password';
@ -59,7 +59,7 @@ function deleteCookie(name) {
} }
function setSavedPassword(value, saveToDisk) { function setSavedPassword(value, saveToDisk) {
return new Promise(resolve => { return new Promise((resolve) => {
const password = value === undefined || value === null ? '' : value; const password = value === undefined || value === null ? '' : value;
sessionPassword = password; sessionPassword = password;
@ -74,17 +74,17 @@ function setSavedPassword(value, saveToDisk) {
} }
function getSavedPassword() { function getSavedPassword() {
return new Promise(resolve => { return new Promise((resolve) => {
if (sessionPassword) { if (sessionPassword) {
resolve(sessionPassword); resolve(sessionPassword);
} }
return getPasswordFromCookie().then(p => resolve(p)); return getPasswordFromCookie().then((p) => resolve(p));
}); });
} }
function getPasswordFromCookie() { function getPasswordFromCookie() {
return new Promise(resolve => { return new Promise((resolve) => {
let password; let password;
password = getCookie(SAVED_PASSWORD); password = getCookie(SAVED_PASSWORD);
resolve(password); resolve(password);
@ -92,7 +92,7 @@ function getPasswordFromCookie() {
} }
function deleteSavedPassword() { function deleteSavedPassword() {
return new Promise(resolve => { return new Promise((resolve) => {
deleteCookie(SAVED_PASSWORD); deleteCookie(SAVED_PASSWORD);
resolve(); resolve();
}); });
@ -102,19 +102,24 @@ function getAuthToken() {
return getCookie(AUTH_TOKEN); return getCookie(AUTH_TOKEN);
} }
// will take oidc token getter
function getTokens() {
return { auth_token: getAuthToken(), access_token: null };
}
function setAuthToken(value) { function setAuthToken(value) {
return setCookie(AUTH_TOKEN, value, 365); return setCookie(AUTH_TOKEN, value, 365);
} }
function deleteAuthToken() { function deleteAuthToken() {
return new Promise(resolve => { return new Promise((resolve) => {
deleteCookie(AUTH_TOKEN); deleteCookie(AUTH_TOKEN);
resolve(); resolve();
}); });
} }
function doSignOutCleanup() { function doSignOutCleanup() {
return new Promise(resolve => { return new Promise((resolve) => {
deleteAuthToken(); deleteAuthToken();
deleteSavedPassword(); deleteSavedPassword();
resolve(); resolve();
@ -122,10 +127,10 @@ function doSignOutCleanup() {
} }
function doAuthTokenRefresh() { function doAuthTokenRefresh() {
const authToken = getAuthToken(); const { auth_token: authToken } = getAuthToken();
if (authToken) { if (authToken) {
deleteAuthToken(); deleteAuthToken();
setAuthToken(authToken); setCookie(AUTH_TOKEN, authToken, 365);
} }
} }
@ -147,6 +152,7 @@ module.exports = {
deleteSavedPassword, deleteSavedPassword,
getAuthToken, getAuthToken,
setAuthToken, setAuthToken,
getTokens,
deleteAuthToken, deleteAuthToken,
doSignOutCleanup, doSignOutCleanup,
doAuthTokenRefresh, doAuthTokenRefresh,

12
web/src/robots.js
View file

@ -1,12 +0,0 @@
const fs = require('fs');
const path = require('path');
let robots;
async function getRobots(ctx) {
if (!robots) {
robots = fs.readFileSync(path.join(__dirname, '/../dist/public/robots.txt'), 'utf8');
}
return robots;
}
module.exports = { getRobots };

4
yarn.lock
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#0b4e41ef90d6347819dd3453f2f9398a5c1b4f36: lbryinc@lbryio/lbryinc#c9ced4f226e06f4f188cb8dc31b561e1c27c5266:
version "0.0.1" version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/0b4e41ef90d6347819dd3453f2f9398a5c1b4f36" resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/c9ced4f226e06f4f188cb8dc31b561e1c27c5266"
dependencies: dependencies:
reselect "^3.0.0" reselect "^3.0.0"