Merge branch 'main' into feat/filter-search

Author: setchy

src/renderer/context/App.test.tsx

@@ -201,6 +201,10 @@ describe('renderer/context/App.tsx', () => {
       });
     });
 
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+
     it('should call loginWithPersonalAccessToken', async () => {
       apiRequestAuthMock.mockResolvedValueOnce(null);
 
@@ -230,15 +234,10 @@ describe('renderer/context/App.tsx', () => {
         expect(fetchNotificationsMock).toHaveBeenCalledTimes(1),
       );
 
-      expect(apiRequestAuthMock).toHaveBeenCalledTimes(2);
+      expect(apiRequestAuthMock).toHaveBeenCalledTimes(1);
       expect(apiRequestAuthMock).toHaveBeenCalledWith(
         'https://api.github.com/notifications',
         'HEAD',
-        '123-456',
-      );
-      expect(apiRequestAuthMock).toHaveBeenCalledWith(
-        'https://api.github.com/user',
-        'GET',
         'encrypted',
       );
     });

src/renderer/context/App.tsx

@@ -223,7 +223,9 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
   const loginWithOAuthApp = useCallback(
     async (data: LoginOAuthAppOptions) => {
       const { authOptions, authCode } = await authGitHub(data);
+
       const { token, hostname } = await getToken(authCode, authOptions);
+
       const updatedAuth = await addAccount(auth, 'OAuth App', token, hostname);
       setAuth(updatedAuth);
       saveState({ auth: updatedAuth, settings });
@@ -233,7 +235,9 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
 
   const loginWithPersonalAccessToken = useCallback(
     async ({ token, hostname }: LoginPersonalAccessTokenOptions) => {
-      await headNotifications(hostname, token);
+      const encryptedToken = (await encryptValue(token)) as Token;
+      await headNotifications(hostname, encryptedToken);
+
       const updatedAuth = await addAccount(
         auth,
         'Personal Access Token',
@@ -248,10 +252,8 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
 
   const logoutFromAccount = useCallback(
     async (account: Account) => {
-      // Remove notifications for account
       removeAccountNotifications(account);
 
-      // Remove from auth state
       const updatedAuth = removeAccount(auth, account);
       setAuth(updatedAuth);
       saveState({ auth: updatedAuth, settings });

src/renderer/utils/notifications/handlers/checkSuite.ts

@@ -77,7 +77,7 @@ export function getCheckSuiteAttributes(
 
   return {
     workflowName,
-    attemptNumber: attemptNumber ? Number.parseInt(attemptNumber) : null,
+    attemptNumber: attemptNumber ? Number.parseInt(attemptNumber, 10) : null,
     status: getCheckSuiteStatus(statusDisplayName),
     statusDisplayName,
     branchName,