Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable extra user preferences for remotely authorized users #18887

Merged
merged 4 commits into from
Oct 16, 2024
Merged

Enable extra user preferences for remotely authorized users #18887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb8019c
user pref model enable for remote user
maartenschermer Sep 25, 2024
2699893
user api remote user disable email & username
maartenschermer Sep 25, 2024
f99f64f
user api remote user disable email & username
maartenschermer Sep 25, 2024
7a7a278
linting
maartenschermer Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions client/src/components/User/UserPreferencesModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ export const getUserPreferencesModel = (user_id) => {
information: {
title: _l("Manage Information"),
id: "edit-preferences-information",
description: config.enable_account_interface
? _l("Edit your email, addresses and custom parameters or change your public name.")
: _l("Edit your custom parameters."),
description:
config.enable_account_interface && !config.use_remote_user
? _l("Edit your email, addresses and custom parameters or change your public name.")
: _l("Edit your custom parameters."),
url: `/api/users/${user_id}/information/inputs`,
icon: "fa-user",
redirect: "/user",
disabled: config.use_remote_user,
},
password: {
title: _l("Change Password"),
Expand Down
1 change: 1 addition & 0 deletions lib/galaxy/web/framework/middleware/remoteuser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ def __call__(self, environ, start_response):
"/user/api_key",
"/user/edit_username",
"/user/dbkeys",
"/user/information",
"/user/logout",
"/user/toolbox_filters",
"/user/set_default_permissions",
Expand Down
4 changes: 2 additions & 2 deletions lib/galaxy/webapps/galaxy/api/users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ def get_information(self, trans, id, **kwd):
"username": username,
}
is_galaxy_app = trans.webapp.name == "galaxy"
if trans.app.config.enable_account_interface or not is_galaxy_app:
if (trans.app.config.enable_account_interface and not trans.app.config.use_remote_user) or not is_galaxy_app:
inputs.append(
{
"id": "email_input",
Expand All @@ -826,7 +826,7 @@ def get_information(self, trans, id, **kwd):
}
)
if is_galaxy_app:
if trans.app.config.enable_account_interface:
if trans.app.config.enable_account_interface and not trans.app.config.use_remote_user:
inputs.append(
{
"id": "name_input",
Expand Down
Loading