From 7fda07448bdbf7877f8f5b59d427e6440f3e5624 Mon Sep 17 00:00:00 2001
From: build-token <build-token>
Date: Mon, 25 Nov 2024 08:19:29 +0000
Subject: [PATCH] publish: Merge branch 'fix/consent-refused' into 'dev'
generated from commit 3b7a6f94e5eb4ea4f9df12751e5d6872a89c226a
---
...804bf480d510441e8.js => ecolyo.94ed1cf3010185300847.js} | 3 ++-
...749e9513e17fa83d2.js => ecolyo.d1803e9a0e40526f7480.js} | 7 ++++++-
index.html | 2 +-
...db2f3ed722f4cc306.js => ecolyo.f1648235db28a7a526d2.js} | 2 ++
public/index.html | 2 +-
services/aggregatorUsageEvents/ecolyo.js | 5 +++++
services/consumptionAlert/ecolyo.js | 2 ++
services/enedisHalfHourMonthlyAnalysis/ecolyo.js | 2 ++
services/fluidsPrices/ecolyo.js | 2 ++
services/monthlyReportNotification/ecolyo.js | 2 ++
10 files changed, 25 insertions(+), 4 deletions(-)
rename 5/{ecolyo.73c804bf480d510441e8.js => ecolyo.94ed1cf3010185300847.js} (99%)
rename app/{ecolyo.9aa749e9513e17fa83d2.js => ecolyo.d1803e9a0e40526f7480.js} (99%)
rename public/{ecolyo.2dddb2f3ed722f4cc306.js => ecolyo.f1648235db28a7a526d2.js} (99%)
diff --git a/5/ecolyo.73c804bf480d510441e8.js b/5/ecolyo.94ed1cf3010185300847.js
similarity index 99%
rename from 5/ecolyo.73c804bf480d510441e8.js
rename to 5/ecolyo.94ed1cf3010185300847.js
index 55e023727..d4c08259f 100644
--- a/5/ecolyo.73c804bf480d510441e8.js
+++ b/5/ecolyo.94ed1cf3010185300847.js
@@ -1203,6 +1203,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
isOutdatedData = _useState10[0],
setIsOutdatedData = _useState10[1];
var isWaitingForConsent = fluidType === _enums.FluidType.GAS && currentFluidStatus.status === _enums.FluidState.CHALLENGE_ASKED;
+ var emailHasBeenIgnored = fluidType === _enums.FluidType.GAS && currentFluidStatus.status === _enums.FluidState.EMAIL_IGNORED;
var fluidService = (0, _react.useMemo)(function () {
return new _fluid.default(client);
}, [client]);
@@ -1610,7 +1611,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
}, [callbackResponse, client, currentFluidStatus.connection, currentFluidStatus.fluidType, currentFluidStatus.lastDataDate, dispatch, fluidSlug, fluidType, konnector, shouldRefreshConsent, trigger]);
return /*#__PURE__*/_react.default.createElement("div", {
className: "konnector-section-root"
- }, isWaitingForConsent && /*#__PURE__*/_react.default.createElement(_GrdfWaitConsent.GrdfWaitConsent, null), !isWaitingForConsent && !showOfflineData && /*#__PURE__*/_react.default.createElement(_Connection.default, {
+ }, isWaitingForConsent && /*#__PURE__*/_react.default.createElement(_GrdfWaitConsent.GrdfWaitConsent, null), (!isWaitingForConsent || emailHasBeenIgnored) && !showOfflineData && /*#__PURE__*/_react.default.createElement(_Connection.default, {
fluidType: fluidType
}), !isWaitingForConsent && showOfflineData && /*#__PURE__*/_react.default.createElement(_core.Accordion, {
expanded: showConnectionDetails,
diff --git a/app/ecolyo.9aa749e9513e17fa83d2.js b/app/ecolyo.d1803e9a0e40526f7480.js
similarity index 99%
rename from app/ecolyo.9aa749e9513e17fa83d2.js
rename to app/ecolyo.d1803e9a0e40526f7480.js
index 6aaf33912..3696d11b6 100644
--- a/app/ecolyo.9aa749e9513e17fa83d2.js
+++ b/app/ecolyo.d1803e9a0e40526f7480.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"7f30cc00556bcb6ae91b","4":"67f3fe6d9d232a3381d9","5":"73c804bf480d510441e8","6":"7f1b6b6905ffdbd47ccd","7":"d1f87eb67105e4a00434","8":"7f86157816222c0086ca","9":"f45e19d3c34ba67e355b","10":"fe3625578fa387c11975","11":"346fcb0fa7b2e3565ad3"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"7f30cc00556bcb6ae91b","4":"67f3fe6d9d232a3381d9","5":"94ed1cf3010185300847","6":"7f1b6b6905ffdbd47ccd","7":"d1f87eb67105e4a00434","8":"7f86157816222c0086ca","9":"f45e19d3c34ba67e355b","10":"fe3625578fa387c11975","11":"346fcb0fa7b2e3565ad3"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -2935,6 +2935,7 @@ exports.FluidState = FluidState;
FluidState["ERROR"] = "ERROR";
FluidState["LOGIN_FAILED"] = "LOGIN_FAILED";
FluidState["CHALLENGE_ASKED"] = "CHALLENGE_ASKED";
+ FluidState["EMAIL_IGNORED"] = "EMAIL_IGNORED";
})(FluidState || (exports.FluidState = FluidState = {}));
/***/ }),
@@ -16168,6 +16169,9 @@ var FluidService = /*#__PURE__*/function () {
if ((state === null || state === void 0 ? void 0 : state.last_error) === 'CHALLENGE_ASKED') {
return _enums.FluidState.CHALLENGE_ASKED;
}
+ if ((state === null || state === void 0 ? void 0 : state.last_error) === 'EMAIL_IGNORED') {
+ return _enums.FluidState.EMAIL_IGNORED;
+ }
return _enums.FluidState.ERROR;
default:
return _enums.FluidState.NOT_CONNECTED;
@@ -20510,6 +20514,7 @@ exports.KonnectorError = KonnectorError;
KonnectorError["USER_ACTION_NEEDED"] = "USER_ACTION_NEEDED";
KonnectorError["TERMS_VERSION_MISMATCH"] = "TERMS_VERSION_MISMATCH";
KonnectorError["CHALLENGE_ASKED"] = "CHALLENGE_ASKED";
+ KonnectorError["EMAIL_IGNORED"] = "USER_ACTION_NEEDED.WEBAUTH_REQUIRED";
KonnectorError["UNKNOWN_ERROR"] = "UNKNOWN_ERROR";
KonnectorError["CRITICAL"] = "exit status 1";
KonnectorError["MISSING_SECRET"] = "Cannot read property 'secret' of null";
diff --git a/index.html b/index.html
index 82ad87036..66cac0d9e 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"><meta name="color-scheme" content="only dark">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.d8f4ed281ee673627c46.js"></script><script src="app/ecolyo.9aa749e9513e17fa83d2.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"><meta name="color-scheme" content="only dark">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.d8f4ed281ee673627c46.js"></script><script src="app/ecolyo.d1803e9a0e40526f7480.js"></script></div></body></html>
\ No newline at end of file
diff --git a/public/ecolyo.2dddb2f3ed722f4cc306.js b/public/ecolyo.f1648235db28a7a526d2.js
similarity index 99%
rename from public/ecolyo.2dddb2f3ed722f4cc306.js
rename to public/ecolyo.f1648235db28a7a526d2.js
index 0f264470e..b1f0a7e26 100644
--- a/public/ecolyo.2dddb2f3ed722f4cc306.js
+++ b/public/ecolyo.f1648235db28a7a526d2.js
@@ -19835,6 +19835,7 @@ exports.FluidState = FluidState;
FluidState["ERROR"] = "ERROR";
FluidState["LOGIN_FAILED"] = "LOGIN_FAILED";
FluidState["CHALLENGE_ASKED"] = "CHALLENGE_ASKED";
+ FluidState["EMAIL_IGNORED"] = "EMAIL_IGNORED";
})(FluidState || (exports.FluidState = FluidState = {}));
/***/ }),
@@ -121198,6 +121199,7 @@ exports.KonnectorError = KonnectorError;
KonnectorError["USER_ACTION_NEEDED"] = "USER_ACTION_NEEDED";
KonnectorError["TERMS_VERSION_MISMATCH"] = "TERMS_VERSION_MISMATCH";
KonnectorError["CHALLENGE_ASKED"] = "CHALLENGE_ASKED";
+ KonnectorError["EMAIL_IGNORED"] = "USER_ACTION_NEEDED.WEBAUTH_REQUIRED";
KonnectorError["UNKNOWN_ERROR"] = "UNKNOWN_ERROR";
KonnectorError["CRITICAL"] = "exit status 1";
KonnectorError["MISSING_SECRET"] = "Cannot read property 'secret' of null";
diff --git a/public/index.html b/public/index.html
index f1f4f25a9..ed98ead9b 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo | Désabonnement</title><link rel="icon" type="image/png" href="public/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="public/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="mask-icon" href="public/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="public/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="public/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"><meta name="color-scheme" content="only dark">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="../public/ecolyo.2dddb2f3ed722f4cc306.js"></script></div></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo | Désabonnement</title><link rel="icon" type="image/png" href="public/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="public/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="mask-icon" href="public/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="public/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="public/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"><meta name="color-scheme" content="only dark">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="../public/ecolyo.f1648235db28a7a526d2.js"></script></div></body></html>
\ No newline at end of file
diff --git a/services/aggregatorUsageEvents/ecolyo.js b/services/aggregatorUsageEvents/ecolyo.js
index 307e70a15..eb91e03d6 100644
--- a/services/aggregatorUsageEvents/ecolyo.js
+++ b/services/aggregatorUsageEvents/ecolyo.js
@@ -46330,6 +46330,7 @@ exports.FluidState = FluidState;
FluidState["ERROR"] = "ERROR";
FluidState["LOGIN_FAILED"] = "LOGIN_FAILED";
FluidState["CHALLENGE_ASKED"] = "CHALLENGE_ASKED";
+ FluidState["EMAIL_IGNORED"] = "EMAIL_IGNORED";
})(FluidState || (exports.FluidState = FluidState = {}));
/***/ }),
@@ -46389,6 +46390,7 @@ exports.KonnectorError = KonnectorError;
KonnectorError["USER_ACTION_NEEDED"] = "USER_ACTION_NEEDED";
KonnectorError["TERMS_VERSION_MISMATCH"] = "TERMS_VERSION_MISMATCH";
KonnectorError["CHALLENGE_ASKED"] = "CHALLENGE_ASKED";
+ KonnectorError["EMAIL_IGNORED"] = "USER_ACTION_NEEDED.WEBAUTH_REQUIRED";
KonnectorError["UNKNOWN_ERROR"] = "UNKNOWN_ERROR";
KonnectorError["CRITICAL"] = "exit status 1";
KonnectorError["MISSING_SECRET"] = "Cannot read property 'secret' of null";
@@ -136312,6 +136314,9 @@ class FluidService {
if ((state === null || state === void 0 ? void 0 : state.last_error) === 'CHALLENGE_ASKED') {
return _enums.FluidState.CHALLENGE_ASKED;
}
+ if ((state === null || state === void 0 ? void 0 : state.last_error) === 'EMAIL_IGNORED') {
+ return _enums.FluidState.EMAIL_IGNORED;
+ }
return _enums.FluidState.ERROR;
default:
return _enums.FluidState.NOT_CONNECTED;
diff --git a/services/consumptionAlert/ecolyo.js b/services/consumptionAlert/ecolyo.js
index 623a98870..d3d6c2c67 100644
--- a/services/consumptionAlert/ecolyo.js
+++ b/services/consumptionAlert/ecolyo.js
@@ -45927,6 +45927,7 @@ exports.FluidState = FluidState;
FluidState["ERROR"] = "ERROR";
FluidState["LOGIN_FAILED"] = "LOGIN_FAILED";
FluidState["CHALLENGE_ASKED"] = "CHALLENGE_ASKED";
+ FluidState["EMAIL_IGNORED"] = "EMAIL_IGNORED";
})(FluidState || (exports.FluidState = FluidState = {}));
/***/ }),
@@ -45986,6 +45987,7 @@ exports.KonnectorError = KonnectorError;
KonnectorError["USER_ACTION_NEEDED"] = "USER_ACTION_NEEDED";
KonnectorError["TERMS_VERSION_MISMATCH"] = "TERMS_VERSION_MISMATCH";
KonnectorError["CHALLENGE_ASKED"] = "CHALLENGE_ASKED";
+ KonnectorError["EMAIL_IGNORED"] = "USER_ACTION_NEEDED.WEBAUTH_REQUIRED";
KonnectorError["UNKNOWN_ERROR"] = "UNKNOWN_ERROR";
KonnectorError["CRITICAL"] = "exit status 1";
KonnectorError["MISSING_SECRET"] = "Cannot read property 'secret' of null";
diff --git a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
index 1ab775f68..e812f1f21 100644
--- a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
+++ b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
@@ -45927,6 +45927,7 @@ exports.FluidState = FluidState;
FluidState["ERROR"] = "ERROR";
FluidState["LOGIN_FAILED"] = "LOGIN_FAILED";
FluidState["CHALLENGE_ASKED"] = "CHALLENGE_ASKED";
+ FluidState["EMAIL_IGNORED"] = "EMAIL_IGNORED";
})(FluidState || (exports.FluidState = FluidState = {}));
/***/ }),
@@ -45986,6 +45987,7 @@ exports.KonnectorError = KonnectorError;
KonnectorError["USER_ACTION_NEEDED"] = "USER_ACTION_NEEDED";
KonnectorError["TERMS_VERSION_MISMATCH"] = "TERMS_VERSION_MISMATCH";
KonnectorError["CHALLENGE_ASKED"] = "CHALLENGE_ASKED";
+ KonnectorError["EMAIL_IGNORED"] = "USER_ACTION_NEEDED.WEBAUTH_REQUIRED";
KonnectorError["UNKNOWN_ERROR"] = "UNKNOWN_ERROR";
KonnectorError["CRITICAL"] = "exit status 1";
KonnectorError["MISSING_SECRET"] = "Cannot read property 'secret' of null";
diff --git a/services/fluidsPrices/ecolyo.js b/services/fluidsPrices/ecolyo.js
index 5c14162ce..a503c117b 100644
--- a/services/fluidsPrices/ecolyo.js
+++ b/services/fluidsPrices/ecolyo.js
@@ -45927,6 +45927,7 @@ exports.FluidState = FluidState;
FluidState["ERROR"] = "ERROR";
FluidState["LOGIN_FAILED"] = "LOGIN_FAILED";
FluidState["CHALLENGE_ASKED"] = "CHALLENGE_ASKED";
+ FluidState["EMAIL_IGNORED"] = "EMAIL_IGNORED";
})(FluidState || (exports.FluidState = FluidState = {}));
/***/ }),
@@ -45986,6 +45987,7 @@ exports.KonnectorError = KonnectorError;
KonnectorError["USER_ACTION_NEEDED"] = "USER_ACTION_NEEDED";
KonnectorError["TERMS_VERSION_MISMATCH"] = "TERMS_VERSION_MISMATCH";
KonnectorError["CHALLENGE_ASKED"] = "CHALLENGE_ASKED";
+ KonnectorError["EMAIL_IGNORED"] = "USER_ACTION_NEEDED.WEBAUTH_REQUIRED";
KonnectorError["UNKNOWN_ERROR"] = "UNKNOWN_ERROR";
KonnectorError["CRITICAL"] = "exit status 1";
KonnectorError["MISSING_SECRET"] = "Cannot read property 'secret' of null";
diff --git a/services/monthlyReportNotification/ecolyo.js b/services/monthlyReportNotification/ecolyo.js
index ff33f6874..ede4bc430 100644
--- a/services/monthlyReportNotification/ecolyo.js
+++ b/services/monthlyReportNotification/ecolyo.js
@@ -45927,6 +45927,7 @@ exports.FluidState = FluidState;
FluidState["ERROR"] = "ERROR";
FluidState["LOGIN_FAILED"] = "LOGIN_FAILED";
FluidState["CHALLENGE_ASKED"] = "CHALLENGE_ASKED";
+ FluidState["EMAIL_IGNORED"] = "EMAIL_IGNORED";
})(FluidState || (exports.FluidState = FluidState = {}));
/***/ }),
@@ -45986,6 +45987,7 @@ exports.KonnectorError = KonnectorError;
KonnectorError["USER_ACTION_NEEDED"] = "USER_ACTION_NEEDED";
KonnectorError["TERMS_VERSION_MISMATCH"] = "TERMS_VERSION_MISMATCH";
KonnectorError["CHALLENGE_ASKED"] = "CHALLENGE_ASKED";
+ KonnectorError["EMAIL_IGNORED"] = "USER_ACTION_NEEDED.WEBAUTH_REQUIRED";
KonnectorError["UNKNOWN_ERROR"] = "UNKNOWN_ERROR";
KonnectorError["CRITICAL"] = "exit status 1";
KonnectorError["MISSING_SECRET"] = "Cannot read property 'secret' of null";
--
GitLab