From b27a99aaa32290566cc56268cc852529ca5f114a Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Thu, 12 Mar 2020 12:19:42 -0400 Subject: [PATCH 1/2] add callback param for doAuthenticate that returns the status --- dist/bundle.es.js | 11 +++++++---- dist/bundle.js | 9 +++++++-- src/redux/actions/user.js | 16 +++++++++++++--- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dist/bundle.es.js b/dist/bundle.es.js index 9967b3a..e36c7a2 100644 --- a/dist/bundle.es.js +++ b/dist/bundle.es.js @@ -1275,7 +1275,7 @@ function doFetchInviteStatus() { }); }; } -function doInstallNew(appVersion, os = null, firebaseToken = null) { +function doInstallNew(appVersion, os = null, firebaseToken = null, callback) { const payload = { app_version: appVersion }; @@ -1292,11 +1292,15 @@ function doInstallNew(appVersion, os = null, firebaseToken = null) { payload.operating_system = os || version.os_system; payload.platform = version.platform; Lbryio.call('install', 'new', payload); + + if (callback) { + callback(status); + } }); }); } // TODO: Call doInstallNew separately so we don't have to pass appVersion and os_system params? -function doAuthenticate(appVersion, os = null, firebaseToken = null, shareUsageData = true) { +function doAuthenticate(appVersion, os = null, firebaseToken = null, shareUsageData = true, callback) { return dispatch => { dispatch({ type: AUTHENTICATION_STARTED @@ -1314,7 +1318,7 @@ function doAuthenticate(appVersion, os = null, firebaseToken = null, shareUsageD if (shareUsageData) { dispatch(doRewardList()); dispatch(doFetchInviteStatus()); - doInstallNew(appVersion, os, firebaseToken); + doInstallNew(appVersion, os, firebaseToken, callback); } }); }).catch(error => { @@ -2698,7 +2702,6 @@ function doGetSync(passedPassword, callback) { } handleCallback(syncAttemptError); - return; } else if (data.hasSyncedWallet) { const error = 'Error getting synced wallet'; dispatch({ diff --git a/dist/bundle.js b/dist/bundle.js index 298d1ba..eb470ba 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -4904,6 +4904,7 @@ function doFetchInviteStatus() { function doInstallNew(appVersion) { var os = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null; var firebaseToken = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null; + var callback = arguments.length > 3 ? arguments[3] : undefined; var payload = { app_version: appVersion }; @@ -4920,6 +4921,10 @@ function doInstallNew(appVersion) { payload.operating_system = os || version.os_system; payload.platform = version.platform; lbryio__WEBPACK_IMPORTED_MODULE_5__["default"].call('install', 'new', payload); + + if (callback) { + callback(status); + } }); }); } // TODO: Call doInstallNew separately so we don't have to pass appVersion and os_system params? @@ -4928,6 +4933,7 @@ function doAuthenticate(appVersion) { var os = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null; var firebaseToken = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null; var shareUsageData = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true; + var callback = arguments.length > 4 ? arguments[4] : undefined; return function (dispatch) { dispatch({ type: constants_action_types__WEBPACK_IMPORTED_MODULE_1__["AUTHENTICATION_STARTED"] @@ -4945,7 +4951,7 @@ function doAuthenticate(appVersion) { if (shareUsageData) { dispatch(Object(redux_actions_rewards__WEBPACK_IMPORTED_MODULE_2__["doRewardList"])()); dispatch(doFetchInviteStatus()); - doInstallNew(appVersion, os, firebaseToken); + doInstallNew(appVersion, os, firebaseToken, callback); } }); })["catch"](function (error) { @@ -6467,7 +6473,6 @@ function doGetSync(passedPassword, callback) { } handleCallback(syncAttemptError); - return; } else if (data.hasSyncedWallet) { var error = 'Error getting synced wallet'; dispatch({ diff --git a/src/redux/actions/user.js b/src/redux/actions/user.js index 80b3c6d..43c6332 100644 --- a/src/redux/actions/user.js +++ b/src/redux/actions/user.js @@ -45,7 +45,7 @@ export function doFetchInviteStatus() { }; } -export function doInstallNew(appVersion, os = null, firebaseToken = null) { +export function doInstallNew(appVersion, os = null, firebaseToken = null, callback) { const payload = { app_version: appVersion }; if (firebaseToken) { payload.firebase_token = firebaseToken; @@ -59,12 +59,22 @@ export function doInstallNew(appVersion, os = null, firebaseToken = null) { payload.operating_system = os || version.os_system; payload.platform = version.platform; Lbryio.call('install', 'new', payload); + + if (callback) { + callback(status); + } }); }); } // TODO: Call doInstallNew separately so we don't have to pass appVersion and os_system params? -export function doAuthenticate(appVersion, os = null, firebaseToken = null, shareUsageData = true) { +export function doAuthenticate( + appVersion, + os = null, + firebaseToken = null, + shareUsageData = true, + callback +) { return dispatch => { dispatch({ type: ACTIONS.AUTHENTICATION_STARTED, @@ -81,7 +91,7 @@ export function doAuthenticate(appVersion, os = null, firebaseToken = null, shar if (shareUsageData) { dispatch(doRewardList()); dispatch(doFetchInviteStatus()); - doInstallNew(appVersion, os, firebaseToken); + doInstallNew(appVersion, os, firebaseToken, callback); } }); }) -- 2.45.3 From a53cffb0d8ddb923447e0907ab4dcd4b76f7d37f Mon Sep 17 00:00:00 2001 From: seanyesmunt Date: Mon, 16 Mar 2020 18:00:46 -0400 Subject: [PATCH 2/2] update variable name --- dist/bundle.es.js | 10 +++++----- dist/bundle.js | 10 +++++----- src/redux/actions/user.js | 15 ++++++++++----- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dist/bundle.es.js b/dist/bundle.es.js index e36c7a2..a844ac2 100644 --- a/dist/bundle.es.js +++ b/dist/bundle.es.js @@ -1275,7 +1275,7 @@ function doFetchInviteStatus() { }); }; } -function doInstallNew(appVersion, os = null, firebaseToken = null, callback) { +function doInstallNew(appVersion, os = null, firebaseToken = null, callbackForUsersWhoAreSharingData) { const payload = { app_version: appVersion }; @@ -1293,14 +1293,14 @@ function doInstallNew(appVersion, os = null, firebaseToken = null, callback) { payload.platform = version.platform; Lbryio.call('install', 'new', payload); - if (callback) { - callback(status); + if (callbackForUsersWhoAreSharingData) { + callbackForUsersWhoAreSharingData(status); } }); }); } // TODO: Call doInstallNew separately so we don't have to pass appVersion and os_system params? -function doAuthenticate(appVersion, os = null, firebaseToken = null, shareUsageData = true, callback) { +function doAuthenticate(appVersion, os = null, firebaseToken = null, shareUsageData = true, callbackForUsersWhoAreSharingData) { return dispatch => { dispatch({ type: AUTHENTICATION_STARTED @@ -1318,7 +1318,7 @@ function doAuthenticate(appVersion, os = null, firebaseToken = null, shareUsageD if (shareUsageData) { dispatch(doRewardList()); dispatch(doFetchInviteStatus()); - doInstallNew(appVersion, os, firebaseToken, callback); + doInstallNew(appVersion, os, firebaseToken, callbackForUsersWhoAreSharingData); } }); }).catch(error => { diff --git a/dist/bundle.js b/dist/bundle.js index eb470ba..8614884 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -4904,7 +4904,7 @@ function doFetchInviteStatus() { function doInstallNew(appVersion) { var os = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null; var firebaseToken = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null; - var callback = arguments.length > 3 ? arguments[3] : undefined; + var callbackForUsersWhoAreSharingData = arguments.length > 3 ? arguments[3] : undefined; var payload = { app_version: appVersion }; @@ -4922,8 +4922,8 @@ function doInstallNew(appVersion) { payload.platform = version.platform; lbryio__WEBPACK_IMPORTED_MODULE_5__["default"].call('install', 'new', payload); - if (callback) { - callback(status); + if (callbackForUsersWhoAreSharingData) { + callbackForUsersWhoAreSharingData(status); } }); }); @@ -4933,7 +4933,7 @@ function doAuthenticate(appVersion) { var os = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null; var firebaseToken = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null; var shareUsageData = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true; - var callback = arguments.length > 4 ? arguments[4] : undefined; + var callbackForUsersWhoAreSharingData = arguments.length > 4 ? arguments[4] : undefined; return function (dispatch) { dispatch({ type: constants_action_types__WEBPACK_IMPORTED_MODULE_1__["AUTHENTICATION_STARTED"] @@ -4951,7 +4951,7 @@ function doAuthenticate(appVersion) { if (shareUsageData) { dispatch(Object(redux_actions_rewards__WEBPACK_IMPORTED_MODULE_2__["doRewardList"])()); dispatch(doFetchInviteStatus()); - doInstallNew(appVersion, os, firebaseToken, callback); + doInstallNew(appVersion, os, firebaseToken, callbackForUsersWhoAreSharingData); } }); })["catch"](function (error) { diff --git a/src/redux/actions/user.js b/src/redux/actions/user.js index 43c6332..0cb18e7 100644 --- a/src/redux/actions/user.js +++ b/src/redux/actions/user.js @@ -45,7 +45,12 @@ export function doFetchInviteStatus() { }; } -export function doInstallNew(appVersion, os = null, firebaseToken = null, callback) { +export function doInstallNew( + appVersion, + os = null, + firebaseToken = null, + callbackForUsersWhoAreSharingData +) { const payload = { app_version: appVersion }; if (firebaseToken) { payload.firebase_token = firebaseToken; @@ -60,8 +65,8 @@ export function doInstallNew(appVersion, os = null, firebaseToken = null, callba payload.platform = version.platform; Lbryio.call('install', 'new', payload); - if (callback) { - callback(status); + if (callbackForUsersWhoAreSharingData) { + callbackForUsersWhoAreSharingData(status); } }); }); @@ -73,7 +78,7 @@ export function doAuthenticate( os = null, firebaseToken = null, shareUsageData = true, - callback + callbackForUsersWhoAreSharingData ) { return dispatch => { dispatch({ @@ -91,7 +96,7 @@ export function doAuthenticate( if (shareUsageData) { dispatch(doRewardList()); dispatch(doFetchInviteStatus()); - doInstallNew(appVersion, os, firebaseToken, callback); + doInstallNew(appVersion, os, firebaseToken, callbackForUsersWhoAreSharingData); } }); }) -- 2.45.3