From cf4b511582bf2babd4bd5576f9f594f36a2b6af4 Mon Sep 17 00:00:00 2001 From: yyar Date: Fri, 5 Nov 2021 13:50:38 +0900 Subject: [PATCH 1/2] Fix Personal Access Token login method to Github Enterprise Server --- src/context/App.tsx | 4 ++-- src/utils/auth.ts | 4 ++-- 2 files changed, 4 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 db94c2b3c..ab57aabb5 100644 --- a/src/utils/auth.ts +++ b/src/utils/auth.ts @@ -68,9 +68,9 @@ export const authGitHub = ( }); }; -export const getUserData = async (token: string): Promise => { +export const getUserData = async (token: string, hostname: string): Promise => { const response = await apiRequestAuth( - `https://api.${Constants.DEFAULT_AUTH_OPTIONS.hostname}/user`, + `https://api.${hostname}/user`, 'GET', token ); From 4c16b696fc7883ae92a20902f581f35d6c5d1c1e Mon Sep 17 00:00:00 2001 From: yyar Date: Tue, 9 Nov 2021 09:41:26 +0900 Subject: [PATCH 2/2] Apply prettier --- src/utils/auth.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/utils/auth.ts b/src/utils/auth.ts index ab57aabb5..c94ba38ae 100644 --- a/src/utils/auth.ts +++ b/src/utils/auth.ts @@ -68,7 +68,10 @@ export const authGitHub = ( }); }; -export const getUserData = async (token: string, hostname: string): Promise => { +export const getUserData = async ( + token: string, + hostname: string +): Promise => { const response = await apiRequestAuth( `https://api.${hostname}/user`, 'GET',