Skip to content
Merged
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
9 changes: 9 additions & 0 deletions assets/tailwindcss.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,12 @@
@plugin "@tailwindcss/typography";
@plugin "@tailwindcss/forms";
@config "../tailwind.config.js";

@layer base {
input[type="number"]::-webkit-outer-spin-button,
input[type="number"]::-webkit-inner-spin-button,
input[type="number"] {
-webkit-appearance: none;
-moz-appearance: textfield !important;
}
}
5 changes: 5 additions & 0 deletions components/UserHeader/UserWidget.vue
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,11 @@ const navigation = computed<NavigationItem[]>(() =>
route: "/account",
prefix: "",
},
{
label: "Authorize client",
route: "/client/code",
prefix: "",
},
].filter((e) => e !== undefined),
);
</script>
18 changes: 18 additions & 0 deletions i18n/locales/en_au.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
{
"setup": {
"welcome": "G'day."
},
"account": {
"devices": {
"subheader": "Manage the devices authorised to access your Drop account."
}
},
"auth": {
"callback": {
"authClient": "Authorise client?",
"authorize": "Authorise",
"authorizedClient": "Drop has successfully authorised the client. You may now close this window."
}
},
"library": {
"collection": {
"subheader": "Add a new collection to organise your games"
},
"subheader": "Organise your games into collections for easy access, and access all your games."
}
}
27 changes: 25 additions & 2 deletions i18n/locales/en_pirate.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,25 @@
"listItemPlaceholder": "list item, eh?"
},
"errors": {
"admin": {
"user": {
"delete": {
"desc": "Couldn't make {0} walk the plank!",
"title": "Couldn't make 'em walk the plank"
}
}
},
"auth": {
"disabled": "Ya' angered the Cap'n, give him a holler!",
"invalidInvite": "Boarding pass no longer valid, ya scallywag!",
"invalidPassState": "Cap'n's rolled snake eyes, see how he's doin'.",
"invalidUserOrPass": "Are ya lying to me about your username and password, ya dog?",
"inviteIdRequired": "Ya need to include the ID for your boarding pass, matey!",
"method": {
"signinDisabled": "No entrance through these parts, arr!"
},
"usernameTaken": "We already have a scallywag with that 'ere name of yours."
},
"backHome": "{arrow} Back to yer safe harbor",
"game": {
"banner": {
Expand Down Expand Up @@ -203,7 +222,8 @@
"discord": "Discord, argh!",
"github": "GitHub, savvy?"
},
"topSellers": "Top Plunderers"
"topSellers": "Top Plunderers",
"version": "Drop {version} {gitRef}"
},
"header": {
"admin": {
Expand Down Expand Up @@ -401,7 +421,8 @@
"cleanupSessionsDescription": "Cleans up expired sessions to save space and keep ye safe, ye dog!",
"cleanupSessionsName": "Clean up sessions."
},
"viewTask": "View {arrow}"
"viewTask": "View {arrow}",
"weeklyScheduledTitle": "Weekly chores"
}
},
"title": "Drop",
Expand Down Expand Up @@ -439,6 +460,8 @@
"title": "Passage"
},
"authoptionsHeader": "Passage Options",
"delete": "Scuttle!",
"deleteUser": "Make {0} walk the plank!",
"description": "Manage the crew on yer Drop vessel, and set yer passage methods, savvy?",
"displayNameHeader": "Scallywag Name",
"emailHeader": "Salty Mail",
Expand Down
4 changes: 4 additions & 0 deletions i18n/locales/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@
"requestedAccess": "\"{name}\" has requested access to your Drop account.",
"success": "Successful!"
},
"code": {
"title": "Connect your Drop client",
"description": "Use a code to connect your Drop client if you are unable to open a web browser on your device."
},
"confirmPassword": "Confirm @:auth.password",
"displayName": "Display Name",
"email": "Email",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "drop",
"version": "0.3.0",
"version": "0.3.1",
"private": true,
"type": "module",
"license": "AGPL-3.0-or-later",
Expand Down
79 changes: 53 additions & 26 deletions pages/client/[id]/callback.vue → pages/client/authorize/[id].vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div
v-if="completed"
class="min-h-full w-full flex items-center justify-center"
class="min-h-full w-full flex items-center justify-center py-10"
>
<div class="flex flex-col items-center">
<CheckCircleIcon class="h-12 w-12 text-green-600" aria-hidden="true" />
Expand All @@ -14,7 +14,7 @@
{{ $t("auth.callback.authorizedClient") }}
</p>

