Merge pull request #4920 from mozilla/MNTOR-2566

MNTOR-2566: send status code 401 for unauth'd API endpoints instead of redirect
mozilla · Aug 7, 2024 · c1f2afb · c1f2afb
2 parents 0ec33a9 + fdeeff6
commit c1f2afb
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 37 deletions.
diff --git a/src/app/api/v1/admin/feature-flags/[flagId]/route.ts b/src/app/api/v1/admin/feature-flags/[flagId]/route.ts
@@ -14,7 +14,6 @@ import {
   updateWaitList,
 } from "../../../../../../db/tables/featureFlags";
 import { isAdmin } from "../../../../utils/auth";
-import appConstants from "../../../../../../appConstants";
 
 export async function GET(
   req: NextRequest,
@@ -32,8 +31,7 @@ export async function GET(
       return NextResponse.json({ success: false }, { status: 500 });
     }
   } else {
-    // Not Signed in, redirect to home
-    return NextResponse.redirect(appConstants.SERVER_URL, 301);
+    return NextResponse.json({ success: false }, { status: 401 });
   }
 }
 
@@ -92,7 +90,6 @@ export async function PUT(req: NextRequest) {
       return NextResponse.json({ success: false }, { status: 500 });
     }
   } else {
-    // Not Signed in, redirect to home
-    return NextResponse.redirect(appConstants.SERVER_URL, 301);
+    return NextResponse.json({ success: false }, { status: 401 });
   }
 }
diff --git a/src/app/api/v1/admin/feature-flags/route.ts b/src/app/api/v1/admin/feature-flags/route.ts
@@ -17,7 +17,6 @@ import {
 } from "../../../../../db/tables/featureFlags";
 
 import { isAdmin } from "../../../utils/auth";
-import appConstants from "../../../../../appConstants";
 
 export async function GET() {
   const session = await getServerSession();
@@ -30,8 +29,7 @@ export async function GET() {
       return NextResponse.json({ success: false }, { status: 500 });
     }
   } else {
-    // Not Signed in, redirect to home
-    return NextResponse.redirect(appConstants.SERVER_URL, 301);
+    return NextResponse.json({ success: false }, { status: 401 });
   }
 }
 
@@ -51,8 +49,7 @@ export async function POST(req: NextRequest) {
       return NextResponse.json({ success: false }, { status: 500 });
     }
   } else {
-    // Not Signed in, redirect to home
-    return NextResponse.redirect(appConstants.SERVER_URL, 301);
+    return NextResponse.json({ success: false }, { status: 401 });
   }
 }
 
@@ -89,8 +86,7 @@ export async function PUT(req: NextRequest) {
       return NextResponse.json({ success: false }, { status: 500 });
     }
   } else {
-    // Not Signed in, redirect to home
-    return NextResponse.redirect(appConstants.SERVER_URL, 301);
+    return NextResponse.json({ success: false }, { status: 401 });
   }
 }
 
@@ -111,7 +107,6 @@ export async function DELETE(req: NextRequest) {
       return NextResponse.json({ success: false }, { status: 500 });
     }
   } else {
-    // Not Signed in, redirect to home
-    return NextResponse.redirect(appConstants.SERVER_URL, 301);
+    return NextResponse.json({ success: false }, { status: 401 });
   }
 }
diff --git a/src/app/api/v1/hibp/notify/route.ts b/src/app/api/v1/hibp/notify/route.ts
@@ -108,7 +108,7 @@ export async function POST(req: NextRequest) {
     pubsub = new PubSub({ projectId });
   } catch (ex) {
     logger.error("Error connecting to PubSub:", ex);
-    return NextResponse.json({ success: false }, { status: 500 });
+    return NextResponse.json({ success: false }, { status: 429 });
   }
 
   try {

diff --git a/src/app/api/v1/user/breaches/route.ts b/src/app/api/v1/user/breaches/route.ts
@@ -12,7 +12,6 @@ import {
   getSubscriberByFxaUid,
   setBreachResolution,
 } from "../../../../../db/tables/subscribers";
-import appConstants from "../../../../../appConstants";
 import { HibpBreachDataTypes } from "../../../../functions/universal/breach";
 
 export interface BreachResolutionRequest {
@@ -40,8 +39,7 @@ export async function GET(req: NextRequest) {
       return NextResponse.json({ success: false }, { status: 500 });
     }
   } else {
-    // Not Signed in, redirect to home
-    return NextResponse.redirect(appConstants.SERVER_URL, 301);
+    return NextResponse.json({ success: false }, { status: 401 });
   }
 }
 
@@ -159,7 +157,6 @@ export async function PUT(req: NextRequest) {
       return NextResponse.json({ success: false }, { status: 500 });
     }
   } else {
-    // Not Signed in, redirect to home
-    return NextResponse.redirect(appConstants.SERVER_URL);
+    return NextResponse.json({ success: false }, { status: 401 });
   }
 }
