Sync latest

Author: thdxr

backend/core/config.d.ts

@@ -1,6 +1,6 @@
-import { Config } from "@serverless-stack/backend";
+import { Config } from "@serverless-stack/node";
 
-declare module "@serverless-stack/backend" {
+declare module "@serverless-stack/node" {
   interface ConfigType {
     RDS_DATABASE: string;
     RDS_SECRET: string;

backend/core/sql/sql.ts

@@ -1,6 +1,6 @@
 import { Kysely } from "kysely";
 import { DataApiDialect } from "kysely-data-api";
-import { Config } from "@serverless-stack/backend";
+import { Config } from "@serverless-stack/node";
 import RDSDataService from "aws-sdk/clients/rdsdataservice.js";
 
 type TodoRow = {

backend/extract/config.ts

@@ -4,12 +4,11 @@
   "type": "module",
   "scripts": {},
   "dependencies": {
-    "@graphql-tools/schema": "^8.3.1",
+    "@serverless-stack/node": "^0.2.0",
     "apollo-server-core": "^3.6.1",
     "aws-jwt-verify": "^2.0.0",
     "aws-sdk": "^2.1058.0",
     "fetch-headers": "^3.0.1",
-    "graphql-helix": "^1.11.0",
     "kysely": "^0.16.6",
     "kysely-data-api": "^0.0.9"
   },

backend/extract/graphql.ts

@@ -1,14 +1,16 @@
 import { typeDefs } from "./schema";
 import { useContext, Context } from "@acme/core";
-import { Config } from "@serverless-stack/backend";
 import { CognitoJwtVerifier } from "aws-jwt-verify";
 
 import { TodoResolver } from "./resolvers/todo";
 import { UserResolver } from "./resolvers/user";
 import { SessionResolver } from "./resolvers/session";
 import { DebugResolver } from "./resolvers/debug";
-import { UploadResolver } from "./resolvers/upload";
-import { createGQLHandler } from "@serverless-stack/backend";
+import {
+  createGQLHandler,
+  Config,
+  UploadResolver,
+} from "@serverless-stack/node";
 
 const verifier = CognitoJwtVerifier.create({
   userPoolId: Config.COGNITO_USER_POOL_ID,
@@ -21,7 +23,13 @@ export const handler = createGQLHandler<Context>({
     UserResolver,
     SessionResolver,
     DebugResolver,
-    UploadResolver,
+    UploadResolver<Context>({
+      user: async (ctx) => {
+        const user = ctx.assertAuthenticated();
+        return user.id;
+      },
+      bucket: Config.BUCKET,
+    }),
   ],
   context: async (req) => {
     const auth = req.event.headers.authorization;

backend/extract/index.ts

@@ -1,6 +1,6 @@
 import { Resolvers } from "./types";
 import S3 from "aws-sdk/clients/s3.js";
-import { Config } from "@serverless-stack/backend";
+import { Config } from "@serverless-stack/node";
 
 const s3 = new S3();
 

backend/package.json

@@ -7,8 +7,7 @@
     "moduleResolution": "node",
     "baseUrl": ".",
     "paths": {
-      "@acme/core": ["./core"],
-      "@serverless-stack/backend": ["./extract"]
+      "@acme/core": ["./core"]
     }
   }
 }

backend/services/gql/gql.ts renamed to backend/services/graphql/graphql.ts

@@ -7,7 +7,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "amazon-cognito-identity-js": "^5.2.4",
+    "@serverless-stack/web": "^0.2.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-router-dom": "^6.2.1",