Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4bdd4c1d8a | |||
| 336334c7f5 | |||
| a502ae2687 | |||
| 782d8446d9 | |||
| 5b79f5fb4b | |||
| a0f84ec78e |
@@ -1743,13 +1743,12 @@ def update_api_key(kid: int):
|
|||||||
|
|
||||||
@app.route("/api/api-keys/<int:kid>", methods=["DELETE"])
|
@app.route("/api/api-keys/<int:kid>", methods=["DELETE"])
|
||||||
@require_login
|
@require_login
|
||||||
def revoke_api_key(kid: int):
|
def delete_api_key(kid: int):
|
||||||
with db_cursor() as (_, cur):
|
with db_cursor() as (_, cur):
|
||||||
cur.execute(
|
cur.execute(
|
||||||
"""
|
"""
|
||||||
UPDATE api_keys
|
DELETE FROM api_keys
|
||||||
SET revoked_at = CURRENT_TIMESTAMP
|
WHERE id = %s
|
||||||
WHERE id = %s AND revoked_at IS NULL
|
|
||||||
""",
|
""",
|
||||||
(kid,),
|
(kid,),
|
||||||
)
|
)
|
||||||
|
|||||||
+18
-17
@@ -366,14 +366,14 @@ async function submitApiKey() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function revokeApiKey(id: number, label: string) {
|
async function deleteApiKey(id: number, label: string) {
|
||||||
if (!confirm(`Revoke API key "${label}"? This cannot be undone.`)) return;
|
if (!confirm(`Delete API key "${label}"? This cannot be undone.`)) return;
|
||||||
apiKeysErr.value = "";
|
apiKeysErr.value = "";
|
||||||
try {
|
try {
|
||||||
await api.revokeApiKey(id);
|
await api.deleteApiKey(id);
|
||||||
await refreshApiKeys();
|
await refreshApiKeys();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
apiKeysErr.value = e instanceof Error ? e.message : "Failed to revoke API key";
|
apiKeysErr.value = e instanceof Error ? e.message : "Failed to delete API key";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -692,27 +692,29 @@ async function deleteIdentityRow(id: number) {
|
|||||||
/>
|
/>
|
||||||
</svg>
|
</svg>
|
||||||
</button>
|
</button>
|
||||||
<a
|
<div class="flex items-center gap-2 truncate">
|
||||||
href="https://git.jdbnet.co.uk/jamie/ssh"
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
class="flex items-center gap-2 truncate"
|
|
||||||
>
|
|
||||||
<span class="truncate text-sm font-semibold text-white">JDB-NET SSH</span>
|
<span class="truncate text-sm font-semibold text-white">JDB-NET SSH</span>
|
||||||
<span class="truncate text-xs text-slate-400 hover:text-slate-300">{{ appVersion }}</span>
|
<a
|
||||||
</a>
|
href="https://git.jdbnet.co.uk/jamie/ssh"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
class="truncate text-xs text-slate-400 hover:text-slate-300"
|
||||||
|
>
|
||||||
|
{{ appVersion }}
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="rounded-lg px-3 py-1.5 text-xs text-slate-400 hover:bg-slate-800 hover:text-white"
|
class="hidden rounded-lg px-3 py-1.5 text-xs text-slate-400 hover:bg-slate-800 hover:text-white md:inline-flex"
|
||||||
@click="openApiKeys"
|
@click="openApiKeys"
|
||||||
>
|
>
|
||||||
API keys
|
API keys
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="rounded-lg px-3 py-1.5 text-xs text-slate-400 hover:bg-slate-800 hover:text-white"
|
class="hidden rounded-lg px-3 py-1.5 text-xs text-slate-400 hover:bg-slate-800 hover:text-white md:inline-flex"
|
||||||
@click="openAuditLog"
|
@click="openAuditLog"
|
||||||
>
|
>
|
||||||
Connection audit
|
Connection audit
|
||||||
@@ -1139,12 +1141,11 @@ async function deleteIdentityRow(id: number) {
|
|||||||
<td class="px-2 py-2">{{ apiKeyStatus(row) }}</td>
|
<td class="px-2 py-2">{{ apiKeyStatus(row) }}</td>
|
||||||
<td class="px-2 py-2 text-right">
|
<td class="px-2 py-2 text-right">
|
||||||
<button
|
<button
|
||||||
v-if="row.active"
|
|
||||||
type="button"
|
type="button"
|
||||||
class="rounded px-2 py-1 text-red-400 hover:bg-slate-800"
|
class="rounded px-2 py-1 text-red-400 hover:bg-slate-800"
|
||||||
@click="revokeApiKey(row.id, row.label)"
|
@click="deleteApiKey(row.id, row.label)"
|
||||||
>
|
>
|
||||||
Revoke
|
Delete
|
||||||
</button>
|
</button>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
+1
-1
@@ -226,7 +226,7 @@ export const api = {
|
|||||||
return handle(res);
|
return handle(res);
|
||||||
},
|
},
|
||||||
|
|
||||||
async revokeApiKey(id: number): Promise<void> {
|
async deleteApiKey(id: number): Promise<void> {
|
||||||
const res = await fetch(`/api/api-keys/${id}`, {
|
const res = await fetch(`/api/api-keys/${id}`, {
|
||||||
method: "DELETE",
|
method: "DELETE",
|
||||||
credentials: "include",
|
credentials: "include",
|
||||||
|
|||||||
Generated
-6
@@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "ssh",
|
|
||||||
"lockfileVersion": 3,
|
|
||||||
"requires": true,
|
|
||||||
"packages": {}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user