From 5be9ff8383ae381ebcb859f0d838704dc57592a1 Mon Sep 17 00:00:00 2001
From: Faruk AYDIN <omerfaruk26@gmail.com>
Date: Thu, 14 Oct 2021 16:38:03 +0200
Subject: [PATCH] chore: Use currentUser from authentication

---
 .../src/graphql/mutations/create-auth-link.ts      | 12 ++++--------
 .../src/graphql/mutations/create-credential.ts     | 14 +++++---------
 packages/backend/src/helpers/authentication.ts     |  6 +-----
 .../types/express/request-with-current-user.d.ts   |  8 ++++++++
 4 files changed, 18 insertions(+), 22 deletions(-)
 create mode 100644 packages/backend/src/types/express/request-with-current-user.d.ts

diff --git a/packages/backend/src/graphql/mutations/create-auth-link.ts b/packages/backend/src/graphql/mutations/create-auth-link.ts
index 103a12e0..c2bdea73 100644
--- a/packages/backend/src/graphql/mutations/create-auth-link.ts
+++ b/packages/backend/src/graphql/mutations/create-auth-link.ts
@@ -1,18 +1,14 @@
 import { GraphQLNonNull, GraphQLInt } from 'graphql';
 import Credential from '../../models/credential';
 import authLinkType from '../types/auth-link';
-import User from '../../models/user';
+import RequestWithCurrentUser from '../../types/express/request-with-current-user';
 
 type Params = {
   credentialId: number,
 }
-const createAuthLinkResolver = async (params: Params) => {
-  const user = await User.query().findOne({
-    email: 'user@automatisch.com'
-  })
-
+const createAuthLinkResolver = async (params: Params, req: RequestWithCurrentUser) => {
   const credential = await Credential.query().findOne({
-    user_id: user.id,
+    user_id: req.currentUser.id,
     id: params.credentialId
   })
 
@@ -29,7 +25,7 @@ const createAuthLink = {
   args: {
     credentialId: { type: GraphQLNonNull(GraphQLInt) },
   },
-  resolve: (_: any, params: Params) => createAuthLinkResolver(params)
+  resolve: (_: any, params: Params, req: RequestWithCurrentUser) => createAuthLinkResolver(params, req)
 };
 
 export default createAuthLink;
diff --git a/packages/backend/src/graphql/mutations/create-credential.ts b/packages/backend/src/graphql/mutations/create-credential.ts
index 3a99747c..5e4120ed 100644
--- a/packages/backend/src/graphql/mutations/create-credential.ts
+++ b/packages/backend/src/graphql/mutations/create-credential.ts
@@ -1,24 +1,20 @@
-import { GraphQLString, GraphQLNonNull, GraphQLObjectType, GraphQLCompositeType } from 'graphql';
+import { GraphQLString, GraphQLNonNull } from 'graphql';
 import Credential from '../../models/credential';
 import credentialType from '../types/credential';
 import twitterCredentialInputType from '../types/twitter-credential-input';
-import User from '../../models/user';
+import RequestWithCurrentUser from '../../types/express/request-with-current-user';
 
 type Params = {
   key: string,
   displayName: string,
   data: object
 }
-const createCredentialResolver = async (params: Params) => {
-  const user = await User.query().findOne({
-    email: 'user@automatisch.com'
-  })
-
+const createCredentialResolver = async (params: Params, req: RequestWithCurrentUser) => {
   const credential = await Credential.query().insert({
     displayName: params.displayName,
     key: params.key,
     data: params.data,
-    userId: user.id
+    userId: req.currentUser.id
   });
 
   return credential;
@@ -31,7 +27,7 @@ const createCredential = {
     displayName: { type: GraphQLNonNull(GraphQLString) },
     data: { type: GraphQLNonNull(twitterCredentialInputType) }
   },
-  resolve: (_: any, params: Params) => createCredentialResolver(params)
+  resolve: (_: any, params: Params, req: RequestWithCurrentUser) => createCredentialResolver(params, req)
 };
 
 export default createCredential;
diff --git a/packages/backend/src/helpers/authentication.ts b/packages/backend/src/helpers/authentication.ts
index 535c7dfc..c5fc9f06 100644
--- a/packages/backend/src/helpers/authentication.ts
+++ b/packages/backend/src/helpers/authentication.ts
@@ -1,10 +1,6 @@
 import { Request, Response, NextFunction } from 'express';
 import User from '../models/user';
-import UserType from '../types/user';
-
-interface RequestWithCurrentUser extends Request {
-  currentUser: UserType
-}
+import RequestWithCurrentUser from '../types/express/request-with-current-user';
 
 const authentication = async (req: RequestWithCurrentUser, _res: Response, next: NextFunction) => {
   // We set authentication to use the sample user we created temporarily.
diff --git a/packages/backend/src/types/express/request-with-current-user.d.ts b/packages/backend/src/types/express/request-with-current-user.d.ts
new file mode 100644
index 00000000..d2c7119c
--- /dev/null
+++ b/packages/backend/src/types/express/request-with-current-user.d.ts
@@ -0,0 +1,8 @@
+import { Request } from 'express';
+import User from '../user';
+
+interface RequestWithCurrentUser extends Request {
+  currentUser: User
+}
+
+export default RequestWithCurrentUser;