feat(frontend): Clean-up schemas, remove dead code, move types

This commit is contained in:
2025-10-03 08:44:15 +02:00
parent 17a3a76054
commit 6c88b4fd96
12 changed files with 136 additions and 351 deletions

View File

@@ -1,5 +1,5 @@
import type { LegalRole } from '~/server/utils/permissions'
import type { ListMembersOptions } from '~/composables/useAuth'
import type { ListMembersOptions } from '~/types/auth'
export function useOrganizationApi() {
const { organization } = useAuth()

View File

@@ -2,47 +2,20 @@
import { defu } from 'defu'
import { createAuthClient } from 'better-auth/vue'
import type { InferSessionFromClient, InferUserFromClient, ClientOptions } from 'better-auth/client'
import { organizationClient, jwtClient } from 'better-auth/client/plugins'
import type { ClientOptions, InferSessionFromClient, InferUserFromClient } from 'better-auth/client'
import { jwtClient, organizationClient } from 'better-auth/client/plugins'
import type { RouteLocationRaw } from 'vue-router'
import {
accessControl,
employerRole,
worksCouncilMemberRole,
employeeRole,
adminRole,
employeeRole,
employerRole,
ownerRole,
ROLES
ROLES,
worksCouncilMemberRole
} from '~/server/utils/permissions'
import type { RuntimeAuthConfig } from '~/types/auth'
interface RuntimeAuthConfig {
redirectUserTo: RouteLocationRaw | string
redirectGuestTo: RouteLocationRaw | string
}
// Types can be found here: https://github.com/better-auth/better-auth/blob/3f574ec70bb15c155a78673d42c5e25f7376ced3/packages/better-auth/src/plugins/organization/routes/crud-invites.ts#L531
type Client = ReturnType<typeof useAuth>['client']
export type Session = Client['$Infer']['Session']
export type User = Session['user']
export type ActiveOrganization = Client['$Infer']['ActiveOrganization']
export type Organization = Client['$Infer']['Organization']
export type Invitation = Client['$Infer']['Invitation']
export type Member = Client['$Infer']['Member']
export type ListMembersOptions = Parameters<Client['organization']['listMembers']>[0]
export type ListMembersResponse = Awaited<ReturnType<Client['organization']['listMembers']>>
export type ListMembersQuery = NonNullable<ListMembersOptions>['query']
// Extended invitation type with additional organization and inviter details
export type CustomInvitation =
| (Invitation & {
organizationName: string
organizationSlug: string
inviterEmail: string
})
| null
// TODO: Move into pinia store
const session = ref<InferSessionFromClient<ClientOptions> | null>(null)
const user = ref<InferUserFromClient<ClientOptions> | null>(null)
const sessionFetching = import.meta.server ? ref(false) : ref(false)
@@ -195,7 +168,6 @@ export function useAuth() {
user,
loggedIn: computed(() => !!session.value),
signIn: client.signIn,
signUp: client.signUp,
deleteUser: client.deleteUser,
signOut,
organization: client.organization,