Skip to content

fix: move admins to Config2.pm #14245

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

Open
stephanegigandet wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix: move admins to Config2.pm #14245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1ba834c
fix: move admins to Config2.pm
stephanegigandet Aug 10, 2026
68c1de3
fix: update admins assignment to use hash reference from Config2.pm
hangy Aug 22, 2026
4a5649b
fix: move admins to Config2.pm
stephanegigandet Aug 10, 2026
5effefa
fix: update admins assignment to use hash reference from Config2.pm
hangy Aug 22, 2026
5be6355
fix(tests): update admin user handling in tests to use %admins hash
hangy Aug 22, 2026
989af74
Merge remote-tracking branch 'upstream/admins' into admins
hangy Aug 22, 2026
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
3 changes: 2 additions & 1 deletion lib/ProductOpener/APITest.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ use ProductOpener::Mail qw/$LOG_EMAIL_START $LOG_EMAIL_END/;
use ProductOpener::Store qw/store retrieve/;
use ProductOpener::Minion qw/get_minion write_minion_log/;
use ProductOpener::HTTP qw/create_user_agent/;
use ProductOpener::Config qw/%oidc_options/;
use ProductOpener::Config qw/%admins %oidc_options/;
use ProductOpener::Auth qw/get_oidc_implementation_level get_token_using_password_credentials/;
use ProductOpener::Tags qw/country_to_cc/;
use ProductOpener::TestDefaults qw/:all/;
Expand Down Expand Up @@ -398,6 +398,7 @@ sub create_test_users($admin = undef, $moderator = undef) {
if ($admin or $moderator) {
# Create an admin
$admin_ua = new_client();
$admins{$admin_user_form{userid}} = 1;
create_user($admin_ua, \%admin_user_form);
$users{admin} = $admin_ua;
}
Expand Down
16 changes: 2 additions & 14 deletions lib/ProductOpener/Config.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,20 +110,8 @@ autoload("ProductOpener::Config_$flavor");
},
);

%ProductOpener::Config::admins = map {$_ => 1} qw(
alex-off
charlesnepote
galina-off
meriem1994
hangy
manoncorneille
mellie-mellow
raphael0202
stephane
tacinte
teolemon
g123k
);
# Administrators need to be defined in Config2.pm
%ProductOpener::Config::admins = %ProductOpener::Config2::admins || ();

=head2 Available product types and flavors

