Update GraphQL Modules w/ enhancements (#582)

* Update GraphQL Modules w/ enhancements * Fix dependencies * Fix schema def * Fix typeDefs merging * Update GraphQL Modules 0.4.1 * Pin dependencies and add required core-js version to fix apollo-server * Fix tests * Try lowercase headerName if it doesn't exist * Fix lock files Signed-off-by: Arda TANRIKULU <[email protected]> * skipLibCheck in react-rest-typescript Signed-off-by: Arda TANRIKULU <[email protected]> * Use latest node version * Revert jest version * Fix lock file * Fix typing * Add skipLibCheck to graphql-server-typescript * Implement userFieldsFragment support Signed-off-by: Arda TANRIKULU <[email protected]> * remove skipLibCheck and update GraphQL Modules version * Remove resolutions field in e2e * Remove skipLibCheck from examples and use tslib instead of duplicating polyfills * Remove unnecessary jest * Fix netlify build
accounts-js · Feb 6, 2019 · 6fdec83 · 6fdec83
1 parent 7f1f125
commit 6fdec83
Show file tree

Hide file tree

Showing 95 changed files with 8,542 additions and 7,269 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,4 @@ website/build/
 website/node_modules
 website/i18n/*
 docs/api
+build/
diff --git a/README.md b/README.md
@@ -78,7 +78,7 @@ These variables should then be referenced when creating your GraphQL server.
 ```javascript
 import accountsBoost, { authenticated } from '@accounts/boost';
 import { ApolloServer } from 'apollo-server';
-import { mergeGraphQLSchemas, mergeResolvers } from '@graphql-modules/epoxy';
+import { mergeGraphQLSchemas, mergeResolvers } from 'graphql-toolkit';
 
 (async () => {
   const accounts = (await accountsBoost({
@@ -190,11 +190,11 @@ const accountsServerUri = 'http://localhost:4003/';
     if (!previousContext.graphqlContext) {
       return {};
     }
-    // Attach the accounts-access-token to requests which are proxied to the remote schema.
+    // Attach the Authorization to requests which are proxied to the remote schema.
     // This step is optional and only required if you want the `getUser` query to return data.
     return {
       headers: {
-        'accounts-access-token': previousContext.graphqlContext.authToken,
+        Authorization: 'Bearer ' + previousContext.graphqlContext.authToken,
       },
     };
   }).concat(http);

diff --git a/docs/getting-started.md b/docs/getting-started.md
@@ -179,11 +179,11 @@ const accountsServerUri = 'http://localhost:4003/';
     if (!previousContext.graphqlContext) {
       return {};
     }
-    // Attach the accounts-access-token to requests which are proxied to the remote schema.
+    // Attach the Authorization to requests which are proxied to the remote schema.
     // This step is optional and only required if you want the `getUser` query to return data.
     return {
       headers: {
-        'accounts-access-token': previousContext.graphqlContext.authToken,
+        Authorization: 'Bearer ' + previousContext.graphqlContext.authToken,
       },
     };
   }).concat(http);

diff --git a/examples/accounts-boost/package.json b/examples/accounts-boost/package.json
@@ -13,22 +13,22 @@
     "test": "yarn build"
   },
   "dependencies": {
-    "@accounts/boost": "^0.7.0",
-    "@graphql-modules/epoxy": "^0.2.15",
-    "apollo-link-context": "^1.0.10",
-    "apollo-link-http": "^1.5.7",
-    "apollo-server": "^2.2.3",
-    "graphql": "^14.0.2",
-    "graphql-tools": "^4.0.3",
+    "@accounts/boost": "^0.9.3",
+    "graphql-toolkit": "^0.0.5",
+    "apollo-link-context": "^1.0.14",
+    "apollo-link-http": "^1.5.11",
+    "apollo-server": "^2.3.3",
+    "graphql": "^14.1.1",
+    "graphql-tools": "^4.0.4",
     "lodash": "^4.17.11",
-    "node-fetch": "^2.3.0"
+    "node-fetch": "^2.3.0",
+    "tslib": "1.9.3"
   },
   "devDependencies": {
     "@accounts/tslint-config-accounts": "^0.0.9",
-    "@types/node": "10.12.10",
-    "nodemon": "1.18.7",
-    "ts-node": "7.0.1",
-    "tslint": "^5.11.0",
-    "typescript": "3.1.6"
+    "nodemon": "1.18.9",
+    "ts-node": "8.0.2",
+    "tslint": "^5.12.1",
+    "typescript": "3.3.1"
   }
 }
diff --git a/examples/accounts-boost/src/microservice/app-server.ts b/examples/accounts-boost/src/microservice/app-server.ts
@@ -28,11 +28,11 @@ const accountsServerUri = 'http://localhost:4003/';
     if (!previousContext.graphqlContext) {
       return {};
     }
-    // Attach the accounts-access-token to requests which are proxied to the remote schema.
+    // Attach the Authorization to requests which are proxied to the remote schema.
     // This step is optional and only required if you want the `getUser` query to return data.
     return {
       headers: {
-        'accounts-access-token': previousContext.graphqlContext.authToken,
+        Authorization: 'Bearer ' + previousContext.graphqlContext.authToken,
       },
     };
   }).concat(http);
@@ -92,10 +92,7 @@ const accountsServerUri = 'http://localhost:4003/';
   const apolloServer = await new ApolloServer({
     schema: mergeSchemas({
       schemas: [executableLocalSchema, executableRemoteSchema],
-      schemaDirectives: {
-        // In order for the `@auth` directive to work
-        ...accounts.schemaDirectives,
-      },
+      schemaDirectives: accounts.schemaDirectives as any,
     }),
     context: ({ req }) => accounts.context({ req }),
   }).listen();

diff --git a/examples/accounts-boost/src/monolithic/app-server.ts b/examples/accounts-boost/src/monolithic/app-server.ts
@@ -1,5 +1,5 @@
 import accountsBoost, { authenticated } from '@accounts/boost';
-import { mergeGraphQLSchemas, mergeResolvers } from '@graphql-modules/epoxy';
+import { mergeGraphQLSchemas, mergeResolvers } from 'graphql-toolkit';
 import { ApolloServer } from 'apollo-server';
 
 (async () => {

diff --git a/examples/accounts-boost/tsconfig.json b/examples/accounts-boost/tsconfig.json
@@ -3,7 +3,9 @@
     "outDir": "./lib",
     "target": "es5",
     "lib": ["es2015", "esnext.asynciterable"],
-    "sourceMap": true
+    "sourceMap": true,
+    "importHelpers": true,
+    "esModuleInterop": true
   },
   "include": ["./src/**/*"],
   "exclude": ["node_modules", "lib"]