email response functioning

api/src/models/user.ts

@@ -1,7 +1,3 @@
-import { getLogger } from '../utils/logger';
-
-const defaultLog = getLogger('models/user');
-
 export class UserObject {
   id: number;
   user_identifier: string;
@@ -10,8 +6,6 @@ export class UserObject {
   role_names: string[];
 
   constructor(obj?: any) {
-    defaultLog.debug({ label: 'UserObject', message: 'params', obj });
-
     this.id = obj?.system_user_id || null;
     this.user_identifier = obj?.user_identifier || null;
     this.record_end_date = obj?.record_end_date || null;
@@ -27,8 +21,6 @@ export class ProjectUserObject {
   project_role_names: string[];
 
   constructor(obj?: any) {
-    defaultLog.debug({ label: 'ProjectUserObject', message: 'params', obj });
-
     this.project_id = obj?.project_id || null;
     this.system_user_id = obj?.system_user_id || null;
     this.project_role_ids = (obj?.project_role_ids?.length && obj.project_role_ids) || [];

api/src/paths/gcnotify/send.ts

@@ -1,14 +1,15 @@
 import { RequestHandler } from 'express';
 import { Operation } from 'express-openapi';
 import { SYSTEM_ROLE } from '../../constants/roles';
-import { HTTP400 } from '../../errors/custom-error';
 import { IgcNotifyPostReturn } from '../../models/gcnotify';
 import { authorizeRequestHandler } from '../../request-handlers/security/authorization';
 import { GCNotifyService } from '../../services/gcnotify-service';
 import { getLogger } from '../../utils/logger';
 
 const defaultLog = getLogger('paths/gcnotify');
 
+const APP_HOST = process.env.APP_HOST;
+
 export const POST: Operation = [
   authorizeRequestHandler(() => {
     return {
@@ -42,17 +43,7 @@ POST.apiDoc = {
           properties: {
             recipient: {
               type: 'object',
-              oneOf: [
-                {
-                  required: ['emailAddress']
-                },
-                {
-                  required: ['phoneNumber']
-                },
-                {
-                  required: ['userId']
-                }
-              ],
+              required: ['emailAddress', 'userId'],
               properties: {
                 emailAddress: {
                   type: 'string'
@@ -149,35 +140,7 @@ POST.apiDoc = {
 export function sendNotification(): RequestHandler {
   return async (req, res) => {
     const recipient = req.body?.recipient || null;
-    const message = req.body?.message || null;
-
-    if (!req.body) {
-      throw new HTTP400('Missing required param: body');
-    }
-
-    if (!recipient) {
-      throw new HTTP400('Missing required body param: recipient');
-    }
-
-    if (!message) {
-      throw new HTTP400('Missing required body param: message');
-    }
-
-    if (!message.header) {
-      throw new HTTP400('Missing required body param: message.header');
-    }
-
-    if (!message.body1) {
-      throw new HTTP400('Missing required body param: message.body1');
-    }
-
-    if (!message.body2) {
-      throw new HTTP400('Missing required body param: message.body2');
-    }
-
-    if (!message.footer) {
-      throw new HTTP400('Missing required body param: message.footer');
-    }
+    const message = { ...req.body?.message, footer: `To access the site, ${APP_HOST}` } || null;
 
     try {
       const gcnotifyService = new GCNotifyService();
@@ -191,9 +154,9 @@ export function sendNotification(): RequestHandler {
         response = await gcnotifyService.sendPhoneNumberGCNotification(recipient.phoneNumber, message);
       }
 
-      if (recipient.userId) {
-        defaultLog.error({ label: 'send gcnotify', message: 'email and sms from Id not implemented yet' });
-      }
+      // if (recipient.userId) {
+      //   defaultLog.error({ label: 'send gcnotify', message: 'email and sms from Id not implemented yet' });
+      // }
 
       return res.status(200).json(response);
     } catch (error) {

app/src/features/admin/users/AccessRequestList.tsx

@@ -18,7 +18,11 @@ import { AdministrativeActivityStatusType } from 'constants/misc';
 import { DialogContext } from 'contexts/dialogContext';
 import { APIError } from 'hooks/api/useAxios';
 import { useBiohubApi } from 'hooks/useBioHubApi';
-import { IGetAccessRequestsListResponse } from 'interfaces/useAdminApi.interface';
+import {
+  IgcNotifyGenericMessage,
+  IgcNotifyRecipient,
+  IGetAccessRequestsListResponse
+} from 'interfaces/useAdminApi.interface';
 import { IGetAllCodeSetsResponse } from 'interfaces/useCodesApi.interface';
 import React, { useContext, useState } from 'react';
 import { getFormattedDate } from 'utils/Utils';
@@ -53,7 +57,6 @@ const AccessRequestList: React.FC<IAccessRequestListProps> = (props) => {
   const { accessRequests, codes, refresh } = props;
 
   const classes = useStyles();
-
   const biohubApi = useBiohubApi();
 
   const [activeReviewDialog, setActiveReviewDialog] = useState<{
@@ -83,6 +86,30 @@ const AccessRequestList: React.FC<IAccessRequestListProps> = (props) => {
 
     setActiveReviewDialog({ open: false, request: null });
 
+    console.log('updatedRequest', updatedRequest);
+
+    try {
+      await biohubApi.admin.sendGCNotification(
+        {
+          emailAddress: 'kjartanreinarsson@gmail.com', //updatedRequest.data.email
+          userId: updatedRequest.id
+        } as IgcNotifyRecipient,
+        {
+          subject: 'SIMS: Your request for access has been approved.',
+          header: 'Your request for access to the Species Inventory Management System has been approved.',
+          body1: 'This is an automated message from the BioHub Species Inventory Management System',
+          body2: ' ',
+          footer: ' '
+        } as IgcNotifyGenericMessage
+      );
+    } catch (error) {
+      dialogContext.setErrorDialog({
+        ...defaultErrorDialogProps,
+        open: true,
+        dialogErrorDetails: (error as APIError).errors
+      });
+    }
+
     try {
       await biohubApi.admin.approveAccessRequest(
         updatedRequest.id,