finally fix uuid import mess

Author: SpaceK33z

examples/with-prisma/package.json

@@ -10,10 +10,11 @@
     "graphql-cli": "^2.16.4",
     "graphql-yoga": "^1.14.12",
     "prisma": "^1.11.1",
-    "prisma-binding": "^2.1.0"
+    "prisma-binding": "^2.1.0",
+    "ts-node": "^7.0.0"
   },
   "scripts": {
-    "start": "node server.js",
+    "start": "ts-node server.ts",
     "prisma": "PRISMA_MANAGEMENT_API_SECRET=mymanagementsecret123 prisma"
   }
 }

examples/with-prisma/yarn.lock

@@ -5229,6 +5229,19 @@ ts-node@^6.0.2:
     source-map-support "^0.5.6"
     yn "^2.0.0"
 
+ts-node@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-7.0.0.tgz#a94a13c75e5e1aa6b82814b84c68deb339ba7bff"
+  dependencies:
+    arrify "^1.0.0"
+    buffer-from "^1.1.0"
+    diff "^3.1.0"
+    make-error "^1.1.1"
+    minimist "^1.2.0"
+    mkdirp "^0.5.1"
+    source-map-support "^0.5.6"
+    yn "^2.0.0"
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"

packages/graphql-authentication/package.json

@@ -69,11 +69,6 @@
     "transform": {
       "^.+\\.ts$": "ts-jest"
     },
-    "globals": {
-      "ts-jest": {
-        "skipBabel": true
-      }
-    },
     "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(js|ts)$",
     "setupTestFrameworkScriptFile": "<rootDir>/src/__tests__/setup.ts",
     "moduleFileExtensions": [

packages/graphql-authentication/src/mutations.ts

@@ -1,7 +1,7 @@
 import * as bcrypt from 'bcryptjs';
 import * as jwt from 'jsonwebtoken';
 import * as validator from 'validator';
-import * as uuidv4 from 'uuid/v4';
+import { v4 as uuid } from 'uuid';
 import { getUser, Context } from './utils';
 import { User } from './Adapter';
 import {
@@ -96,7 +96,7 @@ export const mutations = {
 
     validatePassword(data.password);
     const hashedPassword = await getHashedPassword(data.password);
-    const emailConfirmToken = uuidv4();
+    const emailConfirmToken = uuid();
 
     const newUser = await ctx.graphqlAuthentication.adapter.createUserBySignup(
       ctx,
@@ -266,7 +266,7 @@ export const mutations = {
     // This token will be used in the email to the user.
     // According to https://gist.github.com/joepie91/7105003c3b26e65efcea63f3db82dfba
     // uuid v4 is safe to be used as random token generator.
-    const inviteToken = uuidv4();
+    const inviteToken = uuid();
 
     const newUser = await ctx.graphqlAuthentication.adapter.createUserByInvite(
       ctx,
@@ -327,7 +327,7 @@ export const mutations = {
     // This token will be used in the email to the user.
     // According to https://gist.github.com/joepie91/7105003c3b26e65efcea63f3db82dfba
     // uuid v4 is safe to be used as random token generator.
-    const resetToken = uuidv4();
+    const resetToken = uuid();
     const now = new Date();
     // Expires in two hours
     const resetExpires = new Date(now.getTime() + 7200000).toISOString();

tsconfig.base.json

@@ -9,7 +9,6 @@
     "noUnusedLocals": false,
     "strictFunctionTypes": false,
     "noImplicitAny": false,
-    "forceConsistentCasingInFileNames": true,
-    "allowSyntheticDefaultImports": true
+    "forceConsistentCasingInFileNames": true
   }
 }