feat(auth): account scopes and expired pat workflow

Signed-off-by: Adam Setch <adam.setch@outlook.com>

Author: setchy

src/renderer/routes/Accounts.tsx

@@ -142,7 +142,10 @@ export const AccountsRoute: FC = () => {
           state: { account },
         });
       case 'OAuth App':
-        return navigate('/login-oauth-app', { replace: true });
+        return navigate('/login-oauth-app', {
+          replace: true,
+          state: { account },
+        });
       default:
         break;
     }

src/renderer/routes/LoginWithOAuthApp.tsx

@@ -1,5 +1,5 @@
 import { type FC, useCallback, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
 
 import {
   BookIcon,
@@ -27,7 +27,13 @@ import { Page } from '../components/layout/Page';
 import { Footer } from '../components/primitives/Footer';
 import { Header } from '../components/primitives/Header';
 
-import type { ClientID, ClientSecret, Hostname, Token } from '../types';
+import type {
+  Account,
+  ClientID,
+  ClientSecret,
+  Hostname,
+  Token,
+} from '../types';
 import type { LoginOAuthWebOptions } from '../utils/auth/types';
 
 import {
@@ -39,6 +45,10 @@ import {
 import { openExternalLink } from '../utils/comms';
 import { rendererLogError } from '../utils/logger';
 
+interface LocationState {
+  account?: Account;
+}
+
 export interface IFormData {
   hostname: Hostname;
   clientId: ClientID;
@@ -78,14 +88,16 @@ export const validateForm = (values: IFormData): IFormErrors => {
 
 export const LoginWithOAuthAppRoute: FC = () => {
   const navigate = useNavigate();
+  const location = useLocation();
+  const { account: reAuthAccount } = (location.state ?? {}) as LocationState;
 
   const { loginWithOAuthApp } = useAppContext();
 
   const [shouldMaskClientSecret, setShouldMaskClientSecret] = useState(true);
   const [isVerifyingCredentials, setIsVerifyingCredentials] = useState(false);
 
   const [formData, setFormData] = useState({
-    hostname: Constants.GITHUB_HOSTNAME,
+    hostname: reAuthAccount?.hostname ?? Constants.GITHUB_HOSTNAME,
     clientId: '' as ClientID,
     clientSecret: '' as ClientSecret,
   } as IFormData);

src/renderer/utils/auth/utils.ts

@@ -210,7 +210,7 @@ export async function addAccount(
     (a) => getAccountUUID(a) === newAccountUUID,
   );
 
-  if (existingIndex !== -1) {
+  if (existingIndex >= 0) {
     // Clear the cached Octokit client so the new token is used
     clearOctokitClientCacheForAccount(accountList[existingIndex]);
     // Replace the existing account (e.g. re-authentication with a new token)