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 that internal authentication when combined with other authentication providers, the order of internal source should not matter while picking up the provider. Fixes #6832

Browse Source
This commit is contained in:
Rahul Shirsat 2021-11-11 12:29:30 +05:30 committed by Akshay Joshi
parent 36e5708464
commit 572b5a126a
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_6_2.rst
View File

@ -22,6 +22,7 @@ Bug fixes
| `Issue #5427 <https://redmine.postgresql.org/issues/5427>`_ - Fixed pgAdmin freezing issue by providing the error message for the operation that can't perform due to lock on the particular table.
| `Issue #6780 <https://redmine.postgresql.org/issues/6780>`_ - Ensure that columns should be merged if the newly added column is present in the parent table.
| `Issue #6809 <https://redmine.postgresql.org/issues/6809>`_ - Fixed an issue where pgAdmin is not opening properly.
| `Issue #6832 <https://redmine.postgresql.org/issues/6832>`_ - Ensure that internal authentication when combined with other authentication providers, the order of internal source should not matter while picking up the provider.
| `Issue #6859 <https://redmine.postgresql.org/issues/6859>`_ - Fixed an issue where properties panel is not updated when any object is added from the browser tree.
| `Issue #6905 <https://redmine.postgresql.org/issues/6905>`_ - Fixed an issue where database nodes are not getting loaded behind a reverse proxy with SSL.
| `Issue #6939 <https://redmine.postgresql.org/issues/6939>`_ - Fixed an issue where older server group name displayed in the confirmation pop-up when the user removes server group.

8
web/pgAdmin4.py
View File

@ -104,7 +104,13 @@ if config.SERVER_MODE:
# Authentication sources
if len(config.AUTHENTICATION_SOURCES) > 0:
app.PGADMIN_EXTERNAL_AUTH_SOURCE = config.AUTHENTICATION_SOURCES[0]
# Creating a temporary auth source list removing INTERNAL
# This change is done to avoid selecting INTERNAL authentication when user
# mistakenly keeps that the first option.
auth_source = [x for x in config.AUTHENTICATION_SOURCES
if x != INTERNAL]
app.PGADMIN_EXTERNAL_AUTH_SOURCE = auth_source[0] \
if len(auth_source) > 0 else INTERNAL
else:
app.PGADMIN_EXTERNAL_AUTH_SOURCE = INTERNAL