Merge branch 'master' into master

decaporg · Mar 5, 2024 · 5a94c36 · 5a94c36
2 parents 24ad087 + 966f4d0
commit 5a94c36
Show file tree

Hide file tree

Showing 22 changed files with 144 additions and 40 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/decap-cms-app/CHANGELOG.md b/packages/decap-cms-app/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.2](https://github.com/decaporg/decap-cms/compare/decap-cms-app@3.1.1...decap-cms-app@3.1.2) (2024-02-21)
+
+**Note:** Version bump only for package decap-cms-app
+
 ## [3.1.1](https://github.com/decaporg/decap-cms/compare/decap-cms-app@3.1.0...decap-cms-app@3.1.1) (2024-02-01)
 
 **Note:** Version bump only for package decap-cms-app

diff --git a/packages/decap-cms-app/package.json b/packages/decap-cms-app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-app",
   "description": "An extensible, open source, Git-based, React CMS for static sites. Reusable congiuration with React as peer.",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "homepage": "https://www.decapcms.org",
   "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-app",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
@@ -30,17 +30,17 @@
     "@emotion/styled": "^11.11.0",
     "codemirror": "^5.46.0",
     "dayjs": "^1.11.10",
-    "decap-cms-backend-aws-cognito-github-proxy": "^3.1.0",
+    "decap-cms-backend-aws-cognito-github-proxy": "^3.1.1",
     "decap-cms-backend-azure": "^3.1.0",
     "decap-cms-backend-bitbucket": "^3.1.0",
     "decap-cms-backend-git-gateway": "^3.1.0",
     "decap-cms-backend-github": "^3.1.0",
-    "decap-cms-backend-gitlab": "^3.1.0",
+    "decap-cms-backend-gitlab": "^3.1.1",
     "decap-cms-backend-proxy": "^3.1.0",
     "decap-cms-backend-test": "^3.1.0",
-    "decap-cms-core": "^3.3.1",
+    "decap-cms-core": "^3.3.2",
     "decap-cms-editor-component-image": "^3.1.0",
-    "decap-cms-lib-auth": "^3.0.3",
+    "decap-cms-lib-auth": "^3.0.4",
     "decap-cms-lib-util": "^3.0.2",
     "decap-cms-lib-widgets": "^3.0.1",
     "decap-cms-locales": "^3.1.3",

diff --git a/packages/decap-cms-backend-aws-cognito-github-proxy/CHANGELOG.md b/packages/decap-cms-backend-aws-cognito-github-proxy/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.1](https://github.com/decaporg/decap-cms/compare/decap-cms-backend-aws-cognito-github-proxy@3.1.0...decap-cms-backend-aws-cognito-github-proxy@3.1.1) (2024-02-21)
+
+### Bug Fixes
+
+- gitlab pkce auth error ([#7110](https://github.com/decaporg/decap-cms/issues/7110)) ([bcd58d6](https://github.com/decaporg/decap-cms/commit/bcd58d6e117b4654b3e0dca173f7f8aaca8dabdf))
+
 # [3.1.0](https://github.com/decaporg/decap-cms/compare/decap-cms-backend-aws-cognito-github-proxy@3.1.0-beta.2...decap-cms-backend-aws-cognito-github-proxy@3.1.0) (2024-02-01)
 
 **Note:** Version bump only for package decap-cms-backend-aws-cognito-github-proxy

diff --git a/packages/decap-cms-backend-aws-cognito-github-proxy/package.json b/packages/decap-cms-backend-aws-cognito-github-proxy/package.json
@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-backend-aws-cognito-github-proxy",
   "description": "GitHub backend for Decap CMS proxied through AWS Cognito",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "license": "MIT",
   "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-backend-aws-cognito-github-proxy",
   "bugs": "https://github.com/decaporg/decap-cms/issues",

diff --git a/packages/decap-cms-backend-aws-cognito-github-proxy/src/AuthenticationPage.js b/packages/decap-cms-backend-aws-cognito-github-proxy/src/AuthenticationPage.js
@@ -24,14 +24,12 @@ export default class GenericPKCEAuthenticationPage extends React.Component {
       app_id = '',
       auth_endpoint = 'oauth2/authorize',
       auth_token_endpoint = 'oauth2/token',
-      redirect_uri = document.location.origin + document.location.pathname,
     } = this.props.config.backend;
     this.auth = new PkceAuthenticator({
       base_url,
       auth_endpoint,
       app_id,
       auth_token_endpoint,
-      redirect_uri,
       auth_token_endpoint_content_type: 'application/x-www-form-urlencoded; charset=utf-8',
     });
     // Complete authentication if we were redirected back to from the provider.

diff --git a/packages/decap-cms-backend-gitea/CHANGELOG.md b/packages/decap-cms-backend-gitea/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.1](https://github.com/decaporg/decap-cms/compare/decap-cms-backend-gitea@3.1.0-beta.1...decap-cms-backend-gitea@3.1.1) (2024-02-21)
+
+### Bug Fixes
+
+- gitlab pkce auth error ([#7110](https://github.com/decaporg/decap-cms/issues/7110)) ([bcd58d6](https://github.com/decaporg/decap-cms/commit/bcd58d6e117b4654b3e0dca173f7f8aaca8dabdf))
+
 # [3.1.0](https://github.com/decaporg/decap-cms/compare/decap-cms-backend-gitea@3.1.0-beta.1...decap-cms-backend-gitea@3.1.0) (2024-02-01)
 
 **Note:** Version bump only for package decap-cms-backend-gitea

diff --git a/packages/decap-cms-backend-gitea/package.json b/packages/decap-cms-backend-gitea/package.json
@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-backend-gitea",
   "description": "Gitea backend for Decap CMS",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-backend-gitea",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
   "license": "MIT",

diff --git a/packages/decap-cms-backend-gitea/src/AuthenticationPage.js b/packages/decap-cms-backend-gitea/src/AuthenticationPage.js
@@ -26,7 +26,6 @@ export default class GiteaAuthenticationPage extends React.Component {
       app_id,
       auth_token_endpoint: 'login/oauth/access_token',
       auth_token_endpoint_content_type: 'application/json; charset=utf-8',
-      redirect_uri: document.location.origin + document.location.pathname,
     });
     // Complete authentication if we were redirected back to from the provider.
     this.auth.completeAuth((err, data) => {

diff --git a/packages/decap-cms-backend-gitlab/CHANGELOG.md b/packages/decap-cms-backend-gitlab/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.1](https://github.com/decaporg/decap-cms/compare/decap-cms-backend-gitlab@3.1.0-beta.1...decap-cms-backend-gitlab@3.1.1) (2024-02-21)
+
+### Bug Fixes
+
+- gitlab pkce auth error ([#7110](https://github.com/decaporg/decap-cms/issues/7110)) ([bcd58d6](https://github.com/decaporg/decap-cms/commit/bcd58d6e117b4654b3e0dca173f7f8aaca8dabdf))
+
 # [3.1.0](https://github.com/decaporg/decap-cms/compare/decap-cms-backend-gitlab@3.1.0-beta.1...decap-cms-backend-gitlab@3.1.0) (2024-02-01)
 
 **Note:** Version bump only for package decap-cms-backend-gitlab

diff --git a/packages/decap-cms-backend-gitlab/package.json b/packages/decap-cms-backend-gitlab/package.json
@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-backend-gitlab",
   "description": "GitLab backend for Decap CMS",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-backend-gitlab",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
   "license": "MIT",