diff --git a/3/ecolyo.de191d68f6fa3e470771.js b/3/ecolyo.17547f57897152811308.js
similarity index 99%
rename from 3/ecolyo.de191d68f6fa3e470771.js
rename to 3/ecolyo.17547f57897152811308.js
index 55bcc7a367d6e16d691604f6b3adedffa0d9ea74..3d03f44bcb5e396c270e989ec603fff77b2feea6 100644
--- a/3/ecolyo.de191d68f6fa3e470771.js
+++ b/3/ecolyo.17547f57897152811308.js
@@ -1084,35 +1084,32 @@ var SgeInit = function SgeInit(_ref) {
switch (_context.prev = _context.next) {
case 0:
if (!sgeConnect.shouldLaunchAccount) {
- _context.next = 13;
+ _context.next = 10;
break;
}
- console.log('shouldLaunchhhh variable true');
dispatch((0, _global.updateSgeStore)(_objectSpread(_objectSpread({}, sgeConnect), {}, {
shouldLaunchAccount: false
})));
dispatch((0, _global.setShouldRefreshConsent)(false));
if (account) {
- _context.next = 10;
+ _context.next = 8;
break;
}
- console.log('connect ');
- _context.next = 8;
+ _context.next = 6;
return connect();
- case 8:
- _context.next = 13;
+ case 6:
+ _context.next = 10;
break;
- case 10:
- console.log('update ');
- _context.next = 13;
+ case 8:
+ _context.next = 10;
return update();
- case 13:
+ case 10:
case "end":
return _context.stop();
}
@@ -1123,14 +1120,7 @@ var SgeInit = function SgeInit(_ref) {
}
launchConnect();
- }, [account, connect, dispatch, sgeConnect, update]); // useEffect(() => {
- // if (shouldRefreshConsent) {
- // // If user has selected accept button on Expired consent modal, his account has been deleted on KonnectorViewerCard then automatically launch oauth connexion flow
- // console.log('sgeConnect store', sgeConnect)
- // console.log('launch new connexion with account', account)
- // }
- // }, [account, sgeConnect, shouldRefreshConsent])
-
+ }, [account, connect, dispatch, sgeConnect, update]);
return /*#__PURE__*/_react.default.createElement("div", {
className: "kloginform sge-connect"
}, /*#__PURE__*/_react.default.createElement("p", {
@@ -1879,10 +1869,9 @@ var useKonnectorAuth = function useKonnectorAuth(fluidStatus, login, password) {
_ref4 = _context3.t0;
_account = _ref4.account;
_trigger = _ref4.trigger;
- console.log('account CREATED', _account);
if (!(!_trigger || !_account)) {
- _context3.next = 21;
+ _context3.next = 20;
break;
}
@@ -1890,7 +1879,7 @@ var useKonnectorAuth = function useKonnectorAuth(fluidStatus, login, password) {
sendUsageEventError(konnectorSlug);
return _context3.abrupt("return", null);
- case 21:
+ case 20:
updatedConnection = _objectSpread(_objectSpread({}, fluidStatus.connection), {}, {
account: _account,
trigger: _trigger
@@ -1898,22 +1887,22 @@ var useKonnectorAuth = function useKonnectorAuth(fluidStatus, login, password) {
(0, _chart.setLoading)(false);
dispatch((0, _global.updatedFluidConnection)(fluidStatus.fluidType, updatedConnection));
onSuccess();
- _context3.next = 32;
+ _context3.next = 31;
break;
- case 27:
- _context3.prev = 27;
+ case 26:
+ _context3.prev = 26;
_context3.t1 = _context3["catch"](1);
(0, _chart.setLoading)(false);
sendUsageEventError(konnectorSlug);
console.log(_context3.t1);
- case 32:
+ case 31:
case "end":
return _context3.stop();
}
}
- }, _callee3, null, [[1, 27]]);
+ }, _callee3, null, [[1, 26]]);
}));
return function connect() {
@@ -1929,10 +1918,8 @@ var useKonnectorAuth = function useKonnectorAuth(fluidStatus, login, password) {
while (1) {
switch (_context4.prev = _context4.next) {
case 0:
- console.log('call UPDATE');
-
if (!fluidStatus.connection.account) {
- _context4.next = 12;
+ _context4.next = 11;
break;
}
@@ -1956,10 +1943,10 @@ var useKonnectorAuth = function useKonnectorAuth(fluidStatus, login, password) {
_account.auth = auth;
accountService = new _account2.default(client);
- _context4.next = 8;
+ _context4.next = 7;
return accountService.updateAccount(_account);
- case 8:
+ case 7:
updatedAccount = _context4.sent;
updatedConnection = _objectSpread(_objectSpread({}, fluidStatus.connection), {}, {
account: updatedAccount
@@ -1967,7 +1954,7 @@ var useKonnectorAuth = function useKonnectorAuth(fluidStatus, login, password) {
dispatch((0, _global.updatedFluidConnection)(fluidStatus.fluidType, updatedConnection));
onSuccess();
- case 12:
+ case 11:
case "end":
return _context4.stop();
}
@@ -2562,6 +2549,44 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
return t("konnector_options.label_connect_to_".concat(_fluid.FluidType[fluidStatus.fluidType].toLowerCase()));
}
}, [fluidStatus.connection.account, fluidStatus.fluidType, fluidStatus.status, isOutdatedData, t]);
+ (0, _react.useEffect)(function () {
+ // If user has selected accept button on Expired consent modal, then delete its account
+ function deleteAccountForConsentRefresh() {
+ return _deleteAccountForConsentRefresh.apply(this, arguments);
+ }
+
+ function _deleteAccountForConsentRefresh() {
+ _deleteAccountForConsentRefresh = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
+ var accountService;
+ return _regenerator.default.wrap(function _callee8$(_context8) {
+ while (1) {
+ switch (_context8.prev = _context8.next) {
+ case 0:
+ if (!(shouldRefreshConsent && account)) {
+ _context8.next = 6;
+ break;
+ }
+
+ accountService = new _account.default(client);
+ _context8.next = 4;
+ return accountService.deleteAccount(account);
+
+ case 4:
+ _context8.next = 6;
+ return handleAccountDeletion();
+
+ case 6:
+ case "end":
+ return _context8.stop();
+ }
+ }
+ }, _callee8);
+ }));
+ return _deleteAccountForConsentRefresh.apply(this, arguments);
+ }
+
+ deleteAccountForConsentRefresh();
+ }, [account, client, handleAccountDeletion, shouldRefreshConsent]);
(0, _react.useEffect)(function () {
var subscribed = true;
@@ -2570,14 +2595,14 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
}
function _getData() {
- _getData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
+ _getData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9() {
var connectionFlow;
- return _regenerator.default.wrap(function _callee8$(_context8) {
+ return _regenerator.default.wrap(function _callee9$(_context9) {
while (1) {
- switch (_context8.prev = _context8.next) {
+ switch (_context9.prev = _context9.next) {
case 0:
if (!(fluidStatus.connection.shouldLaunchKonnector && !(0, _triggers.isKonnectorRunning)(trigger))) {
- _context8.next = 9;
+ _context9.next = 8;
break;
}
@@ -2588,11 +2613,10 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
}
connectionFlow = new _ConnectionFlow.default(client, trigger, konnector);
- console.log('LAUNCH CONNECTION FLOW');
- _context8.next = 6;
+ _context9.next = 5;
return connectionFlow.launch();
- case 6:
+ case 5:
connectionFlow.jobWatcher.on(_flowEvents.ERROR_EVENT, function () {
sendUsageEventError(fluidSlug, fluidStatus.lastDataDate === null);
setKonnectorErrorDescription(connectionFlow.jobWatcher.on()._error);
@@ -2600,21 +2624,19 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
});
connectionFlow.jobWatcher.on(_flowEvents.LOGIN_SUCCESS_EVENT, function () {
setIsLogging(false);
- console.log('LOGGING SUCCESSSS');
sendUsageEventSuccess(fluidSlug, fluidStatus.lastDataDate === null);
});
connectionFlow.jobWatcher.on(_flowEvents.SUCCESS_EVENT, function () {
- console.log(' SUCCESSSS EVENT');
sendUsageEventSuccess(fluidSlug, fluidStatus.lastDataDate === null);
callbackResponse(_flowEvents.SUCCESS_EVENT);
});
- case 9:
+ case 8:
case "end":
- return _context8.stop();
+ return _context9.stop();
}
}
- }, _callee8);
+ }, _callee9);
}));
return _getData.apply(this, arguments);
}
@@ -2626,45 +2648,6 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
subscribed = false;
};
}, [client, konnector, trigger, fluidStatus.connection, fluidStatus.connection.shouldLaunchKonnector, fluidStatus.connection.isUpdating, fluidStatus.fluidType, callbackResponse, setActive, fluidStatus.lastDataDate, fluidType, sendUsageEventError, fluidSlug, sendUsageEventSuccess]);
- (0, _react.useEffect)(function () {
- // If user has selected accept button on Expired consent modal, then delete its account
- function deleteAccountForConsentRefresh() {
- return _deleteAccountForConsentRefresh.apply(this, arguments);
- }
-
- function _deleteAccountForConsentRefresh() {
- _deleteAccountForConsentRefresh = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9() {
- var accountService;
- return _regenerator.default.wrap(function _callee9$(_context9) {
- while (1) {
- switch (_context9.prev = _context9.next) {
- case 0:
- if (!(shouldRefreshConsent && account)) {
- _context9.next = 7;
- break;
- }
-
- console.log('deleteACOUNT', account);
- accountService = new _account.default(client);
- _context9.next = 5;
- return accountService.deleteAccount(account);
-
- case 5:
- _context9.next = 7;
- return handleAccountDeletion();
-
- case 7:
- case "end":
- return _context9.stop();
- }
- }
- }, _callee9);
- }));
- return _deleteAccountForConsentRefresh.apply(this, arguments);
- }
-
- deleteAccountForConsentRefresh();
- }, [account, client, handleAccountDeletion, shouldRefreshConsent]);
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !isDisconnected ? /*#__PURE__*/_react.default.createElement(_core.Accordion, {
expanded: active,
onChange: toggleAccordion,
@@ -6558,8 +6541,7 @@ var ExpiredConsentModal = function ExpiredConsentModal(_ref) {
if (fluidType === _fluid.FluidType.ELECTRICITY) {
var _fluidStatus$FluidTyp;
- var accountData = (_fluidStatus$FluidTyp = fluidStatus[_fluid.FluidType.ELECTRICITY].connection.account) === null || _fluidStatus$FluidTyp === void 0 ? void 0 : _fluidStatus$FluidTyp.auth;
- console.log('accountData', accountData); //store the previous account data since the onDelete will remove account from DB
+ var accountData = (_fluidStatus$FluidTyp = fluidStatus[_fluid.FluidType.ELECTRICITY].connection.account) === null || _fluidStatus$FluidTyp === void 0 ? void 0 : _fluidStatus$FluidTyp.auth; //store the previous account data since the onDelete will remove account from DB
dispatch((0, _global.updateSgeStore)({
currentStep: 0,
@@ -7136,7 +7118,6 @@ var ConnectionResult = function ConnectionResult(_ref) {
}
}, [lastExecutionDate]);
var handleRefreshConsent = (0, _react.useCallback)(function () {
- console.log('handleREFRESHCONSENT');
deleteAccountsAndTriggers();
dispatch((0, _global.setShouldRefreshConsent)(true));
}, [deleteAccountsAndTriggers, dispatch]);
diff --git a/app/ecolyo.67a9cf43a641a5462556.js b/app/ecolyo.c99bd245bc3befd46006.js
similarity index 99%
rename from app/ecolyo.67a9cf43a641a5462556.js
rename to app/ecolyo.c99bd245bc3befd46006.js
index c3672acad019737d5769d5594abf87a9339a70a2..0e3226b12f221ea3b1e632cefad7cacad36eadac 100644
--- a/app/ecolyo.67a9cf43a641a5462556.js
+++ b/app/ecolyo.c99bd245bc3befd46006.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"2":"6ba46749230053507f7d","3":"de191d68f6fa3e470771","4":"5e481431cf0b2359d58d","5":"be40de25a698f7337c41","6":"cf316224f80d91ba8e19","7":"8e0088481e1baf094fa4","8":"bcd9da9f5a58c3f60050","9":"b67676e3ba222d0c6efa","10":"1823bf23fa5cf052fd8e"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"2":"6ba46749230053507f7d","3":"17547f57897152811308","4":"5e481431cf0b2359d58d","5":"be40de25a698f7337c41","6":"cf316224f80d91ba8e19","7":"8e0088481e1baf094fa4","8":"bcd9da9f5a58c3f60050","9":"b67676e3ba222d0c6efa","10":"1823bf23fa5cf052fd8e"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
diff --git a/index.html b/index.html
index 70cf696127899b9946427b1c5ae399b11233e07f..b9e9389c5699143d6e84be2e6e7e5cb363ecfe46 100644
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,user-scalable=0,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.c1180bc5cd66dfd3234e.js"></script><script src="app/ecolyo.67a9cf43a641a5462556.js"></script></div></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,user-scalable=0,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.c1180bc5cd66dfd3234e.js"></script><script src="app/ecolyo.c99bd245bc3befd46006.js"></script></div></body></html>
\ No newline at end of file