@loomcore/api 0.2.50 → 0.2.52

package/dist/utils/auth/authorize-method.util.d.ts

@@ -1,2 +1,2 @@
 import { RequestHandler } from 'express';
-export declare function authorizeMethod<T extends object>(instance: T, methodName: Extract<keyof T, string>): RequestHandler;
+export declare function authorizeMethod(instance: object, methodName: string): RequestHandler;

package/dist/utils/auth/index.d.ts

@@ -1,11 +1,5 @@
-export * from './assert-admin.util.js';
-export * from './assert-admin-or-feature.util.js';
-export * from './assert-owner-or-admin.util.js';
-export * from './assert-user-or-admin.util.js';
 export * from './attempt-login.util.js';
 export * from './auth-user-specs.util.js';
-export * from './assert-user-has-feature.util.js';
-export * from './change-password.util.js';
 export * from './create-new-refresh-token.util.js';
 export * from './create-new-tokens.util.js';
 export * from './generate-device-id.util.js';

package/dist/utils/auth/index.js

@@ -1,11 +1,5 @@
-export * from './assert-admin.util.js';
-export * from './assert-admin-or-feature.util.js';
-export * from './assert-owner-or-admin.util.js';
-export * from './assert-user-or-admin.util.js';
 export * from './attempt-login.util.js';
 export * from './auth-user-specs.util.js';
-export * from './assert-user-has-feature.util.js';
-export * from './change-password.util.js';
 export * from './create-new-refresh-token.util.js';
 export * from './create-new-tokens.util.js';
 export * from './generate-device-id.util.js';

package/dist/utils/auth/request-token-using-refresh-token.util.d.ts

@@ -1,5 +1,5 @@
 import { type ITokenResponse } from '@loomcore/common/models';
 import type { IDatabase } from '../../databases/models/index.js';
-import { AuthorizationsService } from '../../services/authorizations.service.js';
+import { AuthorizationService } from '../../services/authorization.service.js';
 import { UserService } from '../../services/user.service.js';
-export declare function requestTokenUsingRefreshToken(database: IDatabase, refreshToken: string, deviceId: string, userService?: UserService, authorizationsService?: AuthorizationsService): Promise<ITokenResponse | null>;
+export declare function requestTokenUsingRefreshToken(database: IDatabase, refreshToken: string, deviceId: string, userService?: UserService, authorizationsService?: AuthorizationService): Promise<ITokenResponse | null>;

package/dist/utils/auth/request-token-using-refresh-token.util.js

@@ -1,10 +1,10 @@
 import { getSystemUserContext, } from '@loomcore/common/models';
-import { AuthorizationsService } from '../../services/authorizations.service.js';
+import { AuthorizationService } from '../../services/authorization.service.js';
 import { UserService } from '../../services/user.service.js';
 import { createNewTokens } from './create-new-tokens.util.js';
 import { getActiveRefreshToken } from './get-active-refresh-token.util.js';
 import { BadRequestError } from '../../errors/index.js';
-export async function requestTokenUsingRefreshToken(database, refreshToken, deviceId, userService = new UserService(database), authorizationsService = new AuthorizationsService(database)) {
+export async function requestTokenUsingRefreshToken(database, refreshToken, deviceId, userService = new UserService(database), authorizationsService = new AuthorizationService(database)) {
     const systemUserContext = getSystemUserContext();
     const activeRefreshToken = await getActiveRefreshToken(database, systemUserContext, refreshToken, deviceId);
     if (!activeRefreshToken) {

package/dist/utils/auth/reset-password.util.js

@@ -3,7 +3,6 @@ import { entityUtils } from '@loomcore/common/utils';
 import { BadRequestError, ServerError } from '../../errors/index.js';
 import { PasswordResetTokenService } from '../../services/password-reset-token.service.js';
 import { UserService } from '../../services/user.service.js';
-import { changePassword } from './change-password.util.js';
 export async function resetPassword(database, email, passwordResetToken, password, organization, userService = new UserService(database), userSpec = UserSpec) {
     const validationErrors = entityUtils.validate(userSpec, { password: password }, true, passwordValidator);
     entityUtils.handleValidationResult(validationErrors, 'AuthService.resetPassword');
@@ -26,9 +25,12 @@ export async function resetPassword(database, email, passwordResetToken, passwor
     if (!user) {
         throw new ServerError(`Unable to retrieve user for email: ${lowerCaseEmail}`);
     }
-    const result = await changePassword(database, systemUserContext, user._id, password, userService);
+    const result = await userService.changePassword(systemUserContext, user._id, password);
     console.log(`password changed using forgot-password for email: ${lowerCaseEmail}`);
     await passwordResetTokenService.deleteById(systemUserContext, retrievedPasswordResetToken._id);
     console.log(`passwordResetToken deleted for email: ${lowerCaseEmail}`);
-    return result;
+    return {
+        success: true,
+        count: 1,
+    };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.2.50",
+  "version": "0.2.52",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
   "scripts": {

package/dist/services/features.service.d.ts

@@ -1,7 +0,0 @@
-import { IFeature, IUserContext } from '@loomcore/common/models';
-import { IDatabase } from '../databases/index.js';
-import { MultiTenantApiService } from './multi-tenant-api.service.js';
-export declare class FeaturesService extends MultiTenantApiService<IFeature> {
-    constructor(database: IDatabase);
-    preProcessEntity(userContext: IUserContext, entity: Partial<IFeature>, isCreate: boolean, allowId?: boolean): Promise<Partial<IFeature>>;
-}

package/dist/services/features.service.js

@@ -1,12 +0,0 @@
-import { FeatureModelSpec } from '@loomcore/common/models';
-import { MultiTenantApiService } from './multi-tenant-api.service.js';
-import { assertUserHasFeature } from '../utils/index.js';
-export class FeaturesService extends MultiTenantApiService {
-    constructor(database) {
-        super(database, 'features', 'feature', FeatureModelSpec);
-    }
-    async preProcessEntity(userContext, entity, isCreate, allowId = true) {
-        assertUserHasFeature(userContext, ['admin', 'system', 'features']);
-        return super.preProcessEntity(userContext, entity, isCreate, allowId);
-    }
-}

package/dist/services/roles.service.d.ts

@@ -1,7 +0,0 @@
-import { IRole, IUserContext } from '@loomcore/common/models';
-import { IDatabase } from '../databases/index.js';
-import { MultiTenantApiService } from './multi-tenant-api.service.js';
-export declare class RolesService extends MultiTenantApiService<IRole> {
-    constructor(database: IDatabase);
-    preProcessEntity(userContext: IUserContext, entity: Partial<IRole>, isCreate: boolean, allowId?: boolean): Promise<Partial<IRole>>;
-}

package/dist/services/roles.service.js

@@ -1,12 +0,0 @@
-import { RoleModelSpec } from '@loomcore/common/models';
-import { MultiTenantApiService } from './multi-tenant-api.service.js';
-import { assertUserHasFeature } from '../utils/index.js';
-export class RolesService extends MultiTenantApiService {
-    constructor(database) {
-        super(database, 'roles', 'role', RoleModelSpec);
-    }
-    async preProcessEntity(userContext, entity, isCreate, allowId = true) {
-        assertUserHasFeature(userContext, ['admin', 'system', 'roles']);
-        return super.preProcessEntity(userContext, entity, isCreate, allowId);
-    }
-}

package/dist/services/user-roles.service.d.ts

@@ -1,7 +0,0 @@
-import { IUserContext, IUserRole } from '@loomcore/common/models';
-import { IDatabase } from '../databases/index.js';
-import { MultiTenantApiService } from './multi-tenant-api.service.js';
-export declare class UserRolesService extends MultiTenantApiService<IUserRole> {
-    constructor(database: IDatabase);
-    preProcessEntity(userContext: IUserContext, entity: Partial<IUserRole>, isCreate: boolean, allowId?: boolean): Promise<Partial<IUserRole>>;
-}

package/dist/services/user-roles.service.js

@@ -1,12 +0,0 @@
-import { UserRoleModelSpec } from '@loomcore/common/models';
-import { MultiTenantApiService } from './multi-tenant-api.service.js';
-import { assertUserHasFeature } from '../utils/index.js';
-export class UserRolesService extends MultiTenantApiService {
-    constructor(database) {
-        super(database, 'userRoles', 'userRole', UserRoleModelSpec);
-    }
-    async preProcessEntity(userContext, entity, isCreate, allowId = true) {
-        assertUserHasFeature(userContext, ['admin', 'system', 'user-roles']);
-        return super.preProcessEntity(userContext, entity, isCreate, allowId);
-    }
-}

package/dist/utils/auth/assert-admin-or-feature.util.d.ts

@@ -1,2 +0,0 @@
-import type { IUserContext } from '@loomcore/common/models';
-export declare function assertAdminOrFeature(userContext: IUserContext, features: string[], requireAll?: boolean): void;

package/dist/utils/auth/assert-admin-or-feature.util.js

@@ -1,8 +0,0 @@
-import { isAdmin } from './is-admin.util.js';
-import { assertUserHasFeature } from './assert-user-has-feature.util.js';
-export function assertAdminOrFeature(userContext, features, requireAll = false) {
-    if (isAdmin(userContext)) {
-        return;
-    }
-    assertUserHasFeature(userContext, features, requireAll);
-}

package/dist/utils/auth/assert-admin.util.d.ts

@@ -1,2 +0,0 @@
-import type { IUserContext } from '@loomcore/common/models';
-export declare function assertAdmin(userContext: IUserContext): void;

package/dist/utils/auth/assert-admin.util.js

@@ -1,7 +0,0 @@
-import { UnauthorizedError } from '../../errors/index.js';
-import { isAdmin } from './is-admin.util.js';
-export function assertAdmin(userContext) {
-    if (!isAdmin(userContext)) {
-        throw new UnauthorizedError();
-    }
-}

package/dist/utils/auth/assert-owner-or-admin.util.d.ts

@@ -1,2 +0,0 @@
-import type { IAuditable, IUserContext } from '@loomcore/common/models';
-export declare function assertOwnerOrAdmin(userContext: IUserContext, auditable: IAuditable): void;

package/dist/utils/auth/assert-owner-or-admin.util.js

@@ -1,10 +0,0 @@
-import { UnauthorizedError } from '../../errors/index.js';
-import { isAdmin } from './is-admin.util.js';
-export function assertOwnerOrAdmin(userContext, auditable) {
-    if (isAdmin(userContext)) {
-        return;
-    }
-    if (userContext.user._id !== auditable._createdBy) {
-        throw new UnauthorizedError();
-    }
-}

package/dist/utils/auth/assert-user-has-feature.util.d.ts

@@ -1,2 +0,0 @@
-import { IUserContext } from '@loomcore/common/models';
-export declare function assertUserHasFeature(userContext: IUserContext, features: string[], requireAll?: boolean): void;

package/dist/utils/auth/assert-user-has-feature.util.js

@@ -1,18 +0,0 @@
-import { UnauthorizedError } from '../../errors/index.js';
-export function assertUserHasFeature(userContext, features, requireAll = false) {
-    if (features.length === 0) {
-        return;
-    }
-    const missingFeatures = features.filter(feature => !userContext.features.includes(feature));
-    if (requireAll) {
-        if (missingFeatures.length > 0) {
-            throw new UnauthorizedError(missingFeatures);
-        }
-    }
-    else {
-        if (missingFeatures.length === features.length) {
-            throw new UnauthorizedError(missingFeatures);
-        }
-    }
-    return;
-}

package/dist/utils/auth/assert-user-or-admin.util.d.ts

@@ -1,3 +0,0 @@
-import type { IUserContext } from '@loomcore/common/models';
-import type { AppIdType } from '@loomcore/common/types';
-export declare function assertUserOrAdmin(userContext: IUserContext, userId: AppIdType): void;

package/dist/utils/auth/assert-user-or-admin.util.js

@@ -1,10 +0,0 @@
-import { UnauthorizedError } from '../../errors/index.js';
-import { isAdmin } from './is-admin.util.js';
-export function assertUserOrAdmin(userContext, userId) {
-    if (isAdmin(userContext)) {
-        return;
-    }
-    if (userContext.user._id !== userId) {
-        throw new UnauthorizedError();
-    }
-}

package/dist/utils/auth/change-password.util.d.ts

@@ -1,6 +0,0 @@
-import { type IUserContext } from '@loomcore/common/models';
-import type { IDatabase } from '../../databases/models/index.js';
-import type { UpdateResult } from '../../databases/models/update-result.js';
-import { UserService } from '../../services/user.service.js';
-import { AppIdType } from '@loomcore/common/types';
-export declare function changePassword(database: IDatabase, userContext: IUserContext, userId: AppIdType, password: string, userService?: UserService): Promise<UpdateResult>;

package/dist/utils/auth/change-password.util.js

@@ -1,11 +0,0 @@
-import { UserService } from '../../services/user.service.js';
-export async function changePassword(database, userContext, userId, password, userService = new UserService(database)) {
-    const updates = {
-        password: password,
-    };
-    await userService.partialUpdateById(userContext, userId, updates, true);
-    return {
-        success: true,
-        count: 1,
-    };
-}