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

feat: Allowing Org Admins to Add/Invite Users #8763

Merged
merged 10 commits into from
Aug 14, 2023
Merged

feat: Allowing Org Admins to Add/Invite Users #8763

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0322452
allow-org-admins-to-add/invite-users
MonalikaPatnaik Jul 31, 2023
2ab4047
minor-changes
MonalikaPatnaik Aug 1, 2023
f135447
Merge branch 'main' into add/invite-users-by-org-admin
MonalikaPatnaik Aug 1, 2023
9ba1855
Merge branch 'main' into add/invite-users-by-org-admin
MonalikaPatnaik Aug 4, 2023
67c0a7b
updated-display-page
MonalikaPatnaik Aug 4, 2023
1368170
list-of-users-moved-to-html-template
MonalikaPatnaik Aug 10, 2023
678d825
translatable-strings-added
MonalikaPatnaik Aug 11, 2023
ddc6d4a
Update cgi/org.pl
MonalikaPatnaik Aug 11, 2023
56bd17e
Merge branch 'main' into add/invite-users-by-org-admin
MonalikaPatnaik Aug 11, 2023
091862a
Update cgi/org.pl
MonalikaPatnaik Aug 12, 2023
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
20 changes: 17 additions & 3 deletions cgi/org.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,18 +358,32 @@
if ($type eq "edit") {

store_org($org_ref);
$template_data_ref->{result} = lang("edit_org_result");
}
elsif ($type eq 'user_delete') {

if (is_user_in_org_group($org_ref, $User_id, "admins")) {
remove_user_by_org_admin($orgid, single_param('user_id'));
if (is_user_in_org_group($org_ref, $User_id, "admins") or $admin or $User{moderator}) {
MonalikaPatnaik marked this conversation as resolved.
Show resolved Hide resolved
remove_user_by_org_admin(single_param('org_id'), single_param('user_id'));
$template_data_ref->{result} = lang("edit_org_result");
}
else {
display_error_and_exit($Lang{error_no_permission}{$lang}, 403);
}

}
$template_data_ref->{result} = lang("edit_org_result");
elsif ($type eq 'add_users') {
if (is_user_in_org_group($org_ref, $User_id, "admins") or $admin or $User{moderator}) {
MonalikaPatnaik marked this conversation as resolved.
Show resolved Hide resolved
my $email_list = remove_tags_and_quote(single_param('email_list'));
my $email_ref = add_users_to_org_by_admin($orgid, $email_list);

# Set the template data for display
$template_data_ref->{email_ref} = {
added => \@{$email_ref->{added}},
invited => \@{$email_ref->{invited}},
};
}
}

$template_data_ref->{profile_url} = canonicalize_tag_link("editors", "org-" . $orgid);
$template_data_ref->{profile_name} = sprintf(lang('user_s_page'), $org_ref->{name});
}
Expand Down
52 changes: 52 additions & 0 deletions lib/ProductOpener/Users.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ BEGIN {
&check_password_hash
&retrieve_user
&remove_user_by_org_admin
&add_users_to_org_by_admin

&check_session

Expand Down Expand Up @@ -936,6 +937,25 @@ sub retrieve_user ($user_id) {
return $user_ref;
}

sub is_email_has_off_account ($email) {

# First, check if the email exists in the users_emails.sto file
my $emails_ref = retrieve("$data_root/users/users_emails.sto");

if (defined $emails_ref->{$email}) {
my $user_id = $emails_ref->{$email}[0];

# Next, check if the user file exists and has the 'userid' field
my $user_file = "$data_root/users/" . get_string_id_for_lang("no_language", $user_id) . ".sto";
if (-e $user_file) {
my $user_ref = retrieve($user_file);
return $user_ref->{userid} if defined $user_ref->{userid};
}
}

return; # Email is not associated with an OFF account
}

sub remove_user_by_org_admin ($orgid, $user_id) {
my $groups_ref = ['admins', 'members'];
remove_user_from_org($orgid, $user_id, $groups_ref);
Expand All @@ -949,6 +969,38 @@ sub remove_user_by_org_admin ($orgid, $user_id) {
return;
}

sub add_users_to_org_by_admin ($org_id, $email_list) {
MonalikaPatnaik marked this conversation as resolved.
Show resolved Hide resolved

my @emails_added;
my @emails_invited;

# Convert the email_list into an array of email addresses
my @emails = split(/,\s*/, $email_list);

foreach my $email (@emails) {

# Check if the email is associated with an OpenFoodFacts account
my $user_id = is_email_has_off_account($email);
if (defined $user_id) {
# Add the user to the organization
add_user_to_org($org_id, $user_id, ["members"]);
push @emails_added, $email;
}
else {

push @emails_invited, $email;

}
}
my $email_ref = {
added => \@emails_added,
invited => \@emails_invited,
};
$log->debug("The list of email ids ", {emails_list => $email_ref}) if $log->is_debug();

return $email_ref;
}

sub init_user ($request_ref) {

my $user_id = undef;
Expand Down
8 changes: 8 additions & 0 deletions po/common/common.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6689,6 +6689,14 @@ msgctxt "product_js_enter_value_between_0_and_max"
msgid "Please enter a value between 0 and {max}."
msgstr "Please enter a value between 0 and {max}."

msgctxt "please_ask_users_create_account_first"
msgid "Please ask the following users to create an Open Food Facts account first:"
msgstr "Please ask the following users to create an Open Food Facts account first:"

msgctxt "users_added_successfully"
msgid "Users added to the organization successfully:"
msgstr "Users added to the organization successfully:"

msgctxt "product_js_sugars_warning"
msgid "Sugars should not be higher than carbohydrates."
msgstr "Sugars should not be higher than carbohydrates."
Expand Down
8 changes: 8 additions & 0 deletions po/common/en.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6729,6 +6729,14 @@ msgctxt "product_js_enter_value_between_0_and_max"
msgid "Please enter a value between 0 and {max}."
msgstr "Please enter a value between 0 and {max}."

msgctxt "please_ask_users_create_account_first"
msgid "Please ask the following users to create an Open Food Facts account first:"
msgstr "Please ask the following users to create an Open Food Facts account first:"

msgctxt "users_added_successfully"
msgid "Users added to the organization successfully:"
msgstr "Users added to the organization successfully:"

msgctxt "product_js_sugars_warning"
msgid "Sugars should not be higher than carbohydrates."
msgstr "Sugars should not be higher than carbohydrates."
Expand Down
26 changes: 26 additions & 0 deletions templates/web/pages/org_form/org_form.tt.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@ <h2>[% lang("organization_members") %]</h2>
</div>
[% END %]

<form method="post" action="/cgi/org.pl" enctype="multipart/form-data" style="margin-bottom: 20px;">
<p>Enter email addresses of users to invite (comma-separated):</p>
MonalikaPatnaik marked this conversation as resolved.
Show resolved Hide resolved
<textarea id="email_list" name="email_list" style="height:100px;width:50vw"></textarea>
<input type="hidden" name="action" value="process" />
<input type="hidden" name="type" value="add_users" />
<input type="hidden" name="orgid" value="[% orgid %]" />
<input type="submit" name=".submit" class="button" value="Invite Users" />
MonalikaPatnaik marked this conversation as resolved.
Show resolved Hide resolved
</form>

<!-- Start form -->

<p>[% lang('org_profile_description') %]</p>
Expand Down Expand Up @@ -131,6 +140,23 @@ <h2>[% lang("organization_members") %]</h2>
<!-- End form -->

[% ELSIF action == 'process' %]

[% IF email_ref.invited.size > 0 OR email_ref.added.size > 0 %]
MonalikaPatnaik marked this conversation as resolved.
Show resolved Hide resolved
[% SET messages = [] %]

[% IF email_ref.invited.size > 0 %]
[% SET emails_invited_str = email_ref.invited.join("<br>&rarr; ") %]
[% messages.push('<h3>' _ lang('please_ask_users_create_account_first') _ '</h3><br>&rarr; ' _ emails_invited_str) %]
[% END %]

[% IF email_ref.added.size > 0 %]
[% SET emails_added_str = email_ref.added.join("<br>&rarr; ") %]
[% messages.push('<h3>' _ lang('users_added_successfully') _ '</h3><br>&rarr; ' _ emails_added_str) %]
[% END %]

[% messages.join("<br>") %]
[% END %]

<p>[% result %]</p>
<p>&rarr; <a href="[% profile_url %]">[% profile_name %]</a></p>
[% END %]
Expand Down
Loading