feat(accounts): enhance auth account data structure

src/__mocks__/notifications-mocks.ts

@@ -2,23 +2,26 @@ import type { AccountNotifications } from '../types';
 import {
   mockEnterpriseNotifications,
   mockGitHubNotifications,
-  mockSingleNotification,
 } from '../utils/api/__mocks__/response-mocks';
+import {
+  mockGitHubCloudAccount,
+  mockGitHubEnterpriseServerAccount,
+} from './state-mocks';
 
 export const mockAccountNotifications: AccountNotifications[] = [
   {
-    hostname: 'github.com',
+    account: mockGitHubCloudAccount,
     notifications: mockGitHubNotifications,
   },
   {
-    hostname: 'github.gitify.io',
+    account: mockGitHubEnterpriseServerAccount,
     notifications: mockEnterpriseNotifications,
   },
 ];
 
 export const mockSingleAccountNotifications: AccountNotifications[] = [
   {
-    hostname: 'github.com',
-    notifications: [mockSingleNotification],
+    account: mockGitHubCloudAccount,
+    notifications: [mockGitHubNotifications[0]],
   },
 ];

src/__mocks__/partial-mocks.ts

@@ -1,11 +1,18 @@
 import type { Notification, Subject, User } from '../typesGitHub';
 import Constants from '../utils/constants';
