Skip to content

feat: user invite uses external domain option #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ DATABASE_URL="postgres://drop:drop@127.0.0.1:5432/drop"

GIANT_BOMB_API_KEY=""

EXTERNAL_URL="localhost:3000"
EXTERNAL_URL="http://localhost:3000"
27 changes: 5 additions & 22 deletions pages/admin/users/auth/simple/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,14 @@
</div>
<ul role="list" class="divide-y divide-zinc-800">
<li
v-for="(invitation, invitationIdx) in invitations"
v-for="invitation in invitations"
:key="invitation.id"
class="relative flex justify-between gap-x-6 py-5"
>
<div class="flex min-w-0 gap-x-4">
<div class="min-w-0 flex-auto">
<div class="text-sm/6 font-semibold text-zinc-100">
<p v-if="invitationUrls">
{{ invitationUrls[invitationIdx] }}
</p>
<div
v-else
class="h-4 w-full bg-zinc-800 animate-pulse rounded"
/>
<p>{{ invitation.inviteUrl }}</p>
</div>

<p class="mt-1 flex text-xs/5 text-gray-500">
Expand Down Expand Up @@ -415,20 +409,11 @@ useHead({
title: "Simple authentication",
});

const data = await $dropFetch<Array<SerializeObject<Invitation>>>(
"/api/v1/admin/auth/invitation",
);
const data = await $dropFetch<
Array<SerializeObject<Invitation & { inviteUrl: string }>>
>("/api/v1/admin/auth/invitation");
const invitations = ref(data ?? []);

const generateInvitationUrl = (id: string) =>
`${window.location.protocol}//${window.location.host}/auth/register?id=${id}`;
const invitationUrls = ref<undefined | Array<string>>();
onMounted(() => {
invitationUrls.value = invitations.value.map((invitation) =>
generateInvitationUrl(invitation.id),
);
});

// Makes username undefined if it's empty
const _username = ref<undefined | string>(undefined);
const username = computed({
Expand Down Expand Up @@ -515,7 +500,6 @@ function invite_wrapper() {
invite()
.then((invitation) => {
invitations.value.push(invitation);
invitationUrls.value?.push(generateInvitationUrl(invitation.id));
})
.catch((response) => {
const message = response.statusMessage || t("errors.unknown");
Expand All @@ -536,7 +520,6 @@ async function deleteInvitation(id: string) {

const index = invitations.value.findIndex((e) => e.id === id);
invitations.value.splice(index, 1);
invitationUrls.value?.splice(index, 1);
}

const createModalOpen = ref(false);
Expand Down
10 changes: 9 additions & 1 deletion server/api/v1/admin/auth/invitation/index.get.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import aclManager from "~/server/internal/acls";
import { systemConfig } from "~/server/internal/config/sys-conf";
import prisma from "~/server/internal/db/database";
import taskHandler from "~/server/internal/tasks";

Expand All @@ -10,6 +11,13 @@ export default defineEventHandler(async (h3) => {

await taskHandler.runTaskGroupByName("cleanup:invitations");

const externalUrl = systemConfig.getExternalUrl();
const invitations = await prisma.invitation.findMany({});
return invitations;

return invitations.map((invitation) => {
return {
...invitation,
inviteUrl: `${externalUrl}/auth/register?id=${invitation.id}`,
};
});
});
6 changes: 5 additions & 1 deletion server/api/v1/admin/auth/invitation/index.post.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { readDropValidatedBody, throwingArktype } from "~/server/arktype";
import aclManager from "~/server/internal/acls";
import prisma from "~/server/internal/db/database";
import { SharedRegisterValidator } from "../../../auth/signup/simple.post";
import { systemConfig } from "~/server/internal/config/sys-conf";

const CreateInvite = SharedRegisterValidator.partial()
.and({
Expand All @@ -22,5 +23,8 @@ export default defineEventHandler(async (h3) => {
data: body,
});

return invitation;
return {
...invitation,
inviteUrl: `${systemConfig.getExternalUrl()}/auth/register?id=${invitation.id}`,
};
});