diff --git a/packages/nuxt-ripple/server/utils/verifyCaptcha.ts b/packages/nuxt-ripple/server/utils/verifyCaptcha.ts index cd2e1be378..6a64fcffb4 100644 --- a/packages/nuxt-ripple/server/utils/verifyCaptcha.ts +++ b/packages/nuxt-ripple/server/utils/verifyCaptcha.ts @@ -152,7 +152,7 @@ const verifyCaptcha = async (event: H3Event) => { logger ) - webform = webformApi.getWebform(formId) + webform = await webformApi.getWebform(formId) } catch (error) { throw new ApplicationError( `Couldn't get webform data, unable to continue because we don't know if a captcha is required`, diff --git a/packages/ripple-tide-webform/mapping/webforms-captcha.ts b/packages/ripple-tide-webform/mapping/webforms-captcha.ts index 09ed3781a1..54bbe8d755 100644 --- a/packages/ripple-tide-webform/mapping/webforms-captcha.ts +++ b/packages/ripple-tide-webform/mapping/webforms-captcha.ts @@ -9,20 +9,19 @@ export const getCaptchaSettings = ( webform: ApiWebForm ): MappedCaptchaConfig => { const scoreThreshold = - webform?.third_party_settings?.tide_webform_captcha?.score_threshold + webform?.third_party_settings?.tide_webform?.score_threshold const siteIdentifier = camelCase( - (webform?.third_party_settings?.tide_webform_captcha?.captcha_details - ?.captcha_id || '') as string + (webform?.third_party_settings?.tide_webform?.captcha_details?.captcha_id || + '') as string ) return { - enabled: - webform?.third_party_settings?.tide_webform_captcha?.enable_captcha === 1, - type: webform?.third_party_settings?.tide_webform_captcha + enabled: webform?.third_party_settings?.tide_webform?.enable_captcha === 1, + type: webform?.third_party_settings?.tide_webform ?.captcha_type as CaptchaType, - siteKey: (webform?.third_party_settings?.tide_webform_captcha - ?.captcha_details?.site_key || '') as string, + siteKey: (webform?.third_party_settings?.tide_webform?.captcha_details + ?.site_key || '') as string, siteIdentifier, scoreThreshold: typeof scoreThreshold === 'number' ? scoreThreshold : undefined diff --git a/packages/ripple-tide-webform/types.ts b/packages/ripple-tide-webform/types.ts index 1a3493e034..dc619e554f 100644 --- a/packages/ripple-tide-webform/types.ts +++ b/packages/ripple-tide-webform/types.ts @@ -39,7 +39,7 @@ export interface ApiWebForm { form_reset?: boolean } third_party_settings?: { - tide_webform_captcha?: ApiCaptchaSettings + tide_webform?: ApiCaptchaSettings } }