+import { mockGitifyUser, mockToken } from './state-mocks';
 
 export function partialMockNotification(
   subject: Partial<Subject>,
 ): Notification {
   const mockNotification: Partial<Notification> = {
-    hostname: Constants.GITHUB_API_BASE_URL,
+    account: {
+      method: 'Personal Access Token',
+      platform: 'GitHub Cloud',
+      hostname: Constants.GITHUB_API_BASE_URL,
+      token: mockToken,
+      user: mockGitifyUser,
+    },
     subject: subject as Subject,
   };
 

src/__mocks__/state-mocks.ts

@@ -1,10 +1,12 @@
 import {
+  type Account,
   type AuthState,
   type GitifyUser,
   type SettingsState,
   Theme,
 } from '../types';
 import type { EnterpriseAccount } from '../utils/auth/types';
+import Constants from '../utils/constants';
 
 export const mockEnterpriseAccounts: EnterpriseAccount[] = [
   {
@@ -13,18 +15,50 @@ export const mockEnterpriseAccounts: EnterpriseAccount[] = [
   },
 ];
 
-export const mockUser: GitifyUser = {
+export const mockGitifyUser: GitifyUser = {
   login: 'octocat',
   name: 'Mona Lisa Octocat',
   id: 123456789,
 };
 
-export const mockAuth: AuthState = {
+export const mockPersonalAccessTokenAccount: Account = {
+  platform: 'GitHub Cloud',
+  method: 'Personal Access Token',
+  token: 'token-123-456',
+  hostname: Constants.DEFAULT_AUTH_OPTIONS.hostname,
+  user: mockGitifyUser,
+};
+
+export const mockOAuthAccount: Account = {
+  platform: 'GitHub Enterprise Server',
+  method: 'OAuth App',
+  token: '1234568790',
+  hostname: 'github.gitify.io',
+  user: mockGitifyUser,
+};
+
+export const mockGitHubCloudAccount: Account = {
+  platform: 'GitHub Cloud',
+  method: 'Personal Access Token',
   token: 'token-123-456',
-  enterpriseAccounts: mockEnterpriseAccounts,
-  user: mockUser,
+  hostname: Constants.DEFAULT_AUTH_OPTIONS.hostname,
+  user: mockGitifyUser,
 };
 
+export const mockGitHubEnterpriseServerAccount: Account = {
+  platform: 'GitHub Enterprise Server',
+  method: 'Personal Access Token',
+  token: '1234568790',
+  hostname: 'github.gitify.io',
+  user: mockGitifyUser,
+};
+
+export const mockAuth: AuthState = {
+  accounts: [mockGitHubCloudAccount, mockGitHubEnterpriseServerAccount],
+};
+
+export const mockToken = 'token-123-456';
+
 export const mockSettings: SettingsState = {
   participating: false,
   playSound: true,

src/components/NotificationRow.tsx

@@ -36,8 +36,8 @@ interface IProps {
 
 export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
   const {
-    settings,
     auth,
+    settings,
     removeNotificationFromState,
     markNotificationRead,
     markNotificationDone,
@@ -46,7 +46,7 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
   } = useContext(AppContext);
 
   const openNotification = useCallback(() => {
-    openInBrowser(notification, auth);
+    openInBrowser(notification);
 
     if (settings.markAsDoneOnOpen) {
       markNotificationDone(notification.id, hostname);

src/context/App.test.tsx

@@ -1,6 +1,5 @@
 import { act, fireEvent, render, waitFor } from '@testing-library/react';
 import { useContext } from 'react';
-
 import { mockAuth, mockSettings } from '../__mocks__/state-mocks';
 import { useNotifications } from '../hooks/useNotifications';
 import type { AuthState, SettingsState } from '../types';
@@ -133,6 +132,7 @@ describe('context/App.tsx', () => {
       expect(markNotificationReadMock).toHaveBeenCalledTimes(1);
       expect(markNotificationReadMock).toHaveBeenCalledWith(
         {
+          accounts: [],
           enterpriseAccounts: [],
           token: null,
           user: null,
@@ -165,7 +165,7 @@ describe('context/App.tsx', () => {
 
       expect(markNotificationDoneMock).toHaveBeenCalledTimes(1);
       expect(markNotificationDoneMock).toHaveBeenCalledWith(
-        { enterpriseAccounts: [], token: null, user: null },
+        { accounts: [], enterpriseAccounts: [], token: null, user: null },
         mockSettings,
         '123-456',
         'github.com',
@@ -194,7 +194,7 @@ describe('context/App.tsx', () => {
 
       expect(unsubscribeNotificationMock).toHaveBeenCalledTimes(1);
       expect(unsubscribeNotificationMock).toHaveBeenCalledWith(
-        { enterpriseAccounts: [], token: null, user: null },
+        { accounts: [], enterpriseAccounts: [], token: null, user: null },
         mockSettings,
         '123-456',
         'github.com',
@@ -228,7 +228,7 @@ describe('context/App.tsx', () => {
 
       expect(markRepoNotificationsMock).toHaveBeenCalledTimes(1);
       expect(markRepoNotificationsMock).toHaveBeenCalledWith(
-        { enterpriseAccounts: [], token: null, user: null },
+        { accounts: [], enterpriseAccounts: [], token: null, user: null },
         mockSettings,
         'gitify-app/notifications-test',
         'github.com',
@@ -262,13 +262,14 @@ describe('context/App.tsx', () => {
 
       expect(markRepoNotificationsDoneMock).toHaveBeenCalledTimes(1);
       expect(markRepoNotificationsDoneMock).toHaveBeenCalledWith(
-        { enterpriseAccounts: [], token: null, user: null },
+        { accounts: [], enterpriseAccounts: [], token: null, user: null },
         mockSettings,
         'gitify-app/notifications-test',
         'github.com',
       );
     });
   });
+
   describe('authentication methods', () => {
     const apiRequestAuthMock = jest.spyOn(apiRequests, 'apiRequestAuth');
     const fetchNotificationsMock = jest.fn();
@@ -370,7 +371,7 @@ describe('context/App.tsx', () => {
       });
 
       expect(saveStateMock).toHaveBeenCalledWith({
-        auth: { enterpriseAccounts: [], token: null, user: null },
+        auth: { accounts: [], enterpriseAccounts: [], token: null, user: null },
         settings: {
           participating: true,
           playSound: true,
@@ -415,7 +416,7 @@ describe('context/App.tsx', () => {
       expect(setAutoLaunchMock).toHaveBeenCalledWith(true);
 
       expect(saveStateMock).toHaveBeenCalledWith({
-        auth: { enterpriseAccounts: [], token: null, user: null },
+        auth: { accounts: [], enterpriseAccounts: [], token: null, user: null },
         settings: {
           participating: false,
           playSound: true,

src/context/App.tsx

@@ -17,6 +17,7 @@ import {
   Theme,
 } from '../types';
 import { headNotifications } from '../utils/api/client';
+import { migrateAuthenticatedAccounts } from '../utils/auth/migration';
 import type {
   LoginOAuthAppOptions,
   LoginPersonalAccessTokenOptions,
@@ -34,6 +35,7 @@ import { clearState, loadState, saveState } from '../utils/storage';
 import { setTheme } from '../utils/theme';
 
 const defaultAuth: AuthState = {
+  accounts: [],
   token: null,
   enterpriseAccounts: [],
   user: null,
@@ -116,8 +118,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     settings.participating,
     settings.showBots,
     settings.detailedNotifications,
-    auth.token,
-    auth.enterpriseAccounts.length,
+    auth.accounts.length,
   ]);
 
   useInterval(() => {
@@ -149,15 +150,15 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
   );
 
   const isLoggedIn = useMemo(() => {
-    return !!auth.token || auth.enterpriseAccounts.length > 0;
+    return auth.accounts.length > 0;
   }, [auth]);
 
   const loginWithGitHubApp = useCallback(async () => {
     const { authCode } = await authGitHub();
     const { token } = await getToken(authCode);
     const hostname = Constants.DEFAULT_AUTH_OPTIONS.hostname;
     const user = await getUserData(token, hostname);
-    const updatedAuth = addAccount(auth, token, hostname, user);
+    const updatedAuth = addAccount(auth, 'GitHub App', token, hostname, user);
     setAuth(updatedAuth);
     saveState({ auth: updatedAuth, settings });
   }, [auth, settings]);
@@ -166,7 +167,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     async (data: LoginOAuthAppOptions) => {
       const { authOptions, authCode } = await authGitHub(data);
       const { token, hostname } = await getToken(authCode, authOptions);
-      const updatedAuth = addAccount(auth, token, hostname);
+      const updatedAuth = addAccount(auth, 'OAuth App', token, hostname);
       setAuth(updatedAuth);
       saveState({ auth: updatedAuth, settings });
     },
@@ -178,7 +179,13 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
       await headNotifications(hostname, token);
 
       const user = await getUserData(token, hostname);
-      const updatedAuth = addAccount(auth, token, hostname, user);
+      const updatedAuth = addAccount(
+        auth,
+        'Personal Access Token',
+        token,
+        hostname,
+        user,
+      );
       setAuth(updatedAuth);
       saveState({ auth: updatedAuth, settings });
     },
@@ -190,7 +197,9 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     clearState();
   }, []);
 
-  const restoreSettings = useCallback(() => {
+  const restoreSettings = useCallback(async () => {
+    await migrateAuthenticatedAccounts();
+
     const existing = loadState();
 
     if (existing.auth) {