IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure google authentication can be completed successfully, while pgAdmin is running in behind proxy servers. #5750

Browse Source
This commit is contained in:
Yogesh Mahajan
2023-03-28 11:07:41 +05:30
committed by GitHub
parent 12f82820c9
commit 501bff6f7a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/pgadmin/misc/cloud/google/__init__.py
View File

@@ -12,6 +12,7 @@ import pickle
import json
import os
from pathlib import Path
from urllib.parse import unquote
from config import root
from pgadmin.utils.csrf import pgCSRFProtect
@@ -80,6 +81,7 @@ def verify_credentials():
error = None
res_data = {}
client_secret_path = unquote(client_secret_path)
try:
client_secret_path = \
filename_with_file_manager_path(client_secret_path)
@@ -102,7 +104,11 @@ def verify_credentials():
_google = pickle.loads(session['google']['google_obj'])
# get auth url
auth_url, error_msg = _google.get_auth_url(request.host_url)
host_url = request.origin + '/'
if request.root_path != '':
host_url = host_url + request.root_path + '/'
auth_url, error_msg = _google.get_auth_url(host_url)
if error_msg:
error = error_msg
else: