ng-easycommerce 0.0.684 → 0.0.685

package/README.md

@@ -1,3 +1,9 @@
+# Version 0.0.685
+- Redsys redirect: el modal ahora finaliza el flujo escuchando `postMessage` y `storage`, sin depender únicamente del polling.
+- Redsys redirect: se corrige el cierre automático del modal cuando el pago termina con `ok` o falla con `menosuno`.
+- Redsys bridge: `redsysProBase.html`, `redsysFrameRedirectBase.html`, `redsysFrameRedirectOutBase.html` y `redsysStateBase.html` notifican el estado al checkout con `postMessage` y storage local.
+- Redsys bridge: se elimina la dependencia de la ruta `/cart/checkout/redsys/ok`, que podía dejar el iframe cargando indefinidamente en legacy y single.
+- Redsys out: el flujo de ventana externa quedó alineado con los mismos estados de éxito/error para mantener consistencia entre checkout legacy y single.
 # Version 0.0.684
 - Checkout legacy: el campo `postcode` ahora se muestra y se requiere según `checkoutRequiredFields.postalCode` del país seleccionado.
 - Si el backend no envía `checkoutRequiredFields.postalCode`, se mantiene el comportamiento base anterior del checkout: visible y requerido.

package/assets/redsysFrameRedirectBase.html

