Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -258,3 +258,25 @@ WEBHOOKS__BOT_USER_EMAIL=bot@bitissues.local
# Example: {"implements":{"status":"In Progress"},"closes":{"status":"Closed","verb":"Closed"}}
# Valid statuses: New, Open, In Progress, Resolved, Closed, Reopened, Invalid, Duplicate, Wontfix, On Hold
WEBHOOKS__ACTION_KEYWORDS='{"fixes":{"status":"Resolved","verb":"Resolved"},"fixed":{"status":"Resolved","verb":"Resolved"},"resolves":{"status":"Resolved","verb":"Resolved"},"resolved":{"status":"Resolved","verb":"Resolved"},"closes":{"status":"Closed","verb":"Closed"},"closed":{"status":"Closed","verb":"Closed"},"blocks":{"status":"On Hold","verb":"On Hold"},"blocked":{"status":"On Hold","verb":"On Hold"},"on hold":{"status":"On Hold","verb":"On Hold"}}'

# =============================================================================
# BITBUCKET CONFIGURATION
# =============================================================================

# Bitbucket OAuth Client ID (optional)
# Purpose: Consumer key of the Bitbucket OAuth consumer app used by the admin
# "Connect with Bitbucket" flow
# Format: String (Bitbucket OAuth consumer key)
# Default: (empty - OAuth connection disabled)
# Setup: Bitbucket workspace settings -> OAuth consumers -> Add consumer.
# Required scope: webhook. See docs/oauth-setup.md for the walkthrough.
OAUTH__CLIENT_ID=

# Bitbucket OAuth Client Secret (optional)
# Purpose: Consumer secret of the Bitbucket OAuth consumer app; sent only to
# the Bitbucket OAuth token endpoint, never logged
# Format: String (Bitbucket OAuth consumer secret)
# Default: (empty - OAuth connection disabled)
# NOTE: MVP stores the exchanged access and refresh tokens plaintext in the
# oauth_tokens table; encryption at rest is planned post-MVP.
OAUTH__CLIENT_SECRET=
10 changes: 10 additions & 0 deletions bitbucket.http
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
@client_id={{$dotenv BITBUCKET__CLIENT_ID}}
@client_secret={{$dotenv BITBUCKET__CLIENT_SECRET}}
@code={{$dotenv BITBUCKET__CODE}}

###
POST https://bitbucket.org/site/oauth2/access_token HTTP/1.1
Authorization: Basic {{client_id}}:{{client_secret}}
Content-Type: application/x-www-form-urlencoded

grant_type=authorization_code&code={{code}}
20 changes: 20 additions & 0 deletions frontend/src/lib/api/oauth.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { apiRequest } from './client'
import type {
BitbucketOAuthAuthorizeResponse,
BitbucketOAuthStatus,
} from '$lib/types/api'

export function getBitbucketOAuthStatus(): Promise<BitbucketOAuthStatus> {
return apiRequest<BitbucketOAuthStatus>('GET', '/oauth/bitbucket/status')
}

export function getBitbucketOAuthAuthorizeUrl(): Promise<BitbucketOAuthAuthorizeResponse> {
return apiRequest<BitbucketOAuthAuthorizeResponse>(
'GET',
'/oauth/bitbucket/authorize',
)
}

export function disconnectBitbucketOAuth(): Promise<void> {
return apiRequest<void>('POST', '/oauth/bitbucket/disconnect')
}
182 changes: 182 additions & 0 deletions frontend/src/lib/components/BitbucketOAuthCard.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
<script lang="ts">
import { Button } from "$lib/components/ui/button";
import * as Card from "$lib/components/ui/card";
import * as Badge from "$lib/components/ui/badge";
import * as Dialog from "$lib/components/ui/dialog";
import {
disconnectBitbucketOAuth,
getBitbucketOAuthAuthorizeUrl,
getBitbucketOAuthStatus,
} from "$lib/api/oauth";
import { toast } from "$lib/toast";
import type { BitbucketOAuthStatus } from "$lib/types/api";

let status = $state<BitbucketOAuthStatus | null>(null);
let loading = $state(true);
let loadError = $state("");
let busy = $state(false);
let showDisconnectDialog = $state(false);

let connected = $derived(status?.connected === true);
let expired = $derived(
connected &&
!!status?.expires_at &&
new Date(status.expires_at).getTime() <= Date.now(),
);

