feat: Allowing Org Admins to Add/Invite Users

cgi/org.pl

@@ -358,18 +358,35 @@
 	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'));
+			$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")) {
+			my $email_list = remove_tags_and_quote(single_param('email_list'));
+			my $result = add_users_to_org_by_admin($orgid, $email_list);
+			if ($result) {
+				# Users added successfully
+				$template_data_ref->{result} = "Users added to the organization successfully.";
+
+			}
+			else {
+				# Error handling if user does not exist
+				$template_data_ref->{result} = "Users matching some of the emails does not exist";
+			}
+		}
+	}
+
 	$template_data_ref->{profile_url} = canonicalize_tag_link("editors", "org-" . $orgid);
 	$template_data_ref->{profile_name} = sprintf(lang('user_s_page'), $org_ref->{name});
 }

lib/ProductOpener/Users.pm

@@ -65,6 +65,7 @@ BEGIN {
 		&check_password_hash
 		&retrieve_user
 		&remove_user_by_org_admin
+		&add_users_to_org_by_admin
 
 		&check_session
 
@@ -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);
@@ -949,6 +969,27 @@ sub remove_user_by_org_admin ($orgid, $user_id) {
 	return;
 }
 
+sub add_users_to_org_by_admin ($org_id, $email_list) {
+
+	# 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"]);
+		}
+		else {
+			# we can send an invitation email to the user
+			return 0;
+		}
+	}
+
+	return 1;
+}
+
 sub init_user ($request_ref) {
 
 	my $user_id = undef;

templates/web/pages/org_form/org_form.tt.html

@@ -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>
+		<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" />
+	</form>
+
     <!-- Start form -->
 
     <p>[% lang('org_profile_description') %]</p>