wip

Author: setchy

main.js

@@ -107,3 +107,5 @@ mb.on('ready', () => {
     app.setLoginItemSettings(settings);
   });
 });
+
+// TODO - Implement protocol event handler https://www.electronjs.org/docs/latest/api/protocol

package.json

@@ -72,6 +72,10 @@
       "main.js",
       "first-run.js"
     ],
+    "protocols": {
+      "name": "Gitify",
+      "schemes": ["gitify"]
+    },
     "mac": {
       "category": "public.app-category.developer-tools",
       "icon": "assets/images/app-icon.icns",

src/routes/Login.tsx

@@ -1,10 +1,12 @@
-import { KeyIcon, PersonIcon } from '@primer/octicons-react';
+import { KeyIcon, MarkGithubIcon, PersonIcon } from '@primer/octicons-react';
 import { ipcRenderer } from 'electron';
-import { type FC, useContext, useEffect } from 'react';
+import { type FC, useCallback, useContext, useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { Logo } from '../components/Logo';
 import { Button } from '../components/fields/Button';
 import { AppContext } from '../context/App';
+import { authGitHub, getGitHubAuthURL } from '../utils/auth/utils';
+import { openExternalLink } from '../utils/comms';
 
 export const LoginRoute: FC = () => {
   const navigate = useNavigate();
@@ -17,14 +19,14 @@ export const LoginRoute: FC = () => {
     }
   }, [isLoggedIn]);
 
-  // FIXME: Temporarily disable Login with GitHub (OAuth) as it's currently broken and requires a rewrite - see #485 #561 #747
-  /* const loginUser = useCallback(async () => {
+  const loginUser = useCallback(async () => {
     try {
-      await login();
+      openExternalLink(getGitHubAuthURL());
+      await authGitHub();
     } catch (err) {
       // Skip
     }
-  }, []); */
+  }, []);
 
   return (
     <div className="flex flex-1 flex-col justify-center items-center p-4 bg-white dark:bg-gray-dark dark:text-white">
@@ -35,19 +37,13 @@ export const LoginRoute: FC = () => {
       </div>
 
       <div className="font-semibold text-center text-sm italic">Login with</div>
-      {
-        // FIXME: Temporarily disable Login with GitHub (OAuth) as it's currently broken and requires a rewrite - see #485 #561 #747
-        /*    
-       <Button
+      <Button
         name="GitHub"
-        icon={MarkGitHubIcon}
+        icon={MarkGithubIcon}
         label="Login with GitHub"
-        class="w-50 px-2 py-2 my-2 text-xs"
+        class="py-2 mt-2"
         onClick={loginUser}
-      />  
-      */
-      }
-
+      />
       <Button
         name="Personal Access Token"
         icon={KeyIcon}

src/utils/auth/types.ts

@@ -6,6 +6,7 @@ export interface LoginOAuthAppOptions {
   hostname: string;
   clientId: string;
   clientSecret: string;
+  redirect: string;
 }
 
 export interface LoginPersonalAccessTokenOptions {

src/utils/auth/utils.ts

@@ -4,6 +4,7 @@ import type { Account, AuthState, GitifyUser } from '../../types';
 import type { UserDetails } from '../../typesGitHub';
 import { getAuthenticatedUser } from '../api/client';
 import { apiRequest } from '../api/request';
+import { openExternalLink } from '../comms';
 import { Constants } from '../constants';
 import { getPlatformFromHostname } from '../helpers';
 import type { AuthMethod, AuthResponse, AuthTokenResponse } from './types';
@@ -22,6 +23,9 @@ export const authGitHub = (
     const githubUrl = `https://${authOptions.hostname}/login/oauth/authorize`;
     const authUrl = `${githubUrl}?client_id=${authOptions.clientId}&scope=${Constants.AUTH_SCOPE}`;
 
+    console.log('ADAM HERE');
+    openExternalLink(authUrl);
+
     const session = authWindow.webContents.session;
     session.clearStorageData();
 
@@ -138,6 +142,22 @@ export function removeAccount(auth: AuthState, account: Account): AuthState {
   };
 }
 
+export function getGitHubAuthURL() {
+  const authURL = new URL(`https://${Constants.DEFAULT_AUTH_OPTIONS.hostname}`);
+  authURL.pathname = '/login/oauth/authorize';
+  authURL.searchParams.append(
+    'client_id',
+    Constants.DEFAULT_AUTH_OPTIONS.clientId,
+  );
+  authURL.searchParams.append(
+    'redirect_uri',
+    Constants.DEFAULT_AUTH_OPTIONS.redirect,
+  );
+  authURL.searchParams.append('scope', Constants.AUTH_SCOPE.join(','));
+
+  return authURL.toString();
+}
+
 export function getDeveloperSettingsURL(account: Account): string {
   const settingsURL = new URL(`https://${account.hostname}`);
 

src/utils/constants.ts

@@ -8,6 +8,7 @@ export const Constants = {
     hostname: 'github.com',
     clientId: process.env.OAUTH_CLIENT_ID,
     clientSecret: process.env.OAUTH_CLIENT_SECRET,
+    redirect: 'gitify://auth/callback',
   },
 
   GITHUB_API_BASE_URL: 'https://api.github.com',