let badgeLabel = $derived(
connected ? (expired ? "Expired/Revoked" : "Connected") : "Disconnected",
);
let badgeColor = $derived(
connected
? expired
? "border-transparent bg-red-100 text-red-700 dark:bg-red-300/15 dark:text-red-300"
: "border-transparent bg-green-100 text-green-700 dark:bg-green-300/15 dark:text-green-300"
: "border-transparent bg-gray-100 text-gray-600 dark:bg-gray-300/15 dark:text-gray-300",
);

function formatDate(iso?: string): string {
if (!iso) return "-";
const d = new Date(iso);
return Number.isNaN(d.getTime()) ? iso : d.toLocaleString();
}

function loadStatus() {
loading = true;
loadError = "";
getBitbucketOAuthStatus()
.then((res) => {
status = res;
})
.catch((e: Error) => {
status = null;
loadError = e?.message || "Failed to load Bitbucket connection status";
})
.finally(() => {
loading = false;
});
}

$effect(loadStatus);

async function handleConnect() {
if (busy) return;
busy = true;
try {
const { url } = await getBitbucketOAuthAuthorizeUrl();
window.location.assign(url);
} catch (e: any) {
toast.error(e?.message || "Failed to start Bitbucket connection");
busy = false;
}
}

async function handleDisconnect() {
if (busy) return;
busy = true;
try {
await disconnectBitbucketOAuth();
status = { connected: false };
showDisconnectDialog = false;
toast.success("Disconnected from Bitbucket");
} catch (e: any) {
toast.error(e?.message || "Failed to disconnect from Bitbucket");
} finally {
busy = false;
}
}
</script>

