allow matching path with different method

Author: jackkav

Diff for: packages/insomnia/src/ui/components/editors/mock-response-extractor.tsx

@@ -106,11 +106,12 @@ export const MockResponseExtractor = () => {
               onComplete: async name => {
                 invariant(activeResponse, 'Active response must be defined');
                 const body = await fs.readFile(activeResponse.bodyPath);
-                const hasRouteInServer = mockServerAndRoutes.find(s => s._id === selectedMockServer)?.routes.find(r => r.name === name);
+                const hasRouteInServer = mockServerAndRoutes.find(s => s._id === selectedMockServer)?.routes
+                  .find(r => r.name === name && r.method.toUpperCase() === 'GET');
                 if (hasRouteInServer) {
                   showModal(AlertModal, {
                     title: 'Error',
-                    message: `Path "${name}" must be unique. Please enter a different name.`,
+                    message: `Path "${name}" and method must be unique. Please enter a different name.`,
                   });
                   return;
                 };

Diff for: packages/insomnia/src/ui/routes/mock-route.tsx

@@ -151,13 +151,13 @@ export const MockRouteRoute = () => {
         action: `/organization/${organizationId}/project/${projectId}/workspace/${workspaceId}/debug/request/new-mock-send`,
         method: 'post',
       });
-
   const upsertMockbinHar = async (pathInput?: string) => {
-    const hasRouteInServer = mockRoutes.filter(m => m._id !== mockRoute._id).find(m => m.name === pathInput);
+    const hasRouteInServer = mockRoutes.filter(m => m._id !== mockRoute._id)
+      .find(m => m.name === pathInput && m.method.toUpperCase() === mockRoute.method.toUpperCase());
     if (hasRouteInServer) {
       showModal(AlertModal, {
         title: 'Error',
-        message: `Path "${pathInput}" must be unique. Please enter a different name.`,
+        message: `Path "${pathInput}" and method must be unique. Please enter a different name.`,
       });
       return;
     };
@@ -188,11 +188,12 @@ export const MockRouteRoute = () => {
     });
   };
   const onSend = async (pathInput: string) => {
-    const hasRouteInServer = mockRoutes.filter(m => m._id !== mockRoute._id).find(m => m.name === pathInput);
+    const hasRouteInServer = mockRoutes.filter(m => m._id !== mockRoute._id)
+      .find(m => m.name === pathInput && m.method.toUpperCase() === mockRoute.method.toUpperCase());
     if (hasRouteInServer) {
       showModal(AlertModal, {
         title: 'Error',
-        message: `Path "${pathInput}" must be unique. Please enter a different name.`,
+        message: `Path "${pathInput}" and method must be unique. Please enter a different name.`,
       });
       return;
     };

Diff for: packages/insomnia/src/ui/routes/mock-server.tsx

@@ -71,11 +71,12 @@ const MockServerRoute = () => {
             defaultValue: mockRoutes.find(s => s._id === id)?.name,
             submitName: 'Rename',
             onComplete: name => {
-              const hasRouteInServer = mockRoutes.filter(m => m._id !== id).find(m => m.name === name);
+              const hasRouteInServer = mockRoutes.filter(m => m._id !== id)
+                .find(m => m.name === name && m.method.toUpperCase() === mockRoutes.find(m => m._id !== id)?.method.toUpperCase());
               if (hasRouteInServer) {
                 showModal(AlertModal, {
                   title: 'Error',
-                  message: `Path "${name}" must be unique. Please enter a different name.`,
+                  message: `Path "${name}" and method must be unique. Please enter a different name.`,
                 });
                 return;
               };
@@ -198,11 +199,11 @@ const MockServerRoute = () => {
                 submitName: 'Create',
                 placeholder: '/path/to/resource',
                 onComplete: name => {
-                  const hasRouteInServer = mockRoutes.find(m => m.name === name);
+                  const hasRouteInServer = mockRoutes.find(m => m.name === name && m.method.toUpperCase() === 'GET');
                   if (hasRouteInServer) {
                     showModal(AlertModal, {
                       title: 'Error',
-                      message: `Path "${name}" must be unique. Please enter a different name.`,
+                      message: `Path "${name}" and must be unique. Please enter a different name.`,
                     });
                     return;
                   };
@@ -284,11 +285,11 @@ const MockServerRoute = () => {
                     ariaLabel="Mock route name"
                     className='hover:!bg-transparent'
                     onSubmit={name => {
-                      const hasRouteInServer = mockRoutes.filter(m => m._id !== item._id).find(m => m.name === name);
+                      const hasRouteInServer = mockRoutes.filter(m => m._id !== item._id).find(m => m.name === name && m.method.toUpperCase() === item.method.toUpperCase());
                       if (hasRouteInServer) {
                         showModal(AlertModal, {
                           title: 'Error',
-                          message: `Path "${name}" must be unique. Please enter a different name.`,
+                          message: `Path "${name}" and method must be unique. Please enter a different name.`,
                         });
                         return;
                       };