feat: migrate auth from supabase to better auth (#596)
* feat: add README for @cio/db package and remove existingAccounts.json * load session, load profile and organization, add create profile hook * chore: cache session request The trick was passing all the cookies to the backend. Previously I was only passing the better-auth.session_token and not better-auth.session_data. Read about the difference here https://www.better-auth.com/docs/concepts/cookies#custom-cookies * feat: login, logout, onboarding, verify email, reset password. * feat: complete change email and email verification * feat: standardise how we make rpc calls and create org endpoints * fix ui errors * fix: handle potential undefined customerId and standardize avatar URL property * refactor: standardize custom domain handling and update telegram chat ID references * chore: add tailwind prefix to @cio/ui this fixed the media query issues because @cio/ui classes were overriding this dashboard tailwind build * chore: clean up org sidebar * chore: persist mode state * feat: implement order breadcrumbs * chore: upgrade to better auth 1.4 * chore: address common auth flow bugs and setup app for others to setup locally.
This commit is contained in:
Rotimi Best
@@ -1,46 +1,56 @@
|
||||
import type { CurrentOrg, OrgAudience, OrgTeamMember } from '../types/org';
|
||||
import type { OrgAudience, OrgTeamMember } from '../types/org';
|
||||
import { browser, dev } from '$app/environment';
|
||||
import { derived, writable } from 'svelte/store';
|
||||
|
||||
import type { AccountOrg } from '$lib/features/app/types';
|
||||
import { PLAN } from '@cio/utils/plans';
|
||||
import { PUBLIC_IS_SELFHOSTED } from '$env/static/public';
|
||||
import { ROLE } from '$lib/utils/constants/roles';
|
||||
import { ROLE } from '@cio/utils/constants';
|
||||
import { STEPS } from '../constants/quiz';
|
||||
import type { UserLessonDataType } from '$lib/utils/types';
|
||||
import type { Writable } from 'svelte/store';
|
||||
|
||||
// Trigger build
|
||||
export const defaultCurrentOrgState: CurrentOrg = {
|
||||
id: '',
|
||||
name: '',
|
||||
shortName: '',
|
||||
siteName: '',
|
||||
avatar_url: '',
|
||||
memberId: '',
|
||||
role_id: 0,
|
||||
landingpage: {},
|
||||
export const defaultCurrentOrgState: AccountOrg = {
|
||||
avatarUrl: '',
|
||||
createdAt: '',
|
||||
customCode: '',
|
||||
customDomain: '',
|
||||
customization: {
|
||||
apps: { poll: true, comments: true },
|
||||
course: { grading: true, newsfeed: true },
|
||||
dashboard: { exercise: true, community: true, bannerText: '', bannerImage: '' }
|
||||
},
|
||||
theme: '',
|
||||
organization_plan: [],
|
||||
is_restricted: false
|
||||
favicon: '',
|
||||
id: '',
|
||||
isCustomDomainVerified: false,
|
||||
isRestricted: false,
|
||||
landingpage: {},
|
||||
name: '',
|
||||
plans: [],
|
||||
roleId: 0,
|
||||
settings: {},
|
||||
siteName: '',
|
||||
theme: ''
|
||||
};
|
||||
|
||||
export const orgs = writable<CurrentOrg[]>([]);
|
||||
export const currentOrg: Writable<CurrentOrg> = writable(defaultCurrentOrgState);
|
||||
export const orgs = writable<AccountOrg[]>([]);
|
||||
|
||||
export const currentOrg: Writable<AccountOrg> = writable(defaultCurrentOrgState);
|
||||
export const orgAudience = writable<OrgAudience[]>([]);
|
||||
export const orgTeam = writable<OrgTeamMember[]>([]);
|
||||
export const isOrgAdmin = derived(currentOrg, ($currentOrg) => {
|
||||
if ($currentOrg.role_id === 0) return null;
|
||||
if ($currentOrg.roleId === 0) return null;
|
||||
|
||||
return $currentOrg.role_id === ROLE.ADMIN;
|
||||
return $currentOrg.roleId === ROLE.ADMIN;
|
||||
});
|
||||
export const isOrgStudent = derived(currentOrg, ($currentOrg) => {
|
||||
if ($currentOrg.roleId === 0) return null;
|
||||
|
||||
return $currentOrg.roleId === ROLE.STUDENT;
|
||||
});
|
||||
|
||||
const getActivePlan = (org: CurrentOrg) => {
|
||||
return org.organization_plan.find((p) => p.is_active);
|
||||
const getActivePlan = (org: AccountOrg) => {
|
||||
return org.plans.find((p) => p.isActive);
|
||||
};
|
||||
|
||||
export const currentOrgPlan = derived(currentOrg, ($currentOrg) => getActivePlan($currentOrg));
|
||||
@@ -78,15 +88,15 @@ export const isFreePlan = derived(currentOrg, ($currentOrg) => {
|
||||
|
||||
const plan = getActivePlan($currentOrg);
|
||||
|
||||
return !plan || plan.plan_name === PLAN.BASIC;
|
||||
return !plan || plan.planName === PLAN.BASIC;
|
||||
});
|
||||
|
||||
export const currentOrgMaxAudience = derived(currentOrgPlan, ($plan) =>
|
||||
!$plan
|
||||
? 20
|
||||
: $plan.plan_name === PLAN.EARLY_ADOPTER
|
||||
: $plan.planName === PLAN.EARLY_ADOPTER
|
||||
? 10000
|
||||
: $plan.plan_name === PLAN.ENTERPRISE
|
||||
: $plan.planName === PLAN.ENTERPRISE
|
||||
? Number.MAX_SAFE_INTEGER
|
||||
: 20
|
||||
);
|
||||
|
||||
@@ -1,31 +1,19 @@
|
||||
import { LOCALE } from '../types';
|
||||
import type { User } from '@supabase/supabase-js';
|
||||
import type { TProfile, TUser } from '@cio/db/types';
|
||||
|
||||
import { writable } from 'svelte/store';
|
||||
|
||||
interface UserStore {
|
||||
openAuthModal: boolean;
|
||||
fetchingUser: boolean;
|
||||
isLoggedIn: boolean;
|
||||
currentSession: User | undefined;
|
||||
currentSession: TUser | undefined;
|
||||
expiresAt: number;
|
||||
}
|
||||
|
||||
export interface ProfileStore {
|
||||
// Using TProfile type from @cio/utils/types with optional id for store initialization
|
||||
export type ProfileStore = Omit<TProfile, 'id'> & {
|
||||
id: string | undefined;
|
||||
fullname: string;
|
||||
avatar_url: string;
|
||||
profile_url?: string;
|
||||
username: string;
|
||||
user_id: string;
|
||||
email: string;
|
||||
role: string;
|
||||
goal: string;
|
||||
source: string;
|
||||
telegram_chat_id: number | null;
|
||||
locale: LOCALE;
|
||||
is_email_verified: boolean;
|
||||
verified_at: string;
|
||||
}
|
||||
};
|
||||
|
||||
export const defaultUserState: UserStore = {
|
||||
openAuthModal: false,
|
||||
@@ -35,22 +23,26 @@ export const defaultUserState: UserStore = {
|
||||
expiresAt: 0
|
||||
};
|
||||
|
||||
export const defaultProfileState: ProfileStore = {
|
||||
id: undefined,
|
||||
export const defaultProfileState: TProfile = {
|
||||
id: '',
|
||||
fullname: '',
|
||||
avatar_url: '',
|
||||
avatarUrl: '',
|
||||
username: '',
|
||||
user_id: '',
|
||||
email: '',
|
||||
role: '',
|
||||
goal: '',
|
||||
source: '',
|
||||
telegram_chat_id: null,
|
||||
locale: LOCALE.EN,
|
||||
is_email_verified: false,
|
||||
verified_at: ''
|
||||
email: null,
|
||||
role: null,
|
||||
goal: null,
|
||||
source: null,
|
||||
telegramChatId: null,
|
||||
locale: 'en',
|
||||
isEmailVerified: false,
|
||||
verifiedAt: null,
|
||||
canAddCourse: true,
|
||||
isRestricted: false,
|
||||
createdAt: '',
|
||||
updatedAt: '',
|
||||
metadata: null
|
||||
};
|
||||
|
||||
export const user = writable<UserStore>(defaultUserState);
|
||||
|
||||
export const profile = writable<ProfileStore>(defaultProfileState);
|
||||
export const profile = writable<TProfile>(defaultProfileState);
|
||||
|
||||
Reference in New Issue
Block a user