Skip to content

fix(orm): stricter validation in $setAuth and clean up imports #2514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ymc9 merged 1 commit into from
Mar 24, 2026
Merged

fix(orm): stricter validation in $setAuth and clean up imports #2514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions packages/orm/src/client/client-impl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,14 @@ import * as BuiltinFunctions from './functions';
import { SchemaDbPusher } from './helpers/schema-db-pusher';
import type { ClientOptions, ProceduresOptions } from './options';
import type { AnyPlugin } from './plugin';
import { createZenStackPromise, type ZenStackPromise } from './promise';
import { fieldHasDefaultValue, getField, isUnsupportedField, requireModel } from './query-utils';
import { ResultProcessor } from './result-processor';

type ExtResultFieldDef = {
needs: Record<string, true>;
compute: (data: Record<string, any>) => unknown;
};
import { getField } from './query-utils';
import { createZenStackPromise, type ZenStackPromise } from './promise';
import { fieldHasDefaultValue, isUnsupportedField, requireModel } from './query-utils';
import { ResultProcessor } from './result-processor';

/**
* ZenStack ORM client.
Expand Down Expand Up @@ -172,7 +171,8 @@ export class ClientImpl {
if (modelDef.computedFields) {
for (const fieldName of Object.keys(modelDef.computedFields)) {
// check both uncapitalized (current) and original (backward compat) model name
const modelConfig = computedFieldsConfig?.[lowerCaseFirst(modelName)] ?? computedFieldsConfig?.[modelName];
const modelConfig =
computedFieldsConfig?.[lowerCaseFirst(modelName)] ?? computedFieldsConfig?.[modelName];
const fieldConfig = modelConfig?.[fieldName];
// Check if the computed field has a configuration
if (fieldConfig === null || fieldConfig === undefined) {
Expand Down Expand Up @@ -426,7 +426,7 @@ export class ClientImpl {
}

$setAuth(auth: AuthType<SchemaDef> | undefined) {
if (auth !== undefined && typeof auth !== 'object') {
if (auth !== undefined && (typeof auth !== 'object' || auth === null || Array.isArray(auth))) {
throw new Error('Invalid auth object');
}
const newClient = new ClientImpl(this.schema, this.$options, this);
Expand Down
3 changes: 2 additions & 1 deletion packages/orm/src/client/contract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,13 @@ export type ClientContract<
$queryRawUnsafe<T = unknown>(query: string, ...values: any[]): ZenStackPromise<Schema, T>;

/**
* The current user identity.
* The current user identity. If the client is not bound to any user context, returns `undefined`.
*/
get $auth(): AuthType<Schema> | undefined;

/**
* Returns a new client bound to the specified user identity. The original client remains unchanged.
* Pass `undefined` to return a client without any user context.
*
* @example
* ```
Expand Down
Loading