@@ -76,7 +76,10 @@
 
         const processError = (error) => {
             console.log("ERROR ENVIO BACK  ", error);
-            sessionStorage.setItem('state', 'error')
+            try { sessionStorage.setItem('state', 'menosuno'); } catch (e) { }
+            try { localStorage.setItem('state', 'menosuno'); } catch (e) { }
+            try { window.parent && window.parent.postMessage('menosuno', '*'); } catch (e) { }
+            try { window.opener && window.opener.postMessage('menosuno', '*'); } catch (e) { }
         }
 
         setTimeout(() => {
@@ -100,4 +103,4 @@
     </script>
 </body>
 
-</html>
+</html>

package/assets/redsysFrameRedirectOutBase.html

@@ -76,7 +76,7 @@
 
         const processError = (error) => {
             console.log("ERROR ENVIO BACK  ", error);
-            localStorage.setItem('state', 'error')
+            localStorage.setItem('state', 'menosuno')
         }
 
         setTimeout(() => {
@@ -100,4 +100,4 @@
     </script>
 </body>
 
-</html>
+</html>

package/assets/redsysProBase.html

@@ -203,8 +203,7 @@
             switch (status) {
                 case 200:
                     console.log('ESTATUS 200 ', res);
-                    console.log('URL -> ', `${urlOrigin}/cart/checkout/redsys/ok`);
-                    location.href = `${urlOrigin}/cart/checkout/redsys/ok`
+                    notifyCheckoutState('ok')
                     break;
                 case 401:
                     console.log('ESTATUS 401 ', res);
@@ -212,8 +211,7 @@
                         if (!res.error) {
                             setDobleAuthVuno(res)
                         } else {
-                            console.log('URL -> ', `${urlOrigin}/cart/checkout/redsys/error`);
-                            location.href = `${urlOrigin}/cart/checkout/redsys/error`
+                            notifyCheckoutState('menosuno')
                         }
                     } else {
                         setDobleAuthVuno(res)
@@ -229,8 +227,7 @@
                     break;
                 case 500:
                     console.log('ESTATUS 500 ', res);
-                    console.log('URL -> ', `${urlOrigin}/cart/checkout/redsys/error`);
-                    location.href = `${urlOrigin}/cart/checkout/redsys/error`
+                    notifyCheckoutState('menosuno')
                     break;
                 default:
                     console.log('NO ERA 200 ', res);
@@ -267,11 +264,20 @@
             //this.toastrService.show(err != '' ? err : 'payment-error');
             console.log("ERROR ENVIO BACK  ", err);
             sessionStorage.setItem('state', 'error')
+            notifyCheckoutState('menosuno')
             //window.document.getElementById('redsys-hosted-pay-button').remove()
             //this.loading = true;
             //this.renderInit()
         }
 
+        const notifyCheckoutState = (state) => {
+            try { sessionStorage.setItem('state', state); } catch (error) { }
+            try { localStorage.setItem('state', state); } catch (error) { }
+            try { window.parent && window.parent.postMessage(state, '*'); } catch (error) { }
+            try { window.opener && window.opener.postMessage(state, '*'); } catch (error) { }
+            try { window.close(); } catch (error) { }
+        }
+
         const setDobleAuthVuno = (res) => {
             const { status, status_detail, paRequest, autSession, acsUrl } = res
             sessionStorage.setItem('status_detail', status_detail)
@@ -397,4 +403,4 @@
     </script>
 </body>
 
-</html>
+</html>

package/assets/redsysStateBase.html

@@ -53,12 +53,20 @@
 
     <script>
 
+        const notifyCheckoutState = (state) => {
+            try { sessionStorage.setItem('state', state); } catch (error) { }
+            try { localStorage.setItem('state', state); } catch (error) { }
+            try { window.parent && window.parent.postMessage(state, '*'); } catch (error) { }
+            try { window.opener && window.opener.postMessage(state, '*'); } catch (error) { }
+            try { window.close(); } catch (error) { }
+        }
+
         setTimeout(() => {
-            let state = 'ok' //o lo que pinte!!!
-            //sessionStorage.setItem('state', state)
-            location.href = `http://ags.easycommercetech.tienda/cart/checkout/redsys/ok`
+            const params = new URLSearchParams(window.location.search);
+            const state = params.get('state') || 'ok';
+            notifyCheckoutState(state);
         }, 2000);
     </script>
 </body>
 
-</html>
+</html>

package/bundles/ng-easycommerce.umd.js

@@ -16817,6 +16817,7 @@
             _this.isDobleAuth = false;
             _this.urls = [];
             _this.closeModalReason = ''; // Renombrado para evitar confusión
+            _this.finished = false;
             _this.dataRedirect = function () { return _this.consts.getUrlBase() + 'shop-api/' + _this.consts.getChannel() + '/redsys/redirect/' + _this.cartService.cart_token + '/process-payment'; };
             _this.clearStorageState = function () {
                 sessionStorage.removeItem('state');
@@ -16825,31 +16826,23 @@
             // Método que se llama desde la X de la cabecera del modal en el HTML
             _this.clickClose = function () {
                 _this.closeModalReason = 'cancel';
+                _this.finished = true;
+                if (_this.stateTimeout) {
+                    clearTimeout(_this.stateTimeout);
+                    _this.stateTimeout = null;
+                }
                 if (_this.modalRef) {
                     _this.modalRef.hide();
                 }
                 _this.processError('Se canceló el pago con tarjeta');
             };
             _this.callState = function () {
-                var _a, _b, _c;
+                if (_this.finished) {
+                    return;
+                }
                 var state = _this.closeModalReason != '' ? _this.closeModalReason : sessionStorage.getItem('state');
                 if (state) {
-                    _this.clearStorageState();
-                    if (state == 'ok') {
-                        (_a = _this.modalRef) === null || _a === void 0 ? void 0 : _a.hide();
-                        _this.ready.emit(true);
-                        return;
-                    }
-                    if (state == 'menosuno') {
-                        (_b = _this.modalRef) === null || _b === void 0 ? void 0 : _b.hide();
-                        _this.processError('Error en el pago');
-                        return;
-                    }
-                    if (state == 'cancel') {
-                        return; // El modal ya se escondió dentro de clickClose()
-                    }
-                    (_c = _this.modalRef) === null || _c === void 0 ? void 0 : _c.hide();
-                    _this.processError('Error desconocido en la transacción');
+                    _this.handleState(state);
                     return;
                 }
                 // Guardamos el timeout en una variable de clase
@@ -16857,6 +16850,33 @@
                     _this.callState();
                 }, 6000);
             };
+            _this.handleState = function (state) {
+                var _a, _b, _c, _d;
+                if (_this.finished)
+                    return;
+                _this.finished = true;
+                if (_this.stateTimeout) {
+                    clearTimeout(_this.stateTimeout);
+                    _this.stateTimeout = null;
+                }
+                _this.clearStorageState();
+                if (state === 'ok') {
+                    (_a = _this.modalRef) === null || _a === void 0 ? void 0 : _a.hide();
+                    _this.ready.emit(true);
+                    return;
+                }
+                if (state === 'menosuno' || state === 'error' || state === 'failure') {
+                    (_b = _this.modalRef) === null || _b === void 0 ? void 0 : _b.hide();
+                    _this.processError('Error en el pago');
+                    return;
+                }
+                if (state === 'cancel') {
+                    (_c = _this.modalRef) === null || _c === void 0 ? void 0 : _c.hide();
+                    return;
+                }
+                (_d = _this.modalRef) === null || _d === void 0 ? void 0 : _d.hide();
+                _this.processError('Error desconocido en la transacción');
+            };
             _this.processError = function (err) {
                 _this.toastrService.show(err != '' ? err : 'payment-error');
                 console.log("ERROR ENVIO BACK  ", err);
@@ -16875,10 +16895,11 @@
             }
         };
         RedSysRedirectEcComponent.prototype.ngOnChanges = function () {
-            console.log("SE CAMBIO");
+            // console.log("SE CAMBIO");
         };
         RedSysRedirectEcComponent.prototype.openModal = function (template) {
             this.clearStorageState();
+            this.finished = false;
             sessionStorage.setItem('dataRedirect', this.dataRedirect());
             // Abrimos el modal y guardamos la referencia en this.modalRef
             this.modalRef = this.modalService.show(template, { class: 'modal-lg modal-dialog-centered', keyboard: false, backdrop: 'static', animated: true });
@@ -16887,11 +16908,33 @@
         };
         // Opcional pero recomendado: Capturar mensajes enviados desde el Iframe de Redsys
         RedSysRedirectEcComponent.prototype.onMessage = function (event) {
-            if (event.data === 'pago_completado' || event.data === 'ok') {
-                sessionStorage.setItem('state', 'ok');
+            var _a, _b, _c, _d;
+            var data = (_a = event) === null || _a === void 0 ? void 0 : _a.data;
+            var state = typeof data === 'string'
+                ? data
+                : ((_b = data) === null || _b === void 0 ? void 0 : _b.state) || ((_c = data) === null || _c === void 0 ? void 0 : _c.status) || ((_d = data) === null || _d === void 0 ? void 0 : _d.result) || null;
+            if (!state) {
+                return;
+            }
+            if (state === 'pago_completado' || state === 'ok' || state === 'success') {
+                this.handleState('ok');
+                return;
+            }
+            if (state === 'pago_error' || state === 'menosuno' || state === 'error' || state === 'failure') {
+                this.handleState('menosuno');
+            }
+        };
+        RedSysRedirectEcComponent.prototype.onStorage = function (event) {
+            var _a;
+            if (!((_a = event) === null || _a === void 0 ? void 0 : _a.key) || event.key !== 'state' || !event.newValue) {
+                return;
+            }
+            if (event.newValue === 'ok' || event.newValue === 'success') {
+                this.handleState('ok');
+                return;
             }
-            else if (event.data === 'pago_error' || event.data === 'menosuno') {
-                sessionStorage.setItem('state', 'menosuno');
+            if (event.newValue === 'menosuno' || event.newValue === 'error' || event.newValue === 'failure') {
+                this.handleState('menosuno');
             }
         };
         RedSysRedirectEcComponent.ctorParameters = function () { return [
@@ -16921,6 +16964,9 @@
         __decorate$1m([
             core.HostListener('window:message', ['$event'])
         ], RedSysRedirectEcComponent.prototype, "onMessage", null);
+        __decorate$1m([
+            core.HostListener('window:storage', ['$event'])
+        ], RedSysRedirectEcComponent.prototype, "onStorage", null);
         RedSysRedirectEcComponent = __decorate$1m([
             core.Component({
                 selector: 'app-redsys-redirect-ec',
@@ -19126,7 +19172,7 @@
                 (_a = _this.ventana) === null || _a === void 0 ? void 0 : _a.close();
             };
             _this.callState = function () {
-                var _a, _b, _c, _d, _e;
+                var _a, _b, _c, _d;
                 var state = _this.closeModal != '' ? _this.closeModal : localStorage.getItem('state');
                 !state && _this.ventana.closed && (state = 'cancel');
                 _this.loading = true;
@@ -19134,27 +19180,22 @@
                 if (state) {
                     _this.loading = false;
                     localStorage.removeItem('state');
-                    if (state == 'success' || state == 'ok') {
+                    if (state == 'success' || state == 'ok' || state == 'pending') {
                         (_a = _this.ventana) === null || _a === void 0 ? void 0 : _a.close();
                         _this.ready.emit(true);
                         return;
                     }
-                    if (state == 'pending' || state == 'ok') {
+                    if (state == 'failure' || state == 'error' || state == 'menosuno') {
                         (_b = _this.ventana) === null || _b === void 0 ? void 0 : _b.close();
-                        _this.ready.emit(true);
-                        return;
-                    }
-                    if (state == 'failure' || state == 'error') {
-                        (_c = _this.ventana) === null || _c === void 0 ? void 0 : _c.close();
                         _this.processError('');
                         return;
                     }
                     if (state == 'cancel') {
-                        (_d = _this.ventana) === null || _d === void 0 ? void 0 : _d.close();
+                        (_c = _this.ventana) === null || _c === void 0 ? void 0 : _c.close();
                         _this.processError('Se cancelo el pago con redsys');
                         return;
                     }
-                    (_e = _this.ventana) === null || _e === void 0 ? void 0 : _e.close();
+                    (_d = _this.ventana) === null || _d === void 0 ? void 0 : _d.close();
                     _this.processError('');
                     return;
                 }