more cleanup

.vscode/settings.json

@@ -9,5 +9,5 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "editor.gotoLocation.multipleDefinitions": "goto",
-  "cSpell.words": ["astrojs", "Libravatar", "robotstxt", "studiocms", "withstudiocms"]
+  "cSpell.words": ["astrojs", "Libravatar", "oslojs", "robotstxt", "studiocms", "withstudiocms"]
 }

packages/studiocms_auth/src/components/oAuthButtonProviders.ts

@@ -1,12 +1,8 @@
 import { authEnvCheck } from 'studiocms:auth/utils/authEnvCheck';
-import Config from 'studiocms:config';
+import { AuthConfig } from 'studiocms:config';
 import { StudioCMSRoutes } from 'studiocms:lib';
 
-const {
-	dashboardConfig: {
-		AuthConfig: { providers },
-	},
-} = Config;
+const { providers } = AuthConfig;
 
 const {
 	authLinks: { googleIndex, auth0Index, discordIndex, githubIndex },

packages/studiocms_auth/src/layouts/AuthLayout.astro

@@ -4,17 +4,15 @@ import '@studiocms/ui/css/global.css';
 import './authlayout.css';
 import { Image } from 'astro:assets';
 import { validImages } from 'studiocms:auth/utils/validImages';
-import Config from 'studiocms:config';
+import { dashboardConfig } from 'studiocms:config';
 import studioCMS_SDK from 'studiocms:sdk';
 import version from 'studiocms:version';
 import onestWoff2 from '@fontsource-variable/onest/files/onest-latin-wght-normal.woff2?url';
 import { Toaster } from '@studiocms/ui/components';
 import OAuthButtonStack from '../components/OAuthButtonStack.astro';
 import StudioCMSLogoSVG from '../components/StudioCMSLogoSVG.astro';
 
-const {
-	dashboardConfig: { faviconURL },
-} = Config;
+const { faviconURL } = dashboardConfig;
 
 interface Props {
 	title: string;

packages/studiocms_auth/src/lib/password.ts

@@ -9,8 +9,8 @@ type RemoveLast<T extends unknown[]> = T extends [...infer Rest, infer _Last] ?
 function scrypt(...opts: RemoveLast<Parameters<typeof nodeScrypt>>): Promise<Buffer> {
 	return new Promise((res, rej) => {
 		nodeScrypt(...opts, (err, derivedKey) => {
-			if (err) rej(err)
-			else res(derivedKey)
+			if (err) rej(err);
+			else res(derivedKey);
 		});
 	});
 }

packages/studiocms_auth/src/routes/api/login.ts

@@ -1,7 +1,6 @@
-import { db, eq } from 'astro:db';
 import { verifyPasswordHash } from 'studiocms:auth/lib/password';
 import { createUserSession } from 'studiocms:auth/lib/session';
-import { tsUsers } from '@studiocms/core/sdk-utils/tables';
+import studioCMS_SDK from 'studiocms:sdk';
 import type { APIContext, APIRoute } from 'astro';
 import { badFormDataEntry, parseFormDataEntryToString } from './shared';
 
@@ -18,7 +17,7 @@ export const POST: APIRoute = async (context: APIContext): Promise<Response> =>
 	if (!password) return badFormDataEntry('Missing field', 'Password is required');
 
 	// Get the user from the database
-	const existingUser = await db.select().from(tsUsers).where(eq(tsUsers.username, username)).get();
+	const existingUser = await studioCMS_SDK.GET.databaseEntry.users.byUsername(username);
 
 	// If the user does not exist, return an ambiguous error
 	if (!existingUser) return badFormDataEntry('Invalid credentials', 'Invalid username or password');

packages/studiocms_auth/src/routes/api/register.ts

@@ -1,8 +1,7 @@
-import { db, eq } from 'astro:db';
 import { verifyPasswordStrength } from 'studiocms:auth/lib/password';
 import { createUserSession } from 'studiocms:auth/lib/session';
 import { createLocalUser, verifyUsernameInput } from 'studiocms:auth/lib/user';
-import { tsUsers } from '@studiocms/core/sdk-utils/tables';
+import studioCMS_SDK from 'studiocms:sdk';
 import type { APIContext, APIRoute } from 'astro';
 import { z } from 'astro/zod';
 import { badFormDataEntry, parseFormDataEntryToString } from './shared';
@@ -44,18 +43,15 @@ export const POST: APIRoute = async (context: APIContext): Promise<Response> =>
 	if (!name) return badFormDataEntry('Missing entry', 'Display name is required');
 
 	// If the email is invalid, return an error
-	const checkemail = z.coerce
+	const checkEmail = z.coerce
 		.string()
 		.email({ message: 'Email address is invalid' })
 		.safeParse(email);
 
-	if (!checkemail.success) return badFormDataEntry('Invalid email', checkemail.error.message);
+	if (!checkEmail.success) return badFormDataEntry('Invalid email', checkEmail.error.message);
 
-	// Check if the username or email is already used by another user
-	const [usernameSearch, emailSearch] = await db.batch([
-		db.select().from(tsUsers).where(eq(tsUsers.username, username)),
-		db.select().from(tsUsers).where(eq(tsUsers.email, checkemail.data)),
-	]);
+	const { usernameSearch, emailSearch } =
+		await studioCMS_SDK.AUTH.user.searchUsersForUsernameOrEmail(username, checkEmail.data);
 
 	if (usernameSearch.length > 0)
 		return badFormDataEntry('Invalid username', 'Username is already in use');

packages/studiocms_auth/src/routes/login.astro

@@ -1,6 +1,6 @@
 ---
 import { authEnvCheck } from 'studiocms:auth/utils/authEnvCheck';
-import Config from 'studiocms:config';
+import { AuthConfig } from 'studiocms:config';
 import { getLangFromUrl, staticPaths, useTranslatedPath, useTranslations } from 'studiocms:i18n';
 import { StudioCMSRoutes } from 'studiocms:lib';
 import { Button, Input } from '@studiocms/ui/components';
@@ -18,16 +18,12 @@ export const getStaticPaths = (() => {
 }) satisfies GetStaticPaths;
 
 const {
-	dashboardConfig: {
-		AuthConfig: {
-			providers,
-			providers: {
-				usernameAndPassword,
-				usernameAndPasswordConfig: { allowUserRegistration },
-			},
-		},
+	providers,
+	providers: {
+		usernameAndPassword,
+		usernameAndPasswordConfig: { allowUserRegistration },
 	},
-} = Config;
+} = AuthConfig;
 
 const {
 	authLinks: { loginAPI, signupURL },

packages/studiocms_auth/src/routes/signup.astro

@@ -1,6 +1,6 @@
 ---
 import { authEnvCheck } from 'studiocms:auth/utils/authEnvCheck';
-import Config from 'studiocms:config';
+import { AuthConfig } from 'studiocms:config';
 import { getLangFromUrl, staticPaths, useTranslatedPath, useTranslations } from 'studiocms:i18n';
 import { StudioCMSRoutes } from 'studiocms:lib';
 import { Button, Input } from '@studiocms/ui/components';
@@ -18,16 +18,12 @@ export const getStaticPaths = (() => {
 }) satisfies GetStaticPaths;
 
 const {
-	dashboardConfig: {
-		AuthConfig: {
-			providers,
-			providers: {
-				usernameAndPassword,
-				usernameAndPasswordConfig: { allowUserRegistration },
-			},
-		},
+	providers,
+	providers: {
+		usernameAndPassword,
+		usernameAndPasswordConfig: { allowUserRegistration },
 	},
-} = Config;
+} = AuthConfig;
 
 const {
 	authLinks: { registerAPI, loginURL },

packages/studiocms_core/src/integration.ts

@@ -39,21 +39,6 @@ export default defineIntegration({
 					addVirtualImports(params, {
 						name,
 						imports: {
-							'virtual:studiocms/config': `
-								export default ${JSON.stringify(options)};
-							`,
-							'virtual:studiocms/version': `
-								export default '${version}';
-							`,
-
-							// Core Virtual Modules
-							'studiocms:config': `
-								export default ${JSON.stringify(options)};
-							`,
-							'studiocms:version': `
-								export default '${version}';
-							`,
-
 							// Old Virtual helpers - TO BE REMOVED
 							'studiocms:helpers': `
 								export { default as pathGenerators } from '${resolve('./lib/pathGenerators.ts')}';
@@ -68,6 +53,19 @@ export default defineIntegration({
 								export * from '${resolve('./lib/routeMap.ts')}';
 							`,
 
+							// Core Virtual Modules
+							'studiocms:config': `
+								export default ${JSON.stringify(options)};
+								export const config = ${JSON.stringify(options)};
+								export const dashboardConfig = ${JSON.stringify(options.dashboardConfig)};
+								export const AuthConfig = ${JSON.stringify(options.dashboardConfig.AuthConfig)};
+								export const developerConfig = ${JSON.stringify(options.dashboardConfig.developerConfig)};
+								export const defaultFrontEndConfig = ${JSON.stringify(options.defaultFrontEndConfig)};
+							`,
+							'studiocms:version': `
+								export default '${version}';
+							`,
+
 							// Core Virtual Components
 							'studiocms:components': `
 								export { default as Avatar } from '${resolve('./components/Avatar.astro')}';
@@ -122,8 +120,7 @@ export default defineIntegration({
 								export default studioCMS_SDK_AUTH;
 							`,
 							'studiocms:sdk/types': `
-								import type { STUDIOCMS_SDK } from '${resolve('./sdk-utils/types.ts')}';
-								export type { STUDIOCMS_SDK };
+								export * from '${resolve('./sdk-utils/types.ts')}';
 							`,
 						},
 					});

packages/studiocms_core/src/sdk-utils/auth/user.ts

@@ -42,6 +42,27 @@ export const authUser: STUDIOCMS_SDK['AUTH']['user'] = {
 			throw new StudioCMS_SDK_Error('Error updating user: An unknown error occurred.', `${error}`);
 		}
 	},
+	searchUsersForUsernameOrEmail: async (username, email) => {
+		try {
+			const [usernameSearch, emailSearch] = await db.batch([
+				db.select().from(tsUsers).where(eq(tsUsers.username, username)),
+				db.select().from(tsUsers).where(eq(tsUsers.email, email)),
+			]);
+
+			return { usernameSearch, emailSearch };
+		} catch (error) {
+			if (error instanceof Error) {
+				throw new StudioCMS_SDK_Error(
+					`Error searching for username or email: ${error.message}`,
+					error.stack
+				);
+			}
+			throw new StudioCMS_SDK_Error(
+				'Error searching for username or email: An unknown error occurred.',
+				`${error}`
+			);
+		}
+	},
 	// TODO: Implement delete function that wont error since
 	// there could be references to the user in other tables
 	// delete: async () => {},

packages/studiocms_core/src/sdk-utils/types/index.ts

@@ -657,6 +657,11 @@ export interface STUDIOCMS_SDK {
 			 */
 			update: (userId: string, userData: tsUsersUpdate) => Promise<tsUsersSelect>;
 
+			searchUsersForUsernameOrEmail: (
+				username: string,
+				email: string
+			) => Promise<{ usernameSearch: tsUsersSelect[]; emailSearch: tsUsersSelect[] }>;
+
 			// delete: async () => {},
 		};
 

packages/studiocms_core/src/stubs/core.ts

@@ -13,6 +13,28 @@ dtsFile.addModule('studiocms:config', {
 	defaultExport: {
 		typeDef: `import('${resolve('../schemas/config/index.ts')}').StudioCMSConfig`,
 	},
+	namedExports: [
+		{
+			name: 'config',
+			typeDef: `import('${resolve('../schemas/config/index.ts')}').StudioCMSConfig`,
+		},
+		{
+			name: 'dashboardConfig',
+			typeDef: `import('${resolve('../schemas/config/index.ts')}').StudioCMSConfig['dashboardConfig']`,
+		},
+		{
+			name: 'AuthConfig',
+			typeDef: `import('${resolve('../schemas/config/index.ts')}').StudioCMSConfig['dashboardConfig']['AuthConfig']`,
+		},
+		{
+			name: 'developerConfig',
+			typeDef: `import('${resolve('../schemas/config/index.ts')}').StudioCMSConfig['dashboardConfig']['developerConfig']`,
+		},
+		{
+			name: 'defaultFrontEndConfig',
+			typeDef: `import('${resolve('../schemas/config/index.ts')}').StudioCMSConfig['defaultFrontEndConfig']`,
+		},
+	],
 });
 
 dtsFile.addModule('studiocms:version', {