<Card.Root>
<Card.CardHeader>
<div class="flex items-center justify-between gap-2">
<Card.CardTitle>Bitbucket OAuth</Card.CardTitle>
{#if status}
<Badge.Root class={badgeColor}>{badgeLabel}</Badge.Root>
{/if}
</div>
</Card.CardHeader>
<Card.CardContent>
{#if loading}
<p class="text-muted-foreground text-sm">Loading...</p>
{:else if loadError}
<p class="text-destructive text-sm">{loadError}</p>
{:else if status}
<div class="flex flex-col gap-2">
<p class="text-muted-foreground text-sm">
{#if connected}
Webhook registration uses the connected Bitbucket app.
{:else}
Connect a Bitbucket app to manage repository webhooks.
{/if}
</p>
{#if connected}
<div class="flex flex-col gap-1">
<span class="text-muted-foreground text-xs font-medium">
Connected At
</span>
<span class="text-sm">{formatDate(status.connected_at)}</span>
</div>
<div class="flex flex-col gap-1">
<span class="text-muted-foreground text-xs font-medium">
Token Expires At
</span>
<span class="text-sm">{formatDate(status.expires_at)}</span>
</div>
{#if status.scopes?.length}
<div class="flex flex-col gap-1">
<span class="text-muted-foreground text-xs font-medium">
Scopes
</span>
<span class="text-sm">{status.scopes.join(", ")}</span>
</div>
{/if}
{/if}
</div>
{/if}
</Card.CardContent>
{#if !loading && (status || loadError)}
<Card.CardFooter class="justify-end gap-2">
{#if loadError && !status}
<Button size="sm" variant="outline" onclick={loadStatus}>Retry</Button>
{/if}
{#if status}
{#if !connected || expired}
<Button size="sm" disabled={busy} onclick={handleConnect}>
{busy ? "..." : "Connect with Bitbucket"}
</Button>
{/if}
{#if connected}
<Button
size="sm"
variant="destructive"
disabled={busy}
onclick={() => (showDisconnectDialog = true)}
>
Disconnect
</Button>
{/if}
{/if}
</Card.CardFooter>
{/if}
</Card.Root>

<Dialog.Root
bind:open={showDisconnectDialog}
title="Disconnect from Bitbucket?"
description="Remove the stored Bitbucket OAuth connection?"
>
<p class="text-muted-foreground text-sm">
Active repository webhooks will stop delivering push events after the
Bitbucket token expires (about 2 hours). No remote webhooks are removed
automatically.
</p>
{#snippet footer()}
<Button variant="ghost" onclick={() => (showDisconnectDialog = false)}>
Cancel
</Button>
<Button variant="destructive" onclick={handleDisconnect} disabled={busy}>
{busy ? "Disconnecting..." : "Disconnect"}
</Button>
{/snippet}
</Dialog.Root>
5 changes: 2 additions & 3 deletions frontend/src/lib/components/Sidebar.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
const adminNav = [
{ pattern: "/admin/users", label: "Users", icon: UsersIcon },
{ pattern: "/admin/projects", label: "Projects", icon: SettingsIcon },
{ pattern: "/admin", label: "Settings", icon: SettingsIcon },
];
</script>

Expand Down Expand Up @@ -97,9 +98,7 @@
</button>

{#if pattern === "/projects" && recentProjects.length > 0}
<div
class="mt-2 ml-1 space-y-0.5 border-l border-border pl-2"
>
<div class="mt-2 ml-1 space-y-0.5 border-l border-border pl-2">
<p class="px-2 pb-0.5 text-xs font-medium text-muted-foreground">
Recent
</p>
Expand Down
46 changes: 44 additions & 2 deletions frontend/src/lib/pages/admin.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,47 @@
<script lang="ts">
import { onMount } from "svelte";
import { navigate } from "$lib/router/routes";
onMount(() => navigate("/admin/users"));
import BitbucketOAuthCard from "$lib/components/BitbucketOAuthCard.svelte";
import { toast } from "$lib/toast";

const OAUTH_ERROR_MESSAGES: Record<string, string> = {
access_denied: "Bitbucket authorization was denied",
missing_params: "The Bitbucket callback was missing required parameters",
exchange_failed: "Bitbucket rejected the authorization code",
invalid_state: "The connection session expired or was already used. Try again.",
};

onMount(() => {
// The Bitbucket OAuth callback redirects to /#/admin?oauth=success|error.
// With the hash router the result lives in the fragment, so read it from
// window.location.hash (falling back to search for robustness).
const hashQuery = window.location.hash.split("?")[1] ?? "";
const params = new URLSearchParams(hashQuery || window.location.search);
const outcome = params.get("oauth");
if (outcome === "success") {
toast.success("Connected to Bitbucket");
} else if (outcome === "error") {
const reason = params.get("reason") ?? "";
toast.error(
OAUTH_ERROR_MESSAGES[reason] ?? "Failed to connect to Bitbucket",
);
} else {
return;
}
const route = window.location.hash.slice(1).split("?")[0] || "/admin";
window.history.replaceState(
null,
"",
window.location.pathname + window.location.search + "#" + route,
);
});
</script>

<div class="flex flex-col gap-4 p-6">
<div>
<h1 class="text-2xl font-bold">Settings</h1>
<p class="text-muted-foreground text-sm">
Manage integrations and workspace settings
</p>
</div>
<BitbucketOAuthCard />
</div>
11 changes: 11 additions & 0 deletions frontend/src/lib/types/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,17 @@ export interface UserBrief {
created_at: string
}

export interface BitbucketOAuthStatus {
connected: boolean
connected_at?: string
expires_at?: string
scopes?: string[]
}

export interface BitbucketOAuthAuthorizeResponse {
url: string
}

export interface Task {
id: number
project_slug: string
Expand Down
8 changes: 5 additions & 3 deletions internal/commands/serve/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/bit-issues/backend/internal/config"
"github.com/bit-issues/backend/internal/db"
"github.com/bit-issues/backend/internal/jwt"
"github.com/bit-issues/backend/internal/oauth"
"github.com/bit-issues/backend/internal/projects"
"github.com/bit-issues/backend/internal/server"
"github.com/bit-issues/backend/internal/storage"
Expand Down Expand Up @@ -75,12 +76,13 @@ func run(ctx context.Context, version healthfx.Version) error {
//
// BUSINESS MODULES
fx.Supply(version),
attachments.Module(),
comments.Module(),
jwt.Module(),
users.Module(),
oauth.Module(),
projects.Module(),
tasks.Module(),
attachments.Module(),
comments.Module(),
users.Module(),
webauthn.Module(),
webhooks.Module(),
//
Expand Down
10 changes: 10 additions & 0 deletions internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ type webhooksConfig struct {
ActionKeywords map[string]webhooks.KeywordEntry `koanf:"action_keywords"`
}

type oauthConfig struct {
ClientID string `koanf:"client_id"`
ClientSecret string `koanf:"client_secret"`
}

type Config struct {
HTTP http `koanf:"http"`
Database databaseConfig `koanf:"database"`
Expand All @@ -72,6 +77,7 @@ type Config struct {
WebAuthn webauthnConfig `koanf:"webauthn"`
Cache cacheConfig `koanf:"cache"`
Webhooks webhooksConfig `koanf:"webhooks"`
OAuth oauthConfig `koanf:"oauth"`
}

func Default() Config {
Expand Down Expand Up @@ -134,6 +140,10 @@ func Default() Config {
"on hold": {Status: "On Hold", Verb: "On Hold"},
},
},
OAuth: oauthConfig{
ClientID: "",
ClientSecret: "",
},
}
}

Expand Down
Loading
Loading