mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Fix issues found while testing login pages. #6295
This commit is contained in:
parent
def1f31ba8
commit
ac5be70c60
@ -7,4 +7,3 @@
|
|||||||
'errorMessage': error_message,
|
'errorMessage': error_message,
|
||||||
} %}
|
} %}
|
||||||
{% extends "security/render_page.html" %}
|
{% extends "security/render_page.html" %}
|
||||||
{% block title %}{{ _('Authentication Registration') }}{% endblock %}
|
|
||||||
|
@ -8,4 +8,3 @@
|
|||||||
'csrfToken': csrf_token()
|
'csrfToken': csrf_token()
|
||||||
} %}
|
} %}
|
||||||
{% extends "security/render_page.html" %}
|
{% extends "security/render_page.html" %}
|
||||||
{% block title %}{{ _('Authentication') }}{% endblock %}
|
|
||||||
|
@ -18,7 +18,8 @@ from smtplib import SMTPConnectError, SMTPResponseException, \
|
|||||||
from socket import error as SOCKETErrorException
|
from socket import error as SOCKETErrorException
|
||||||
from urllib.request import urlopen
|
from urllib.request import urlopen
|
||||||
from pgadmin.utils.constants import KEY_RING_SERVICE_NAME, \
|
from pgadmin.utils.constants import KEY_RING_SERVICE_NAME, \
|
||||||
KEY_RING_USERNAME_FORMAT, KEY_RING_DESKTOP_USER, KEY_RING_TUNNEL_FORMAT
|
KEY_RING_USERNAME_FORMAT, KEY_RING_DESKTOP_USER, KEY_RING_TUNNEL_FORMAT, \
|
||||||
|
MessageType
|
||||||
|
|
||||||
import time
|
import time
|
||||||
|
|
||||||
@ -46,7 +47,8 @@ from pgadmin.authenticate import get_logout_url
|
|||||||
from pgadmin.authenticate.mfa.utils import mfa_required, is_mfa_enabled
|
from pgadmin.authenticate.mfa.utils import mfa_required, is_mfa_enabled
|
||||||
from pgadmin.settings import get_setting, store_setting
|
from pgadmin.settings import get_setting, store_setting
|
||||||
from pgadmin.utils import PgAdminModule
|
from pgadmin.utils import PgAdminModule
|
||||||
from pgadmin.utils.ajax import make_json_response
|
from pgadmin.utils.ajax import make_json_response, internal_server_error, \
|
||||||
|
bad_request
|
||||||
from pgadmin.utils.csrf import pgCSRFProtect
|
from pgadmin.utils.csrf import pgCSRFProtect
|
||||||
from pgadmin.utils.preferences import Preferences
|
from pgadmin.utils.preferences import Preferences
|
||||||
from pgadmin.utils.menu import MenuItem
|
from pgadmin.utils.menu import MenuItem
|
||||||
@ -1103,11 +1105,14 @@ if hasattr(config, 'SECURITY_CHANGEABLE') and config.SECURITY_CHANGEABLE:
|
|||||||
|
|
||||||
return redirect(get_url(_security.post_change_view) or
|
return redirect(get_url(_security.post_change_view) or
|
||||||
get_url(_security.post_login_view))
|
get_url(_security.post_login_view))
|
||||||
else:
|
elif errormsg is not None:
|
||||||
return internal_server_error(errormsg)
|
return internal_server_error(errormsg)
|
||||||
else:
|
else:
|
||||||
return bad_request(list(form.errors.values())[0][0])
|
return bad_request(list(form.errors.values())[0][0])
|
||||||
|
return make_json_response(
|
||||||
|
success=1,
|
||||||
|
info=gettext('pgAdmin user password changed successfully')
|
||||||
|
)
|
||||||
|
|
||||||
# Only register route if SECURITY_RECOVERABLE is set to True
|
# Only register route if SECURITY_RECOVERABLE is set to True
|
||||||
if hasattr(config, 'SECURITY_RECOVERABLE') and config.SECURITY_RECOVERABLE:
|
if hasattr(config, 'SECURITY_RECOVERABLE') and config.SECURITY_RECOVERABLE:
|
||||||
@ -1194,6 +1199,10 @@ if hasattr(config, 'SECURITY_RECOVERABLE') and config.SECURITY_RECOVERABLE:
|
|||||||
if request.get_json(silent=True) and not has_error:
|
if request.get_json(silent=True) and not has_error:
|
||||||
return default_render_json(form, include_user=False)
|
return default_render_json(form, include_user=False)
|
||||||
|
|
||||||
|
for errors in form.errors.values():
|
||||||
|
for error in errors:
|
||||||
|
flash(error, MessageType.WARNING)
|
||||||
|
|
||||||
return _security.render_template(
|
return _security.render_template(
|
||||||
config_value('FORGOT_PASSWORD_TEMPLATE'),
|
config_value('FORGOT_PASSWORD_TEMPLATE'),
|
||||||
forgot_password_form=form,
|
forgot_password_form=form,
|
||||||
|
@ -325,7 +325,9 @@ export function showChangeUserPassword(url) {
|
|||||||
url: url,
|
url: url,
|
||||||
data: formData,
|
data: formData,
|
||||||
}).then((res)=>{
|
}).then((res)=>{
|
||||||
resolve(res);
|
resolve(res.data.info);
|
||||||
|
onClose();
|
||||||
|
Notify.success(res.data.info);
|
||||||
}).catch((err)=>{
|
}).catch((err)=>{
|
||||||
reject(err);
|
reject(err);
|
||||||
});
|
});
|
||||||
|
@ -36,7 +36,7 @@ export default function LoginPage({userLanguage, langOptions, forgotPassUrl, csr
|
|||||||
<a style={{color: 'inherit'}} href={forgotPassUrl}>{gettext('Forgotten your password?')}</a>
|
<a style={{color: 'inherit'}} href={forgotPassUrl}>{gettext('Forgotten your password?')}</a>
|
||||||
</Box>
|
</Box>
|
||||||
<InputSelectNonSearch name="language" options={langOptions} value={form.language} onChange={(v)=>onTextChange('language', v.target.value)} />
|
<InputSelectNonSearch name="language" options={langOptions} value={form.language} onChange={(v)=>onTextChange('language', v.target.value)} />
|
||||||
<SecurityButton name="internal_button" value="Login">{gettext('Login')}</SecurityButton>
|
<SecurityButton name="internal_button" value="Login" disabled={!(form.email && form.password)}>{gettext('Login')}</SecurityButton>
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
{authSources?.includes?.(authSourcesEnum.OAUTH2) &&
|
{authSources?.includes?.(authSourcesEnum.OAUTH2) &&
|
||||||
|
@ -4,5 +4,4 @@
|
|||||||
'csrfToken': csrf_token(),
|
'csrfToken': csrf_token(),
|
||||||
} %}
|
} %}
|
||||||
{% extends "security/render_page.html" %}
|
{% extends "security/render_page.html" %}
|
||||||
{% block title %}{{ _('Recover Password') }}{% endblock %}
|
|
||||||
|
|
||||||
|
@ -19,4 +19,3 @@
|
|||||||
'loginBanner': config.LOGIN_BANNER|safe
|
'loginBanner': config.LOGIN_BANNER|safe
|
||||||
} %}
|
} %}
|
||||||
{% extends "security/render_page.html" %}
|
{% extends "security/render_page.html" %}
|
||||||
{% block title %}{{ _('Login') }}{% endblock %}
|
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
|
{% block title %}{{ config.APP_NAME }}{% endblock %}
|
||||||
{% set other_props = {
|
{% set other_props = {
|
||||||
'messages': get_flashed_messages(with_categories=true)
|
'messages': get_flashed_messages(with_categories=true)
|
||||||
} %}
|
} %}
|
||||||
|
@ -4,5 +4,4 @@
|
|||||||
'csrfToken': csrf_token(),
|
'csrfToken': csrf_token(),
|
||||||
} %}
|
} %}
|
||||||
{% extends "security/render_page.html" %}
|
{% extends "security/render_page.html" %}
|
||||||
{% block title %}{{ _('Reset Password') }}{% endblock %}
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user