DOP-6180 quick fixes (#14789)

* DOP-6180 quick fixes

* DOP-6180 llinting

* DOP-6180 remove id fallback

* DOP-6180 lint

* DOP-6180 lint

Author: anabellabuckvar

platform/docs-nextjs/src/app/api/feedback/upsert/route.ts

@@ -46,9 +46,7 @@ export async function POST(request: NextRequest) {
     submittedAt: new Date(),
     page,
     user: {
-      stitch_id: user.stitch_id || '',
-      segment_id: user.segment_id,
-      isAnonymous: user.isAnonymous,
+      id: user.id,
       email: user.email,
     },
     // TODO change this to empty string instead?

platform/docs-nextjs/src/services/feedback/feedback-types.ts

@@ -58,9 +58,7 @@ export interface Page {
   docs_property: string;
 }
 export interface User {
-  stitch_id: string;
-  segment_id: string;
-  isAnonymous: boolean;
+  id: string;
   email: string;
 }
 

platform/docs-nextjs/src/services/feedback/handle-screenshot-feedback.ts

@@ -21,9 +21,9 @@ export async function getAttachment({
   attachment: Attachment;
 }): Promise<Attachment | S3ScreenshotAttachment> {
   const s3 = new S3({
-    accessKeyId: envConfig.AWS_ACCESS_KEY_ID,
-    secretAccessKey: envConfig.AWS_SECRET_ACCESS_KEY,
-    region: 'us-east-2',
+    accessKeyId: envConfig.AWS_S3_ACCESS_KEY_ID,
+    secretAccessKey: envConfig.AWS_S3_SECRET_ACCESS_KEY,
+    region: envConfig.AWS_KEY_REGION,
   });
 
   switch (attachment.type) {
@@ -58,7 +58,7 @@ async function saveScreenshot(
   const { dataUri } = attachment;
   const fileType = 'image/png';
   const bucket = 'docs-feedback-screenshots';
-  const region = 'us-east-2';
+  const region = envConfig.AWS_KEY_REGION;
   const fileName = `screenshot-${feedback._id}.png`;
   const ETag = await uploadScreenshot({ dataUri, bucket, fileName, s3 });
 
@@ -88,13 +88,14 @@ async function uploadScreenshot({
     })
     .promise();
 
-  if (s3Response) {
+  const { ETag } = s3Response;
+
+  if (!s3Response || !ETag) {
     console.error('Failed to upload screenshot to S3 bucket');
     throw new Error('Failed to upload screenshot to S3 bucket');
   }
   console.log('Uploaded screenshot to S3 bucket');
 
-  const { ETag } = s3Response;
   return ETag;
 }
 

platform/docs-nextjs/src/utils/env-config.ts

@@ -30,8 +30,8 @@ const validateEnvConfigs = () => {
 validateEnvConfigs();
 
 type GlobalEnvConfig = {
-  AWS_ACCESS_KEY_ID: string;
-  AWS_SECRET_ACCESS_KEY: string;
+  AWS_S3_ACCESS_KEY_ID: string;
+  AWS_S3_SECRET_ACCESS_KEY: string;
   AWS_KEY_REGION: string;
   DB_ENV: Environments;
   MONGODB_URI: string;
@@ -45,8 +45,8 @@ type GlobalEnvConfig = {
 };
 
 const envConfig: GlobalEnvConfig = {
-  AWS_ACCESS_KEY_ID: process.env.AWS_ACCESS_KEY_ID ?? '',
-  AWS_SECRET_ACCESS_KEY: process.env.AWS_SECRET_ACCESS_KEY ?? '',
+  AWS_S3_ACCESS_KEY_ID: process.env.AWS_S3_ACCESS_KEY_ID ?? '',
+  AWS_S3_SECRET_ACCESS_KEY: process.env.AWS_S3_SECRET_ACCESS_KEY ?? '',
   AWS_KEY_REGION: process.env.AWS_KEY_REGION ?? 'us-east-2',
   DB_ENV: (process.env.DB_ENV ?? 'dev') as Environments,
   MONGODB_URI: process.env.MONGODB_URI ?? '',