Merge pull request #1342 from dpc-sdp/release/2.17.1

Release/2.17.1
dpc-sdp · Oct 3, 2024 · 85706e9 · 85706e9
2 parents 609a38a + 0dc4449
commit 85706e9
Show file tree

Hide file tree

Showing 27 changed files with 47 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## v2.17.1
+
+[compare changes](https://github.com/dpc-sdp/ripple-framework/compare/2.17.0...v2.17.1)
+
+
+### 🩹 Fixes
+
+  - **@dpc-sdp/ripple-tide-webform:** Fixed verifycaptcha not fetching webform correctly ([cf7b1d168](https://github.com/dpc-sdp/ripple-framework/commit/cf7b1d168))
+
+### ❤️  Contributors
+
+- Jeffrey Dowdle <[email protected]>
+
 ## v2.17.0
 
 [compare changes](https://github.com/dpc-sdp/ripple-framework/compare/2.16.0...v2.17.0)

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.17.0",
+  "version": "2.17.1",
   "npmClient": "pnpm",
   "exact": true,
   "command": {

diff --git a/packages/eslint-config-ripple/package.json b/packages/eslint-config-ripple/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/eslint-config-ripple",
   "description": "ESLint config for Ripple projects",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "index.js",

diff --git a/packages/nuxt-ripple-analytics/package.json b/packages/nuxt-ripple-analytics/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/nuxt-ripple-analytics",
   "description": "Nuxt module for handling event tracking.",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",

diff --git a/packages/nuxt-ripple-cli/package.json b/packages/nuxt-ripple-cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/nuxt-ripple-cli",
   "description": "A CLI for simplifying common setup and scaffolding tasks",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./dist/index.js",

diff --git a/packages/nuxt-ripple-preview/package.json b/packages/nuxt-ripple-preview/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/nuxt-ripple-preview",
   "description": "Adds support for drupal preview links in Ripple frontend sites",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",

diff --git a/packages/nuxt-ripple/package.json b/packages/nuxt-ripple/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/nuxt-ripple",
   "description": "Nuxt module for integrating Ripple and Tide",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",

diff --git a/packages/nuxt-ripple/server/utils/verifyCaptcha.ts b/packages/nuxt-ripple/server/utils/verifyCaptcha.ts
@@ -11,6 +11,8 @@ import {
   MappedCaptchaConfig
 } from '@dpc-sdp/ripple-tide-webform/types'
 
+import { TideWebformApi } from '@dpc-sdp/ripple-tide-webform/api'
+
 const logLabel = 'Verify CAPTCHA'
 
 const genericCaptchaVerify = async (
@@ -145,12 +147,12 @@ const verifyCaptcha = async (event: H3Event) => {
   let webform
 
   try {
-    webform = await $fetch('/api/tide/webform', {
-      baseURL: config.apiUrl || '',
-      params: {
-        id: formId
-      }
-    })
+    const webformApi = new TideWebformApi(
+      { ...config.public.tide, ...config.tide },
+      logger
+    )
+
+    webform = 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-sdp-core/package.json b/packages/ripple-sdp-core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-sdp-core",
   "description": "SDP core content types",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

diff --git a/packages/ripple-storybook/package.json b/packages/ripple-storybook/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ripple-storybook",
   "description": "Ripple Storybook instance",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "private": true,
   "repository": "https://github.com/dpc-sdp/ripple-framework",

diff --git a/packages/ripple-test-utils/package.json b/packages/ripple-test-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-test-utils",
   "description": "Test utils for Ripple sites",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/config/index.js",

diff --git a/packages/ripple-tide-api/package.json b/packages/ripple-tide-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-api",
   "description": "Ripple API endpoints for Tide Drupal backend",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./dist/index.js",

diff --git a/packages/ripple-tide-event/package.json b/packages/ripple-tide-event/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-event",
   "description": "Ripple mappings and components for Tide Event Content type",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",

diff --git a/packages/ripple-tide-grant/package.json b/packages/ripple-tide-grant/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-grant",
   "description": "Ripple mappings and components for Tide Grant Content type",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

diff --git a/packages/ripple-tide-landing-page/package.json b/packages/ripple-tide-landing-page/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-landing-page",
   "description": "Ripple mappings and components for Tide landing-page Content type",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

diff --git a/packages/ripple-tide-media/package.json b/packages/ripple-tide-media/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-media",
   "description": "Ripple mappings and components for Tide media",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

diff --git a/packages/ripple-tide-news/package.json b/packages/ripple-tide-news/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-news",
   "description": "Ripple mappings and components for Tide News content type",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

diff --git a/packages/ripple-tide-publication/package.json b/packages/ripple-tide-publication/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-publication",
   "description": "Ripple mappings and components for Tide Publication Content type",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

diff --git a/packages/ripple-tide-search/package.json b/packages/ripple-tide-search/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-search",
   "description": "Ripple search UI and services for connecting to Tide search",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

diff --git a/packages/ripple-tide-topic/package.json b/packages/ripple-tide-topic/package.json
@@ -9,7 +9,7 @@
     "./mapping": "./mapping/index.ts",
     "./types": "./types.ts"
   },
-  "version": "2.17.0",
+  "version": "2.17.1",
   "dependencies": {
     "@dpc-sdp/nuxt-ripple": "workspace:*",
     "@dpc-sdp/ripple-tide-api": "workspace:*",

diff --git a/packages/ripple-tide-webform/package.json b/packages/ripple-tide-webform/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-webform",
   "description": "Ripple mappings and components for Tide webforms",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",
@@ -10,6 +10,7 @@
     "./mapping": "./mapping/index.ts",
     "./mapping/utils": "./mapping/webform-utils.ts",
     "./server/utils": "./server/webform-utils.ts",
+    "./api": "./server/index.ts",
     "./types": "./types.ts"
   },
   "dependencies": {

diff --git a/packages/ripple-tide-webform/server/api/tide/webform.ts b/packages/ripple-tide-webform/server/api/tide/webform.ts
@@ -19,7 +19,7 @@ import { getFormSchemaFromMapping, getCaptchaSettings } from '../../../mapping'
 /**
  * @description Custom API call methods and response mapping for webform
  */
-class TideWebformApi extends TideApiBase {
+export class TideWebformApi extends TideApiBase {
   webformMapping: IRplTideModuleMapping
   declare logLabel: string
 

diff --git a/packages/ripple-tide-webform/server/index.ts b/packages/ripple-tide-webform/server/index.ts
@@ -0,0 +1 @@
+export { TideWebformApi } from './api/tide/webform'
diff --git a/packages/ripple-ui-core/package.json b/packages/ripple-ui-core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-ui-core",
   "description": "Ripple UI Core component library",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "files": [

diff --git a/packages/ripple-ui-forms/package.json b/packages/ripple-ui-forms/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-ui-forms",
   "description": "A form component library built with Formkit",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./dist/rpl-forms.umd.js",

diff --git a/packages/ripple-ui-maps/package.json b/packages/ripple-ui-maps/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-ui-maps",
   "description": "Ripple UI Core component library",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "files": [

diff --git a/packages/stylelint-config-ripple/package.json b/packages/stylelint-config-ripple/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/stylelint-config-ripple",
   "description": "ESLint config for Ripple projects",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "index.js",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export { TideWebformApi } from './api/tide/webform'