From 3d5b020f337fedc4381434bcd8c6355f52cb2aa2 Mon Sep 17 00:00:00 2001
From: ManifoldFR <wilson.jallet@gmail.com>
Date: Fri, 31 Aug 2018 11:45:20 +0200
Subject: [PATCH] update graphql and graphql-tools
---
package-lock.json | 46 +++++++++++++++++++++++++++++-----------------
package.json | 5 +++--
src/server.ts | 8 ++++----
3 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index fcc43b4..abab8e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -214,6 +214,7 @@
"version": "0.0.34",
"resolved": "https://registry.npmjs.org/@types/connect-flash/-/connect-flash-0.0.34.tgz",
"integrity": "sha512-QC93TwnTZ0sk//bfT81o7U4GOedbOZAcgvqi0v1vJqCESC8tqIVnhzB1CHiAUBUWFjoxG5JQF0TYaNa6DMb6Ig==",
+ "dev": true,
"requires": {
"@types/express": "*"
}
@@ -243,9 +244,10 @@
}
},
"@types/graphql": {
- "version": "0.12.6",
- "resolved": "https://registry.npmjs.org/@types/graphql/-/graphql-0.12.6.tgz",
- "integrity": "sha512-wXAVyLfkG1UMkKOdMijVWFky39+OD/41KftzqfX1Oejd0Gm6dOIKjCihSVECg6X7PHjftxXmfOKA/d1H79ZfvQ=="
+ "version": "0.13.4",
+ "resolved": "https://registry.npmjs.org/@types/graphql/-/graphql-0.13.4.tgz",
+ "integrity": "sha512-B4yel4ro2nTb3v0pYO8vO6SjgvFJSrwUY+IO6TUSLdOSB+gQFslylrhRCHxvXMIhxB71mv5PEE9dAX+24S8sew==",
+ "dev": true
},
"@types/ldapjs": {
"version": "1.0.3",
@@ -632,12 +634,22 @@
"@types/graphql": "0.12.6",
"apollo-utilities": "^1.0.0",
"zen-observable-ts": "^0.8.9"
+ },
+ "dependencies": {
+ "@types/graphql": {
+ "version": "0.12.6",
+ "resolved": "https://registry.npmjs.org/@types/graphql/-/graphql-0.12.6.tgz",
+ "integrity": "sha512-wXAVyLfkG1UMkKOdMijVWFky39+OD/41KftzqfX1Oejd0Gm6dOIKjCihSVECg6X7PHjftxXmfOKA/d1H79ZfvQ=="
+ }
}
},
"apollo-utilities": {
- "version": "1.0.11",
- "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.11.tgz",
- "integrity": "sha512-SAjRTqcYVHwpct+bcwX3x3zGEQOkNzj3Ri7Iy+vFIozxS8xtdkQqPiML7S6EI9Q2IuimQ7gvuYFHY0HQK0O1AA=="
+ "version": "1.0.20",
+ "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.20.tgz",
+ "integrity": "sha512-2M4BJCyX/9UXGJFoV4sTnVTZ4Q29aM18Z1avDrwvlCGGwoRTz50sGBAfTiWnUnnNQyPIIJEYElScw46DgIu0Rg==",
+ "requires": {
+ "fast-json-stable-stringify": "^2.0.0"
+ }
},
"aproba": {
"version": "1.2.0",
@@ -4951,11 +4963,11 @@
"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
},
"graphql": {
- "version": "0.13.2",
- "resolved": "https://registry.npmjs.org/graphql/-/graphql-0.13.2.tgz",
- "integrity": "sha512-QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog==",
+ "version": "14.0.0",
+ "resolved": "https://registry.npmjs.org/graphql/-/graphql-14.0.0.tgz",
+ "integrity": "sha512-HGVcnO6B25YZcSt6ZsH6/N+XkYuPA7yMqJmlJ4JWxWlS4Tr8SHI56R1Ocs8Eor7V7joEZPRXPDH8RRdll1w44Q==",
"requires": {
- "iterall": "^1.2.1"
+ "iterall": "^1.2.2"
}
},
"graphql-request": {
@@ -4967,11 +4979,11 @@
}
},
"graphql-tools": {
- "version": "2.24.0",
- "resolved": "https://registry.npmjs.org/graphql-tools/-/graphql-tools-2.24.0.tgz",
- "integrity": "sha512-Mz9I7jyizrd+RafC/5EogJKTVzBbIddDCrW0sP5QLmsVVM3ujfhqVYu2lEXOaJW8Sy18f3ZICHirmKcn6oMAcA==",
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/graphql-tools/-/graphql-tools-3.1.1.tgz",
+ "integrity": "sha512-yHvPkweUB0+Q/GWH5wIG60bpt8CTwBklCSzQdEHmRUgAdEQKxw+9B7zB3dG7wB3Ym7M7lfrS4Ej+jtDZfA2UXg==",
"requires": {
- "apollo-link": "^1.2.1",
+ "apollo-link": "^1.2.2",
"apollo-utilities": "^1.0.1",
"deprecated-decorator": "^0.1.6",
"iterall": "^1.1.3",
@@ -11004,9 +11016,9 @@
}
},
"zen-observable": {
- "version": "0.8.8",
- "resolved": "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.8.tgz",
- "integrity": "sha512-HnhhyNnwTFzS48nihkCZIJGsWGFcYUz+XPDlPK5W84Ifji8SksC6m7sQWOf8zdCGhzQ4tDYuMYGu5B0N1dXTtg=="
+ "version": "0.8.9",
+ "resolved": "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.9.tgz",
+ "integrity": "sha512-Y9kPzjGvIZ5jchSlqlCpBW3I82zBBL4z+ulXDRVA1NwsKzjt5kwAi+gOYIy0htNkfuehGZZtP5mRXHRV6TjDWw=="
},
"zen-observable-ts": {
"version": "0.8.9",
diff --git a/package.json b/package.json
index 6d5a9fd..6d5a9f7 100644
--- a/package.json
+++ b/package.json
@@ -31,8 +31,8 @@
"file-loader": "^1.1.11",
"fs": "0.0.1-security",
"fuse.js": "^3.2.1",
- "graphql": "^0.13.2",
- "graphql-tools": "^2.24.0",
+ "graphql": "^14.0.0",
+ "graphql-tools": "^3.1.1",
"graphql-voyager": "^1.0.0-rc.19",
"jsonwebtoken": "^8.3.0",
"knex": "^0.14.6",
@@ -50,6 +50,7 @@
"devDependencies": {
"@types/connect-ensure-login": "^0.1.4",
"@types/connect-flash": "0.0.34",
+ "@types/graphql": "^0.13.4",
"@types/node": "^10.9.3",
"@types/passport": "^0.4.6",
"babel-eslint": "^8.2.6",
diff --git a/src/server.ts b/src/server.ts
index 3153aa6..7483cc1 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -85,7 +85,7 @@ app.use(passport.initialize());
app.use(passport.session(), (req, res, next)=>{
console.log(
`passport.session: found user: ${req.user ? req.user.uid : "none"}
- authenticated: ${req.isAuthenticated()}`);
+ authenticated: ${req.isAuthenticated()}`.trim());
next();
});
// *aucun* effet sur les requetes n'ayant pas ete reconnues par app.use(session(...)) (e.g. les requetes sans cookie ou les requetes avec cookie expired). source: lecture directe du code passport/lib/strategies/session.js sur github... :/
@@ -197,9 +197,9 @@ app.use('/graphql',
console.log("Responding to graphql request...");
console.log(`
- | User: ${req.user ? req.user.uid : "none"}
- | Authorization: ${req.headers.authorization}
- | Authenticated: ${req.isAuthenticated()}
+| User: ${req.user ? req.user.uid : "none"}
+| Authorization: ${req.headers.authorization}
+| Authenticated: ${req.isAuthenticated()}
`.trim());
if(req.isAuthenticated()) {
--
GitLab