Expand Down
7 changes: 6 additions & 1 deletion lib/ProductOpener/Config2_docker.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ BEGIN {
$oidc_client_secret
%slack_hook_urls
$health_check_api_key

%admins
);
%EXPORT_TAGS = (all => [@EXPORT_OK]);
}
Expand Down Expand Up @@ -229,4 +229,9 @@ if ((defined $ENV{SLACK_HOOK_URLS}) and ($ENV{SLACK_HOOK_URLS} ne '')) {
# Health check API key
$health_check_api_key = $ENV{HEALTH_CHECK_API_KEY};

# Administrators

%admins = map {$_ => 1} qw(
);

1;
2 changes: 1 addition & 1 deletion lib/ProductOpener/TestDefaults.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ a user which is an admin
%admin_user_form = (
%{clone(\%default_user_form)},
email => 'admin@openfoodfacts.org',
userid => 'stephane', # has to be part of %admins
userid => 'admin', # has to be part of %admins

@Freso Freso Aug 23, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a Config.pm for the tests? Does the user need adding to %admins there too?

name => "Admin",
);

Expand Down
2 changes: 2 additions & 0 deletions tests/integration/api_current_user_permissions.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use ProductOpener::PerlStandards;

use Test2::V0;
use ProductOpener::APITest qw/:all/;
use ProductOpener::Config qw/%admins/;
use ProductOpener::Test qw/remove_all_products remove_all_users/;
use ProductOpener::TestDefaults qw/:all/;

Expand All @@ -12,6 +13,7 @@ remove_all_users();

# Create an admin user
my $admin_ua = new_client();
$admins{$admin_user_form{userid}} = 1;
create_user($admin_ua, \%admin_user_form);

# Create a normal user
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/api_v3_product_images_upload.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use ProductOpener::PerlStandards;

use Test2::V0;
use ProductOpener::APITest qw/:all/;
use ProductOpener::Config qw/%admins/;
use ProductOpener::Test qw/remove_all_products remove_all_users get_base64_image_data_from_file/;
use ProductOpener::TestDefaults qw/:all/;

Expand All @@ -21,6 +22,7 @@ remove_all_users();

# Create an admin
my $admin_ua = new_client();
$admins{$admin_user_form{userid}} = 1;
create_user($admin_ua, \%admin_user_form);

# Create a normal user
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/api_v3_product_revert.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use ProductOpener::PerlStandards;

use Test2::V0;
use ProductOpener::APITest qw/:all/;
use ProductOpener::Config qw/%admins/;
use ProductOpener::Test qw/remove_all_products remove_all_users/;
use ProductOpener::TestDefaults qw/%admin_user_form %default_user_form %moderator_user_form/;

Expand All @@ -17,6 +18,7 @@ remove_all_users();

# Create an admin
my $admin_ua = new_client();
$admins{$admin_user_form{userid}} = 1;
create_user($admin_ua, \%admin_user_form);

# Create a normal user
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/change_product_code_and_product_type.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use ProductOpener::PerlStandards;

use Test2::V0;
use ProductOpener::APITest qw/:all/;
use ProductOpener::Config qw/%admins/;
use ProductOpener::Test qw/remove_all_products remove_all_users/;
use ProductOpener::TestDefaults qw/%admin_user_form %default_user_form %moderator_user_form/;

Expand All @@ -19,6 +20,7 @@ remove_all_users();

# Create an admin
my $admin_ua = new_client();
$admins{$admin_user_form{userid}} = 1;
create_user($admin_ua, \%admin_user_form);

# Create a normal user
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/create_pro_user.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use ProductOpener::PerlStandards;

use ProductOpener::Config qw/$data_root/;
use ProductOpener::Config qw/%admins $data_root/;
use ProductOpener::Store qw/retrieve/;
use ProductOpener::Users qw/retrieve_user/;
use ProductOpener::Auth qw/get_oidc_implementation_level/;
Expand Down Expand Up @@ -34,6 +34,7 @@ remove_all_users();
remove_all_orgs();

my $admin_ua = new_client();
$admins{$admin_user_form{userid}} = 1;
create_user($admin_ua, \%admin_user_form);

# create a pro moderator
Expand Down
1 change: 1 addition & 0 deletions tests/integration/delete_user.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ my %random_admin_user_form = (
%admins = (%admins, $random_admin_user_form{userid} => 1);

my $admin = new_client();
$admins{$admin_user_form{userid}} = 1;
create_user($admin, \%admin_user_form);

#common ua add a new product then delete the account while being still logged in
Expand Down
3 changes: 3 additions & 0 deletions tests/integration/protected_product.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,23 @@ use ProductOpener::PerlStandards;

use Test2::V0;
use ProductOpener::APITest qw/:all/;
use ProductOpener::Config qw/%admins/;
use ProductOpener::Products qw/retrieve_product store_product/;
use ProductOpener::Test qw/remove_all_products remove_all_users/;
use ProductOpener::TestDefaults qw/%admin_user_form %default_product_form %default_user_form %moderator_user_form/;

use File::Basename "dirname";

use Storable qw(dclone);
use List::Util qw(any);

wait_application_ready(__FILE__);
remove_all_products();
remove_all_users();

# Create an admin
my $admin_ua = new_client();
$admins{$admin_user_form{userid}} = 1;
create_user($admin_ua, \%admin_user_form);

# Create a normal user
Expand Down
Loading