refactor: use octokit client

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

Author: setchy

src/renderer/utils/api/client.ts

@@ -72,9 +72,8 @@ export async function listNotificationsForAuthenticatedUser(
           participating: settings.participating,
           all: settings.fetchReadNotifications,
           per_page: 100,
-          // TODO - is this the right way to do this
           headers: {
-            'If-None-Match': '', // Prevent caching
+            'Cache-Control': 'no-cache', // Prevent caching
           },
         },
       );
@@ -86,9 +85,8 @@ export async function listNotificationsForAuthenticatedUser(
         participating: settings.participating,
         all: settings.fetchReadNotifications,
         per_page: 100,
-        // TODO - is this the right way to do this
         headers: {
-          'If-None-Match': '', // Prevent caching
+          'Cache-Control': 'no-cache', // Prevent caching
         },
       });
 

src/renderer/utils/api/octokit.ts

@@ -5,8 +5,9 @@ import { restEndpointMethods } from '@octokit/plugin-rest-endpoint-methods';
 import type { Account } from '../../types';
 
 import { getAccountUUID } from '../auth/utils';
-import { decryptValue } from '../comms';
+import { decryptValue, getAppVersion } from '../comms';
 import { getGitHubAPIBaseUrl } from './utils';
+import { APPLICATION } from '../../../shared/constants';
 
 // Create the Octokit type with plugins
 const OctokitWithPlugins = Octokit.plugin(paginateRest, restEndpointMethods);
@@ -15,6 +16,8 @@ export type OctokitClient = InstanceType<typeof OctokitWithPlugins>;
 // Cache Octokit clients per account UUID
 const octokitClientCache = new Map<string, OctokitClient>();
 
+const version = getAppVersion()
+
 /**
  * Clear the Octokit client cache
  * Useful when accounts are added/removed or tokens change
@@ -52,6 +55,7 @@ export async function createOctokitClient(
   const client = new OctokitWithPlugins({
     auth: decryptedToken,
     baseUrl,
+    userAgent: `${APPLICATION.NAME}/${version}`
   });
 
   // Cache the client

src/renderer/utils/api/utils.test.ts

@@ -1,5 +1,3 @@
-import type { AxiosResponse } from 'axios';
-
 import type { Hostname } from '../../types';
 
 import {
@@ -46,44 +44,5 @@ describe('renderer/utils/api/utils.ts', () => {
     });
   });
 
-  describe('getNextURLFromLinkHeader', () => {
-    it('should parse next url from link header', () => {
-      const mockResponse = {
-        headers: {
-          link: '<https://api.github.com/notifications?participating=false&page=2>; rel="next", <https://api.github.com/notifications?participating=false&page=2>; rel="last"',
-        },
-      };
-
-      const result = getNextURLFromLinkHeader(
-        mockResponse as unknown as AxiosResponse,
-      );
-      expect(result.toString()).toBe(
-        'https://api.github.com/notifications?participating=false&page=2',
-      );
-    });
-
-    it('should return null if no next url in link header', () => {
-      const mockResponse = {
-        headers: {
-          link: '<https://api.github.com/notifications?participating=false&page=2>; rel="last"',
-        },
-      };
-
-      const result = getNextURLFromLinkHeader(
-        mockResponse as unknown as AxiosResponse,
-      );
-      expect(result).toBeNull();
-    });
-
-    it('should return null if no link header exists', () => {
-      const mockResponse = {
-        headers: {},
-      };
-
-      const result = getNextURLFromLinkHeader(
-        mockResponse as unknown as AxiosResponse,
-      );
-      expect(result).toBeNull();
-    });
-  });
+  
 });

src/renderer/utils/api/utils.ts

@@ -1,5 +1,3 @@
-import type { AxiosResponse } from 'axios';
-
 import { APPLICATION } from '../../../shared/constants';
 
 import { Constants } from '../../constants';
@@ -39,14 +37,6 @@ export function getGitHubGraphQLUrl(hostname: Hostname): URL {
   return url;
 }
 
-export function getNextURLFromLinkHeader(
-  response: AxiosResponse,
-): string | null {
-  const linkHeader = response.headers.link;
-  const matches = linkHeader?.match(/<([^<>]+)>;\s*rel="next"/);
-  return matches ? matches[1] : null;
-}
-
 export function getNumberFromUrl(url: string): number {
   return Number.parseInt(url.split('/').pop(), 10);
 }