LeadMagnet/leadchat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'hotfix/4.11.1' into develop

Browse Source
This commit is contained in:
Shivam Mishra
2026-02-20 20:02:39 +05:30
parent d8f4bb940e 15f25f019e
commit 572f5b2709
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION_CW
View File

@@ -1 +1 @@
4.11.0 4.11.1

2
app/javascript/v3/components/GoogleOauth/Button.spec.js
View File

@@ -24,7 +24,7 @@ describe('GoogleOAuthButton.vue', () => {
const googleAuthUrl = new URL(wrapper.vm.getGoogleAuthUrl()); const googleAuthUrl = new URL(wrapper.vm.getGoogleAuthUrl());
const params = googleAuthUrl.searchParams; const params = googleAuthUrl.searchParams;
expect(googleAuthUrl.origin).toBe('https://accounts.google.com'); 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('client_id')).toBe('clientId');
expect(params.get('redirect_uri')).toBe( expect(params.get('redirect_uri')).toBe(
'http://localhost:3000/test-callback' 'http://localhost:3000/test-callback'

3
app/javascript/v3/components/GoogleOauth/Button.vue
View File

@@ -6,8 +6,7 @@ export default {
// Creating the URL manually because the devise-token-auth with // Creating the URL manually because the devise-token-auth with
// omniauth has a standing issue on redirecting the post request // omniauth has a standing issue on redirecting the post request
// https://github.com/lynndylanhurley/devise_token_auth/issues/1466 // https://github.com/lynndylanhurley/devise_token_auth/issues/1466
const baseUrl = const baseUrl = 'https://accounts.google.com/o/oauth2/auth';
'https://accounts.google.com/o/oauth2/auth/oauthchooseaccount';
const clientId = window.chatwootConfig.googleOAuthClientId; const clientId = window.chatwootConfig.googleOAuthClientId;
const redirectUri = window.chatwootConfig.googleOAuthCallbackUrl; const redirectUri = window.chatwootConfig.googleOAuthCallbackUrl;
const responseType = 'code'; const responseType = 'code';

2
config/app.yml
View File

@@ -1,5 +1,5 @@
shared: &shared shared: &shared
version: '4.11.0' version: '4.11.1'
development: development:
<<: *shared <<: *shared

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "@chatwoot/chatwoot", "name": "@chatwoot/chatwoot",
"version": "4.11.0", "version": "4.11.1",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"eslint": "eslint app/**/*.{js,vue}", "eslint": "eslint app/**/*.{js,vue}",