Fix Personal Access Token login method to Github Enterprise Server mo…

…difying getUserData (#524) * Fix Personal Access Token login method to Github Enterprise Server * Apply prettier Co-authored-by: Manos Konstantinidis <[email protected]>
gitify-app · Nov 16, 2021 · f8a6ac2 · f8a6ac2
1 parent f446794
commit f8a6ac2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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
   );