@loomcore/common 0.0.30 → 0.0.32

package/dist/models/index.d.ts

@@ -1,7 +1,7 @@
 export * from './user.model.js';
-export * from './authorization.model.js';
 export * from './organization.model.js';
 export * from './user-context.model.js';
+export * from './user-context-authorization.model.js';
 export * from './entity.model.js';
 export * from './login-response.model.js';
 export * from './token-response.model.js';

package/dist/models/index.js

@@ -1,7 +1,7 @@
 export * from './user.model.js';
-export * from './authorization.model.js';
 export * from './organization.model.js';
 export * from './user-context.model.js';
+export * from './user-context-authorization.model.js';
 export * from './entity.model.js';
 export * from './login-response.model.js';
 export * from './token-response.model.js';

package/dist/models/login-response.model.d.ts

@@ -12,7 +12,8 @@ export declare const LoginResponseSchema: import("@sinclair/typebox").TObject<{
     }>;
     userContext: import("@sinclair/typebox").TObject<{
         user: import("@sinclair/typebox").TSchema;
-        _orgId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+        authorizations: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TSchema>;
+        organization: import("@sinclair/typebox").TSchema;
     }>;
 }>;
 export declare const LoginResponseSpec: import("./model-spec.interface.js").IModelSpec<import("@sinclair/typebox").TSchema>;

package/dist/models/organization.model.d.ts

