From 9d012cd59f6a5752b14220c04de266214dbd9b04 Mon Sep 17 00:00:00 2001 From: Juergen Kunz Date: Mon, 1 Dec 2025 00:10:34 +0000 Subject: [PATCH] Update dependencies and improve validation function handling in registration stepper --- package.json | 2 +- pnpm-lock.yaml | 12 ++++----- ts_web/elements/idp-registration-stepper.ts | 29 ++++++++++----------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index b82f71f..703d95b 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@api.global/typedserver": "^3.0.80", "@api.global/typedsocket": "^3.0.1", "@consent.software/catalog": "^2.0.1", - "@design.estate/dees-catalog": "^2.0.0", + "@design.estate/dees-catalog": "^2.0.2", "@design.estate/dees-domtools": "^2.3.6", "@design.estate/dees-element": "^2.1.3", "@push.rocks/lik": "^6.2.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2710bc7..568d396 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -24,8 +24,8 @@ importers: specifier: ^2.0.1 version: 2.0.1 '@design.estate/dees-catalog': - specifier: ^2.0.0 - version: 2.0.0(@tiptap/pm@2.27.1) + specifier: ^2.0.2 + version: 2.0.2(@tiptap/pm@2.27.1) '@design.estate/dees-domtools': specifier: ^2.3.6 version: 2.3.6 @@ -319,8 +319,8 @@ packages: '@consent.software/webclient@1.1.0': resolution: {integrity: sha512-VX7e8ygZwgU8WEzn22fdvvEytLYl4kfp/u40GusaBU4iFtjrCY2hxDy9Z1FTKicpGcRxf3t13lM0Jaugq7Jj/w==} - '@design.estate/dees-catalog@2.0.0': - resolution: {integrity: sha512-8/02NcrzhmuEx/voZxoUlH2t2zxfguQa1gNyfi676JK0cJ5ha000Gc7X0lcvFBzb6IpXuO+QdNY93ga/a4ee5Q==} + '@design.estate/dees-catalog@2.0.2': + resolution: {integrity: sha512-+4sAj+GS5Tw56G9bEgN+86wLARzgRgPnEOTtTtvV8DItK1Qehgqw0++GFiEHjg76ARNU7Of1iu/Ly7yIUrnyEg==} '@design.estate/dees-comms@1.0.27': resolution: {integrity: sha512-GvzTUwkV442LD60T08iqSoqvhA02Mou5lFvvqBPc4yBUiU7cZISqBx+76xvMgMIEI9Dx9JfTl4/2nW8MoVAanw==} @@ -4387,7 +4387,7 @@ snapshots: '@push.rocks/smarttime': 4.1.1 '@push.rocks/webstore': 2.0.20 - '@design.estate/dees-catalog@2.0.0(@tiptap/pm@2.27.1)': + '@design.estate/dees-catalog@2.0.2(@tiptap/pm@2.27.1)': dependencies: '@design.estate/dees-domtools': 2.3.6 '@design.estate/dees-element': 2.1.3 @@ -6581,7 +6581,7 @@ snapshots: '@uptime.link/webwidget@1.2.4(@tiptap/pm@2.27.1)': dependencies: - '@design.estate/dees-catalog': 2.0.0(@tiptap/pm@2.27.1) + '@design.estate/dees-catalog': 2.0.2(@tiptap/pm@2.27.1) '@design.estate/dees-domtools': 2.3.6 '@design.estate/dees-element': 2.1.3 '@design.estate/dees-wcctools': 1.2.1 diff --git a/ts_web/elements/idp-registration-stepper.ts b/ts_web/elements/idp-registration-stepper.ts index 0fcf35d..8766839 100644 --- a/ts_web/elements/idp-registration-stepper.ts +++ b/ts_web/elements/idp-registration-stepper.ts @@ -349,10 +349,10 @@ export class IdpRegistrationStepper extends DeesElement { Next `, - validationFunc: async (stepperArg, elementArg) => { + validationFunc: async (stepperArg, elementArg, signal) => { const deesForm: plugins.deesCatalog.DeesForm = elementArg.querySelector('dees-form'); deesForm.addEventListener('formData', async (eventArg: CustomEvent) => { - const response = await idpState.idpClient.requests.setData + await idpState.idpClient.requests.setData .fire({ token: this.storedData.validationTokenUrlParam, userData: { @@ -372,7 +372,7 @@ export class IdpRegistrationStepper extends DeesElement { ); deesForm.setStatus('success', 'ok!'); stepperArg.goNext(); - }); + }, { signal }); }, onReturnToStepFunc: async (stepperArg, stepElementArg) => { const deesForm = stepElementArg.querySelector('dees-form'); @@ -391,10 +391,10 @@ export class IdpRegistrationStepper extends DeesElement { Next `, - validationFunc: async (stepperArg, elementArg) => { + validationFunc: async (stepperArg, elementArg, signal) => { const deesForm: plugins.deesCatalog.DeesForm = elementArg.querySelector('dees-form'); deesForm.addEventListener('formData', async (eventArg: CustomEvent) => { - const response = await idpState.idpClient.requests.mobileNumberVerification + await idpState.idpClient.requests.mobileNumberVerification .fire({ token: this.storedData.validationTokenUrlParam, mobileNumber: eventArg.detail.data.mobileNumber, @@ -408,7 +408,7 @@ export class IdpRegistrationStepper extends DeesElement { ); deesForm.setStatus('success', 'ok!'); stepperArg.goNext(); - }); + }, { signal }); }, onReturnToStepFunc: async (stepperArg, stepElementArg) => { const deesForm = stepElementArg.querySelector('dees-form'); @@ -427,7 +427,7 @@ export class IdpRegistrationStepper extends DeesElement { Next `, - validationFunc: async (stepperArg, elementArg) => { + validationFunc: async (stepperArg, elementArg, signal) => { const deesForm: plugins.deesCatalog.DeesForm = elementArg.querySelector('dees-form'); deesForm.addEventListener('formData', async (eventArg: CustomEvent) => { const response = await idpState.idpClient.requests.mobileNumberVerification.fire({ @@ -443,7 +443,7 @@ export class IdpRegistrationStepper extends DeesElement { await this.domtools.convenience.smartdelay.delayFor(3000); deesForm.setStatus('normal', 'Retry And Next!'); } - }); + }, { signal }); }, onReturnToStepFunc: async (stepperArg, stepElementArg) => { stepperArg.goBack(); @@ -463,10 +463,10 @@ export class IdpRegistrationStepper extends DeesElement { Next `, - validationFunc: async (stepperArg, elementArg) => { + validationFunc: async (stepperArg, elementArg, signal) => { const deesForm: plugins.deesCatalog.DeesForm = elementArg.querySelector('dees-form'); deesForm.addEventListener('formData', async (eventArg: CustomEvent) => { - const response = await idpState.idpClient.requests.setData.fire({ + await idpState.idpClient.requests.setData.fire({ token: this.storedData.validationTokenUrlParam, userData: { username: null, @@ -477,10 +477,9 @@ export class IdpRegistrationStepper extends DeesElement { password: eventArg.detail.data.password, }, }); - const finishRegistrationResponse = - await idpState.idpClient.requests.finishRegistration.fire({ - token: this.storedData.validationTokenUrlParam, - }); + await idpState.idpClient.requests.finishRegistration.fire({ + token: this.storedData.validationTokenUrlParam, + }); deesForm.setStatus('pending', 'User created!'); await this.domtools.convenience.smartdelay.delayFor(500); deesForm.setStatus('pending', 'Obtaining Refresh Token...'); @@ -499,7 +498,7 @@ export class IdpRegistrationStepper extends DeesElement { deesForm.setStatus('success', 'Ok! Lets Go!'); await idpState.idpClient.setJwt(jwtResponse.jwt); idpState.domtools.router.pushUrl('/account'); - }); + }, { signal }); }, }, ] as plugins.deesCatalog.IStep[]}