Merge pull request #89 from mbc-net/develop

resolve security vulnerabilities for appsync local and cognito
mbc-net · Dec 3, 2024 · 67ce90c · 67ce90c
2 parents 731addb + a7bce5e
commit 67ce90c
Show file tree

Hide file tree

Showing 19 changed files with 4,471 additions and 8,481 deletions.
diff --git a/examples/master/package-lock.json b/examples/master/package-lock.json
diff --git a/examples/seq/package-lock.json b/examples/seq/package-lock.json
diff --git a/packages/cli/templates/infra-local/appsync-simulator/Dockerfile b/packages/cli/templates/infra-local/appsync-simulator/Dockerfile
@@ -3,6 +3,6 @@ WORKDIR /app
 
 COPY ./package.json ./
 COPY ./package-lock.json ./
-RUN npm install --legacy-peer-deps
+RUN npm ci
 COPY . .
 CMD ["npm", "run", "serve"]
diff --git a/packages/cli/templates/infra-local/appsync-simulator/package-lock.json b/packages/cli/templates/infra-local/appsync-simulator/package-lock.json
diff --git a/packages/cli/templates/infra-local/appsync-simulator/package.json b/packages/cli/templates/infra-local/appsync-simulator/package.json
@@ -25,6 +25,9 @@
     "typescript": "^4.9.4"
   },
   "dependencies": {
-    "amplify-appsync-simulator": "https://github.com/tabk30/amplify-appsync-simulator.git"
+    "@aws-amplify/amplify-appsync-simulator": "^2.16.7"
+  },
+  "overrides": {
+    "graphql": "^14.7.0"
   }
 }
diff --git a/packages/cli/templates/infra-local/appsync-simulator/src/main.ts b/packages/cli/templates/infra-local/appsync-simulator/src/main.ts
@@ -2,17 +2,17 @@ import {
   AmplifyAppSyncSimulator,
   AmplifyAppSyncSimulatorAuthenticationType,
   AmplifyAppSyncSimulatorConfig,
-} from 'amplify-appsync-simulator';
+} from '@aws-amplify/amplify-appsync-simulator'
 
-import { schema } from './schema';
-import { readVTL } from './vtl/readVTL';
-import { resolversConfig } from './resolversConfig';
+import { schema } from './schema'
+import { readVTL } from './vtl/readVTL'
+import { resolversConfig } from './resolversConfig'
 
 class AppSyncSimulator {
-  httpPort: number;
+  httpPort: number
 
   constructor(httpPort: number) {
-    this.httpPort = httpPort;
+    this.httpPort = httpPort
   }
 
   async start() {
@@ -43,19 +43,20 @@ class AppSyncSimulator {
         },
       ],
       resolvers: resolversConfig,
-    };
+    }
     const amplifySimulator = new AmplifyAppSyncSimulator({
       port: this.httpPort,
-    });
-    await amplifySimulator.start();
-    await amplifySimulator.init(simulatorConfig);
+    })
+    console.log('simulatorConfig', simulatorConfig)
+    await amplifySimulator.start()
+    await amplifySimulator.init(simulatorConfig)
   }
 }
 
-const httpPort = Number(process.env.PORT) || 4000;
-const simulator = new AppSyncSimulator(httpPort);
+const httpPort = Number(process.env.PORT) || 4000
+const simulator = new AppSyncSimulator(httpPort)
 simulator.start().then(() => {
   console.log(
     `🚀 App Sync Simulator started at http://localhost:${httpPort}/graphql`,
-  );
-});
+  )
+})
diff --git a/packages/cli/templates/infra-local/appsync-simulator/src/resolversConfig.ts b/packages/cli/templates/infra-local/appsync-simulator/src/resolversConfig.ts
@@ -2,7 +2,7 @@ import {
   AppSyncSimulatorPipelineResolverConfig,
   AppSyncSimulatorUnitResolverConfig,
   RESOLVER_KIND,
-} from 'amplify-appsync-simulator';
+} from '@aws-amplify/amplify-appsync-simulator';
 
 export const resolversConfig: (
   | AppSyncSimulatorPipelineResolverConfig