fix tests

rename device flow login functions

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

Author: setchy

src/renderer/context/App.tsx

@@ -79,9 +79,11 @@ import {
 export interface AppContextState {
   auth: AuthState;
   isLoggedIn: boolean;
-  startGitHubDeviceFlow: () => Promise<DeviceFlowSession>;
-  pollGitHubDeviceFlow: (session: DeviceFlowSession) => Promise<Token | null>;
-  completeGitHubDeviceLogin: (
+  loginWithDeviceFlowStart: () => Promise<DeviceFlowSession>;
+  loginWithDeviceFlowPoll: (
+    session: DeviceFlowSession,
+  ) => Promise<Token | null>;
+  loginWithDeviceFlowComplete: (
     token: Token,
     hostname?: Hostname,
   ) => Promise<void>;
@@ -406,25 +408,31 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
   }, [auth]);
 
   /**
-   * Start a GitHub device flow session.
+   * Login to GitHub Gitify OAuth App.
+   *
+   * Initiate device flow session.
    */
-  const startGitHubDeviceFlowWithDefaults = useCallback(
+  const loginWithDeviceFlowStart = useCallback(
     async () => await startGitHubDeviceFlow(),
     [],
   );
 
   /**
-   * Poll GitHub device flow session for completion.
+   * Login to GitHub Gitify OAuth App.
+   *
+   * Poll for device flow session.
    */
-  const pollGitHubDeviceFlowWithSession = useCallback(
+  const loginWithDeviceFlowPoll = useCallback(
     async (session: DeviceFlowSession) => await pollGitHubDeviceFlow(session),
     [],
   );
 
   /**
-   * Persist GitHub app login after device flow completes.
+   * Login to GitHub Gitify OAuth App.
+   *
+   * Finalize device flow session.
    */
-  const completeGitHubDeviceLogin = useCallback(
+  const loginWithDeviceFlowComplete = useCallback(
     async (
       token: Token,
       hostname: Hostname = Constants.OAUTH_DEVICE_FLOW.hostname,
@@ -520,9 +528,9 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     () => ({
       auth,
       isLoggedIn,
-      startGitHubDeviceFlow: startGitHubDeviceFlowWithDefaults,
-      pollGitHubDeviceFlow: pollGitHubDeviceFlowWithSession,
-      completeGitHubDeviceLogin,
+      loginWithDeviceFlowStart,
+      loginWithDeviceFlowPoll,
+      loginWithDeviceFlowComplete,
       loginWithOAuthApp,
       loginWithPersonalAccessToken,
       logoutFromAccount,
@@ -552,9 +560,9 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     [
       auth,
       isLoggedIn,
-      startGitHubDeviceFlowWithDefaults,
-      pollGitHubDeviceFlowWithSession,
-      completeGitHubDeviceLogin,
+      loginWithDeviceFlowStart,
+      loginWithDeviceFlowPoll,
+      loginWithDeviceFlowComplete,
       loginWithOAuthApp,
       loginWithPersonalAccessToken,
       logoutFromAccount,

src/renderer/routes/LoginWithDeviceFlow.test.tsx

@@ -25,7 +25,7 @@ describe('renderer/routes/LoginWithDeviceFlow.tsx', () => {
   });
 
   it('should render and initialize device flow', async () => {
-    const startGitHubDeviceFlowMock = jest.fn().mockResolvedValueOnce({
+    const loginWithDeviceFlowStartMock = jest.fn().mockResolvedValueOnce({
       hostname: 'github.com',
       clientId: 'test-id',
       deviceCode: 'device-code',
@@ -36,10 +36,10 @@ describe('renderer/routes/LoginWithDeviceFlow.tsx', () => {
     });
 
     renderWithAppContext(<LoginWithDeviceFlowRoute />, {
-      startGitHubDeviceFlow: startGitHubDeviceFlowMock,
+      loginWithDeviceFlowStart: loginWithDeviceFlowStartMock,
     });
 
-    expect(startGitHubDeviceFlowMock).toHaveBeenCalled();
+    expect(loginWithDeviceFlowStartMock).toHaveBeenCalled();
 
     await screen.findByText(/USER-1234/);
     expect(screen.getByText(/github.com\/login\/device/)).toBeInTheDocument();
@@ -52,7 +52,7 @@ describe('renderer/routes/LoginWithDeviceFlow.tsx', () => {
   });
 
   it('should copy user code to clipboard when clicking copy button', async () => {
-    const startGitHubDeviceFlowMock = jest.fn().mockResolvedValueOnce({
+    const loginWithDeviceFlowStartMock = jest.fn().mockResolvedValueOnce({
       hostname: 'github.com',
       clientId: 'test-id',
       deviceCode: 'device-code',
@@ -63,7 +63,7 @@ describe('renderer/routes/LoginWithDeviceFlow.tsx', () => {
     });
 
     renderWithAppContext(<LoginWithDeviceFlowRoute />, {
-      startGitHubDeviceFlow: startGitHubDeviceFlowMock,
+      loginWithDeviceFlowStart: loginWithDeviceFlowStartMock,
     });
 
     await screen.findByText(/USER-1234/);
@@ -77,19 +77,19 @@ describe('renderer/routes/LoginWithDeviceFlow.tsx', () => {
   });
 
   it('should handle device flow errors during initialization', async () => {
-    const startGitHubDeviceFlowMock = jest
+    const loginWithDeviceFlowStartMock = jest
       .fn()
       .mockRejectedValueOnce(new Error('Network error'));
 
     renderWithAppContext(<LoginWithDeviceFlowRoute />, {
-      startGitHubDeviceFlow: startGitHubDeviceFlowMock,
+      loginWithDeviceFlowStart: loginWithDeviceFlowStartMock,
     });
 
     await screen.findByText(/Failed to start authentication/);
   });
 
   it('should navigate back on cancel', async () => {
-    const startGitHubDeviceFlowMock = jest.fn().mockResolvedValueOnce({
+    const loginWithDeviceFlowStartMock = jest.fn().mockResolvedValueOnce({
       hostname: 'github.com',
       clientId: 'test-id',
       deviceCode: 'device-code',
@@ -100,7 +100,7 @@ describe('renderer/routes/LoginWithDeviceFlow.tsx', () => {
     });
 
     renderWithAppContext(<LoginWithDeviceFlowRoute />, {
-      startGitHubDeviceFlow: startGitHubDeviceFlowMock,
+      loginWithDeviceFlowStart: loginWithDeviceFlowStartMock,
     });
 
     await screen.findByText(/USER-1234/);

src/renderer/routes/LoginWithDeviceFlow.tsx

@@ -28,9 +28,9 @@ export const LoginWithDeviceFlowRoute: FC = () => {
   const navigate = useNavigate();
 
   const {
-    startGitHubDeviceFlow,
-    pollGitHubDeviceFlow,
-    completeGitHubDeviceLogin,
+    loginWithDeviceFlowStart,
+    loginWithDeviceFlowPoll,
+    loginWithDeviceFlowComplete,
   } = useAppContext();
 
   const [session, setSession] = useState<DeviceFlowSession | null>(null);
@@ -41,7 +41,7 @@ export const LoginWithDeviceFlowRoute: FC = () => {
   useEffect(() => {
     const initializeDeviceFlow = async () => {
       try {
-        const newSession = await startGitHubDeviceFlow();
+        const newSession = await loginWithDeviceFlowStart();
         setSession(newSession);
 
         // Auto-copy the user code to clipboard
@@ -60,7 +60,7 @@ export const LoginWithDeviceFlowRoute: FC = () => {
     };
 
     initializeDeviceFlow();
-  }, [startGitHubDeviceFlow]);
+  }, [loginWithDeviceFlowStart]);
 
   // Poll for device flow completion
   useEffect(() => {
@@ -77,10 +77,10 @@ export const LoginWithDeviceFlowRoute: FC = () => {
 
       try {
         while (isActive && Date.now() < session.expiresAt) {
-          const token = await pollGitHubDeviceFlow(session);
+          const token = await loginWithDeviceFlowPoll(session);
 
           if (token && isActive) {
-            await completeGitHubDeviceLogin(token, session.hostname);
+            await loginWithDeviceFlowComplete(token, session.hostname);
             navigate(-1);
             return;
           }
@@ -117,7 +117,7 @@ export const LoginWithDeviceFlowRoute: FC = () => {
         clearTimeout(timeoutId);
       }
     };
-  }, [session, pollGitHubDeviceFlow, completeGitHubDeviceLogin]);
+  }, [session, loginWithDeviceFlowPoll, loginWithDeviceFlowComplete]);
 
   const handleCopyUserCode = useCallback(async () => {
     if (session?.userCode) {