diff --git a/api/openapi.yaml b/api/openapi.yaml index 4d5a286a525d695aa87d78302908daa4f8d45ec2..859736f4264f87c52b150231b95501cbc9fcbdad 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -275,8 +275,6 @@ paths: application/json: schema: $ref: '#/components/schemas/User' - security: - - bearerAuth: [ ] responses: default: description: successful operation diff --git a/controllers/Ad.js b/controllers/Ad.js index dce6b628bbdd12b2593e0bcdbd0865622f92b5ac..38e88fdcd95b3a2c07eab34bfdb3c82e056722ea 100644 --- a/controllers/Ad.js +++ b/controllers/Ad.js @@ -26,7 +26,6 @@ router.put('/update/:id', extractToken, async (req, res) => { } }); - router.post('/delete/:id', extractToken, async (req, res) => { try { const response = await AdService.deleteAd(req.params.id, req.token); diff --git a/controllers/User.js b/controllers/User.js index bb754120881c0d00637dbd18a1483c6a4e731998..98ddcc0e27faa0a164ba73e2ec3ec2e99effb8b9 100644 --- a/controllers/User.js +++ b/controllers/User.js @@ -2,15 +2,19 @@ const express = require('express'); const passport = require('../passeport-config'); const jwt = require('jsonwebtoken'); const utils = require('../utils/writer.js'); + +const { typeDefs, resolvers } = require('../schemas/User'); + const User = require('../service/UserService'); const authRouter = express.Router(); -authRouter.post('/user', async (req, res) => { +authRouter.post('/', async (req, res) => { try { const { username, password, isAgent } = req.body; - await User.createUser(username, password, isAgent); - utils.writeJson(res, { message: 'Utilisateur créé avec succès' }); + user = await User.createUser(username, password, isAgent); + console.log("user", user) + utils.writeJson(res, { message: 'Utilisateur créé avec succès', user }); } catch (error) { utils.writeJson(res, { error: error.message }); } @@ -44,4 +48,13 @@ authRouter.post('/logout', async (req, res) => { } }); +/* +const expressGraphQL = require('express-graphql').graphqlHTTP; + +authRouter.use('/graphql', expressGraphQL({ + schema: typeDefs, + rootValue: resolvers, + graphiql: true, +})); +*/ module.exports = authRouter; diff --git a/index.js b/index.js index f2b9f4f363b3d3892434fadb93d34c69235a00c8..9b87a3366e88debdf2a0692c92baf480db787ee9 100644 --- a/index.js +++ b/index.js @@ -1,5 +1,4 @@ const express = require('express'); -const session = require('express-session'); const swaggerUi = require('swagger-ui-express'); const { makeExecutableSchema } = require('@graphql-tools/schema'); const { createHandler } = require('graphql-http/lib/use/express'); @@ -8,10 +7,8 @@ const YAML = require('yamljs'); const swaggerJsdoc = require('swagger-jsdoc'); const swaggerParser = require('swagger-parser'); const connectToDatabase = require('./data-access/connection'); -const passport = require('./passeport-config'); const apiRouter = require('./controllers/Ad'); const authRouter = require('./controllers/User'); -const utils = require('./utils/writer'); const path = require('path'); const app = express(); @@ -45,47 +42,16 @@ swaggerParser.validate(openApiDocument, (err, api) => { }); const swaggerSpec = swaggerJsdoc(options); -// Your GraphQL schema and resolvers -const typeDefs = ` - type Query { - hello: String - users(filterName: String): [User] - user(id: ID!): User - goods: [Good] - } - type Mutation { - createPurchaseForUser(userId: ID!, goodId: ID!, quantity: Int!): Purchase - } - type User { - id: ID! - name: String! - email: String! - purchases: [Purchase]! - } - type Purchase { - id: ID! - date: Date - good: Good - quantity: Int - } - type Good { - id: ID! - name: String! - price: Float! - } - scalar Date -`; -const resolvers = { - // Your resolvers here -}; -const schema = makeExecutableSchema({ typeDefs, resolvers }); +const {schema} = require("./schemas/User"); + app.use('/docs', swaggerUi.serve, swaggerUi.setup(openApiDocument, swaggerSpec)); app.get('/graphql-playground', expressPlayground({ endpoint: '/graphql' })); app.post('/graphql', createHandler({ schema })); app.use('/announcements', apiRouter); app.use('/user', authRouter); +app.use(express.json()); connectToDatabase() .then(() => { diff --git a/package-lock.json b/package-lock.json index 813703ddf80309c55248943daf9bc962a5bfb1b1..d48a5dade108251441a22b4f41addc76bb53fe2e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "license": "Unlicense", "dependencies": { "@graphql-tools/schema": "^10.0.0", + "axios": "^1.6.1", "connect": "^3.2.0", "dotenv": "^16.3.1", "express": "^4.18.2", @@ -344,6 +345,21 @@ "lodash": "^4.17.14" } }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "node_modules/axios": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.1.tgz", + "integrity": "sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==", + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -506,6 +522,17 @@ "fsevents": "~2.3.2" } }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -662,6 +689,14 @@ "node": ">= 0.4" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -1093,6 +1128,38 @@ "node": ">= 0.8" } }, + "node_modules/follow-redirects": { + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", + "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -2089,6 +2156,11 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/pstree.remy": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", diff --git a/package.json b/package.json index b305434cf99351f7847d777320086192d3ea4f08..6a559e53178c8162783f312b230d585f95546eac 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "private": true, "dependencies": { "@graphql-tools/schema": "^10.0.0", + "axios": "^1.6.1", "connect": "^3.2.0", "dotenv": "^16.3.1", "express": "^4.18.2", diff --git a/schemas/User.js b/schemas/User.js new file mode 100644 index 0000000000000000000000000000000000000000..1fd4930e3d73d9bbba7c227591b1ac0ed22eeb3a --- /dev/null +++ b/schemas/User.js @@ -0,0 +1,91 @@ +const { makeExecutableSchema } = require("@graphql-tools/schema"); + +const UserModel = require("../models/User"); +const axios = require('axios'); + +const typeDefs = ` + type User { + _id: ID! + username: String! + password: String + isAgent: Boolean + } + + input UserInput { + username: String! + password: String + isAgent: Boolean + } + + type AuthPayload { + token: String! + } + + type Query { + getUser(id: ID, username: String): User + } + + type Mutation { + createUser(input: UserInput): User + loginUser(username: String!, password: String!): AuthPayload + logoutUser: String + } +`; + +const resolvers = { + Query: { + getUser: async (parent, { id, username }) => { + if (id) { + return await UserModel.findById(id); + } else if (username) { + return await UserModel.findOne({ username }); + } else { + return null; + } + } + }, + Mutation: { + createUser: async (parent, { input }) => { + try { + const response = await axios.post('http://localhost:8080/user', input); + if (response.data.exports){ + throw new Error(response.data.exports.error); + } + return response.data.user; + } catch (error) { + console.error('Erreur lors de la création de l\'utilisateur:', error); + throw new Error('Erreur lors de la création de l\'utilisateur. Vérifiez les détails dans les journaux.'); + } + }, + loginUser: async (parent, { username, password }) => { + try { + const response = await axios.post('http://localhost:8080/user/login', { username, password }); + + if (response.status === 200) { + return { token: response.data.token }; + } else { + throw new Error('Invalid username or password.'); + } + } catch (error) { + console.error('Erreur lors de la tentative de connexion:', error); + throw new Error('Erreur lors de la tentative de connexion. Vérifiez les détails dans les journaux.'); + } + }, + logoutUser: async () => { + try { + const response = await axios.post('http://localhost:8080/user/logout'); + + if (response.status === 200) { + return 'Logout successful.'; + } else { + throw new Error('Logout failed.'); + } + } catch (error) { + console.error('Erreur lors de la déconnexion de l\'utilisateur:', error); + throw new Error('Erreur lors de la déconnexion de l\'utilisateur. Vérifiez les détails dans les journaux.'); + } + }, + }, +}; + +exports.schema = makeExecutableSchema({ typeDefs, resolvers }); \ No newline at end of file diff --git a/service/UserService.js b/service/UserService.js index 15690fd4b0d94dc5b33853c8c6e554aa0905bbf0..3559f1467dbaad615b421355aef9de3da1e6928a 100644 --- a/service/UserService.js +++ b/service/UserService.js @@ -21,7 +21,9 @@ exports.createUser = async function(username, password, isAgent) { throw new Error('This user already exists.'); } - await User.register(new User ({ username : username, isAgent : isAgent}), password); + const user = await User.register(new User ({ username : username, isAgent : isAgent}), password); + console.log("user", user) + return user; }; /**