* feat: new components, deploy storybook * refactor: simplify component field definitions and enhance button loading state - Removed unnecessary type imports and simplified the FIELDS array definitions across multiple components in Storybook. - Updated button component to use a loading state instead of isLoading, improving clarity and consistency in props. - Adjusted button stories to reflect the new loading prop and enhanced the button's loading visual feedback. - Minor CSS adjustments for better layout and styling consistency. * chore: add field, card, password components * feat: improve page component & update AuthUI path * chore: update bits-ui to version 2.14.4 and all org related UI's - Updated bits-ui dependency in pnpm-lock.yaml and package.json to version 2.14.4. - Refactored imports for RoleBasedSecurity and UpgradeBanner components to use the new ui feature directory. - Removed unused Course components and related files to clean up the codebase. - Enhanced various components to improve consistency and maintainability. * chore: move all setting buttons to the top and update auth ui styles * chore: remove svelte-loading-spinners and replace with @cio/ui/base/spinner - Removed all instances of svelte-loading-spinners from the project. - Updated components to use the new Spinner from @cio/ui/base/spinner. - Cleaned up pnpm-lock.yaml and package.json to reflect the removal of svelte-loading-spinners. - Added new CSS animations for rocket launch effects in app.css. - Enhanced email change flow with updated verification messages in translations. * chore: remove supabase file upload from dashboard and move to r2 * chore: update organization API and UI components - Added new API methods for organization plan operations and team management. - Introduced middleware for API key authentication and organization admin checks. - Refactored organization-related components to utilize the new API structure. - Updated various UI components to improve consistency and maintainability. - Enhanced error handling and validation for organization-related actions. - Removed deprecated services and streamlined the codebase.
127 lines
3.4 KiB
TypeScript
127 lines
3.4 KiB
TypeScript
import type { AccountOrg } from '$lib/features/app/types';
|
|
import type { Cookies } from '@sveltejs/kit';
|
|
import { OrgApiServer } from '$lib/features/org/api/org.server';
|
|
import { PUBLIC_IS_SELFHOSTED } from '$env/static/public';
|
|
import { blockedSubdomain } from '$lib/utils/constants/app';
|
|
import { env } from '$env/dynamic/private';
|
|
|
|
export interface OrgSiteInfo {
|
|
isOrgSite: boolean;
|
|
org: AccountOrg | null;
|
|
subdomain: string;
|
|
orgSiteName: string;
|
|
}
|
|
|
|
export async function getOrgSiteInfo(url: URL, cookies: Cookies): Promise<OrgSiteInfo> {
|
|
const response: OrgSiteInfo = {
|
|
orgSiteName: '',
|
|
subdomain: '',
|
|
isOrgSite: false,
|
|
org: null
|
|
};
|
|
|
|
// Selfhosted usecase
|
|
if (PUBLIC_IS_SELFHOSTED === 'true') {
|
|
const subdomain = getSubdomain(url);
|
|
|
|
// Student dashboard
|
|
if (subdomain) {
|
|
const org = await OrgApiServer.getOrgBySiteName(subdomain);
|
|
|
|
// Organization by subdomain not found
|
|
if (!org) {
|
|
return response;
|
|
}
|
|
|
|
response.org = org as AccountOrg;
|
|
response.isOrgSite = true;
|
|
response.orgSiteName = subdomain;
|
|
response.subdomain = subdomain;
|
|
}
|
|
|
|
// Never go beyond this for selfhosted instances
|
|
return response;
|
|
}
|
|
|
|
const isLocalHost = url.host.includes('localhost');
|
|
const tempSiteName = url.searchParams.get('org');
|
|
|
|
if (isLocalHost && tempSiteName) {
|
|
cookies.set('_orgSiteName', tempSiteName, {
|
|
path: '/'
|
|
});
|
|
}
|
|
|
|
const _orgSiteName = cookies.get('_orgSiteName');
|
|
const debugMode = _orgSiteName && _orgSiteName !== 'false';
|
|
|
|
const subdomain = getSubdomain(url) || '';
|
|
|
|
// Custom domain
|
|
if (isURLCustomDomain(url)) {
|
|
const orgs = await OrgApiServer.getOrgsByCustomDomain(url.host, true);
|
|
|
|
if (!orgs || orgs.length === 0) {
|
|
return response;
|
|
}
|
|
|
|
const org = orgs[0];
|
|
response.org = org as AccountOrg;
|
|
response.isOrgSite = true;
|
|
response.orgSiteName = response.org?.siteName || '';
|
|
response.subdomain = subdomain;
|
|
|
|
return response;
|
|
}
|
|
|
|
// Subdomain except blocked ones.
|
|
if (!blockedSubdomain.includes(subdomain)) {
|
|
const APP_SUBDOMAINS = env.PRIVATE_APP_SUBDOMAINS?.split(',') || [];
|
|
|
|
if (APP_SUBDOMAINS.includes(subdomain)) {
|
|
return response;
|
|
}
|
|
|
|
response.isOrgSite = debugMode || !!subdomain;
|
|
response.orgSiteName = debugMode ? _orgSiteName : subdomain;
|
|
|
|
if (response.orgSiteName) {
|
|
const org = await OrgApiServer.getOrgBySiteName(response.orgSiteName);
|
|
response.org = (org as AccountOrg) || null;
|
|
}
|
|
|
|
const shouldDeleteCookie = !response.org && _orgSiteName;
|
|
if (shouldDeleteCookie) {
|
|
cookies.delete('_orgSiteName', { path: '/' });
|
|
}
|
|
}
|
|
|
|
return response;
|
|
}
|
|
|
|
function isURLCustomDomain(url: URL) {
|
|
if (url.host.includes('localhost')) {
|
|
return false;
|
|
}
|
|
|
|
const notCustomDomainHosts = [env.PRIVATE_APP_HOST || '', 'classroomio.com', 'vercel.app'].filter(Boolean);
|
|
|
|
return !notCustomDomainHosts.some((host) => url.host.endsWith(host));
|
|
}
|
|
|
|
export function getSubdomain(url: URL) {
|
|
const host = url.hostname.replace('www.', '');
|
|
const parts = host.split('.');
|
|
const appHost = env.PRIVATE_APP_HOST;
|
|
|
|
const appHostParts = appHost.split('.');
|
|
const isAppHost = parts.slice(-appHostParts.length).join('.') === appHost;
|
|
|
|
if (isAppHost) {
|
|
// Subdomain exists only if extra part(s) before main domain
|
|
return parts.length > appHostParts.length ? parts[0] : null;
|
|
}
|
|
|
|
return null;
|
|
}
|