diff --git a/5/ecolyo.c1b2f164bf4b539c2854.js b/5/ecolyo.9d0f128f5662fa0c91dd.js
similarity index 99%
rename from 5/ecolyo.c1b2f164bf4b539c2854.js
rename to 5/ecolyo.9d0f128f5662fa0c91dd.js
index eb4334c99a7aa8b8bd84b5340b35bca078406b76..7411f6e4274f9adba892d0c34a17a8baddad3bae 100644
--- a/5/ecolyo.c1b2f164bf4b539c2854.js
+++ b/5/ecolyo.9d0f128f5662fa0c91dd.js
@@ -972,26 +972,23 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
openModal = _useState2[0],
setOpenModal = _useState2[1];
- var _useState3 = (0, _react.useState)(false),
+ // const [isUpdating, setIsUpdating] = useState(false)
+ var _useState3 = (0, _react.useState)(fluidType === _enums.FluidType.ELECTRICITY),
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
- isUpdating = _useState4[0],
- setIsUpdating = _useState4[1];
- var _useState5 = (0, _react.useState)(fluidType === _enums.FluidType.ELECTRICITY),
+ isVerifyingIdentity = _useState4[0],
+ setIsVerifyingIdentity = _useState4[1];
+ var _useState5 = (0, _react.useState)(null),
_useState6 = (0, _slicedToArray2.default)(_useState5, 2),
- isVerifyingIdentity = _useState6[0],
- setIsVerifyingIdentity = _useState6[1];
+ konnectorErrorDescription = _useState6[0],
+ setKonnectorErrorDescription = _useState6[1];
var _useState7 = (0, _react.useState)(null),
_useState8 = (0, _slicedToArray2.default)(_useState7, 2),
- konnectorErrorDescription = _useState8[0],
- setKonnectorErrorDescription = _useState8[1];
+ konnectorState = _useState8[0],
+ setKonnectorState = _useState8[1];
var _useState9 = (0, _react.useState)(null),
_useState10 = (0, _slicedToArray2.default)(_useState9, 2),
- konnectorState = _useState10[0],
- setKonnectorState = _useState10[1];
- var _useState11 = (0, _react.useState)(null),
- _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
- isOutdatedData = _useState12[0],
- setIsOutdatedData = _useState12[1];
+ isOutdatedData = _useState10[0],
+ setIsOutdatedData = _useState10[1];
var isWaitingForConsent = fluidType === _enums.FluidType.GAS && currentFluidStatus.status === _enums.FluidState.CHALLENGE_ASKED;
var fluidService = (0, _react.useMemo)(function () {
return new _fluid.default(client);
@@ -1111,48 +1108,48 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
})), [refreshChallengeState, updateGlobalFluidStatus, partnersInfoService, fluidService, dispatch]);
var handleConnectionEnd = (0, _react.useCallback)( /*#__PURE__*/function () {
var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(isSuccess) {
- var isGlobalLoginFailed, isEnedisCodeInseeError, shouldDeleteAccount, _currentFluidStatus$c2, auth, lastEpglLogin, accountService, updatedFluidStatus;
+ var _currentFluidStatus$c2, account, isUpdating, isGlobalLoginFailed, isEnedisCodeInseeError, shouldDeleteAccount, auth, lastEpglLogin, accountService, updatedFluidStatus;
return _regenerator.default.wrap(function _callee4$(_context4) {
while (1) {
switch (_context4.prev = _context4.next) {
case 0:
- // CASE FOR GLOBAL LOGIN FAILED
+ _currentFluidStatus$c2 = currentFluidStatus.connection, account = _currentFluidStatus$c2.account, isUpdating = _currentFluidStatus$c2.isUpdating; // CASE FOR GLOBAL LOGIN FAILED
isGlobalLoginFailed = konnectorErrorDescription === _enums.KonnectorError.LOGIN_FAILED || konnectorErrorDescription === _enums.KonnectorError.UNKNOWN_ERROR || konnectorErrorDescription === _enums.KonnectorError.CRITICAL || konnectorErrorDescription === _enums.KonnectorError.MISSING_SECRET || konnectorErrorDescription === _enums.KonnectorError.USER_ACTION_NEEDED_ACCOUNT_REMOVED; // CASE FOR ENEDIS CODE INSEE ERROR
isEnedisCodeInseeError = !isUpdating && fluidType === _enums.FluidType.ELECTRICITY;
- shouldDeleteAccount = account && !isSuccess && currentFluidStatus && currentFluidStatus.connection.account && (isGlobalLoginFailed || isEnedisCodeInseeError);
+ shouldDeleteAccount = account && !isSuccess && account && (isGlobalLoginFailed || isEnedisCodeInseeError);
if (!shouldDeleteAccount) {
- _context4.next = 13;
+ _context4.next = 14;
break;
}
(0, _logger.default)('info', "shouldDeleteAccount");
// KEEP LAST LOGIN FOR EPGL
- if (fluidSlug === _enums.FluidSlugType.WATER && (_currentFluidStatus$c2 = currentFluidStatus.connection.account) !== null && _currentFluidStatus$c2 !== void 0 && _currentFluidStatus$c2.auth) {
- auth = currentFluidStatus.connection.account.auth;
+ if (fluidSlug === _enums.FluidSlugType.WATER && account !== null && account !== void 0 && account.auth) {
+ auth = account.auth;
lastEpglLogin = auth.login;
dispatch((0, _global.setLastEpglLogin)(lastEpglLogin));
}
// DELETE ACCOUNT
accountService = new _account.default(client);
- _context4.next = 9;
+ _context4.next = 10;
return accountService.deleteAccount(account);
- case 9:
- _context4.next = 11;
+ case 10:
+ _context4.next = 12;
return handleAccountDeletion();
- case 11:
- _context4.next = 17;
+ case 12:
+ _context4.next = 18;
break;
- case 13:
- _context4.next = 15;
+ case 14:
+ _context4.next = 16;
return fluidService.getFluidStatus(partnersInfo);
- case 15:
+ case 16:
updatedFluidStatus = _context4.sent;
dispatch((0, _global.setFluidStatus)(updatedFluidStatus));
- case 17:
+ case 18:
dispatch((0, _chart.setShowConnectionDetails)(false));
setOpenModal(false);
setKonnectorState(null);
setKonnectorErrorDescription(null);
- case 21:
+ case 22:
case "end":
return _context4.stop();
}
@@ -1162,7 +1159,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
return function (_x) {
return _ref5.apply(this, arguments);
};
- }(), [account, konnectorErrorDescription, currentFluidStatus, isUpdating, fluidType, fluidSlug, client, handleAccountDeletion, fluidService, partnersInfo, dispatch]);
+ }(), [konnectorErrorDescription, currentFluidStatus, fluidType, fluidSlug, client, handleAccountDeletion, fluidService, partnersInfo, dispatch]);
var toggleModalConnection = (0, _react.useCallback)(function () {
switch (fluidType) {
case _enums.FluidType.ELECTRICITY:
@@ -1183,7 +1180,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
onClick: toggleModalConnection
}, t("auth.".concat((0, _utils.getKonnectorSlug)(fluidType), ".connect")));
}
- if (fluidState === _enums.FluidState.KONNECTOR_NOT_FOUND && !isUpdating) {
+ if (fluidState === _enums.FluidState.KONNECTOR_NOT_FOUND && !currentFluidStatus.connection.isUpdating) {
return /*#__PURE__*/_react.default.createElement(_ConnectionNotFound.default, {
konnectorSlug: fluidSlug
});
@@ -1196,7 +1193,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
fluidType: fluidType
});
}
- }, [account, currentFluidStatus.status, fluidSlug, fluidState, fluidType, handleAccountDeletion, isUpdating, showOfflineData, t, toggleModalConnection]);
+ }, [account, currentFluidStatus.connection.isUpdating, currentFluidStatus.status, fluidSlug, fluidState, fluidType, handleAccountDeletion, showOfflineData, t, toggleModalConnection]);
// TODO maybe find a better name ?
var callbackResponse = (0, _react.useCallback)( /*#__PURE__*/function () {
@@ -1333,18 +1330,17 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
} // TODO await this ?
function _getData() {
_getData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
- var updatedConnection, connectionFlow;
+ var updatedConnection, connectionFlow, launch;
return _regenerator.default.wrap(function _callee7$(_context7) {
while (1) {
switch (_context7.prev = _context7.next) {
case 0:
if (!(currentFluidStatus.connection.shouldLaunchKonnector && !(0, _triggers.isKonnectorRunning)(trigger))) {
- _context7.next = 9;
+ _context7.next = 12;
break;
}
if (subscribed) {
// Open Konnector modal then set shouldLaunchKonnector to false
- if (currentFluidStatus.connection.isUpdating) setIsUpdating(true); // weird to do this ?
setOpenModal(true);
updatedConnection = _objectSpread(_objectSpread({}, currentFluidStatus.connection), {}, {
shouldLaunchKonnector: false
@@ -1355,9 +1351,12 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
}));
}
connectionFlow = new _ConnectionFlow.default(client, trigger, konnector);
- _context7.next = 5;
+ console.log('🚀 ~ getData ~ connectionFlow:', connectionFlow);
+ _context7.next = 6;
return connectionFlow.launch();
- case 5:
+ case 6:
+ launch = _context7.sent;
+ console.log('🚀 ~ getData ~ launch:', launch);
console.log('connectionFlow', connectionFlow.jobWatcher);
connectionFlow.jobWatcher.on(_flowEvents.ERROR_EVENT, function () {
setKonnectorErrorDescription(connectionFlow.jobWatcher.on()._error);
@@ -1369,7 +1368,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
connectionFlow.jobWatcher.on(_flowEvents.SUCCESS_EVENT, function () {
callbackResponse(_flowEvents.SUCCESS_EVENT);
});
- case 9:
+ case 12:
case "end":
return _context7.stop();
}
@@ -1414,7 +1413,6 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
}
}, getConnectionCard())), /*#__PURE__*/_react.default.createElement(_KonnectorModal.default, {
open: openModal,
- isUpdating: isUpdating,
isVerifyingIdentity: isVerifyingIdentity,
state: konnectorState,
error: konnectorErrorDescription,
@@ -2896,9 +2894,10 @@ var GrdfWaitConsent = function GrdfWaitConsent(_ref) {
case 0:
updatedConnection = _objectSpread(_objectSpread({}, currentFluidStatus.connection), {}, {
// TODO : investigate is this is duplicate ?
- shouldLaunchKonnector: true,
- isUpdating: true
+ shouldLaunchKonnector: true
+ // isUpdating: true,
});
+
dispatch((0, _global.updateFluidConnection)({
fluidType: currentFluidStatus.fluidType,
fluidConnection: updatedConnection
@@ -3956,6 +3955,7 @@ var _Icon = _interopRequireDefault(__webpack_require__("AHiN"));
var _enums = __webpack_require__("j0hM");
var _lodash = __webpack_require__("nHcj");
var _react = _interopRequireWildcard(__webpack_require__("ivGQ"));
+var _hooks = __webpack_require__("6FOS");
var _utils = __webpack_require__("RgLR");
var _KonnectorModalFooter = _interopRequireDefault(__webpack_require__("X1ii"));
__webpack_require__("0gil");
@@ -3963,7 +3963,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
var KonnectorModal = function KonnectorModal(_ref) {
var open = _ref.open,
- isUpdating = _ref.isUpdating,
isVerifyingIdentity = _ref.isVerifyingIdentity,
state = _ref.state,
error = _ref.error,
@@ -3974,6 +3973,12 @@ var KonnectorModal = function KonnectorModal(_ref) {
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
var fluidName = (0, _utils.getFluidName)(fluidType);
+ var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
+ return state.ecolyo.global;
+ }),
+ fluidStatus = _useAppSelector.fluidStatus;
+ var currentFluidStatus = fluidStatus[fluidType];
+ var isUpdating = currentFluidStatus.connection.isUpdating;
var _useState = (0, _react.useState)(0),
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
index = _useState2[0],
diff --git a/app/ecolyo.bc7590471698233d980a.js b/app/ecolyo.61535ae7b32dac32cfe8.js
similarity index 99%
rename from app/ecolyo.bc7590471698233d980a.js
rename to app/ecolyo.61535ae7b32dac32cfe8.js
index 455159ac66475201faee8f5dc29e5d26d54bef81..9841545bf7e5ac8a90c8a571600f34b773c0cc6a 100644
--- a/app/ecolyo.bc7590471698233d980a.js
+++ b/app/ecolyo.61535ae7b32dac32cfe8.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"f407a5f06d8f4c483bb7","4":"3b4996d5b14bfb7665c0","5":"c1b2f164bf4b539c2854","6":"55a8c1b77f056fa82248","7":"d61472e75eb196504d3e","8":"a73a83af326b8e1dfa4a","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"f407a5f06d8f4c483bb7","4":"3b4996d5b14bfb7665c0","5":"9d0f128f5662fa0c91dd","6":"55a8c1b77f056fa82248","7":"d61472e75eb196504d3e","8":"a73a83af326b8e1dfa4a","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
diff --git a/index.html b/index.html
index fe65529c5c6695518dfc0db1de26e8718ec785c8..b003d570ead3a92120eb6e1a753c537dde5ceeff 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,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.0d643adf7b74041441a1.js"></script><script src="app/ecolyo.bc7590471698233d980a.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,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.0d643adf7b74041441a1.js"></script><script src="app/ecolyo.61535ae7b32dac32cfe8.js"></script></div></body></html>
\ No newline at end of file