From 09662877ea7ceaa740628a2fc12faeee543656c0 Mon Sep 17 00:00:00 2001 From: Dm1tr1y147 Date: Thu, 8 Oct 2020 02:30:20 +0500 Subject: [PATCH] Switched to apollo-server-express. Added authentification middleware and login mutation. Refactored queries, added query --- package.json | 3 +- src/controllers/index.ts | 53 +++++++++++++++++++++++++++ src/db/index.ts | 32 ++++++++++++++-- src/db/types.ts | 6 +++ src/index.ts | 27 +++++++++++--- src/resolvers/Form.ts | 39 ++++++++------------ src/resolvers/User.ts | 32 ++++++++++++++++ src/resolvers/index.ts | 6 +++ src/typeDefs/index.ts | 2 +- src/typeDefs/typeDefs.gql | 12 ++++++ src/types.ts | 6 +++ tsconfig.json | 77 ++++++--------------------------------- 12 files changed, 195 insertions(+), 100 deletions(-) create mode 100644 src/controllers/index.ts create mode 100644 src/db/types.ts diff --git a/package.json b/package.json index 53ae578..49a6db7 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "dependencies": { "@prisma/client": "^2.7.1", "@types/jsonwebtoken": "^8.5.0", - "apollo-server": "^2.18.2", + "apollo-server-express": "^2.18.2", + "express-jwt": "^6.0.0", "graphql": "^15.3.0", "jsonwebtoken": "^8.5.1", "jwks-rsa": "^1.10.1", diff --git a/src/controllers/index.ts b/src/controllers/index.ts new file mode 100644 index 0000000..161a37b --- /dev/null +++ b/src/controllers/index.ts @@ -0,0 +1,53 @@ +import { PrismaClient } from "@prisma/client" +import { getDBForm, getDBFormByUser } from "../db" +import { FullForm } from "../db/types" + +import { Form as GraphqlForm, FormSubmission } from "../typeDefs/typeDefs.gen" + +const getForm = async ( + db: PrismaClient, + id?: number +): Promise => { + const dbForm: FullForm = await getDBForm(db, id) + + if (dbForm == null) throw new Error("Not found") + + const form: GraphqlForm = { + id: dbForm.id, + title: dbForm.title, + questions: [...dbForm.choisesQuestions, ...dbForm.inputQuestions], + dateCreated: dbForm.dateCreated.toString(), + submissions: dbForm.submissions.map((submission) => ({ + answers: submission.answers, + date: submission.date.toString(), + id: submission.id, + })), + } + + return form +} + +const getForms = async ( + db: PrismaClient, + userId: number +): Promise => { + const dbForms = await getDBFormByUser(db, userId) + + const forms = [ + ...dbForms.map((form) => ({ + id: form.id, + title: form.title, + questions: [...form.choisesQuestions, ...form.inputQuestions], + dateCreated: form.dateCreated.toString(), + submissions: form.submissions.map((submission) => ({ + answers: submission.answers, + date: submission.date.toString(), + id: submission.id, + })), + })), + ] + + return forms +} + +export { getForm, getForms } diff --git a/src/db/index.ts b/src/db/index.ts index 57f8ca6..2bb75ff 100644 --- a/src/db/index.ts +++ b/src/db/index.ts @@ -1,9 +1,9 @@ import { PrismaClient } from "@prisma/client" -const getForm = async (db: PrismaClient, id: number) => - db.form.findOne({ +const getDBForm = async (db: PrismaClient, id?: number) => { + return await db.form.findOne({ where: { - id: id, + id: id ? id : undefined, }, include: { author: true, @@ -20,5 +20,29 @@ const getForm = async (db: PrismaClient, id: number) => }, }, }) +} -export { getForm } +const getDBFormByUser = async (db: PrismaClient, id: number) => { + return await db.form.findMany({ + where: { + author: { + id, + }, + }, + include: { + choisesQuestions: { + include: { + variants: true, + }, + }, + inputQuestions: true, + submissions: { + include: { + answers: true, + }, + }, + }, + }) +} + +export { getDBForm, getDBFormByUser } diff --git a/src/db/types.ts b/src/db/types.ts new file mode 100644 index 0000000..ae8d8e0 --- /dev/null +++ b/src/db/types.ts @@ -0,0 +1,6 @@ +import { PromiseReturnType } from "@prisma/client" +import { getDBForm } from "../db" + +type FullForm = PromiseReturnType + +export { FullForm } diff --git a/src/index.ts b/src/index.ts index 3f690eb..3e19246 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,18 +1,35 @@ -import { ApolloServer } from "apollo-server" +import { ApolloServer } from "apollo-server-express" +import express from "express" +import expressJwt from "express-jwt" +import jwt from 'jsonwebtoken' +import { PrismaClient } from "@prisma/client" import typeDefs from "./typeDefs" import resolvers from "./resolvers" -import { PrismaClient } from "@prisma/client" +import { ApolloContextType } from "./types" + +const app = express() + +app.use( + expressJwt({ + secret: "SuperSecret", + credentialsRequired: false, + algorithms: ["HS256"], + }) +) const server = new ApolloServer({ typeDefs, resolvers, - context: async () => { + context: async ({ req }): Promise => { const db = new PrismaClient() + return { db } }, }) -server.listen().then(({ url }) => { - console.log(`Server ready at ${url}`) +server.applyMiddleware({ app }) + +app.listen(4000, () => { + console.log("Server ready at http://localhost:4000") }) diff --git a/src/resolvers/Form.ts b/src/resolvers/Form.ts index 21d8e8f..80effcb 100644 --- a/src/resolvers/Form.ts +++ b/src/resolvers/Form.ts @@ -1,7 +1,6 @@ -import { getForm } from "../db" +import { getForm, getForms } from "../controllers" import { Form, - FormSubmission, QueryFormArgs, QuestionResolvers, Resolver, @@ -15,32 +14,26 @@ const formQuery: Resolver = async ( { db } ) => { try { - const dbForm = await getForm(db, id) + return await getForm(db, id) + } catch (err) { + return err + } +} - if (dbForm == null) throw new Error("Not found") - - const form: Form = { - id: dbForm.id, - title: dbForm.title, - questions: [...dbForm.choisesQuestions, ...dbForm.inputQuestions], - dateCreated: dbForm.dateCreated.toString(), - submissions: dbForm.submissions.map((submission) => { - return { - answers: submission.answers, - date: submission.date.toString(), - id: submission.id, - } - }), - } - - return form +const formsQuery: Resolver = async ( + _, + __, + { db } +) => { + try { + return await getForms(db, 1) } catch (err) { return err } } const QuestionResolver: QuestionResolvers = { - __resolveType(obj: any, context, info) { + __resolveType(obj: any) { if (obj.type) { return "ChoisesQuestion" } @@ -49,7 +42,7 @@ const QuestionResolver: QuestionResolvers = { } const AnswerResolver: AnswerResolvers = { - __resolveType(obj, context, info) { + __resolveType(obj) { if (obj.type == "CHOISE") return "ChoiseAnswer" if (obj.type == "INPUT") return "InputAnswer" @@ -57,4 +50,4 @@ const AnswerResolver: AnswerResolvers = { }, } -export { formQuery, QuestionResolver, AnswerResolver } +export { formQuery, formsQuery, QuestionResolver, AnswerResolver } diff --git a/src/resolvers/User.ts b/src/resolvers/User.ts index e69de29..d90b0b0 100644 --- a/src/resolvers/User.ts +++ b/src/resolvers/User.ts @@ -0,0 +1,32 @@ +import jwt from "jsonwebtoken" +import { MutationLoginArgs, Resolver, User } from "../typeDefs/typeDefs.gen" +import { ApolloContextType, JwtPayload } from "../types" + +const loginResolver: Resolver< + User, + {}, + ApolloContextType, + MutationLoginArgs +> = async (_, { id, admin }, { db }) => { + try { + const payload: JwtPayload = { + id, + admin, + } + const token = jwt.sign(payload, "SuperSecret") + const user = await db.user.findOne({ + where: { + id, + }, + }) + + return { + ...user, + token: token, + } + } catch (err) { + return err + } +} + +export { loginResolver } diff --git a/src/resolvers/index.ts b/src/resolvers/index.ts index 26cae5f..329f7d1 100644 --- a/src/resolvers/index.ts +++ b/src/resolvers/index.ts @@ -4,11 +4,17 @@ import { formQuery as form, QuestionResolver as Question, AnswerResolver as Answer, + formsQuery as forms, } from "./Form" +import { loginResolver as login } from "./User" const resolvers: Resolvers = { Query: { form, + forms, + }, + Mutation: { + login, }, Question, Answer, diff --git a/src/typeDefs/index.ts b/src/typeDefs/index.ts index ef9dbb9..7546391 100644 --- a/src/typeDefs/index.ts +++ b/src/typeDefs/index.ts @@ -1,4 +1,4 @@ -import { gql } from "apollo-server" +import { gql } from "apollo-server-express" import fs from "fs" const typeDefs = gql( diff --git a/src/typeDefs/typeDefs.gql b/src/typeDefs/typeDefs.gql index f737231..46740db 100644 --- a/src/typeDefs/typeDefs.gql +++ b/src/typeDefs/typeDefs.gql @@ -3,6 +3,10 @@ type Query { form(id: Int!): Form } +type Mutation { + login(id: Int!, admin: Boolean!): User +} + type Form { id: Int! title: String! @@ -10,6 +14,7 @@ type Form { submissions: [FormSubmission!]! dateCreated: String! } + interface Question { title: String! number: Int! @@ -64,3 +69,10 @@ enum AnswerType { INPUT CHOISE } + +type User { + name: String! + id: Int! + forms: [Form!]! + token: String +} diff --git a/src/types.ts b/src/types.ts index 1749fbd..9b4e7ba 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,5 +1,11 @@ import { PrismaClient } from "@prisma/client" +import {} from 'express-jwt' export type ApolloContextType = { db: PrismaClient } + +export type JwtPayload = { + id: number, + admin: boolean +} \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index c9f603c..ea8c600 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,69 +1,14 @@ { "compilerOptions": { - /* Visit https://aka.ms/tsconfig.json to read more about this file */ - - /* Basic Options */ - // "incremental": true, /* Enable incremental compilation */ - "target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */ - "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */ - // "lib": [], /* Specify library files to be included in the compilation. */ - // "allowJs": true, /* Allow javascript files to be compiled. */ - // "checkJs": true, /* Report errors in .js files. */ - // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */ - // "declaration": true, /* Generates corresponding '.d.ts' file. */ - // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ - // "sourceMap": true, /* Generates corresponding '.map' file. */ - // "outFile": "./", /* Concatenate and emit output to single file. */ - // "outDir": "./", /* Redirect output structure to the directory. */ - // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ - // "composite": true, /* Enable project compilation */ - // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ - // "removeComments": true, /* Do not emit comments to output. */ - // "noEmit": true, /* Do not emit outputs. */ - // "importHelpers": true, /* Import emit helpers from 'tslib'. */ - // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */ - // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ - - /* Strict Type-Checking Options */ - "strict": true, /* Enable all strict type-checking options. */ - // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ - // "strictNullChecks": true, /* Enable strict null checks. */ - // "strictFunctionTypes": true, /* Enable strict checking of function types. */ - // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */ - // "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */ - // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ - // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */ - - /* Additional Checks */ - // "noUnusedLocals": true, /* Report errors on unused locals. */ - // "noUnusedParameters": true, /* Report errors on unused parameters. */ - // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ - // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ - - /* Module Resolution Options */ - // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ - // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ - // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ - // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ - // "typeRoots": [], /* List of folders to include type definitions from. */ - // "types": [], /* Type declaration files to be included in compilation. */ - // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ - "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ - // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - - /* Source Map Options */ - // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */ - // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */ - - /* Experimental Options */ - // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */ - // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ - - /* Advanced Options */ - "skipLibCheck": true, /* Skip type checking of declaration files. */ - "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ - } + "target": "es6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */, + "module": "CommonJS" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */, + "strict": true /* Enable all strict type-checking options. */, + "outDir": "dist", + "moduleResolution": "Node", + "incremental": true, + "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */, + "skipLibCheck": true /* Skip type checking of declaration files. */, + "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ + }, + "include": ["src"] }