From f8a6ac26c5a58d17f9c2eb639489b045aec1a780 Mon Sep 17 00:00:00 2001
From: yyar <yymjar@gmail.com>
Date: Wed, 17 Nov 2021 05:23:42 +0900
Subject: [PATCH] Fix Personal Access Token login method to Github Enterprise
 Server modifying getUserData (#524)

* Fix Personal Access Token login method to Github Enterprise Server

* Apply prettier

Co-authored-by: Manos Konstantinidis <manosim@users.noreply.github.com>
---
 src/context/App.tsx | 4 ++--
 src/utils/auth.ts   | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/context/App.tsx b/src/context/App.tsx
index 15edf9e4c..f3191fd3b 100644
--- a/src/context/App.tsx
+++ b/src/context/App.tsx
@@ -113,8 +113,8 @@ export const AppProvider = ({ children }: { children: React.ReactNode }) => {
   const login = useCallback(async () => {
     const { authCode } = await authGitHub();
     const { token } = await getToken(authCode);
-    const user = await getUserData(token);
     const hostname = Constants.DEFAULT_AUTH_OPTIONS.hostname;
+    const user = await getUserData(token, hostname);
     const updatedAccounts = addAccount(accounts, token, hostname, user);
     setAccounts(updatedAccounts);
     saveState(updatedAccounts, settings);
@@ -138,7 +138,7 @@ export const AppProvider = ({ children }: { children: React.ReactNode }) => {
         'HEAD',
         token
       );
-      const user = await getUserData(token);
+      const user = await getUserData(token, hostname);
       const updatedAccounts = addAccount(accounts, token, hostname, user);
       setAccounts(updatedAccounts);
       saveState(updatedAccounts, settings);
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index d0319d37c..f89a7e4c0 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -73,9 +73,12 @@ export const authGitHub = (
   });
 };
 
-export const getUserData = async (token: string): Promise<User> => {
+export const getUserData = async (
+  token: string,
+  hostname: string
+): Promise<User> => {
   const response = await apiRequestAuth(
-    `https://api.${Constants.DEFAULT_AUTH_OPTIONS.hostname}/user`,
+    `https://api.${hostname}/user`,
     'GET',
     token
   );