Merge remote-tracking branch 'origin/master' into FIO-7395-subdirecro…

…ries-path-fix
formio · Feb 22, 2024 · a717e4f · a717e4f
2 parents 0a10b79 + e63fafc
commit a717e4f
Show file tree

Hide file tree

Showing 4 changed files with 1,934 additions and 2,005 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
  - FIO 7603: fixed Edit Grid With Empty Rows Not Submitting Form
  - FIO-7445: fixed an issue where the interpolated data does not show up on PDF
  - FIO-7421: Adds ReCaptcha error messages to the translations config
+ - FIO-7804: Added PKCE method for OIDC
 
 ## 5.0.0-rc.37
 ### Fixed

diff --git a/package.json b/package.json
@@ -107,7 +107,7 @@
     "jwt-decode": "^3.1.2",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
-    "moment-timezone": "^0.5.43",
+    "moment-timezone": "^0.5.44",
     "quill": "^2.0.0-dev.3",
     "signature_pad": "^4.1.4",
     "string-hash": "^1.1.3",

diff --git a/src/components/button/Button.js b/src/components/button/Button.js
@@ -402,9 +402,16 @@ export default class ButtonComponent extends Field {
       response_type: 'code',
       client_id: settings.clientId,
       redirect_uri: (settings.redirectURI && this.interpolate(settings.redirectURI)) || window.location.origin || `${window.location.protocol}//${window.location.host}`,
-      state: settings.state,
       scope: settings.scope
     };
+    if (settings.state) {
+      params.state = settings.state;
+    }
+    else if (settings.code_challenge) {
+      params.code_challenge = settings.code_challenge;
+      params.code_challenge_method = 'S256';
+    }
+
     /*eslint-enable camelcase */
 
     // Needs for the correct redirection URI for the OpenID