<Disclosure v-slot="{ open }" as="div" class="mt-8">
<Disclosure v-if="authToken" v-slot="{ open }" as="div" class="mt-8">
<dt>
<DisclosureButton
class="pb-2 flex w-full items-start justify-between text-left text-zinc-400"
Expand Down Expand Up @@ -155,38 +155,58 @@ import {
XCircleIcon,
} from "@heroicons/vue/16/solid";
import { LockClosedIcon } from "@heroicons/vue/20/solid";
import { CheckCircleIcon } from "@heroicons/vue/24/outline";
import { CheckCircleIcon, CloudIcon } from "@heroicons/vue/24/outline";
import { ChevronDownIcon, ChevronUpIcon } from "@heroicons/vue/24/solid";
import type { FetchError } from "ofetch";

const route = useRoute();
const clientId = route.params.id;

const clientData = await $dropFetch(
`/api/v1/client/auth/callback?id=${clientId}`,
);
const clientData = await $dropFetch(`/api/v1/client/auth?id=${clientId}`);

const completed = ref(false);
const error = ref();
const authToken = ref<string | undefined>();

async function authorize() {
const { redirect, token } = await $dropFetch("/api/v1/client/auth/callback", {
method: "POST",
body: { id: clientId },
switch (clientData.mode) {
case "callback": {
const { redirect, token } = await $dropFetch(
`/api/v1/client/auth/callback`,
{
method: "POST",
body: { id: clientId },
},
);
authToken.value = token;
window.location.replace(redirect);
return;
}
case "code": {
await $dropFetch("/api/v1/client/auth/code", {
method: "POST",
body: { id: clientId },
});
return;
}
}
throw createError({
statusCode: 500,
statusMessage: "Unknown client auth mode: " + clientData.mode,
fatal: true,
});
authToken.value = token;
window.location.replace(redirect);
}

function authorize_wrapper() {
authorize()
.catch((e) => {
const errorMessage = e.statusMessage || "An unknown error occurred.";
error.value = errorMessage;
})
.then(() => {
completed.value = true;
});
async function authorize_wrapper() {
try {
await authorize();
} catch (e) {
const errorMessage =
(e as FetchError)?.statusMessage || "An unknown error occurred.";
error.value = errorMessage;
} finally {
completed.value = true;
}
}

const scopes = [
Expand All @@ -198,20 +218,27 @@ const scopes = [
icon: ArrowDownTrayIcon,
},
{
name: "Update your status",
description:
"The client will be able to update your status, and affect your playtime.",
href: "/docs/access/status",
icon: UserGroupIcon,
},
clientData.capabilities["peerAPI"] && {
name: "Access the Drop network",
description:
"The client will be able to establish P2P connections with other users to enable features like download aggregation, Remote LAN play and P2P multiplayer.",
href: "/docs/access/network",
icon: LockClosedIcon,
},
{
name: "Manage your account",
clientData.capabilities["cloudSaves"] && {
name: "Upload and sync cloud saves",
description:
"The client will be able to change your account details, and friend statuses on your behalf.",
href: "/docs/access/account",
icon: UserGroupIcon,
"The client will be able to upload new cloud saves, and edit your existing ones.",
href: "/docs/access/cloud",
icon: CloudIcon,
},
];
].filter((e) => e !== undefined);

useHead({
title: "Authorize",
Expand Down
135 changes: 135 additions & 0 deletions pages/client/code/index.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
<template>
<div class="w-full h-max min-h-[30vw] flex items-center justify-center">
<div class="text-center">
<h1 class="text-2xl font-bold text-zinc-100">
{{ $t("auth.code.title") }}
</h1>
<p class="mt-1 max-w-sm text-zinc-400 mx-auto">
{{ $t("auth.code.description") }}
</p>
<div v-if="!loading" class="mt-8 flex flex-row gap-4">
<input
v-for="i in codeLength"
ref="codeElements"
:key="i"
v-model="code[i - 1]"
class="uppercase w-16 h-16 appearance-none text-center bg-zinc-900 rounded-xl border-zinc-700 focus:border-blue-600 text-2xl text-bold font-display text-zinc-100"
type="text"
pattern="\d*"
:placeholder="placeholder[i - 1]"
@keydown="(v) => keydown(i - 1, v)"
@input="() => input(i - 1)"
@focusin="() => select(i - 1)"
@paste="(v) => paste(i - 1, v)"
/>
</div>
<div v-else class="mt-8 flex items-center justify-center">
<svg
aria-hidden="true"
class="size-12 text-transparent animate-spin fill-white"
viewBox="0 0 100 101"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
fill="currentColor"
/>
<path
d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
fill="currentFill"
/>
</svg>
</div>

<div
v-if="error"
class="mt-8 rounded-md bg-red-600/10 p-4 max-w-sm mx-auto"
>
<div class="flex">
<div class="flex-shrink-0">
<XCircleIcon class="h-5 w-5 text-red-600" aria-hidden="true" />
</div>
<div class="ml-3">
<h3 class="text-sm font-medium text-red-600">
{{ error }}
</h3>
</div>
</div>
</div>
</div>
</div>
</template>

<script setup lang="ts">
import { XCircleIcon } from "@heroicons/vue/24/solid";
import { FetchError } from "ofetch";

const codeLength = 7;
const placeholder = "1A2B3C4";
const codeElements = useTemplateRef("codeElements");
const code = ref<string[]>([]);

const router = useRouter();
const loading = ref(false);
const error = ref<string | undefined>(undefined);

function keydown(index: number, event: KeyboardEvent) {
if (event.key === "Backspace" && !code.value[index] && index > 0) {
codeElements.value![index - 1].focus();
}
}

function input(index: number) {
if (codeElements.value === null) return;
const v = code.value[index] ?? "";
if (v.length > 1) code.value[index] = v[0];

if (!(index + 1 >= codeElements.value.length) && v) {
codeElements.value[index + 1].focus();
}

if (!(index - 1 < 0) && !v) {
codeElements.value[index - 1].focus();
}

console.log(index, codeLength - 1);
if (index == codeLength - 1) {
const assembledCode = code.value.join("");
if (assembledCode.length == codeLength) {
complete(assembledCode);
}
}
}

function select(index: number) {
if (!codeElements.value) return;
if (index >= codeElements.value.length) return;
codeElements.value[index].select();
}

function paste(index: number, event: ClipboardEvent) {
const newCode = event.clipboardData!.getData("text/plain");
for (let i = 0; i < newCode.length && i < codeLength; i++) {
code.value[i] = newCode[i];
codeElements.value![i].focus();
}
event.preventDefault();
}

async function complete(code: string) {
loading.value = true;
try {
const clientId = await $dropFetch(`/api/v1/client/auth/code?code=${code}`);
router.push(`/client/authorize/${clientId}`);
} catch (e) {
if (e instanceof FetchError) {
error.value =
e.statusMessage ?? e.message ?? "An unknown error occurred.";
} else {
error.value = (e as string)?.toString();
}
}
loading.value = false;
}
</script>
11 changes: 11 additions & 0 deletions prisma/migrations/20250801035031_add_delete_casacde/migration.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
-- DropForeignKey
ALTER TABLE "Game" DROP CONSTRAINT "Game_libraryId_fkey";

-- DropIndex
DROP INDEX "GameTag_name_idx";

-- CreateIndex
CREATE INDEX "GameTag_name_idx" ON "GameTag" USING GIST ("name" gist_trgm_ops(siglen=32));

-- AddForeignKey
ALTER TABLE "Game" ADD CONSTRAINT "Game_libraryId_fkey" FOREIGN KEY ("libraryId") REFERENCES "Library"("id") ON DELETE CASCADE ON UPDATE CASCADE;
Loading