From 4cb2136fcd961cc62fdee4f46b0df8f210061ffc Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Wed, 28 Aug 2024 08:16:00 -0400
Subject: [PATCH 01/15] feat: add bitbucket cloud support

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/app.tsx                                   |   7 +-
 .../settings/SettingsFooter.test.tsx          |   2 +-
 src/components/settings/SettingsFooter.tsx    |   2 +-
 src/context/App.tsx                           |  19 +++
 src/routes/Accounts.test.tsx                  |   2 +-
 src/routes/Accounts.tsx                       |  21 ++-
 src/routes/Login.tsx                          |  15 +-
 src/routes/LoginWithBitbucketCloud.tsx        | 137 ++++++++++++++++++
 src/types.ts                                  |   4 +
 src/utils/auth/types.ts                       |  19 ++-
 src/utils/auth/utils.ts                       |  17 ++-
 src/utils/constants.ts                        |   7 +
 src/utils/helpers.ts                          |   4 +
 src/utils/notifications.ts                    |   8 +-
 14 files changed, 250 insertions(+), 14 deletions(-)
 create mode 100644 src/routes/LoginWithBitbucketCloud.tsx

diff --git a/src/app.tsx b/src/app.tsx
index ba4c4e721..c22af7d42 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -12,6 +12,7 @@ import { AppContext, AppProvider } from './context/App';
 import { AccountsRoute } from './routes/Accounts';
 import { FiltersRoute } from './routes/Filters';
 import { LoginRoute } from './routes/Login';
+import { LoginWithBitbucketCloud } from './routes/LoginWithBitbucketCloud';
 import { LoginWithOAuthApp } from './routes/LoginWithOAuthApp';
 import { LoginWithPersonalAccessToken } from './routes/LoginWithPersonalAccessToken';
 import { NotificationsRoute } from './routes/Notifications';
@@ -61,7 +62,7 @@ export const App = () => {
               }
             />
             <Route
