Remove admin functionality related code
The admin functionality related code has been removed which includes various user and organization functionalities like delete, update, ban etc. This includes action logic, UI components and supportive utility functions. Notable deletions include the server action files, dialog components for actions like banning and deleting, and related utility functions. This massive cleanup is aimed at simplifying the codebase and the commit reflects adherence to project restructuring.
This commit is contained in:
giancarlo
@@ -1,87 +0,0 @@
|
||||
'use client';
|
||||
|
||||
import { useCallback, useTransition } from 'react';
|
||||
|
||||
import type { Session } from '@supabase/gotrue-js';
|
||||
|
||||
import useRefreshRoute from '@kit/shared/hooks/use-refresh-route';
|
||||
import { useSignOut } from '@kit/supabase/hooks/use-sign-out';
|
||||
import { Button } from '@kit/ui/button';
|
||||
import { Trans } from '@kit/ui/trans';
|
||||
|
||||
function ExistingUserInviteForm(
|
||||
props: React.PropsWithChildren<{
|
||||
session: Session;
|
||||
code: string;
|
||||
}>,
|
||||
) {
|
||||
const signOut = useSignOut();
|
||||
const refresh = useRefreshRoute();
|
||||
const [isSubmitting, startTransition] = useTransition();
|
||||
|
||||
const onSignOut = useCallback(async () => {
|
||||
await signOut.mutateAsync();
|
||||
refresh();
|
||||
}, [refresh, signOut]);
|
||||
|
||||
const onInviteAccepted = useCallback(() => {
|
||||
return startTransition(async () => {
|
||||
await acceptInviteAction({
|
||||
code: props.code,
|
||||
});
|
||||
});
|
||||
}, [props.code, startTransition]);
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className={'flex flex-col space-y-4'}>
|
||||
<p className={'text-center text-sm'}>
|
||||
<Trans
|
||||
i18nKey={'auth:clickToAcceptAs'}
|
||||
values={{ email: props.session?.user.email }}
|
||||
components={{ b: <b /> }}
|
||||
/>
|
||||
</p>
|
||||
|
||||
<Button
|
||||
className={'w-full'}
|
||||
disabled={isSubmitting}
|
||||
onClick={onInviteAccepted}
|
||||
data-test={'accept-invite-submit-button'}
|
||||
type={'submit'}
|
||||
>
|
||||
<Trans i18nKey={'auth:acceptInvite'} />
|
||||
</Button>
|
||||
|
||||
<div>
|
||||
<div className={'flex flex-col space-y-4'}>
|
||||
<p className={'text-center'}>
|
||||
<span
|
||||
className={
|
||||
'text-center text-sm text-gray-700 dark:text-gray-300'
|
||||
}
|
||||
>
|
||||
<Trans i18nKey={'auth:acceptInviteWithDifferentAccount'} />
|
||||
</span>
|
||||
</p>
|
||||
|
||||
<div className={'flex justify-center'}>
|
||||
<Button
|
||||
data-test={'invite-sign-out-button'}
|
||||
disabled={isSubmitting}
|
||||
variant={'ghost'}
|
||||
size={'sm'}
|
||||
onClick={onSignOut}
|
||||
type={'button'}
|
||||
>
|
||||
<Trans i18nKey={'auth:signOut'} />
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
export default ExistingUserInviteForm;
|
||||
@@ -1,103 +0,0 @@
|
||||
'use client';
|
||||
|
||||
import { useCallback, useState, useTransition } from 'react';
|
||||
|
||||
import { EmailOtpContainer } from '@kit/auth/src/components/email-otp-container';
|
||||
import { OauthProviders } from '@kit/auth/src/components/oauth-providers';
|
||||
import { PasswordSignInContainer } from '@kit/auth/src/components/password-sign-in-container';
|
||||
import { EmailPasswordSignUpContainer } from '@kit/auth/src/components/password-sign-up-container';
|
||||
import { isBrowser } from '@kit/shared/utils';
|
||||
import { Button } from '@kit/ui/button';
|
||||
import { If } from '@kit/ui/if';
|
||||
import { LoadingOverlay } from '@kit/ui/loading-overlay';
|
||||
import { Trans } from '@kit/ui/trans';
|
||||
|
||||
import authConfig from '~/config/auth.config';
|
||||
|
||||
enum Mode {
|
||||
SignUp,
|
||||
SignIn,
|
||||
}
|
||||
|
||||
function NewUserInviteForm(
|
||||
props: React.PropsWithChildren<{
|
||||
code: string;
|
||||
}>,
|
||||
) {
|
||||
const [mode, setMode] = useState<Mode>(Mode.SignUp);
|
||||
const [isSubmitting, startTransition] = useTransition();
|
||||
const oAuthReturnUrl = isBrowser() ? window.location.pathname : '';
|
||||
|
||||
const onInviteAccepted = useCallback(
|
||||
async (userId?: string) => {
|
||||
startTransition(async () => {
|
||||
await acceptInviteAction({
|
||||
code: props.code,
|
||||
userId,
|
||||
});
|
||||
});
|
||||
},
|
||||
[props.code],
|
||||
);
|
||||
|
||||
return (
|
||||
<>
|
||||
<If condition={isSubmitting}>
|
||||
<LoadingOverlay fullPage>
|
||||
Accepting invite. Please wait...
|
||||
</LoadingOverlay>
|
||||
</If>
|
||||
|
||||
<OauthProviders inviteCode={props.code} returnUrl={oAuthReturnUrl} />
|
||||
|
||||
<If condition={authConfig.providers.password}>
|
||||
<If condition={mode === Mode.SignUp}>
|
||||
<div className={'flex w-full flex-col items-center space-y-4'}>
|
||||
<EmailPasswordSignUpContainer
|
||||
emailRedirectTo={emailRedirectTo}
|
||||
onSignUp={onInviteAccepted}
|
||||
/>
|
||||
|
||||
<Button
|
||||
className={'w-full'}
|
||||
variant={'ghost'}
|
||||
size={'sm'}
|
||||
onClick={() => setMode(Mode.SignIn)}
|
||||
>
|
||||
<Trans i18nKey={'auth:alreadyHaveAccountStatement'} />
|
||||
</Button>
|
||||
</div>
|
||||
</If>
|
||||
|
||||
<If condition={mode === Mode.SignIn}>
|
||||
<div className={'flex w-full flex-col items-center space-y-4'}>
|
||||
<PasswordSignInContainer onSignIn={onInviteAccepted} />
|
||||
|
||||
<Button
|
||||
className={'w-full'}
|
||||
variant={'ghost'}
|
||||
size={'sm'}
|
||||
onClick={() => setMode(Mode.SignUp)}
|
||||
>
|
||||
<Trans i18nKey={'auth:doNotHaveAccountStatement'} />
|
||||
</Button>
|
||||
</div>
|
||||
</If>
|
||||
</If>
|
||||
|
||||
<If condition={authConfig.providers.magicLink}>
|
||||
<MagicLinkAuth inviteCode={props.code} />
|
||||
</If>
|
||||
|
||||
<If condition={authConfig.providers.otp}>
|
||||
<EmailOtpContainer
|
||||
inviteCode={props.code}
|
||||
shouldCreateUser={true}
|
||||
onSuccess={onInviteAccepted}
|
||||
/>
|
||||
</If>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
export default NewUserInviteForm;
|
||||
@@ -1,17 +1,10 @@
|
||||
import { headers } from 'next/headers';
|
||||
import { notFound } from 'next/navigation';
|
||||
|
||||
import type { SupabaseClient } from '@supabase/supabase-js';
|
||||
|
||||
import { Logger } from '@kit/shared/logger';
|
||||
import { Database } from '@kit/supabase/database';
|
||||
import { getSupabaseServerComponentClient } from '@kit/supabase/server-component-client';
|
||||
import { Heading } from '@kit/ui/heading';
|
||||
import { If } from '@kit/ui/if';
|
||||
import { Trans } from '@kit/ui/trans';
|
||||
|
||||
import ExistingUserInviteForm from '~/join/_components/ExistingUserInviteForm';
|
||||
import NewUserInviteForm from '~/join/_components/NewUserInviteForm';
|
||||
import { withI18n } from '~/lib/i18n/with-i18n';
|
||||
|
||||
interface Context {
|
||||
@@ -28,12 +21,10 @@ async function JoinTeamAccountPage({ searchParams }: Context) {
|
||||
const token = searchParams.invite_token;
|
||||
const data = await getInviteDataFromInviteToken(token);
|
||||
|
||||
if (!data.membership) {
|
||||
if (!data) {
|
||||
notFound();
|
||||
}
|
||||
|
||||
const organization = data.membership.organization;
|
||||
|
||||
return (
|
||||
<>
|
||||
<Heading level={4}>
|
||||
@@ -62,70 +53,26 @@ async function JoinTeamAccountPage({ searchParams }: Context) {
|
||||
</If>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<If
|
||||
condition={data.session}
|
||||
fallback={<NewUserInviteForm code={token} />}
|
||||
>
|
||||
{(session) => <ExistingUserInviteForm code={token} session={session} />}
|
||||
</If>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
export default withI18n(JoinTeamAccountPage);
|
||||
|
||||
async function getInviteDataFromInviteToken(code: string) {
|
||||
const client = getSupabaseServerComponentClient();
|
||||
|
||||
async function getInviteDataFromInviteToken(token: string) {
|
||||
// we use an admin client to be able to read the pending membership
|
||||
// without having to be logged in
|
||||
const adminClient = getSupabaseServerComponentClient({ admin: true });
|
||||
|
||||
const { data: membership, error } = await getInvite(adminClient, code);
|
||||
const { data: invitation, error } = await adminClient
|
||||
.from('invitations')
|
||||
.select('*')
|
||||
.eq('invite_token', token)
|
||||
.single();
|
||||
|
||||
// if the invite wasn't found, it's 404
|
||||
if (error) {
|
||||
Logger.warn(
|
||||
{
|
||||
code,
|
||||
error,
|
||||
},
|
||||
`User navigated to invite page, but it wasn't found. Redirecting to home page...`,
|
||||
);
|
||||
|
||||
notFound();
|
||||
if (!invitation ?? error) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const { data: userSession } = await client.auth.getSession();
|
||||
const session = userSession?.session;
|
||||
const csrfToken = headers().get('x-csrf-token');
|
||||
|
||||
return {
|
||||
csrfToken,
|
||||
session,
|
||||
membership,
|
||||
code,
|
||||
};
|
||||
}
|
||||
|
||||
function getInvite(adminClient: SupabaseClient<Database>, code: string) {
|
||||
return getMembershipByInviteCode<{
|
||||
id: number;
|
||||
code: string;
|
||||
organization: {
|
||||
name: string;
|
||||
id: number;
|
||||
};
|
||||
}>(adminClient, {
|
||||
code,
|
||||
query: `
|
||||
id,
|
||||
code,
|
||||
organization: organization_id (
|
||||
name,
|
||||
id
|
||||
)
|
||||
`,
|
||||
});
|
||||
return invitation;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user