Merge pull request #8 from UNICEFECAR/fix/issue_76

Fix/issue 76
UNICEFECAR · Dec 22, 2023 · 870d714 · 870d714
2 parents c448126 + 776f384
commit 870d714
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 81 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# USupport-email
-USupport email Node.js API service
+# uSupport-email
+uSupport email Node.js API service
 
-This service handles the sending of emails to users, providers and admins in the USupport project.
+This service handles the sending of emails to users, providers and admins in the uSupport project.
 
-For detailed instructions on how to run the service, please refer to the [USupport-entry-bundle](https://github.com/UNICEFECAR/USupport-entry-bundle)
+For detailed instructions on how to run the service, please refer to the [uSupport-entry-bundle](https://github.com/UNICEFECAR/USupport-entry-bundle)
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "admin",
   "version": "1.0.0",
-  "description": "USupport admin Node.js API service",
+  "description": "uSupport admin Node.js API service",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

diff --git a/service/controllers/admin.js b/service/controllers/admin.js
@@ -11,7 +11,7 @@ const EMAIL_SENDER = process.env.EMAIL_SENDER;
 const FRONTEND_URL = process.env.FRONTEND_URL;
 
 export const sendAdminEmail = async ({ country, subject, title, text }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const countryId = await getCountryIdByAlpha2CodeQuery({ alpha2: country })
     .then((res) => {
@@ -63,7 +63,7 @@ export const sendRegistrationNotify = async ({
   password,
   adminRole,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t("admin_registration_notify_subject", language);
   const title = t("admin_registration_notify_title", language);

diff --git a/service/controllers/client.js b/service/controllers/client.js
@@ -11,7 +11,7 @@ export const sendConsultationConfirmBookingEmail = async ({
   language,
   recipientEmail,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t("client_consultation_confirm_booking_subject", language);
   const title = t("client_consultation_confirm_booking_title", language);
@@ -43,7 +43,7 @@ export const sendConsultationConfirmRescheduleEmail = async ({
   language,
   recipientEmail,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t("client_consultation_confirm_reschedule_subject", language);
   const title = t("client_consultation_confirm_reschedule_title", language);
@@ -75,11 +75,11 @@ export const sendConsultationConfirmCancellationEmail = async ({
   language,
   recipientEmail,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t(
     "client_consultation_confirm_cancellation_subject",
-    language,
+    language
   );
   const title = t("client_consultation_confirm_cancellation_title", language);
   const platformLink = `${FRONTEND_URL}/client`;
@@ -110,11 +110,11 @@ export const sendConsultationNotifyCancellationEmail = async ({
   language,
   recipientEmail,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t(
     "client_consultation_notify_cancellation_subject",
-    language,
+    language
   );
   const title = t("client_consultation_notify_cancellation_title", language);
   const platformLink = `${FRONTEND_URL}/client`;
@@ -146,7 +146,7 @@ export const sendConsultationRemindStartEmail = async ({
   recipientEmail,
   minToConsultation,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t("client_consultation_remind_start_subject", language);
   const title = t("client_consultation_remind_start_title", language);
@@ -179,7 +179,7 @@ export const sendConsultationHasStartedReminderEmail = async ({
   language,
   recipientEmail,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t("consultation_started_remind_subject", language);
   const title = t("consultation_started_remind_title", language);
@@ -211,7 +211,7 @@ export const sendConsultationNotifySuggestionEmail = async ({
   language,
   recipientEmail,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t("client_consultation_notify_suggestion_subject", language);
   const title = t("client_consultation_notify_suggestion_title", language);
@@ -243,22 +243,22 @@ export const sendConsultationConfirmSuggestionBookingEmail = async ({
   language,
   recipientEmail,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t(
     "client_consultation_confirm_suggestion_booking_subject",
-    language,
+    language
   );
   const title = t(
     "client_consultation_confirm_suggestion_booking_title",
-    language,
+    language
   );
   const platformLink = `${FRONTEND_URL}/client`;
   const platformLinkAnchor = `<a href=${platformLink}>${platformLink}</a>`;
   const text = t(
     "client_consultation_confirm_suggestion_booking_text",
     language,
-    [platformLinkAnchor],
+    [platformLinkAnchor]
   );
 
   let computedHTML = GeneralTemplate(title, text);
@@ -283,22 +283,22 @@ export const sendConsultationConfirmSuggestionCancellationEmail = async ({
   language,
   recipientEmail,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t(
     "client_consultation_confirm_suggestion_cancellation_subject",
-    language,
+    language
   );
   const title = t(
     "client_consultation_confirm_suggestion_cancellation_title",
-    language,
+    language
   );
   const platformLink = `${FRONTEND_URL}/client`;
   const platformLinkAnchor = `<a href=${platformLink}>${platformLink}</a>`;
   const text = t(
     "client_consultation_confirm_suggestion_cancellation_text",
     language,
-    [platformLinkAnchor],
+    [platformLinkAnchor]
   );
 
   let computedHTML = GeneralTemplate(title, text);
@@ -324,7 +324,7 @@ export const sendRegistrationOtpToUsersEmail = async ({
   recipientEmail,
   otp,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t("client_registration_otp_subject", language);
   const title = t("client_registration_otp_title", language);

diff --git a/service/controllers/provider.js b/service/controllers/provider.js
@@ -14,7 +14,7 @@ export const sendConsultationNotifyBookingEmail = async ({
   language,
   recipientEmail,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t("provider_consultation_notify_booking_subject", language);
   const title = t("provider_consultation_notify_booking_title", language);
@@ -46,11 +46,11 @@ export const sendConsultationNotifyRescheduleEmail = async ({
   language,
   recipientEmail,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t(
     "provider_consultation_notify_reschedule_subject",
-    language,
+    language
   );
   const title = t("provider_consultation_notify_reschedule_title", language);
   const platformLink = `${FRONTEND_URL}/provider`;
@@ -81,11 +81,11 @@ export const sendConsultationNotifyCancellationEmail = async ({
   language,
   recipientEmail,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t(
     "provider_consultation_notify_cancellation_subject",
-    language,
+    language
   );
   const title = t("provider_consultation_notify_cancellation_title", language);
   const platformLink = `${FRONTEND_URL}/provider`;
@@ -116,11 +116,11 @@ export const sendConsultationConfirmCancellationEmail = async ({
   language,
   recipientEmail,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t(
     "provider_consultation_confirm_cancellation_subject",
-    language,
+    language
   );
   const title = t("provider_consultation_confirm_cancellation_title", language);
   const platformLink = `${FRONTEND_URL}/provider`;
@@ -152,7 +152,7 @@ export const sendConsultationRemindStartEmail = async ({
   recipientEmail,
   minToConsultation,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t("provider_consultation_remind_start_subject", language);
   const title = t("provider_consultation_remind_start_title", language);
@@ -185,7 +185,7 @@ export const sendConsultationHasStartedReminderEmail = async ({
   language,
   recipientEmail,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t("consultation_started_remind_subject", language);
   const title = t("consultation_started_remind_title", language);
@@ -217,11 +217,11 @@ export const sendConsultationConfirmSuggestionEmail = async ({
   language,
   recipientEmail,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t(
     "provider_consultation_confirm_suggestion_subject",
-    language,
+    language
   );
   const title = t("provider_consultation_confirm_suggestion_title", language);
   const platformLink = `${FRONTEND_URL}/provider`;
@@ -252,22 +252,22 @@ export const sendConsultationNotifySuggestionBookingEmail = async ({
   language,
   recipientEmail,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t(
     "provider_consultation_notify_suggestion_booking_subject",
-    language,
+    language
   );
   const title = t(
     "provider_consultation_notify_suggestion_booking_title",
-    language,
+    language
   );
   const platformLink = `${FRONTEND_URL}/provider`;
   const platformLinkAnchor = `<a href=${platformLink}>${platformLink}</a>`;
   const text = t(
     "provider_consultation_notify_suggestion_booking_text",
     language,
-    [platformLinkAnchor],
+    [platformLinkAnchor]
   );
 
   let computedHTML = GeneralTemplate(title, text);
@@ -292,22 +292,22 @@ export const sendConsultationNotifySuggestionCancellationEmail = async ({
   language,
   recipientEmail,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t(
     "provider_consultation_notify_suggestion_cancellation_subject",
-    language,
+    language
   );
   const title = t(
     "provider_consultation_notify_suggestion_cancellation_title",
-    language,
+    language
   );
   const platformLink = `${FRONTEND_URL}/provider`;
   const platformLinkAnchor = `<a href=${platformLink}>${platformLink}</a>`;
   const text = t(
     "provider_consultation_notify_suggestion_cancellation_text",
     language,
-    [platformLinkAnchor],
+    [platformLinkAnchor]
   );
 
   let computedHTML = GeneralTemplate(title, text);
@@ -332,15 +332,15 @@ export const sendAvailabilityRemindAddMoreSlotsEmail = async ({
   language,
   recipientEmail,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t(
     "provider_availability_remind_add_more_slots_subject",
-    language,
+    language
   );
   const title = t(
     "provider_availability_remind_add_more_slots_title",
-    language,
+    language
   );
   const platformLink = `${FRONTEND_URL}/provider`;
   const platformLinkAnchor = `<a href=${platformLink}>${platformLink}</a>`;
@@ -371,7 +371,7 @@ export const sendReportWeeklyEmail = async ({
   recipientEmail,
   csvData,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t("provider_report_weekly_subject", language);
   const title = t("provider_report_weekly_title", language);
@@ -413,7 +413,7 @@ export const sendReportMonthlyEmail = async ({
   recipientEmail,
   csvData,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t("provider_report_monthly_subject", language);
   const title = t("provider_report_monthly_title", language);
@@ -458,7 +458,7 @@ export const sendRegistrationNotify = async ({
   recipientEmail,
   password,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t("provider_registration_notify_subject", language);
   const title = t("provider_registration_notify_title", language);

diff --git a/service/controllers/system.js b/service/controllers/system.js
@@ -13,7 +13,7 @@ export const sendForgotPasswordEmail = async ({
   platform,
   forgotPasswordToken,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t("system_forgot_password_subject", language);
   const title = t("system_forgot_password_title", language);
@@ -46,7 +46,7 @@ export const sendWelcomeEmail = async ({
   language,
   platform,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t("system_welcome_subject", language);
   const title = t("system_welcome_title", language);
@@ -77,7 +77,7 @@ export const sendLogin2FARequest = async ({
   recipientEmail,
   otp,
 }) => {
-  const from = `USupport <${EMAIL_SENDER}>`;
+  const from = `uSupport <${EMAIL_SENDER}>`;
 
   const subject = t("system_login_2fa_request_subject", language);
   const title = t("system_login_2fa_request_title", language);

diff --git a/service/package.json b/service/package.json
@@ -2,7 +2,7 @@
   "type": "module",
   "name": "email",
   "version": "1.0.0",
-  "description": "Express.js app for the USupport email API service",
+  "description": "Express.js app for the uSupport email API service",
   "main": "server.js",
   "scripts": {
     "dev": "nodemon server.js",