-              path="/accounts"
+              path="/settings/accounts"
               element={
                 <RequireAuth>
                   <AccountsRoute />
@@ -74,6 +75,10 @@ export const App = () => {
               element={<LoginWithPersonalAccessToken />}
             />
             <Route path="/login-oauth-app" element={<LoginWithOAuthApp />} />
+            <Route
+              path="/login-bitbucket-cloud"
+              element={<LoginWithBitbucketCloud />}
+            />
           </Routes>
         </div>
       </Router>
diff --git a/src/components/settings/SettingsFooter.test.tsx b/src/components/settings/SettingsFooter.test.tsx
index 86b624f01..094a7232e 100644
--- a/src/components/settings/SettingsFooter.test.tsx
+++ b/src/components/settings/SettingsFooter.test.tsx
@@ -125,7 +125,7 @@ describe('routes/components/settings/SettingsFooter.tsx', () => {
     });
 
     fireEvent.click(screen.getByTitle('Accounts'));
-    expect(mockNavigate).toHaveBeenCalledWith('/accounts');
+    expect(mockNavigate).toHaveBeenCalledWith('/settings/accounts');
   });
 
   it('should quit the app', async () => {
diff --git a/src/components/settings/SettingsFooter.tsx b/src/components/settings/SettingsFooter.tsx
index a5fd609a4..58d4454e5 100644
--- a/src/components/settings/SettingsFooter.tsx
+++ b/src/components/settings/SettingsFooter.tsx
@@ -39,7 +39,7 @@ export const SettingsFooter: FC = () => {
           className={BUTTON_CLASS_NAME}
           title="Accounts"
           onClick={() => {
-            navigate('/accounts');
+            navigate('/settings/accounts');
           }}
         >
           <PersonIcon size={Size.LARGE} aria-label="Accounts" />
diff --git a/src/context/App.tsx b/src/context/App.tsx
index eb93a8e91..a56bd3478 100644
--- a/src/context/App.tsx
+++ b/src/context/App.tsx
@@ -15,6 +15,7 @@ import {
   type AuthState,
   type GitifyError,
   GroupBy,
+  type Hostname,
   OpenPreference,
   type SettingsState,
   type SettingsValue,
@@ -25,6 +26,7 @@ import type { Notification } from '../typesGitHub';
 import { headNotifications } from '../utils/api/client';
 import { migrateAuthenticatedAccounts } from '../utils/auth/migration';
 import type {
+  LoginBitbucketCloudOptions,
   LoginOAuthAppOptions,
   LoginPersonalAccessTokenOptions,
 } from '../utils/auth/types';
@@ -97,6 +99,7 @@ interface AppContextState {
   loginWithGitHubApp: () => void;
   loginWithOAuthApp: (data: LoginOAuthAppOptions) => void;
   loginWithPersonalAccessToken: (data: LoginPersonalAccessTokenOptions) => void;
+  loginWithBitbucketCloud: (data: LoginBitbucketCloudOptions) => void;
   logoutFromAccount: (account: Account) => void;
 
   notifications: AccountNotifications[];
@@ -242,6 +245,21 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     [auth, settings],
   );
 
+  const loginWithBitbucketCloud = useCallback(
+    async ({ token, workspace, username }: LoginBitbucketCloudOptions) => {
+      const updatedAuth = await addAccount(
+        auth,
+        'App Password',
+        token,
+        `https://api.bitbucket.org/internal/workspaces/${workspace}` as Hostname,
+        username,
+      );
+      setAuth(updatedAuth);
+      saveState({ auth: updatedAuth, settings });
+    },
+    [auth, settings],
+  );
+
   const logoutFromAccount = useCallback(
     async (account: Account) => {
       // Remove notifications for account
@@ -320,6 +338,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
         loginWithGitHubApp,
         loginWithOAuthApp,
         loginWithPersonalAccessToken,
+        loginWithBitbucketCloud,
         logoutFromAccount,
 
         notifications,
diff --git a/src/routes/Accounts.test.tsx b/src/routes/Accounts.test.tsx
index 768c7f25f..b03726d17 100644
--- a/src/routes/Accounts.test.tsx
+++ b/src/routes/Accounts.test.tsx
@@ -196,7 +196,7 @@ describe('routes/Accounts.tsx', () => {
         'token-123-456',
       );
       await waitFor(() =>
-        expect(mockNavigate).toHaveBeenNthCalledWith(1, '/accounts', {
+        expect(mockNavigate).toHaveBeenNthCalledWith(1, '/settings/accounts', {
           replace: true,
         }),
       );
diff --git a/src/routes/Accounts.tsx b/src/routes/Accounts.tsx
index ae8ffc8b8..891c2806c 100644
--- a/src/routes/Accounts.tsx
+++ b/src/routes/Accounts.tsx
@@ -1,4 +1,5 @@
 import {
+  BeakerIcon,
   FeedPersonIcon,
   KeyIcon,
   MarkGithubIcon,
@@ -48,7 +49,7 @@ export const AccountsRoute: FC = () => {
   const setAsPrimaryAccount = useCallback((account: Account) => {
     auth.accounts = [account, ...auth.accounts.filter((a) => a !== account)];
     saveState({ auth, settings });
-    navigate('/accounts', { replace: true });
+    navigate('/settings/accounts', { replace: true });
   }, []);
 
   const loginWithGitHub = useCallback(async () => {
@@ -67,6 +68,10 @@ export const AccountsRoute: FC = () => {
     return navigate('/login-oauth-app', { replace: true });
   }, []);
 
+  const loginWithBitbucketCloud = useCallback(() => {
+    return navigate('/login-bitbucket-cloud', { replace: true });
+  }, []);
+
   return (
     <div className="flex h-screen flex-col" data-testid="accounts">
       <Header icon={PersonIcon}>Accounts</Header>
@@ -155,7 +160,7 @@ export const AccountsRoute: FC = () => {
                   title={`Refresh ${account.user.login}`}
                   onClick={async () => {
                     await refreshAccount(account);
-                    navigate('/accounts', { replace: true });
+                    navigate('/settings/accounts', { replace: true });
                   }}
                 >
                   <SyncIcon
@@ -216,6 +221,18 @@ export const AccountsRoute: FC = () => {
             <PersonIcon size={Size.XLARGE} aria-label="Login with OAuth App" />
             <PlusIcon size={Size.SMALL} className="mb-2" />
           </button>
+          <button
+            type="button"
+            className={BUTTON_CLASS_NAME}
+            title="Login with Bitbucket Cloud"
+            onClick={loginWithBitbucketCloud}
+          >
+            <BeakerIcon
+              size={Size.XLARGE}
+              aria-label="Login with Bitbucket Cloud"
+            />
+            <PlusIcon size={Size.SMALL} className="mb-2" />
+          </button>
         </div>
       </div>
     </div>
diff --git a/src/routes/Login.tsx b/src/routes/Login.tsx
index 2a661eb67..8e2a41767 100644
--- a/src/routes/Login.tsx
+++ b/src/routes/Login.tsx
@@ -1,4 +1,9 @@
-import { KeyIcon, MarkGithubIcon, PersonIcon } from '@primer/octicons-react';
+import {
+  BeakerIcon,
+  KeyIcon,
+  MarkGithubIcon,
+  PersonIcon,
+} from '@primer/octicons-react';
 import log from 'electron-log';
 import { type FC, useCallback, useContext, useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
@@ -63,6 +68,14 @@ export const LoginRoute: FC = () => {
       >
         OAuth App
       </Button>
+      <Button
+        icon={{ icon: BeakerIcon }}
+        label="Login with Bitbucket Cloud"
+        className="mt-2 py-2"
+        onClick={() => navigate('/login-bitbucket-cloud')}
+      >
+        Bitbucket Cloud
+      </Button>
     </div>
   );
 };
diff --git a/src/routes/LoginWithBitbucketCloud.tsx b/src/routes/LoginWithBitbucketCloud.tsx
new file mode 100644
index 000000000..e8675c150
--- /dev/null
+++ b/src/routes/LoginWithBitbucketCloud.tsx
@@ -0,0 +1,137 @@
+import { BookIcon, KeyIcon, SignInIcon } from '@primer/octicons-react';
+import log from 'electron-log';
+import { type FC, useCallback, useContext, useState } from 'react';
+import { Form, type FormRenderProps } from 'react-final-form';
+import { useNavigate } from 'react-router-dom';
+import { Header } from '../components/Header';
+import { Button } from '../components/buttons/Button';
+import { FieldInput } from '../components/fields/FieldInput';
+import { AppContext } from '../context/App';
+import { Size, type Token, type Username, type Workspace } from '../types';
+import type { LoginBitbucketCloudOptions } from '../utils/auth/types';
+import { isValidAppPassword } from '../utils/auth/utils';
+import { Constants } from '../utils/constants';
+
+interface IValues {
+  username: Username;
+  token?: Token;
+  workspace?: Workspace;
+}
+
+interface IFormErrors {
+  username?: string;
+  token?: string;
+  workspace?: string;
+}
+
+export const validate = (values: IValues): IFormErrors => {
+  const errors: IFormErrors = {};
+
+  if (!values.username) {
+    errors.token = 'Required';
+  }
+
+  if (!values.token) {
+    errors.token = 'Required';
+  } else if (!isValidAppPassword(values.token)) {
+    errors.token = 'Invalid app password.';
+  }
+
+  if (!values.workspace) {
+    errors.workspace = 'Required';
+  }
+
+  return errors;
+};
+
+export const LoginWithBitbucketCloud: FC = () => {
+  const { loginWithBitbucketCloud } = useContext(AppContext);
+  const navigate = useNavigate();
+  const [isValidToken, setIsValidToken] = useState<boolean>(true);
+
+  const renderForm = (formProps: FormRenderProps) => {
+    const { handleSubmit, submitting, pristine, values } = formProps;
+
+    return (
+      <form onSubmit={handleSubmit}>
+        <FieldInput
+          name="username"
+          label="Username"
+          placeholder="Your Bitbucket Cloud username"
+        />
+
+        <FieldInput
+          name="token"
+          label="App Password"
+          placeholder="The 36 characters app password generated on Bitbucket Cloud"
+        />
+
+        <FieldInput
+          name="workspace"
+          label="Workspace"
+          placeholder="Your Bitbucket Cloud workspace name"
+        />
+
+        {!isValidToken && (
+          <div className="mt-4 text-sm font-medium text-red-500">
+            This token could not be validated with {values.workspace}.
+          </div>
+        )}
+
+        <div className="flex items-end justify-between mt-2">
+          <Button
+            label="Bitbucket Cloud Docs"
+            icon={{ icon: BookIcon, size: Size.XSMALL }}
+            url={Constants.ATLASSIAN_DOCS.BITBUCKET_APP_PASSWORD_URL}
+            size="xs"
+          >
+            Docs
+          </Button>
+          <Button
+            label="Login"
+            className="px-4 py-2 !text-sm"
+            icon={{ icon: SignInIcon, size: Size.MEDIUM }}
+            disabled={submitting || pristine}
+            type="submit"
+          >
+            Login
+          </Button>
+        </div>
+      </form>
+    );
+  };
+
+  const login = useCallback(
+    async (data: IValues) => {
+      setIsValidToken(true);
+      try {
+        await loginWithBitbucketCloud(data as LoginBitbucketCloudOptions);
+        navigate(-1);
+      } catch (err) {
+        log.error('Auth: failed to login with personal access token', err);
+        setIsValidToken(false);
+      }
+    },
+    [loginWithBitbucketCloud],
+  );
+
+  return (
+    <>
+      <Header icon={KeyIcon}>Login with Bitbucket Cloud</Header>
+
+      <div className="px-8">
+        <Form
+          initialValues={{
+            username: '' as Username,
+            token: '' as Token,
+            workspace: '' as Workspace,
+          }}
+          onSubmit={login}
+          validate={validate}
+        >
+          {renderForm}
+        </Form>
+      </div>
+    </>
+  );
+};
diff --git a/src/types.ts b/src/types.ts
index d21ffb95f..c17a6b83f 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -39,6 +39,10 @@ export type ClientSecret = Branded<string, 'ClientSecret'>;
 
 export type Hostname = Branded<string, 'Hostname'>;
 
+export type Username = Branded<string, 'Username'>;
+
+export type Workspace = Branded<string, 'Workspace'>;
+
 export type Link = Branded<string, 'WebUrl'>;
 
 export type Status = 'loading' | 'success' | 'error';
diff --git a/src/utils/auth/types.ts b/src/utils/auth/types.ts
index d66bbbce4..730840d2a 100644
--- a/src/utils/auth/types.ts
+++ b/src/utils/auth/types.ts
@@ -4,11 +4,20 @@ import type {
   ClientSecret,
   Hostname,
   Token,
+  Username,
+  Workspace,
 } from '../../types';
 
-export type AuthMethod = 'GitHub App' | 'Personal Access Token' | 'OAuth App';
+export type AuthMethod =
+  | 'GitHub App'
+  | 'Personal Access Token'
+  | 'OAuth App'
+  | 'App Password';
 
-export type PlatformType = 'GitHub Cloud' | 'GitHub Enterprise Server';
+export type PlatformType =
+  | 'GitHub Cloud'
+  | 'GitHub Enterprise Server'
+  | 'Bitbucket Cloud';
 
 export interface LoginOAuthAppOptions {
   hostname: Hostname;
@@ -21,6 +30,12 @@ export interface LoginPersonalAccessTokenOptions {
   token: Token;
 }
 
+export interface LoginBitbucketCloudOptions {
+  username: Username;
+  token: Token;
+  workspace: Workspace;
+}
+
 export interface AuthResponse {
   authCode: AuthCode;
   authOptions: LoginOAuthAppOptions;
diff --git a/src/utils/auth/utils.ts b/src/utils/auth/utils.ts
index d79fcbce0..8be9d7f18 100644
--- a/src/utils/auth/utils.ts
+++ b/src/utils/auth/utils.ts
@@ -10,6 +10,7 @@ import type {
   Hostname,
   Link,
   Token,
+  Username,
 } from '../../types';
 import type { UserDetails } from '../../typesGitHub';
 import { getAuthenticatedUser } from '../api/client';
@@ -128,6 +129,7 @@ export async function addAccount(
   method: AuthMethod,
   token: Token,
   hostname: Hostname,
+  username?: Username,
 ): Promise<AuthState> {
   let newAccount = {
     hostname: hostname,
@@ -136,7 +138,16 @@ export async function addAccount(
     token: token,
   } as Account;
 
-  newAccount = await refreshAccount(newAccount);
+  if (newAccount.platform === 'Bitbucket Cloud') {
+    newAccount.user = {
+      id: 0,
+      login: username,
+      name: username,
+      avatar: null,
+    };
+  } else {
+    newAccount = await refreshAccount(newAccount);
+  }
 
   return {
     accounts: [...auth.accounts, newAccount],
@@ -238,6 +249,10 @@ export function isValidToken(token: Token) {
   return /^[A-Z0-9_]{40}$/i.test(token);
 }
 
+export function isValidAppPassword(token: Token) {
+  return /^[A-Z0-9_]{36}$/i.test(token);
+}
+
 export function getAccountUUID(account: Account): string {
   return btoa(`${account.hostname}-${account.user.id}-${account.method}`);
 }
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index eabacbaeb..ead888d29 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -11,6 +11,8 @@ export const Constants = {
     clientSecret: process.env.OAUTH_CLIENT_SECRET as ClientSecret,
   },
 
+  BITBUCKET_API_BASE_URL: 'https://api.bitbucket.org/',
+
   GITHUB_API_BASE_URL: 'https://api.github.com/',
   GITHUB_API_GRAPHQL_URL: 'https://api.github.com/graphql',
 
@@ -35,6 +37,11 @@ export const Constants = {
     PARTICIPATING_URL:
       'https://docs.github.com/en/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications#about-participating-and-watching-notifications' as Link,
   },
+
+  ATLASSIAN_DOCS: {
+    BITBUCKET_APP_PASSWORD_URL:
+      'https://support.atlassian.com/bitbucket-cloud/docs/app-passwords/' as Link,
+  },
 };
 
 export const Errors: Record<ErrorType, GitifyError> = {
diff --git a/src/utils/helpers.ts b/src/utils/helpers.ts
index eb688437d..755467da6 100644
--- a/src/utils/helpers.ts
+++ b/src/utils/helpers.ts
@@ -12,6 +12,10 @@ import {
 } from './subject';
 
 export function getPlatformFromHostname(hostname: string): PlatformType {
+  if (hostname.startsWith(Constants.BITBUCKET_API_BASE_URL)) {
+    return 'Bitbucket Cloud';
+  }
+
   return hostname.endsWith(Constants.DEFAULT_AUTH_OPTIONS.hostname)
     ? 'GitHub Cloud'
     : 'GitHub Enterprise Server';
diff --git a/src/utils/notifications.ts b/src/utils/notifications.ts
index 0a2dc618f..9ea253bc6 100644
--- a/src/utils/notifications.ts
+++ b/src/utils/notifications.ts
@@ -114,10 +114,10 @@ function getNotifications(state: GitifyState) {
   return state.auth.accounts.map((account) => {
     return {
       account,
-      notifications: listNotificationsForAuthenticatedUser(
-        account,
-        state.settings,
-      ),
+      notifications:
+        account.platform === 'Bitbucket Cloud'
+          ? null
+          : listNotificationsForAuthenticatedUser(account, state.settings),
     };
   });
 }

From 3fcc1f38403c2365c28ba7d1b261c237f7e0075f Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Wed, 28 Aug 2024 08:29:11 -0400
Subject: [PATCH 02/15] feat: add bitbucket cloud support

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/utils/api/client.ts    | 20 ++++++++++++++++-
 src/utils/api/request.ts   | 14 ++++++++++++
 src/utils/notifications.ts | 45 +++++++++++++++++++++++---------------
 3 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/src/utils/api/client.ts b/src/utils/api/client.ts
index a2f133e89..05ce8626f 100644
--- a/src/utils/api/client.ts
+++ b/src/utils/api/client.ts
@@ -24,7 +24,7 @@ import type {
 } from '../../typesGitHub';
 import { QUERY_SEARCH_DISCUSSIONS } from './graphql/discussions';
 import { formatAsGitHubSearchSyntax } from './graphql/utils';
-import { apiRequestAuth } from './request';
+import { apiRequestAuth, apiRequestBitbucket } from './request';
 import { getGitHubAPIBaseUrl, getGitHubGraphQLUrl } from './utils';
 
 /**
@@ -69,6 +69,24 @@ export function listNotificationsForAuthenticatedUser(
   return apiRequestAuth(url.toString() as Link, 'GET', account.token);
 }
 
+/**
+ * List all notifications for the current user, sorted by most recently updated.
+ *
+ * Endpoint documentation: https://docs.github.com/en/rest/activity/notifications#list-notifications-for-the-authenticated-user
+ */
+export function listBitbucketWork(
+  account: Account,
+): AxiosPromise<Notification[]> {
+  const url = `${account.hostname}/overview-view-state?fields=pullRequestFilters.*,pullRequests.authored.links.html,-pullRequests.authored.extra.*`;
+
+  return apiRequestBitbucket(
+    url.toString() as Link,
+    'GET',
+    account.user.login,
+    account.token,
+  );
+}
+
 /**
  * Marks a thread as "read." Marking a thread as "read" is equivalent to
  * clicking a notification in your notification inbox on GitHub.
diff --git a/src/utils/api/request.ts b/src/utils/api/request.ts
index 03a71b175..90f955c8b 100644
--- a/src/utils/api/request.ts
+++ b/src/utils/api/request.ts
@@ -24,3 +24,17 @@ export function apiRequestAuth(
   axios.defaults.headers.common['Content-Type'] = 'application/json';
   return axios({ method, url, data });
 }
+
+export function apiRequestBitbucket(
+  url: Link,
+  method: Method,
+  username: string,
+  token: Token,
+  data = {},
+): AxiosPromise | null {
+  axios.defaults.headers.common.Accept = 'application/json';
+  axios.defaults.headers.common.Authorization = `Basic ${btoa(`${username}:${token}`)}`;
+  axios.defaults.headers.common['Cache-Control'] = 'no-cache';
+  axios.defaults.headers.common['Content-Type'] = 'application/json';
+  return axios({ method, url, data });
+}
diff --git a/src/utils/notifications.ts b/src/utils/notifications.ts
index 9ea253bc6..a50a20384 100644
--- a/src/utils/notifications.ts
+++ b/src/utils/notifications.ts
@@ -5,7 +5,10 @@ import type {
   SettingsState,
 } from '../types';
 import { Notification } from '../typesGitHub';
-import { listNotificationsForAuthenticatedUser } from './api/client';
+import {
+  listBitbucketWork,
+  listNotificationsForAuthenticatedUser,
+} from './api/client';
 import { determineFailureType } from './api/errors';
 import { getAccountUUID } from './auth/utils';
 import { hideWindow, showWindow, updateTrayIcon } from './comms';
@@ -116,7 +119,7 @@ function getNotifications(state: GitifyState) {
       account,
       notifications:
         account.platform === 'Bitbucket Cloud'
-          ? null
+          ? listBitbucketWork(account)
           : listNotificationsForAuthenticatedUser(account, state.settings),
     };
   });
@@ -132,22 +135,28 @@ export async function getAllNotifications(
       .filter((response) => !!response)
       .map(async (accountNotifications) => {
         try {
-          let notifications = (
-            await accountNotifications.notifications
-          ).data.map((notification: Notification) => ({
-            ...notification,
-            account: accountNotifications.account,
-          }));
-
-          notifications = await enrichNotifications(notifications, state);
-
-          notifications = filterNotifications(notifications, state.settings);
-
-          return {
-            account: accountNotifications.account,
-            notifications: notifications,
-            error: null,
-          };
+          if (accountNotifications.account.platform === 'Bitbucket Cloud') {
+            console.log(
+              JSON.stringify(await accountNotifications.notifications),
+            );
+          } else {
+            let notifications = (
+              await accountNotifications.notifications
+            ).data.map((notification: Notification) => ({
+              ...notification,
+              account: accountNotifications.account,
+            }));
+
+            notifications = await enrichNotifications(notifications, state);
+
+            notifications = filterNotifications(notifications, state.settings);
+
+            return {
+              account: accountNotifications.account,
+              notifications: notifications,
+              error: null,
+            };
+          }
         } catch (error) {
           log.error(
             'Error occurred while fetching account notifications',

From 3734ce17da47645771caba2c09fa7a147928c17b Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Wed, 28 Aug 2024 08:40:57 -0400
Subject: [PATCH 03/15] feat: add bitbucket cloud support

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/utils/notifications.ts | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/utils/notifications.ts b/src/utils/notifications.ts
index a50a20384..2c36022e5 100644
--- a/src/utils/notifications.ts
+++ b/src/utils/notifications.ts
@@ -135,10 +135,37 @@ export async function getAllNotifications(
       .filter((response) => !!response)
       .map(async (accountNotifications) => {
         try {
+          // TODO - this needs to be correctly implemented
           if (accountNotifications.account.platform === 'Bitbucket Cloud') {
-            console.log(
-              JSON.stringify(await accountNotifications.notifications),
-            );
+            const pulls =
+              // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+              ((await accountNotifications.notifications).data as any)
+                .pullRequests.authored;
+
+            console.log(JSON.stringify(pulls, null, 2));
+
+            const notifications = pulls.map((pull: any) => ({
+              id: 1,
+              reason: 'pull_request',
+              repository: {
+                full_name: pull.links.html.href,
+                owner: {
+                  avatar_url:
+                    'https://avatars.githubusercontent.com/u/987654321?v=4',
+                },
+              },
+              subject: {
+                title: pull.extra.commit_statuses[0].key,
+                url: pull.links.html.href,
+              },
+              account: accountNotifications.account,
+            }));
+
+            return {
+              account: accountNotifications.account,
+              notifications: notifications,
+              error: null,
+            };
           } else {
             let notifications = (
               await accountNotifications.notifications

From b6535ba56385b7c2649518543e6e26c4474cff20 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sun, 1 Sep 2024 11:49:57 -0400
Subject: [PATCH 04/15] feat: bitbucket cloud support

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/utils/api/client.ts    |  3 ++-
 src/utils/notifications.ts | 25 ++++++++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/utils/api/client.ts b/src/utils/api/client.ts
index 05ce8626f..0e5af3e75 100644
--- a/src/utils/api/client.ts
+++ b/src/utils/api/client.ts
@@ -77,8 +77,9 @@ export function listNotificationsForAuthenticatedUser(
 export function listBitbucketWork(
   account: Account,
 ): AxiosPromise<Notification[]> {
-  const url = `${account.hostname}/overview-view-state?fields=pullRequestFilters.*,pullRequests.authored.links.html,-pullRequests.authored.extra.*`;
+  const url = `${account.hostname}/overview-view-state?fields=pullRequests.reviewing.id,pullRequests.reviewing.title,pullRequest.reviewing.state,pullRequests.reviewing.author,pullRequests.reviewing.created_on,pullRequests.reviewing.updated_on,pullRequests.reviewing.links,pullRequests.reviewing.task_count,pullRequests.reviewing.comment_count,pullRequests.reviewing.destination.repository.*`;
 
+  console.log(url);
   return apiRequestBitbucket(
     url.toString() as Link,
     'GET',
diff --git a/src/utils/notifications.ts b/src/utils/notifications.ts
index 2c36022e5..2756997f2 100644
--- a/src/utils/notifications.ts
+++ b/src/utils/notifications.ts
@@ -140,23 +140,30 @@ export async function getAllNotifications(
             const pulls =
               // biome-ignore lint/suspicious/noExplicitAny: <explanation>
               ((await accountNotifications.notifications).data as any)
-                .pullRequests.authored;
+                .pullRequests?.reviewing;
 
-            console.log(JSON.stringify(pulls, null, 2));
-
-            const notifications = pulls.map((pull: any) => ({
+            const notifications = pulls?.map((pull: any) => ({
               id: 1,
-              reason: 'pull_request',
+              reason: 'review_requested',
+              updated_at: pull.updated_on,
+              url: pull.links.html.href,
               repository: {
-                full_name: pull.links.html.href,
+                full_name: pull.destination.repository.links.html.href,
                 owner: {
-                  avatar_url:
-                    'https://avatars.githubusercontent.com/u/987654321?v=4',
+                  avatar_url: pull.destination.repository.links.avatar.href,
                 },
               },
               subject: {
-                title: pull.extra.commit_statuses[0].key,
+                number: pull.id,
+                title: pull.title,
                 url: pull.links.html.href,
+                type: 'PullRequest',
+                user: {
+                  login: pull.author.display_name,
+                  html_url: pull.author.links.html.href,
+                  avatar_url: pull.author.links.avatar.href,
+                  type: 'User',
+                },
               },
               account: accountNotifications.account,
             }));

From 812fcfc5ff182ede30a90fc41126dd33992247c4 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Mon, 2 Sep 2024 10:33:38 -0400
Subject: [PATCH 05/15] feat: bitbucket cloud support

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 assets/icons/bitbucket.svg | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 assets/icons/bitbucket.svg

diff --git a/assets/icons/bitbucket.svg b/assets/icons/bitbucket.svg
new file mode 100644
index 000000000..894ed83bf
--- /dev/null
+++ b/assets/icons/bitbucket.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg xmlns="http://www.w3.org/2000/svg"
+aria-label="Bitbucket" role="img"
+viewBox="0 0 512 512"><rect
+width="512" height="512"
+rx="15%"
+fill="#ffffff"/><path fill="#2684ff" d="M422 130a10 10 0 00-9.9-11.7H100.5a10 10 0 00-10 11.7L136 409a10 10 0 009.9 8.4h221c5 0 9.2-3.5 10 -8.4L422 130zM291 316.8h-69.3l-18.7-98h104.8z"/><path fill="url(#a)" d="M59.632 25.2H40.94l-3.1 18.3h-13v18.9H52c1 0 1.7-.7 1.8-1.6l5.8-35.6z" transform="translate(89.8 85) scale(5.3285)"/><linearGradient id="a" x2="1" gradientTransform="rotate(141 22.239 22.239) scale(31.4)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0052cc"/><stop offset="1" stop-color="#2684ff"/></linearGradient></svg>
\ No newline at end of file

From e9405113c6259f9e573d3f3fb47107c46218801e Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Mon, 2 Sep 2024 10:45:19 -0400
Subject: [PATCH 06/15] feat: bitbucket cloud support

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/utils/links.ts         | 8 +++++++-
 src/utils/notifications.ts | 7 +++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/utils/links.ts b/src/utils/links.ts
index e19aaadde..46a899e55 100644
--- a/src/utils/links.ts
+++ b/src/utils/links.ts
@@ -57,7 +57,13 @@ export function openRepository(repository: Repository) {
 }
 
 export async function openNotification(notification: Notification) {
-  const url = await generateGitHubWebUrl(notification);
+  let url = '' as Link;
+  if (notification.account.platform === 'Bitbucket Cloud') {
+    url = notification.url;
+  } else {
+    url = await generateGitHubWebUrl(notification);
+  }
+
   openExternalLink(url);
 }
 
diff --git a/src/utils/notifications.ts b/src/utils/notifications.ts
index 2756997f2..be36ac8ea 100644
--- a/src/utils/notifications.ts
+++ b/src/utils/notifications.ts
@@ -142,22 +142,25 @@ export async function getAllNotifications(
               ((await accountNotifications.notifications).data as any)
                 .pullRequests?.reviewing;
 
+            // console.log(pulls);
             const notifications = pulls?.map((pull: any) => ({
-              id: 1,
+              id: `${pull.destination.repository.full_name}-${pull.id}`,
               reason: 'review_requested',
               updated_at: pull.updated_on,
               url: pull.links.html.href,
               repository: {
-                full_name: pull.destination.repository.links.html.href,
+                full_name: pull.destination.repository.full_name,
                 owner: {
                   avatar_url: pull.destination.repository.links.avatar.href,
                 },
+                html_url: pull.destination.repository.links.html.href,
               },
               subject: {
                 number: pull.id,
                 title: pull.title,
                 url: pull.links.html.href,
                 type: 'PullRequest',
+                state: 'open',
                 user: {
                   login: pull.author.display_name,
                   html_url: pull.author.links.html.href,

From c26e9e8f96d21dcb3d96a4dc2100ea656a42aa3a Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Mon, 2 Sep 2024 10:49:04 -0400
Subject: [PATCH 07/15] feat: bitbucket cloud support

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/components/NotificationRow.tsx         |  7 ++-
 src/components/RepositoryNotifications.tsx | 57 +++++++++++-----------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/components/NotificationRow.tsx b/src/components/NotificationRow.tsx
index 1f0752f22..c1819b8cc 100644
--- a/src/components/NotificationRow.tsx
+++ b/src/components/NotificationRow.tsx
@@ -45,6 +45,11 @@ export const NotificationRow: FC<INotificationRow> = ({
   const [showAsRead, setShowAsRead] = useState(false);
 
   const handleNotification = useCallback(() => {
+    if (notification.account.platform === 'Bitbucket Cloud') {
+      openNotification(notification);
+      return;
+    }
+
     setAnimateExit(!settings.delayNotificationState);
     setShowAsRead(settings.delayNotificationState);
 
@@ -127,7 +132,7 @@ export const NotificationRow: FC<INotificationRow> = ({
         <NotificationFooter notification={notification} />
       </div>
 
-      {!animateExit && (
+      {!animateExit && notification.account.platform !== 'Bitbucket Cloud' && (
         <HoverGroup>
           {isMarkAsDoneFeatureSupported(notification.account) && (
             <InteractionButton
diff --git a/src/components/RepositoryNotifications.tsx b/src/components/RepositoryNotifications.tsx
index 758c3a099..9a29cb894 100644
--- a/src/components/RepositoryNotifications.tsx
+++ b/src/components/RepositoryNotifications.tsx
@@ -79,42 +79,43 @@ export const RepositoryNotifications: FC<IRepositoryNotifications> = ({
           </span>
         </div>
 
-        {!animateExit && (
-          <HoverGroup>
-            {isMarkAsDoneFeatureSupported(repoNotifications[0].account) && (
+        {!animateExit &&
+          repoNotifications[0].account.platform !== 'Bitbucket Cloud' && (
+            <HoverGroup>
+              {isMarkAsDoneFeatureSupported(repoNotifications[0].account) && (
+                <InteractionButton
+                  title="Mark Repository as Done"
+                  icon={CheckIcon}
+                  size={Size.MEDIUM}
+                  onClick={(event: MouseEvent<HTMLElement>) => {
+                    // Don't trigger onClick of parent element.
+                    event.stopPropagation();
+                    setAnimateExit(!settings.delayNotificationState);
+                    setShowAsRead(settings.delayNotificationState);
+                    markRepoNotificationsDone(repoNotifications[0]);
+                  }}
+                />
+              )}
               <InteractionButton
-                title="Mark Repository as Done"
-                icon={CheckIcon}
-                size={Size.MEDIUM}
+                title="Mark Repository as Read"
+                icon={ReadIcon}
+                size={Size.SMALL}
                 onClick={(event: MouseEvent<HTMLElement>) => {
                   // Don't trigger onClick of parent element.
                   event.stopPropagation();
                   setAnimateExit(!settings.delayNotificationState);
                   setShowAsRead(settings.delayNotificationState);
-                  markRepoNotificationsDone(repoNotifications[0]);
+                  markRepoNotificationsRead(repoNotifications[0]);
                 }}
               />
-            )}
-            <InteractionButton
-              title="Mark Repository as Read"
-              icon={ReadIcon}
-              size={Size.SMALL}
-              onClick={(event: MouseEvent<HTMLElement>) => {
-                // Don't trigger onClick of parent element.
-                event.stopPropagation();
-                setAnimateExit(!settings.delayNotificationState);
-                setShowAsRead(settings.delayNotificationState);
-                markRepoNotificationsRead(repoNotifications[0]);
-              }}
-            />
-            <InteractionButton
-              title={toggleRepositoryNotificationsLabel}
-              icon={ChevronIcon}
-              size={Size.SMALL}
-              onClick={toggleRepositoryNotifications}
-            />
-          </HoverGroup>
-        )}
+              <InteractionButton
+                title={toggleRepositoryNotificationsLabel}
+                icon={ChevronIcon}
+                size={Size.SMALL}
+                onClick={toggleRepositoryNotifications}
+              />
+            </HoverGroup>
+          )}
       </div>
 
       {showRepositoryNotifications &&

From 535b37f2cadb38311283fec2b3d71cd177511602 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Mon, 2 Sep 2024 10:51:59 -0400
Subject: [PATCH 08/15] feat: bitbucket cloud support

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/components/icons/PlatformIcon.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/icons/PlatformIcon.tsx b/src/components/icons/PlatformIcon.tsx
index 7fb50501c..824ef5c46 100644
--- a/src/components/icons/PlatformIcon.tsx
+++ b/src/components/icons/PlatformIcon.tsx
@@ -1,4 +1,4 @@
-import { MarkGithubIcon, ServerIcon } from '@primer/octicons-react';
+import { BeakerIcon, MarkGithubIcon, ServerIcon } from '@primer/octicons-react';
 import type { FC } from 'react';
 import type { Size } from '../../types';
 import type { PlatformType } from '../../utils/auth/types';
@@ -15,6 +15,7 @@ export const PlatformIcon: FC<IPlatformIcon> = (props: IPlatformIcon) => {
       {props.type === 'GitHub Enterprise Server' && (
         <ServerIcon size={props.size} />
       )}
+      {props.type === 'Bitbucket Cloud' && <BeakerIcon size={props.size} />}
     </span>
   );
 };

From 9471f6295ff660e207bc4c681b26184c86b69a35 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Mon, 2 Sep 2024 10:54:18 -0400
Subject: [PATCH 09/15] feat: bitbucket cloud support

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/utils/links.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/utils/links.ts b/src/utils/links.ts
index 46a899e55..94a9e2faf 100644
--- a/src/utils/links.ts
+++ b/src/utils/links.ts
@@ -34,9 +34,13 @@ export function openGitHubPulls(hostname: Hostname) {
 }
 
 export function openAccountProfile(account: Account) {
-  const url = new URL(`https://${account.hostname}`);
-  url.pathname = account.user.login;
-  openExternalLink(url.toString() as Link);
+  if (account.platform === 'Bitbucket Cloud') {
+    openExternalLink('https://bitbucket.org/account/settings/' as Link);
+  } else {
+    const url = new URL(`https://${account.hostname}`);
+    url.pathname = account.user.login;
+    openExternalLink(url.toString() as Link);
+  }
 }
 
 export function openUserProfile(user: SubjectUser) {

From b03d53e7adbb29745741f7f46b8dd3b8cfa2a27c Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Mon, 2 Sep 2024 11:01:52 -0400
Subject: [PATCH 10/15] feat: bitbucket cloud support

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/components/AccountNotifications.tsx | 24 +++++++++++++++++-------
 src/routes/LoginWithBitbucketCloud.tsx  |  1 +
 src/utils/links.ts                      |  7 +++++++
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/components/AccountNotifications.tsx b/src/components/AccountNotifications.tsx
index 6ed8afa8d..759aeecdc 100644
--- a/src/components/AccountNotifications.tsx
+++ b/src/components/AccountNotifications.tsx
@@ -13,6 +13,7 @@ import type { Notification } from '../typesGitHub';
 import { cn } from '../utils/cn';
 import {
   openAccountProfile,
+  openBitbucketPulls,
   openGitHubIssues,
   openGitHubPulls,
 } from '../utils/links';
@@ -115,17 +116,26 @@ export const AccountNotifications: FC<IAccountNotifications> = (
           </div>
           <HoverGroup>
             <PlatformIcon type={account.platform} size={Size.SMALL} />
-            <InteractionButton
-              title="My Issues"
-              icon={IssueOpenedIcon}
-              size={Size.SMALL}
-              onClick={() => openGitHubIssues(account.hostname)}
-            />
+            {account.platform !== 'Bitbucket Cloud' && (
+              <InteractionButton
+                title="My Issues"
+                icon={IssueOpenedIcon}
+                size={Size.SMALL}
+                onClick={() => openGitHubIssues(account.hostname)}
+              />
+            )}
             <InteractionButton
               title="My Pull Requests"
               icon={GitPullRequestIcon}
               size={Size.SMALL}
-              onClick={() => openGitHubPulls(account.hostname)}
+              onClick={() => {
+                event.stopPropagation();
+                if (account.platform === 'Bitbucket Cloud') {
+                  openBitbucketPulls(account);
+                } else {
+                  openGitHubPulls(account.hostname);
+                }
+              }}
             />
             <InteractionButton
               title={toggleAccountNotificationsLabel}
diff --git a/src/routes/LoginWithBitbucketCloud.tsx b/src/routes/LoginWithBitbucketCloud.tsx
index e8675c150..e80096673 100644
--- a/src/routes/LoginWithBitbucketCloud.tsx
+++ b/src/routes/LoginWithBitbucketCloud.tsx
@@ -52,6 +52,7 @@ export const LoginWithBitbucketCloud: FC = () => {
   const renderForm = (formProps: FormRenderProps) => {
     const { handleSubmit, submitting, pristine, values } = formProps;
 
+    // TODO - Correctly set account.id and account.hostname
     return (
       <form onSubmit={handleSubmit}>
         <FieldInput
diff --git a/src/utils/links.ts b/src/utils/links.ts
index 94a9e2faf..f0bb19c82 100644
--- a/src/utils/links.ts
+++ b/src/utils/links.ts
@@ -33,6 +33,13 @@ export function openGitHubPulls(hostname: Hostname) {
   openExternalLink(url.toString() as Link);
 }
 
+export function openBitbucketPulls(account: Account) {
+  const url = new URL(
+    `${account.hostname.replace('api.bitbucket.org/internal/workspaces', 'bitbucket.org')}/workspace/pull-requests/?user_filter=ALL&author=${account.user.id}`,
+  );
+  openExternalLink(url.toString() as Link);
+}
+
 export function openAccountProfile(account: Account) {
   if (account.platform === 'Bitbucket Cloud') {
     openExternalLink('https://bitbucket.org/account/settings/' as Link);

From b75f785a6eca3aad2240470636e58e207e3e6812 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Mon, 2 Sep 2024 11:04:33 -0400
Subject: [PATCH 11/15] feat: bitbucket cloud support

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/components/Sidebar.tsx | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
index 6391d205f..b6edf5ebc 100644
--- a/src/components/Sidebar.tsx
+++ b/src/components/Sidebar.tsx
@@ -15,6 +15,7 @@ import { quitApp } from '../utils/comms';
 import Constants from '../utils/constants';
 import { getFilterCount } from '../utils/helpers';
 import {
+  openBitbucketPulls,
   openGitHubIssues,
   openGitHubNotifications,
   openGitHubPulls,
@@ -38,8 +39,10 @@ export const Sidebar: FC = () => {
   } = useContext(AppContext);
 
   // We naively assume that the first account is the primary account for the purposes of our sidebar quick links
+  const primaryAccount = auth.accounts[0];
+
   const primaryAccountHostname =
-    auth.accounts[0]?.hostname ?? Constants.DEFAULT_AUTH_OPTIONS.hostname;
+    primaryAccount?.hostname ?? Constants.DEFAULT_AUTH_OPTIONS.hostname;
 
   const toggleFilters = () => {
     if (location.pathname.startsWith('/filters')) {
@@ -91,16 +94,24 @@ export const Sidebar: FC = () => {
           onClick={() => openGitHubNotifications(primaryAccountHostname)}
         />
 
-        <SidebarButton
-          title="My Issues"
-          icon={IssueOpenedIcon}
-          onClick={() => openGitHubIssues(primaryAccountHostname)}
-        />
+        {primaryAccount?.platform !== 'Bitbucket Cloud' && (
+          <SidebarButton
+            title="My Issues"
+            icon={IssueOpenedIcon}
+            onClick={() => openGitHubIssues(primaryAccountHostname)}
+          />
+        )}
 
         <SidebarButton
           title="My Pull Requests"
           icon={GitPullRequestIcon}
-          onClick={() => openGitHubPulls(primaryAccountHostname)}
+          onClick={() => {
+            if (primaryAccount?.platform === 'Bitbucket Cloud') {
+              openBitbucketPulls(primaryAccount);
+            } else {
+              openGitHubPulls(primaryAccountHostname);
+            }
+          }}
         />
       </div>
 

From 127c328f23481e8844734caa604cc5c84b78f82f Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Tue, 3 Sep 2024 07:36:39 -0400
Subject: [PATCH 12/15] feat: bitbucket cloud support

add bitbucket icon, implement account refresh

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/components/icons/AuthMethodIcon.tsx |  1 +
 src/components/icons/BitbucketIcon.tsx  | 50 +++++++++++++++++++++++++
 src/components/icons/PlatformIcon.tsx   |  5 ++-
 src/components/notification/Pills.tsx   | 13 +++++++
 src/context/App.tsx                     |  2 +-
 src/routes/Accounts.tsx                 | 23 ++++++++----
 src/typesGitHub.ts                      |  1 +
 src/utils/api/bitbucket.ts              | 38 +++++++++++++++++++
 src/utils/api/client.ts                 | 21 +----------
 src/utils/auth/utils.ts                 | 44 +++++++++++++++++-----
 src/utils/notifications.ts              | 10 ++---
 11 files changed, 162 insertions(+), 46 deletions(-)
 create mode 100644 src/components/icons/BitbucketIcon.tsx
 create mode 100644 src/utils/api/bitbucket.ts

diff --git a/src/components/icons/AuthMethodIcon.tsx b/src/components/icons/AuthMethodIcon.tsx
index 90251bd79..aff914c5e 100644
--- a/src/components/icons/AuthMethodIcon.tsx
+++ b/src/components/icons/AuthMethodIcon.tsx
@@ -14,6 +14,7 @@ export const AuthMethodIcon: FC<IAuthMethodIcon> = (props: IAuthMethodIcon) => {
       {props.type === 'GitHub App' && <AppsIcon size={props.size} />}
       {props.type === 'Personal Access Token' && <KeyIcon size={props.size} />}
       {props.type === 'OAuth App' && <PersonIcon size={props.size} />}
+      {props.type === 'App Password' && <KeyIcon size={props.size} />}
     </span>
   );
 };
diff --git a/src/components/icons/BitbucketIcon.tsx b/src/components/icons/BitbucketIcon.tsx
new file mode 100644
index 000000000..dadc1f763
--- /dev/null
+++ b/src/components/icons/BitbucketIcon.tsx
@@ -0,0 +1,50 @@
+import type { FC } from 'react';
+import { Size } from '../../types';
+import { cn } from '../../utils/cn';
+
+interface IBitbucketIcon {
+  onClick?: () => void;
+  size: Size;
+}
+
+export const BitbucketIcon: FC<IBitbucketIcon> = ({
+  onClick,
+  size = Size.MEDIUM,
+  ...props
+}: IBitbucketIcon) => (
+  <svg
+    className={cn(
+      size === Size.XSMALL && 'size-4',
+      size === Size.SMALL && 'size-6',
+      size === Size.MEDIUM && 'size-8',
+      size === Size.LARGE && 'size-10',
+    )}
+    onClick={() => onClick?.()}
+    xmlns="https://www.w3.org/2000/svg"
+    xmlnsXlink="https://www.w3.org/1999/xlink"
+    viewBox="0 0 512 512"
+    role="img"
+    aria-label="Bitbucket Cloud"
+    {...props}
+  >
+    <rect width="512" height="512" rx="15%" fill="none" fillRule="evenodd" />
+    <path
+      fill="#2684ff"
+      d="M422 130a10 10 0 00-9.9-11.7H100.5a10 10 0 00-10 11.7L136 409a10 10 0 009.9 8.4h221c5 0 9.2-3.5 10 -8.4L422 130zM291 316.8h-69.3l-18.7-98h104.8z"
+    />
+    <path
+      fill="url(#a)"
+      d="M59.632 25.2H40.94l-3.1 18.3h-13v18.9H52c1 0 1.7-.7 1.8-1.6l5.8-35.6z"
+      transform="translate(89.8 85) scale(5.3285)"
+    />
+    <linearGradient
+      id="a"
+      x2="1"
+      gradientTransform="rotate(141 22.239 22.239) scale(31.4)"
+      gradientUnits="userSpaceOnUse"
+    >
+      <stop offset="0" stopColor="#0052cc" />
+      <stop offset="1" stopColor="#2684ff" />
+    </linearGradient>
+  </svg>
+);
diff --git a/src/components/icons/PlatformIcon.tsx b/src/components/icons/PlatformIcon.tsx
index 824ef5c46..d33b71d06 100644
--- a/src/components/icons/PlatformIcon.tsx
+++ b/src/components/icons/PlatformIcon.tsx
@@ -1,7 +1,8 @@
-import { BeakerIcon, MarkGithubIcon, ServerIcon } from '@primer/octicons-react';
+import { MarkGithubIcon, ServerIcon } from '@primer/octicons-react';
 import type { FC } from 'react';
 import type { Size } from '../../types';
 import type { PlatformType } from '../../utils/auth/types';
+import { BitbucketIcon } from './BitbucketIcon';
 
 export interface IPlatformIcon {
   type: PlatformType;
@@ -15,7 +16,7 @@ export const PlatformIcon: FC<IPlatformIcon> = (props: IPlatformIcon) => {
       {props.type === 'GitHub Enterprise Server' && (
         <ServerIcon size={props.size} />
       )}
-      {props.type === 'Bitbucket Cloud' && <BeakerIcon size={props.size} />}
+      {props.type === 'Bitbucket Cloud' && <BitbucketIcon size={props.size} />}
     </span>
   );
 };
diff --git a/src/components/notification/Pills.tsx b/src/components/notification/Pills.tsx
index 5b6f877da..0519ce9cb 100644
--- a/src/components/notification/Pills.tsx
+++ b/src/components/notification/Pills.tsx
@@ -1,4 +1,5 @@
 import {
+  CheckboxIcon,
   CommentIcon,
   IssueClosedIcon,
   MilestoneIcon,
@@ -24,6 +25,10 @@ export const Pills: FC<IPills> = ({ notification }: IPills) => {
     notification.subject.comments > 1 ? 'comments' : 'comment'
   }`;
 
+  const tasksPillDescription = `${notification.subject.tasks} ${
+    notification.subject.tasks > 1 ? 'tasks' : 'task'
+  }`;
+
   const labelsPillDescription = notification.subject.labels
     ?.map((label) => `🏷️ ${label}`)
     .join('\n');
@@ -87,6 +92,14 @@ export const Pills: FC<IPills> = ({ notification }: IPills) => {
             }
           />
         )}
+        {notification.subject?.tasks > 0 && (
+          <PillButton
+            title={tasksPillDescription}
+            metric={notification.subject.tasks}
+            icon={CheckboxIcon}
+            color={IconColor.GRAY}
+          />
+        )}
       </div>
     )
   );
diff --git a/src/context/App.tsx b/src/context/App.tsx
index a56bd3478..bb32ee388 100644
--- a/src/context/App.tsx
+++ b/src/context/App.tsx
@@ -251,7 +251,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
         auth,
         'App Password',
         token,
-        `https://api.bitbucket.org/internal/workspaces/${workspace}` as Hostname,
+        `https://api.bitbucket.org/internal/workspaces/${workspace}` as Hostname, // TODO - ideally we don't set it like this
         username,
       );
       setAuth(updatedAuth);
diff --git a/src/routes/Accounts.tsx b/src/routes/Accounts.tsx
index 891c2806c..48f8eeb84 100644
--- a/src/routes/Accounts.tsx
+++ b/src/routes/Accounts.tsx
@@ -1,5 +1,4 @@
 import {
-  BeakerIcon,
   FeedPersonIcon,
   KeyIcon,
   MarkGithubIcon,
@@ -17,6 +16,7 @@ import { useNavigate } from 'react-router-dom';
 import { Header } from '../components/Header';
 import { AuthMethodIcon } from '../components/icons/AuthMethodIcon';
 import { AvatarIcon } from '../components/icons/AvatarIcon';
+import { BitbucketIcon } from '../components/icons/BitbucketIcon';
 import { PlatformIcon } from '../components/icons/PlatformIcon';
 import { AppContext } from '../context/App';
 import { BUTTON_CLASS_NAME } from '../styles/gitify';
@@ -112,8 +112,13 @@ export const AccountsRoute: FC = () => {
                     title="Open Host"
                     onClick={() => openHost(account.hostname)}
                   >
-                    <PlatformIcon type={account.platform} size={Size.XSMALL} />
-                    {account.hostname}
+                    <div className="flex flex-col-1">
+                      <PlatformIcon
+                        type={account.platform}
+                        size={Size.XSMALL}
+                      />
+                      {account.hostname.split('/').pop()}
+                    </div>
                   </button>
                 </div>
                 <div>
@@ -227,11 +232,13 @@ export const AccountsRoute: FC = () => {
             title="Login with Bitbucket Cloud"
             onClick={loginWithBitbucketCloud}
           >
-            <BeakerIcon
-              size={Size.XLARGE}
-              aria-label="Login with Bitbucket Cloud"
-            />
-            <PlusIcon size={Size.SMALL} className="mb-2" />
+            <div className="flex flex-col-1">
+              <BitbucketIcon
+                size={Size.MEDIUM}
+                aria-label="Login with Bitbucket Cloud"
+              />
+              <PlusIcon size={Size.SMALL} className="mb-2" />
+            </div>
           </button>
         </div>
       </div>
diff --git a/src/typesGitHub.ts b/src/typesGitHub.ts
index a9ebf20fc..1d67e6715 100644
--- a/src/typesGitHub.ts
+++ b/src/typesGitHub.ts
@@ -268,6 +268,7 @@ export interface GitifySubject {
   reviews?: GitifyPullRequestReview[];
   linkedIssues?: string[];
   comments?: number;
+  tasks?: number;
   labels?: string[];
   milestone?: Milestone;
 }
diff --git a/src/utils/api/bitbucket.ts b/src/utils/api/bitbucket.ts
new file mode 100644
index 000000000..17d54a1dd
--- /dev/null
+++ b/src/utils/api/bitbucket.ts
@@ -0,0 +1,38 @@
+import type { AxiosPromise } from 'axios';
+import type { Account, Link } from '../../types';
+import type { Notification, UserDetails } from '../../typesGitHub';
+import { apiRequestBitbucket } from './request';
+/**
+ * List all notifications for the current user, sorted by most recently updated.
+ *
+ * Endpoint documentation: https://docs.github.com/en/rest/activity/notifications#list-notifications-for-the-authenticated-user
+ */
+// TODO - Correct types
+export function listBitbucketWork(
+  account: Account,
+): AxiosPromise<Notification[]> {
+  const url = `${account.hostname}/overview-view-state?fields=pullRequests.reviewing.id,pullRequests.reviewing.title,pullRequest.reviewing.state,pullRequests.reviewing.author,pullRequests.reviewing.created_on,pullRequests.reviewing.updated_on,pullRequests.reviewing.links,pullRequests.reviewing.task_count,pullRequests.reviewing.comment_count,pullRequests.reviewing.destination.repository.*`;
+
+  return apiRequestBitbucket(
+    url.toString() as Link,
+    'GET',
+    account.user.login,
+    account.token,
+  );
+}
+
+/**
+ * Get the authenticated user
+ *
+ * Endpoint documentation: https://docs.github.com/en/rest/users/users#get-the-authenticated-user
+ */
+export function getBitbucketUser(account: Account): AxiosPromise<UserDetails> {
+  const url = 'https://api.bitbucket.org/2.0/user';
+
+  return apiRequestBitbucket(
+    url.toString() as Link,
+    'GET',
+    account.user.login,
+    account.token,
+  );
+}
diff --git a/src/utils/api/client.ts b/src/utils/api/client.ts
index 0e5af3e75..a2f133e89 100644
--- a/src/utils/api/client.ts
+++ b/src/utils/api/client.ts
@@ -24,7 +24,7 @@ import type {
 } from '../../typesGitHub';
 import { QUERY_SEARCH_DISCUSSIONS } from './graphql/discussions';
 import { formatAsGitHubSearchSyntax } from './graphql/utils';
-import { apiRequestAuth, apiRequestBitbucket } from './request';
+import { apiRequestAuth } from './request';
 import { getGitHubAPIBaseUrl, getGitHubGraphQLUrl } from './utils';
 
 /**
@@ -69,25 +69,6 @@ export function listNotificationsForAuthenticatedUser(
   return apiRequestAuth(url.toString() as Link, 'GET', account.token);
 }
 
-/**
- * List all notifications for the current user, sorted by most recently updated.
- *
- * Endpoint documentation: https://docs.github.com/en/rest/activity/notifications#list-notifications-for-the-authenticated-user
- */
-export function listBitbucketWork(
-  account: Account,
-): AxiosPromise<Notification[]> {
-  const url = `${account.hostname}/overview-view-state?fields=pullRequests.reviewing.id,pullRequests.reviewing.title,pullRequest.reviewing.state,pullRequests.reviewing.author,pullRequests.reviewing.created_on,pullRequests.reviewing.updated_on,pullRequests.reviewing.links,pullRequests.reviewing.task_count,pullRequests.reviewing.comment_count,pullRequests.reviewing.destination.repository.*`;
-
-  console.log(url);
-  return apiRequestBitbucket(
-    url.toString() as Link,
-    'GET',
-    account.user.login,
-    account.token,
-  );
-}
-
 /**
  * Marks a thread as "read." Marking a thread as "read" is equivalent to
  * clicking a notification in your notification inbox on GitHub.
diff --git a/src/utils/auth/utils.ts b/src/utils/auth/utils.ts
index 8be9d7f18..4e0fad3c2 100644
--- a/src/utils/auth/utils.ts
+++ b/src/utils/auth/utils.ts
@@ -13,6 +13,7 @@ import type {
   Username,
 } from '../../types';
 import type { UserDetails } from '../../typesGitHub';
+import { getBitbucketUser } from '../api/bitbucket';
 import { getAuthenticatedUser } from '../api/client';
 import { apiRequest } from '../api/request';
 import { Constants } from '../constants';
@@ -138,16 +139,7 @@ export async function addAccount(
     token: token,
   } as Account;
 
-  if (newAccount.platform === 'Bitbucket Cloud') {
-    newAccount.user = {
-      id: 0,
-      login: username,
-      name: username,
-      avatar: null,
-    };
-  } else {
-    newAccount = await refreshAccount(newAccount);
-  }
+  newAccount = await refreshAccount(newAccount);
 
   return {
     accounts: [...auth.accounts, newAccount],
@@ -165,6 +157,38 @@ export function removeAccount(auth: AuthState, account: Account): AuthState {
 }
 
 export async function refreshAccount(account: Account): Promise<Account> {
+  if (account.platform === 'Bitbucket Cloud') {
+    return refreshBitbucketAccount(account);
+  }
+
+  return refreshGitHubAccount(account);
+}
+
+export async function refreshBitbucketAccount(
+  account: Account,
+): Promise<Account> {
+  try {
+    // TODO correctly type
+    // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+    const res: any = await getBitbucketUser(account);
+
+    console.log(JSON.stringify(res));
+
+    // Refresh user data
+    account.user = {
+      id: res.data.account_id,
+      login: res.data.username,
+      name: res.data.display_name,
+      avatar: res.data.links.avatar.href,
+    };
+  } catch (error) {
+    log.error('Failed to refresh account', error);
+  }
+
+  return account;
+}
+
+export async function refreshGitHubAccount(account: Account): Promise<Account> {
   try {
     const res = await getAuthenticatedUser(account.hostname, account.token);
 
diff --git a/src/utils/notifications.ts b/src/utils/notifications.ts
index be36ac8ea..5350d7d10 100644
--- a/src/utils/notifications.ts
+++ b/src/utils/notifications.ts
@@ -5,10 +5,8 @@ import type {
   SettingsState,
 } from '../types';
 import { Notification } from '../typesGitHub';
-import {
-  listBitbucketWork,
-  listNotificationsForAuthenticatedUser,
-} from './api/client';
+import { listBitbucketWork } from './api/bitbucket';
+import { listNotificationsForAuthenticatedUser } from './api/client';
 import { determineFailureType } from './api/errors';
 import { getAccountUUID } from './auth/utils';
 import { hideWindow, showWindow, updateTrayIcon } from './comms';
@@ -142,7 +140,7 @@ export async function getAllNotifications(
               ((await accountNotifications.notifications).data as any)
                 .pullRequests?.reviewing;
 
-            // console.log(pulls);
+            console.log(pulls);
             const notifications = pulls?.map((pull: any) => ({
               id: `${pull.destination.repository.full_name}-${pull.id}`,
               reason: 'review_requested',
@@ -167,6 +165,8 @@ export async function getAllNotifications(
                   avatar_url: pull.author.links.avatar.href,
                   type: 'User',
                 },
+                comments: pull.comment_count,
+                tasks: pull.task_count,
               },
               account: accountNotifications.account,
             }));

From e9d505aa18a26d20869a113d52ff65b31743305f Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Tue, 3 Sep 2024 07:57:23 -0400
Subject: [PATCH 13/15] feat: bitbucket cloud support

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/components/AccountNotifications.tsx |  9 +++++++--
 src/utils/auth/utils.ts                 |  2 --
 src/utils/notifications.ts              | 13 ++++++++-----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/components/AccountNotifications.tsx b/src/components/AccountNotifications.tsx
index 759aeecdc..c0f30a0a3 100644
--- a/src/components/AccountNotifications.tsx
+++ b/src/components/AccountNotifications.tsx
@@ -121,14 +121,19 @@ export const AccountNotifications: FC<IAccountNotifications> = (
                 title="My Issues"
                 icon={IssueOpenedIcon}
                 size={Size.SMALL}
-                onClick={() => openGitHubIssues(account.hostname)}
+                onClick={(event: MouseEvent<HTMLElement>) => {
+                  // Don't trigger onClick of parent element.
+                  event.stopPropagation();
+                  openGitHubIssues(account.hostname);
+                }}
               />
             )}
             <InteractionButton
               title="My Pull Requests"
               icon={GitPullRequestIcon}
               size={Size.SMALL}
-              onClick={() => {
+              onClick={(event: MouseEvent<HTMLElement>) => {
+                // Don't trigger onClick of parent element.
                 event.stopPropagation();
                 if (account.platform === 'Bitbucket Cloud') {
                   openBitbucketPulls(account);
diff --git a/src/utils/auth/utils.ts b/src/utils/auth/utils.ts
index 4e0fad3c2..bc7cbf4d0 100644
--- a/src/utils/auth/utils.ts
+++ b/src/utils/auth/utils.ts
@@ -172,8 +172,6 @@ export async function refreshBitbucketAccount(
     // biome-ignore lint/suspicious/noExplicitAny: <explanation>
     const res: any = await getBitbucketUser(account);
 
-    console.log(JSON.stringify(res));
-
     // Refresh user data
     account.user = {
       id: res.data.account_id,
diff --git a/src/utils/notifications.ts b/src/utils/notifications.ts
index 5350d7d10..da5ef0847 100644
--- a/src/utils/notifications.ts
+++ b/src/utils/notifications.ts
@@ -135,12 +135,15 @@ export async function getAllNotifications(
         try {
           // TODO - this needs to be correctly implemented
           if (accountNotifications.account.platform === 'Bitbucket Cloud') {
-            const pulls =
-              // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-              ((await accountNotifications.notifications).data as any)
-                .pullRequests?.reviewing;
+            // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+            const res = (await accountNotifications.notifications).data as any;
 
-            console.log(pulls);
+            // TODO - when using IP allowlists, Bitbucket doesn't return any response indicator
+
+            const pulls = res.pullRequests?.reviewing;
+
+            // console.log(JSON.stringify(pulls));
+            // biome-ignore lint/suspicious/noExplicitAny: <explanation>
             const notifications = pulls?.map((pull: any) => ({
               id: `${pull.destination.repository.full_name}-${pull.id}`,
               reason: 'review_requested',

From 64df440edd4dce46eadf019a9f1d7a09e170a2ff Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Tue, 3 Sep 2024 12:12:30 -0400
Subject: [PATCH 14/15] feat: :zap: ts study group

demo time

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/routes/Login.tsx | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/routes/Login.tsx b/src/routes/Login.tsx
index 8e2a41767..208fd44a8 100644
--- a/src/routes/Login.tsx
+++ b/src/routes/Login.tsx
@@ -1,13 +1,9 @@
-import {
-  BeakerIcon,
-  KeyIcon,
-  MarkGithubIcon,
-  PersonIcon,
-} from '@primer/octicons-react';
+import { KeyIcon, MarkGithubIcon, PersonIcon } from '@primer/octicons-react';
 import log from 'electron-log';
 import { type FC, useCallback, useContext, useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { Button } from '../components/buttons/Button';
+import { BitbucketIcon } from '../components/icons/BitbucketIcon';
 import { LogoIcon } from '../components/icons/LogoIcon';
 import { AppContext } from '../context/App';
 import { Size } from '../types';
@@ -69,12 +65,11 @@ export const LoginRoute: FC = () => {
         OAuth App
       </Button>
       <Button
-        icon={{ icon: BeakerIcon }}
         label="Login with Bitbucket Cloud"
         className="mt-2 py-2"
         onClick={() => navigate('/login-bitbucket-cloud')}
       >
-        Bitbucket Cloud
+        <BitbucketIcon size={Size.SMALL} /> Bitbucket Cloud
       </Button>
     </div>
   );

From a61df49590c91e34e3e0e9cb141348162cc56e50 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Wed, 4 Sep 2024 09:53:20 -0400
Subject: [PATCH 15/15] feat: bitbucket cloud support

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 .../__snapshots__/Accounts.test.tsx.snap      | 184 +++++++++++++-----
 src/routes/__snapshots__/Login.test.tsx.snap  |  92 +++++++++
 src/utils/auth/utils.ts                       |  10 +
 3 files changed, 232 insertions(+), 54 deletions(-)

diff --git a/src/routes/__snapshots__/Accounts.test.tsx.snap b/src/routes/__snapshots__/Accounts.test.tsx.snap
index 4da1a9b83..6539c5bd2 100644
--- a/src/routes/__snapshots__/Accounts.test.tsx.snap
+++ b/src/routes/__snapshots__/Accounts.test.tsx.snap
@@ -94,26 +94,30 @@ exports[`routes/Accounts.tsx General should render itself & its children 1`] = `
               title="Open Host"
               type="button"
             >
-              <span
-                class="mr-1"
-                title="GitHub Cloud"
+              <div
+                class="flex flex-col-1"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-mark-github"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
-                  viewBox="0 0 16 16"
-                  width="12"
+                <span
+                  class="mr-1"
+                  title="GitHub Cloud"
                 >
-                  <path
-                    d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-                  />
-                </svg>
-              </span>
-              github.com
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-mark-github"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                    />
+                  </svg>
+                </span>
+                github.com
+              </div>
             </button>
           </div>
           <div>
@@ -267,26 +271,30 @@ exports[`routes/Accounts.tsx General should render itself & its children 1`] = `
               title="Open Host"
               type="button"
             >
-              <span
-                class="mr-1"
-                title="GitHub Enterprise Server"
+              <div
+                class="flex flex-col-1"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-server"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
-                  viewBox="0 0 16 16"
-                  width="12"
+                <span
+                  class="mr-1"
+                  title="GitHub Enterprise Server"
                 >
-                  <path
-                    d="M1.75 1h12.5c.966 0 1.75.784 1.75 1.75v4c0 .372-.116.717-.314 1 .198.283.314.628.314 1v4a1.75 1.75 0 0 1-1.75 1.75H1.75A1.75 1.75 0 0 1 0 12.75v-4c0-.358.109-.707.314-1a1.739 1.739 0 0 1-.314-1v-4C0 1.784.784 1 1.75 1ZM1.5 2.75v4c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-4a.25.25 0 0 0-.25-.25H1.75a.25.25 0 0 0-.25.25Zm.25 5.75a.25.25 0 0 0-.25.25v4c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-4a.25.25 0 0 0-.25-.25ZM7 4.75A.75.75 0 0 1 7.75 4h4.5a.75.75 0 0 1 0 1.5h-4.5A.75.75 0 0 1 7 4.75ZM7.75 10h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1 0-1.5ZM3 4.75A.75.75 0 0 1 3.75 4h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 3 4.75ZM3.75 10h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5Z"
-                  />
-                </svg>
-              </span>
-              github.gitify.io
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-server"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1.75 1h12.5c.966 0 1.75.784 1.75 1.75v4c0 .372-.116.717-.314 1 .198.283.314.628.314 1v4a1.75 1.75 0 0 1-1.75 1.75H1.75A1.75 1.75 0 0 1 0 12.75v-4c0-.358.109-.707.314-1a1.739 1.739 0 0 1-.314-1v-4C0 1.784.784 1 1.75 1ZM1.5 2.75v4c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-4a.25.25 0 0 0-.25-.25H1.75a.25.25 0 0 0-.25.25Zm.25 5.75a.25.25 0 0 0-.25.25v4c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-4a.25.25 0 0 0-.25-.25ZM7 4.75A.75.75 0 0 1 7.75 4h4.5a.75.75 0 0 1 0 1.5h-4.5A.75.75 0 0 1 7 4.75ZM7.75 10h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1 0-1.5ZM3 4.75A.75.75 0 0 1 3.75 4h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 3 4.75ZM3.75 10h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5Z"
+                    />
+                  </svg>
+                </span>
+                github.gitify.io
+              </div>
             </button>
           </div>
           <div>
@@ -440,26 +448,30 @@ exports[`routes/Accounts.tsx General should render itself & its children 1`] = `
               title="Open Host"
               type="button"
             >
-              <span
-                class="mr-1"
-                title="GitHub Cloud"
+              <div
+                class="flex flex-col-1"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-mark-github"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
-                  viewBox="0 0 16 16"
-                  width="12"
+                <span
+                  class="mr-1"
+                  title="GitHub Cloud"
                 >
-                  <path
-                    d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-                  />
-                </svg>
-              </span>
-              github.com
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-mark-github"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                    />
+                  </svg>
+                </span>
+                github.com
+              </div>
             </button>
           </div>
           <div>
@@ -695,6 +707,70 @@ exports[`routes/Accounts.tsx General should render itself & its children 1`] = `
           />
         </svg>
       </button>
+      <button
+        class="hover:text-gray-500 py-1 px-2 my-1 mx-2 focus:outline-none"
+        title="Login with Bitbucket Cloud"
+        type="button"
+      >
+        <div
+          class="flex flex-col-1"
+        >
+          <svg
+            aria-label="Login with Bitbucket Cloud"
+            class="size-8"
+            role="img"
+            viewBox="0 0 512 512"
+            xmlns="https://www.w3.org/2000/svg"
+            xmlns:xlink="https://www.w3.org/1999/xlink"
+          >
+            <rect
+              fill="none"
+              fill-rule="evenodd"
+              height="512"
+              rx="15%"
+              width="512"
+            />
+            <path
+              d="M422 130a10 10 0 00-9.9-11.7H100.5a10 10 0 00-10 11.7L136 409a10 10 0 009.9 8.4h221c5 0 9.2-3.5 10 -8.4L422 130zM291 316.8h-69.3l-18.7-98h104.8z"
+              fill="#2684ff"
+            />
+            <path
+              d="M59.632 25.2H40.94l-3.1 18.3h-13v18.9H52c1 0 1.7-.7 1.8-1.6l5.8-35.6z"
+              fill="url(#a)"
+              transform="translate(89.8 85) scale(5.3285)"
+            />
+            <lineargradient
+              gradientTransform="rotate(141 22.239 22.239) scale(31.4)"
+              gradientUnits="userSpaceOnUse"
+              id="a"
+              x2="1"
+            >
+              <stop
+                offset="0"
+                stop-color="#0052cc"
+              />
+              <stop
+                offset="1"
+                stop-color="#2684ff"
+              />
+            </lineargradient>
+          </svg>
+          <svg
+            aria-hidden="true"
+            class="mb-2"
+            fill="currentColor"
+            focusable="false"
+            height="14"
+            style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+            viewBox="0 0 16 16"
+            width="14"
+          >
+            <path
+              d="M7.75 2a.75.75 0 0 1 .75.75V7h4.25a.75.75 0 0 1 0 1.5H8.5v4.25a.75.75 0 0 1-1.5 0V8.5H2.75a.75.75 0 0 1 0-1.5H7V2.75A.75.75 0 0 1 7.75 2Z"
+            />
+          </svg>
+        </div>
+      </button>
     </div>
   </div>
 </div>
diff --git a/src/routes/__snapshots__/Login.test.tsx.snap b/src/routes/__snapshots__/Login.test.tsx.snap
index e3c8e0754..d661efa35 100644
--- a/src/routes/__snapshots__/Login.test.tsx.snap
+++ b/src/routes/__snapshots__/Login.test.tsx.snap
@@ -128,6 +128,52 @@ exports[`routes/Login.tsx should render itself & its children 1`] = `
           </svg>
           OAuth App
         </button>
+        <button
+          aria-label="Login with Bitbucket Cloud"
+          class="ring-offset-background focus-visible:ring-ring inline-flex w-fit items-center justify-center whitespace-nowrap rounded text-xs font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 bg-gray-300 dark:text-black hover:opacity-90 min-w-20 h-10 px-4 mt-2 py-2"
+        >
+          <svg
+            aria-label="Bitbucket Cloud"
+            class="size-6"
+            role="img"
+            viewBox="0 0 512 512"
+            xmlns="https://www.w3.org/2000/svg"
+            xmlns:xlink="https://www.w3.org/1999/xlink"
+          >
+            <rect
+              fill="none"
+              fill-rule="evenodd"
+              height="512"
+              rx="15%"
+              width="512"
+            />
+            <path
+              d="M422 130a10 10 0 00-9.9-11.7H100.5a10 10 0 00-10 11.7L136 409a10 10 0 009.9 8.4h221c5 0 9.2-3.5 10 -8.4L422 130zM291 316.8h-69.3l-18.7-98h104.8z"
+              fill="#2684ff"
+            />
+            <path
+              d="M59.632 25.2H40.94l-3.1 18.3h-13v18.9H52c1 0 1.7-.7 1.8-1.6l5.8-35.6z"
+              fill="url(#a)"
+              transform="translate(89.8 85) scale(5.3285)"
+            />
+            <lineargradient
+              gradientTransform="rotate(141 22.239 22.239) scale(31.4)"
+              gradientUnits="userSpaceOnUse"
+              id="a"
+              x2="1"
+            >
+              <stop
+                offset="0"
+                stop-color="#0052cc"
+              />
+              <stop
+                offset="1"
+                stop-color="#2684ff"
+              />
+            </lineargradient>
+          </svg>
+           Bitbucket Cloud
+        </button>
       </div>
     </div>
   </body>,
@@ -255,6 +301,52 @@ exports[`routes/Login.tsx should render itself & its children 1`] = `
         </svg>
         OAuth App
       </button>
+      <button
+        aria-label="Login with Bitbucket Cloud"
+        class="ring-offset-background focus-visible:ring-ring inline-flex w-fit items-center justify-center whitespace-nowrap rounded text-xs font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 bg-gray-300 dark:text-black hover:opacity-90 min-w-20 h-10 px-4 mt-2 py-2"
+      >
+        <svg
+          aria-label="Bitbucket Cloud"
+          class="size-6"
+          role="img"
+          viewBox="0 0 512 512"
+          xmlns="https://www.w3.org/2000/svg"
+          xmlns:xlink="https://www.w3.org/1999/xlink"
+        >
+          <rect
+            fill="none"
+            fill-rule="evenodd"
+            height="512"
+            rx="15%"
+            width="512"
+          />
+          <path
+            d="M422 130a10 10 0 00-9.9-11.7H100.5a10 10 0 00-10 11.7L136 409a10 10 0 009.9 8.4h221c5 0 9.2-3.5 10 -8.4L422 130zM291 316.8h-69.3l-18.7-98h104.8z"
+            fill="#2684ff"
+          />
+          <path
+            d="M59.632 25.2H40.94l-3.1 18.3h-13v18.9H52c1 0 1.7-.7 1.8-1.6l5.8-35.6z"
+            fill="url(#a)"
+            transform="translate(89.8 85) scale(5.3285)"
+          />
+          <lineargradient
+            gradientTransform="rotate(141 22.239 22.239) scale(31.4)"
+            gradientUnits="userSpaceOnUse"
+            id="a"
+            x2="1"
+          >
+            <stop
+              offset="0"
+              stop-color="#0052cc"
+            />
+            <stop
+              offset="1"
+              stop-color="#2684ff"
+            />
+          </lineargradient>
+        </svg>
+         Bitbucket Cloud
+      </button>
     </div>
   </div>,
   "debug": [Function],
diff --git a/src/utils/auth/utils.ts b/src/utils/auth/utils.ts
index bc7cbf4d0..8a64d78d6 100644
--- a/src/utils/auth/utils.ts
+++ b/src/utils/auth/utils.ts
@@ -139,6 +139,16 @@ export async function addAccount(
     token: token,
   } as Account;
 
+  // TODO - find a better way to pass the username through
+  if (username) {
+    newAccount.user = {
+      id: 0,
+      login: username,
+      name: username,
+      avatar: '' as Link,
+    };
+  }
+
   newAccount = await refreshAccount(newAccount);
 
   return {