From 280ca06e5bcce6a818eb0381e67e92241bfc3c2c Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 20 Feb 2026 19:39:23 +0530 Subject: [PATCH 1/2] fix: url endpoint fix: spec --- app/javascript/v3/components/GoogleOauth/Button.spec.js | 2 +- app/javascript/v3/components/GoogleOauth/Button.vue | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/javascript/v3/components/GoogleOauth/Button.spec.js b/app/javascript/v3/components/GoogleOauth/Button.spec.js index dbc2aaf90..139f0779e 100644 --- a/app/javascript/v3/components/GoogleOauth/Button.spec.js +++ b/app/javascript/v3/components/GoogleOauth/Button.spec.js @@ -24,7 +24,7 @@ describe('GoogleOAuthButton.vue', () => { const googleAuthUrl = new URL(wrapper.vm.getGoogleAuthUrl()); const params = googleAuthUrl.searchParams; expect(googleAuthUrl.origin).toBe('https://accounts.google.com'); - expect(googleAuthUrl.pathname).toBe('/o/oauth2/auth/oauthchooseaccount'); + expect(googleAuthUrl.pathname).toBe('/o/oauth2/auth'); expect(params.get('client_id')).toBe('clientId'); expect(params.get('redirect_uri')).toBe( 'http://localhost:3000/test-callback' diff --git a/app/javascript/v3/components/GoogleOauth/Button.vue b/app/javascript/v3/components/GoogleOauth/Button.vue index 2d1fc5a4e..be387ddbe 100644 --- a/app/javascript/v3/components/GoogleOauth/Button.vue +++ b/app/javascript/v3/components/GoogleOauth/Button.vue @@ -6,8 +6,7 @@ export default { // Creating the URL manually because the devise-token-auth with // omniauth has a standing issue on redirecting the post request // https://github.com/lynndylanhurley/devise_token_auth/issues/1466 - const baseUrl = - 'https://accounts.google.com/o/oauth2/auth/oauthchooseaccount'; + const baseUrl = 'https://accounts.google.com/o/oauth2/auth'; const clientId = window.chatwootConfig.googleOAuthClientId; const redirectUri = window.chatwootConfig.googleOAuthCallbackUrl; const responseType = 'code'; From 15f25f019e9743999d0f75b15d707c4f03886ece Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 20 Feb 2026 20:02:09 +0530 Subject: [PATCH 2/2] chore: bump version --- VERSION_CW | 2 +- config/app.yml | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION_CW b/VERSION_CW index a162ea75a..d782fca8f 100644 --- a/VERSION_CW +++ b/VERSION_CW @@ -1 +1 @@ -4.11.0 +4.11.1 diff --git a/config/app.yml b/config/app.yml index 9f7a3980c..4a1b004ac 100644 --- a/config/app.yml +++ b/config/app.yml @@ -1,5 +1,5 @@ shared: &shared - version: '4.11.0' + version: '4.11.1' development: <<: *shared diff --git a/package.json b/package.json index b062495a0..b51ad5ffa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@chatwoot/chatwoot", - "version": "4.11.0", + "version": "4.11.1", "license": "MIT", "scripts": { "eslint": "eslint app/**/*.{js,vue}",