From 1613ab503c5b91866ee26c58dd7a7cbd1aff6275 Mon Sep 17 00:00:00 2001
From: Ali BARIN <ali.barin53@gmail.com>
Date: Thu, 20 Oct 2022 20:15:15 +0200
Subject: [PATCH] refactor(github): replace generateRequest with $.http

---
 .../src/apps/github/auth/is-still-verified.ts |  2 +-
 .../apps/github/common/generate-request.ts    | 28 -------------------
 .../apps/github/common/get-current-user.ts    |  6 +---
 3 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 packages/backend/src/apps/github/common/generate-request.ts

diff --git a/packages/backend/src/apps/github/auth/is-still-verified.ts b/packages/backend/src/apps/github/auth/is-still-verified.ts
index 8f578344..060ad5cd 100644
--- a/packages/backend/src/apps/github/auth/is-still-verified.ts
+++ b/packages/backend/src/apps/github/auth/is-still-verified.ts
@@ -4,7 +4,7 @@ import getCurrentUser from '../common/get-current-user';
 const isStillVerified = async ($: IGlobalVariable) => {
   try {
     const user = await getCurrentUser($);
-    return !!user;
+    return !!user.id;
   } catch (error) {
     return false;
   }
diff --git a/packages/backend/src/apps/github/common/generate-request.ts b/packages/backend/src/apps/github/common/generate-request.ts
deleted file mode 100644
index e78dfc0b..00000000
--- a/packages/backend/src/apps/github/common/generate-request.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { IGlobalVariable, IJSONObject } from '@automatisch/types';
-import { Method } from 'axios';
-
-type IGenereateRequestOptons = {
-  requestPath: string;
-  method: string;
-  data?: IJSONObject;
-};
-
-const generateRequest = async (
-  $: IGlobalVariable,
-  options: IGenereateRequestOptons
-) => {
-  const { requestPath, method, data } = options;
-
-  const response = await $.http.request({
-    url: requestPath,
-    method: method as Method,
-    data,
-    headers: {
-      Authorization: `Bearer ${$.auth.data.accessToken}`
-    },
-  });
-
-  return response;
-};
-
-export default generateRequest;
diff --git a/packages/backend/src/apps/github/common/get-current-user.ts b/packages/backend/src/apps/github/common/get-current-user.ts
index 00295ebb..53f931e5 100644
--- a/packages/backend/src/apps/github/common/get-current-user.ts
+++ b/packages/backend/src/apps/github/common/get-current-user.ts
@@ -1,11 +1,7 @@
 import { IGlobalVariable, IJSONObject } from '@automatisch/types';
-import generateRequest from './generate-request';
 
 const getCurrentUser = async ($: IGlobalVariable): Promise<IJSONObject> => {
-  const response = await generateRequest($, {
-    requestPath: '/user',
-    method: 'GET',
-  });
+  const response = await $.http.get('/user');
 
   const currentUser = response.data;
   return currentUser;