@@ -9,6 +9,7 @@ export interface IOrganization extends IAuditable {
     authToken?: string;
 }
 export declare const OrganizationSchema: import("@sinclair/typebox").TObject<{
+    _id: import("@sinclair/typebox").TString;
     name: import("@sinclair/typebox").TString;
     code: import("@sinclair/typebox").TString;
     description: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;

package/dist/models/organization.model.js

@@ -1,6 +1,9 @@
 import { Type } from '@sinclair/typebox';
 import { entityUtils } from '../utils/index.js';
 export const OrganizationSchema = Type.Object({
+    _id: Type.String({
+        title: 'ID'
+    }),
     name: Type.String({
         title: 'Name'
     }),

package/dist/models/user-context-authorization.model.d.ts

@@ -0,0 +1,12 @@
+import { IEntity } from "./entity.model.js";
+export interface IUserContextAuthorization extends IEntity {
+    role: string;
+    feature: string;
+    config?: any;
+}
+export declare const UserContextAuthorizationSchema: import("@sinclair/typebox").TObject<{
+    role: import("@sinclair/typebox").TString;
+    feature: import("@sinclair/typebox").TString;
+    config: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
+}>;
+export declare const UserContextAuthorizationSpec: import("./model-spec.interface.js").IModelSpec<import("@sinclair/typebox").TSchema>;

package/dist/models/user-context-authorization.model.js

@@ -0,0 +1,8 @@
+import { Type } from "@sinclair/typebox";
+import { entityUtils } from "../utils/entity.utils.js";
+export const UserContextAuthorizationSchema = Type.Object({
+    role: Type.String(),
+    feature: Type.String(),
+    config: Type.Optional(Type.Any())
+});
+export const UserContextAuthorizationSpec = entityUtils.getModelSpec(UserContextAuthorizationSchema);

package/dist/models/user-context.model.d.ts

@@ -1,20 +1,25 @@
-import { IUserOut } from './user.model.js';
+import { IUser } from './user.model.js';
+import { IOrganization } from './organization.model.js';
+import { IUserContextAuthorization } from './user-context-authorization.model.js';
 export interface IUserContext {
-    user: IUserOut;
-    _orgId?: string;
+    user: IUser;
+    authorizations: IUserContextAuthorization[];
+    organization?: IOrganization;
 }
 export declare const EmptyUserContext: IUserContext;
 export declare const UserContextSchema: import("@sinclair/typebox").TObject<{
     user: import("@sinclair/typebox").TSchema;
-    _orgId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    authorizations: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TSchema>;
+    organization: import("@sinclair/typebox").TSchema;
 }>;
 export declare const UserContextSpec: import("./model-spec.interface.js").IModelSpec<import("@sinclair/typebox").TSchema>;
 export declare const PublicUserContextSchema: import("@sinclair/typebox").TObject<{
     user: import("@sinclair/typebox").TSchema;
-    _orgId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    authorizations: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TSchema>;
+    organization: import("@sinclair/typebox").TSchema;
 }>;
 export declare const PublicUserContextSpec: import("./model-spec.interface.js").IModelSpec<import("@sinclair/typebox").TSchema>;
-export declare function initializeSystemUserContext(systemEmail: string, metaOrgId: string | undefined): IUserContext;
+export declare function initializeSystemUserContext(systemEmail: string, metaOrg: IOrganization | undefined): IUserContext;
 export declare function getSystemUserContext(): IUserContext;
 export declare function isSystemUserContextInitialized(): boolean;
 export declare function resetSystemUserContext(): void;

package/dist/models/user-context.model.js

@@ -1,42 +1,48 @@
 import { PublicUserSpec, UserSpec } from './user.model.js';
 import { Type } from '@sinclair/typebox';
 import { entityUtils } from '../utils/entity.utils.js';
+import { OrganizationSpec } from './organization.model.js';
+import { UserContextAuthorizationSpec } from './user-context-authorization.model.js';
 export const EmptyUserContext = {
     user: {},
-    _orgId: undefined
+    authorizations: [],
+    organization: undefined
 };
 let _systemUserContext = null;
 export const UserContextSchema = Type.Object({
     user: UserSpec.fullSchema,
-    _orgId: Type.Optional(Type.String())
+    authorizations: Type.Array(UserContextAuthorizationSpec.fullSchema),
+    organization: OrganizationSpec.fullSchema
 });
 export const UserContextSpec = entityUtils.getModelSpec(UserContextSchema);
 export const PublicUserContextSchema = Type.Object({
     user: PublicUserSpec.fullSchema,
-    _orgId: Type.Optional(Type.String())
+    authorizations: Type.Array(UserContextAuthorizationSpec.fullSchema),
+    organization: OrganizationSpec.fullSchema
 });
 export const PublicUserContextSpec = entityUtils.getModelSpec(PublicUserContextSchema);
-export function initializeSystemUserContext(systemEmail, metaOrgId) {
+export function initializeSystemUserContext(systemEmail, metaOrg) {
     _systemUserContext = {
         user: {
             _id: 'system',
-            _orgId: metaOrgId,
+            _orgId: metaOrg?._id,
+            email: systemEmail,
             firstName: 'System',
             lastName: 'User',
             displayName: 'System User',
-            email: systemEmail,
-            authorizations: [{
-                    _id: 'system-authorization',
-                    _orgId: metaOrgId,
-                    role: 'system',
-                    feature: 'system',
-                }],
+            password: 'systemPassword',
             _created: new Date(),
             _createdBy: 'system',
             _updated: new Date(),
             _updatedBy: 'system',
         },
-        _orgId: metaOrgId,
+        authorizations: [{
+                _id: 'system-authorization',
+                _orgId: metaOrg?._id,
+                role: 'system',
+                feature: 'system'
+            }],
+        organization: metaOrg
     };
     return _systemUserContext;
 }

package/dist/models/user.model.d.ts

@@ -1,44 +1,30 @@
 import { IAuditable } from './auditable.model.js';
 import { IEntity } from './entity.model.js';
-import { IAuthorizationOut } from './authorization.model.js';
-export interface IUserBase extends IEntity, IAuditable {
+export interface IUser extends IEntity, IAuditable {
     email: string;
     firstName?: string;
     lastName?: string;
     displayName?: string;
+    password: string;
     _lastLoggedIn?: Date;
     _lastPasswordChange?: Date;
 }
-export interface IUserIn extends IUserBase {
-    password?: string;
-}
 export declare const UserPasswordSchema: import("@sinclair/typebox").TObject<{
     password: import("@sinclair/typebox").TString;
 }>;
 export declare const passwordValidator: import("@sinclair/typebox/compiler").TypeCheck<import("@sinclair/typebox").TObject<{
     password: import("@sinclair/typebox").TString;
 }>>;
-export declare const UserSchemaBase: import("@sinclair/typebox").TObject<{
-    email: import("@sinclair/typebox").TString;
-    firstName: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    lastName: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    displayName: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    _lastLoggedIn: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TString, Date>>;
-    _lastPasswordChange: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TString, Date>>;
-}>;
 export declare const UserSchema: import("@sinclair/typebox").TObject<{
     email: import("@sinclair/typebox").TString;
     firstName: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     lastName: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     displayName: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    password: import("@sinclair/typebox").TString;
     _lastLoggedIn: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TString, Date>>;
     _lastPasswordChange: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TString, Date>>;
-    password: import("@sinclair/typebox").TString;
 }>;
 export declare const UserSpec: import("./model-spec.interface.js").IModelSpec<import("@sinclair/typebox").TSchema>;
-export interface IUserOut extends IUserBase {
-    authorizations?: IAuthorizationOut[];
-}
 export declare const PublicUserSchema: import("@sinclair/typebox").TObject<{
     email: import("@sinclair/typebox").TString;
     firstName: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
@@ -46,10 +32,5 @@ export declare const PublicUserSchema: import("@sinclair/typebox").TObject<{
     displayName: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     _lastLoggedIn: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TString, Date>>;
     _lastPasswordChange: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TString, Date>>;
-    authorizations: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
-        role: import("@sinclair/typebox").TString;
-        feature: import("@sinclair/typebox").TString;
-        config: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
-    }>>>;
 }>;
 export declare const PublicUserSpec: import("./model-spec.interface.js").IModelSpec<import("@sinclair/typebox").TSchema>;

package/dist/models/user.model.js

@@ -2,7 +2,6 @@ import { TypeboxIsoDate } from '../validation/typebox-extensions.js';
 import { Type } from '@sinclair/typebox';
 import { entityUtils } from '../utils/entity.utils.js';
 import { TypeCompiler } from '@sinclair/typebox/compiler';
-import { PublicAuthorizationSchema } from './authorization.model.js';
 export const UserPasswordSchema = Type.Object({
     password: Type.String({
         title: 'Password',
@@ -11,7 +10,7 @@ export const UserPasswordSchema = Type.Object({
     }),
 });
 export const passwordValidator = TypeCompiler.Compile(UserPasswordSchema);
-export const UserSchemaBase = Type.Object({
+export const UserSchema = Type.Object({
     email: Type.String({
         title: 'Email',
         format: 'email'
@@ -25,20 +24,10 @@ export const UserSchemaBase = Type.Object({
     displayName: Type.Optional(Type.String({
         title: 'Display Name'
     })),
+    password: UserPasswordSchema.properties.password,
     _lastLoggedIn: Type.Optional(TypeboxIsoDate({ title: 'Last Login Date' })),
     _lastPasswordChange: Type.Optional(TypeboxIsoDate({ title: 'Last Password Change Date' })),
 });
-export const UserSchema = Type.Composite([
-    UserSchemaBase,
-    Type.Object({
-        password: UserPasswordSchema.properties.password,
-    })
-]);
 export const UserSpec = entityUtils.getModelSpec(UserSchema, { isAuditable: true });
-export const PublicUserSchema = Type.Composite([
-    UserSchemaBase,
-    Type.Object({
-        authorizations: Type.Optional(Type.Array(PublicAuthorizationSchema, { title: 'Authorizations' })),
-    })
-]);
+export const PublicUserSchema = Type.Omit(UserSchema, ['password']);
 export const PublicUserSpec = entityUtils.getModelSpec(PublicUserSchema, { isAuditable: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/common",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "private": false,
   "description": "Loom Core Models- common models, interfaces, types, and utils for Loom Core. All things common to both api and client apps.",
   "scripts": {

package/dist/models/authorization.model.d.ts

@@ -1,27 +0,0 @@
-import { IAuditable, IEntity } from "./index.js";
-export interface IAuthorizationIn extends IEntity, IAuditable {
-    roleId: string;
-    featureId: string;
-    startDate?: Date;
-    endDate?: Date;
-    config?: any;
-}
-export declare const AuthorizationSchema: import("@sinclair/typebox").TObject<{
-    roleId: import("@sinclair/typebox").TString;
-    featureId: import("@sinclair/typebox").TString;
-    startDate: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TString, Date>>;
-    endDate: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TString, Date>>;
-    config: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
-}>;
-export declare const AuthorizationModelSpec: import("./model-spec.interface.js").IModelSpec<import("@sinclair/typebox").TSchema>;
-export interface IAuthorizationOut extends IEntity {
-    role: string;
-    feature: string;
-    config?: any;
-}
-export declare const PublicAuthorizationSchema: import("@sinclair/typebox").TObject<{
-    role: import("@sinclair/typebox").TString;
-    feature: import("@sinclair/typebox").TString;
-    config: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
-}>;
-export declare const PublicAuthorizationModelSpec: import("./model-spec.interface.js").IModelSpec<import("@sinclair/typebox").TSchema>;

package/dist/models/authorization.model.js

@@ -1,17 +0,0 @@
-import { Type } from "@sinclair/typebox";
-import { entityUtils } from "../utils/index.js";
-import { TypeboxIsoDate } from "../validation/index.js";
-export const AuthorizationSchema = Type.Object({
-    roleId: Type.String({ minLength: 1, title: 'Role ID' }),
-    featureId: Type.String({ minLength: 1, title: 'Feature ID' }),
-    startDate: Type.Optional(TypeboxIsoDate({ title: 'Start Date' })),
-    endDate: Type.Optional(TypeboxIsoDate({ title: 'End Date' })),
-    config: Type.Optional(Type.Any({ title: 'Config' }))
-});
-export const AuthorizationModelSpec = entityUtils.getModelSpec(AuthorizationSchema, { isAuditable: true });
-export const PublicAuthorizationSchema = Type.Object({
-    role: Type.String({ minLength: 1, title: 'Role Name' }),
-    feature: Type.String({ minLength: 1, title: 'Feature Name' }),
-    config: Type.Optional(Type.Any({ title: 'Config' }))
-});
-export const PublicAuthorizationModelSpec = entityUtils.getModelSpec(PublicAuthorizationSchema);