diff --git a/src/app/api/v1/user/remove-email/route.ts b/src/app/api/v1/user/remove-email/route.ts
@@ -58,7 +58,6 @@ export async function POST(req: NextRequest) {
       return NextResponse.json({ success: false }, { status: 500 });
     }
   } else {
-    // Not Signed in, redirect to home
-    return NextResponse.redirect(AppConstants.SERVER_URL, 301);
+    return NextResponse.json({ success: false }, { status: 401 });
   }
 }
diff --git a/src/app/api/v1/user/resend-email/route.ts b/src/app/api/v1/user/resend-email/route.ts
@@ -6,7 +6,6 @@ import { getToken } from "next-auth/jwt";
 import { NextRequest, NextResponse } from "next/server";
 
 import { logger } from "../../../../functions/server/logging";
-import AppConstants from "../../../../../appConstants";
 import { getSubscriberByFxaUid } from "../../../../../db/tables/subscribers";
 import { getUserEmails } from "../../../../../db/tables/emailAddresses";
 import { sendVerificationEmail } from "../../../utils/email";
@@ -72,7 +71,6 @@ export async function POST(req: NextRequest) {
       return NextResponse.json({ success: false }, { status: 500 });
     }
   } else {
-    // Not Signed in, redirect to home
-    return NextResponse.redirect(AppConstants.SERVER_URL, 301);
+    return NextResponse.json({ success: false }, { status: 401 });
   }
 }
diff --git a/src/app/api/v1/user/update-comm-option/route.ts b/src/app/api/v1/user/update-comm-option/route.ts
@@ -6,7 +6,6 @@ import { getToken } from "next-auth/jwt";
 import { NextRequest, NextResponse } from "next/server";
 
 import { logger } from "../../../../functions/server/logging";
-import AppConstants from "../../../../../appConstants";
 
 import {
   getSubscriberByFxaUid,
@@ -65,7 +64,6 @@ export async function POST(req: NextRequest) {
       return NextResponse.json({ success: false }, { status: 500 });
     }
   } else {
-    // Not Signed in, redirect to home
-    return NextResponse.redirect(AppConstants.SERVER_URL, 301);
+    return NextResponse.json({ success: false }, { status: 401 });
   }
 }
diff --git a/src/app/api/v1/user/welcome-scan/create/route.ts b/src/app/api/v1/user/welcome-scan/create/route.ts
@@ -14,7 +14,6 @@ import {
 } from "../../../../../functions/server/onerep";
 import type { CreateProfileRequest } from "../../../../../functions/server/onerep";
 import { meetsAgeRequirement } from "../../../../../functions/universal/user";
-import AppConstants from "../../../../../../appConstants";
 import { getSubscriberByFxaUid } from "../../../../../../db/tables/subscribers";
 import {
   setOnerepProfileId,
@@ -144,7 +143,6 @@ export async function POST(
       return NextResponse.json({ success: false }, { status: 500 });
     }
   } else {
-    // Not Signed in, redirect to home
-    return NextResponse.redirect(AppConstants.SERVER_URL, 302);
+    return NextResponse.json({ success: false }, { status: 401 });
   }
 }
diff --git a/src/app/api/v1/user/welcome-scan/progress/route.ts b/src/app/api/v1/user/welcome-scan/progress/route.ts
@@ -7,7 +7,6 @@ import { NextRequest, NextResponse } from "next/server";
 import { logger } from "../../../../../functions/server/logging";
 
 import { getServerSession } from "../../../../../functions/server/getServerSession";
-import AppConstants from "../../../../../../appConstants";
 import {
   getOnerepProfileId,
   getSubscriberByFxaUid,
@@ -74,7 +73,6 @@ export async function GET(
       return NextResponse.json({ success: false }, { status: 500 });
     }
   } else {
-    // Not Signed in, redirect to home
-    return NextResponse.redirect(AppConstants.SERVER_URL, 302);
+    return NextResponse.json({ success: false }, { status: 401 });
   }
 }
diff --git a/src/app/api/v1/user/welcome-scan/result/route.ts b/src/app/api/v1/user/welcome-scan/result/route.ts
@@ -8,7 +8,6 @@ import { NextResponse } from "next/server";
 import { logger } from "../../../../../functions/server/logging";
 
 import { getServerSession } from "../../../../../functions/server/getServerSession";
-import AppConstants from "../../../../../../appConstants";
 import {
   getOnerepProfileId,
   getSubscriberByFxaUid,
@@ -45,7 +44,6 @@ export async function GET() {
       return NextResponse.json({ success: false }, { status: 500 });
     }
   } else {
-    // Not Signed in, redirect to home
-    return NextResponse.redirect(AppConstants.SERVER_URL, 302);
+    return NextResponse.json({ success: false }, { status: 401 });
   }
 }