eh-commons 0.0.1-testing.97 → 0.0.2-testing.78

package/src/modules/session/services/session-v1.service.ts

@@ -0,0 +1,30 @@
+import { Injectable } from '@nestjs/common';
+import { RedisService } from './redis.service';
+import { SessionClient } from '../../../clients/session.client';
+
+@Injectable()
+export class SessionV1Service {
+  //#region Private Members
+  private readonly _sessionClient: SessionClient;
+  //#endregion
+
+  //#region Constructor
+  constructor(private readonly _redisService: RedisService) {
+    this._sessionClient = new SessionClient(this._redisService.getRedisClient());
+  }
+  //#endregion
+
+  //#region Public APIs
+  public getUserData(token: string) {
+    return this._sessionClient.getUserData(token);
+  }
+
+  public getClientData(userId: string) {
+    return this._sessionClient.getUserClients(userId);
+  }
+
+  public getUserClientPermissions(userId: string, clientId: string) {
+    return this._sessionClient.getUserClientPermissions(userId, clientId);
+  }
+  //#endregion
+}

package/src/modules/session/services/session-v2.service.ts

@@ -0,0 +1,113 @@
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { RestClient } from '../../../clients';
+import { ICompleteUserData } from '../../iam';
+import { ISessionClientData, ISessionData, IUserSessionData } from '../models/interfaces';
+import { generateSessionKeyword, generateUserClientPermissionKeyword, generateUserClientsKeyword, generateUserSessionTokenKeyword } from '../functions';
+import { RESTError } from '../../../models/wrappers/rest-wrapper.class';
+import { RedisService } from './redis.service';
+
+@Injectable()
+export class SessionV2Service {
+  //#region Private Members
+  private readonly _client: RestClient;
+  //#endregion
+
+  //#region Constructor
+  constructor(
+    private readonly _configService: ConfigService,
+    private readonly _redisService: RedisService,
+  ) {
+    this._client = new RestClient({
+      name: 'SESSION_SERVICE',
+      baseUrl: this._configService.get('EH_SESSIONS__REST__BASE_URL', ''),
+      timeout: 30000,
+      accessToken: this._configService.get('EH_SESSIONS__REST__ACCESS_TOKEN', ''),
+    });
+  }
+  //#endregion
+
+  //#region Public APIs
+  public async initPrivateSchool(data: ICompleteUserData) {
+    const requestBody = { data };
+    return await this._client.post<ISessionData>(`/internals/v1/sessions/private-schools`, requestBody);
+  }
+
+  public async readBySessionToken(token: string): Promise<ISessionData> {
+    const userKey = generateSessionKeyword(token);
+    const response = await this._redisService.get(userKey);
+
+    if (!response) {
+      throw new RESTError('session_not_found', null, 401);
+    }
+
+    const parsedUserResponse = JSON.parse(response);
+    const userClientKey = generateUserClientsKeyword(parsedUserResponse.userId);
+
+    const clientResponse = await this._redisService.get(userClientKey);
+    const parsedClient = JSON.parse(clientResponse);
+
+    return {
+      sessionToken: token,
+      userInfo: parsedUserResponse,
+      userClients: parsedClient,
+    };
+  }
+
+  public async deleteBySessionToken(token: string) {
+    const userKey = generateSessionKeyword(token);
+
+    const userInfoRaw = await this._redisService.get(userKey);
+    if (!userInfoRaw) {
+      return;
+    }
+
+    const userInfo: IUserSessionData = JSON.parse(userInfoRaw);
+    const userId = userInfo.userId;
+    const userClientKey = generateUserClientsKeyword(userId);
+    const userSessionTokenKey = generateUserSessionTokenKeyword(userId);
+
+    // Delete per-client permission keys
+    try {
+      const clientsRaw: string = await this._redisService.get(userClientKey);
+      if (clientsRaw) {
+        const clients: { [key: string]: ISessionClientData } = JSON.parse(clientsRaw);
+        for (const key in clients) {
+          const userClientPermissionsKey = generateUserClientPermissionKeyword(userId, clients[key].clientId);
+          await this._redisService.del(userClientPermissionsKey);
+        }
+      }
+    } catch (_) {
+      // Continue cleanup even if client permissions deletion fails
+    }
+
+    // Always delete the main session keys
+    await this._redisService.del(userClientKey);
+    await this._redisService.del(userSessionTokenKey);
+    await this._redisService.del(userKey);
+  }
+
+  public async readByUserId(userId: string): Promise<ISessionData> {
+    const token = await this.validateUsesSessionToken(userId);
+    return await this.readBySessionToken(token);
+  }
+
+  public async deleteByUserId(userId: string) {
+    const token = await this.validateUsesSessionToken(userId);
+    return await this.deleteBySessionToken(token);
+  }
+
+  public async readUserSessionToken(userId: string) {
+    const userSessionTokenKey = generateUserSessionTokenKeyword(userId);
+    return await this._redisService.get(userSessionTokenKey);
+  }
+
+  public async validateUsesSessionToken(userId: string): Promise<string> {
+    const userSessionToken = await this.readUserSessionToken(userId);
+    if (!userSessionToken) {
+      throw new RESTError('user_session_token_not_found', userId, 400);
+    }
+    return userSessionToken;
+  }
+  //#endregion
+}

package/src/modules/session/session.module.ts

@@ -0,0 +1,14 @@
+import { Module } from '@nestjs/common';
+import { ConfigModule } from '@nestjs/config';
+import { SessionV2Service } from './services/session-v2.service';
+import { SessionV1Service } from './services/session-v1.service';
+import { RedisService } from './services/redis.service';
+import { CoreModule } from '../core/core.module';
+
+@Module({
+  imports: [ConfigModule, CoreModule],
+  controllers: [],
+  providers: [RedisService, SessionV1Service, SessionV2Service],
+  exports: [RedisService, SessionV1Service, SessionV2Service],
+})
+export class SessionModule {}

package/src/modules/storage/index.ts

@@ -0,0 +1,4 @@
+export * from './models/inerfaces';
+export * from './models/schemas';
+export * from './services/storage.service';
+export * from './storage.module';

package/src/modules/storage/models/inerfaces/index.ts

@@ -0,0 +1,8 @@
+import { Types } from 'mongoose';
+import { IFileMeta, IS3 } from '../../../..';
+
+export interface IS3FileThin {
+  id: Types.ObjectId;
+  fileMeta: IFileMeta;
+  s3: IS3;
+}

package/src/modules/storage/models/schemas/index.ts

@@ -0,0 +1,42 @@
+import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
+import { HydratedDocument, SchemaTypes, Types } from 'mongoose';
+import { IFileMeta } from '../../../../models/s3/interfaces/file-meta.interface';
+import { S3Schema } from '../../../../models/s3/embedded/s3.embedded';
+import { IS3 } from '../../../../models/s3/interfaces/s3.interface';
+import { IS3FileThin } from '../inerfaces';
+
+@Schema({ _id: false })
+export class FileMeta implements IFileMeta {
+  @Prop({ type: String, required: false })
+  name: string;
+
+  @Prop({ type: Number, required: true })
+  size: number;
+
+  @Prop({ type: String, required: true })
+  mimeType: string;
+
+  @Prop({ type: String, required: true })
+  extension: string;
+}
+
+export const FileMetaSchema = SchemaFactory.createForClass(FileMeta);
+export type FileMetaDocument = HydratedDocument<FileMeta>;
+
+@Schema({ _id: false })
+export class S3FileThin implements IS3FileThin {
+  @Prop({ type: SchemaTypes.ObjectId, required: true })
+  id: Types.ObjectId;
+
+  @Prop({ required: false, type: FileMetaSchema })
+  fileMeta: IFileMeta;
+
+  @Prop({ required: false, type: S3Schema })
+  s3: IS3;
+
+  @Prop({ required: false, type: String })
+  owner: string;
+}
+
+export const S3FileThinSchema = SchemaFactory.createForClass(S3FileThin);
+export type S3FileThinDocument = HydratedDocument<S3FileThin>;

package/src/modules/storage/services/storage.service.ts

@@ -0,0 +1,29 @@
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { ObjectId } from 'mongoose';
+import { RestClient } from '../../../clients';
+import { IS3File } from '../../../models/s3/interfaces/file.interface';
+
+@Injectable()
+export class StorageService {
+  //#region Private Members
+  private readonly _client: RestClient;
+  //#endregion
+
+  //#region Constructor
+  constructor(private _configService: ConfigService) {
+    this._client = new RestClient({
+      name: 'STORAGE_SERVICE',
+      baseUrl: this._configService.get('EH_STORAGE__REST__BASE_URL', ''),
+      timeout: 30000,
+      accessToken: this._configService.get('EH_STORAGE__REST__ACCESS_TOKEN', ''),
+    });
+  }
+  //#endregion
+
+  //#region Public APIs
+  public async fetchMeta(fileId: string | ObjectId, bucketName: string) {
+    return await this._client.get<IS3File>(`/bucket/${bucketName}/file/${fileId}/meta`);
+  }
+  //#endregion
+}

package/src/modules/storage/storage.module.ts

@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common';
+import { StorageService } from './services/storage.service';
+import { ConfigModule } from '@nestjs/config';
+
+@Module({
+  imports: [ConfigModule],
+  controllers: [],
+  providers: [StorageService],
+  exports: [StorageService],
+})
+export class StorageModule {}

package/src/pipes/index.ts

@@ -0,0 +1,49 @@
+import { isMongoId } from 'class-validator';
+import { ObjectId } from 'bson';
+import { TransformFnParams } from 'class-transformer';
+import { RESTError } from '../models/wrappers/rest-wrapper.class';
+
+const toStringArray = (value: string | string[]) => {
+  return typeof value === 'string' ? [value] : value;
+};
+
+const toMongoId = (value: string) => {
+  const check = isMongoId(value);
+  if (!check) {
+    throw new RESTError('invalid_mongoid', value);
+  }
+  return ObjectId.createFromHexString(value);
+};
+
+const toMongoIdArray = (values: string | string[]) => {
+  const result: ObjectId[] = [];
+  const items = typeof values === 'string' ? [values] : values;
+  for (const value of items) {
+    result.push(toMongoId(value));
+  }
+  return result;
+};
+
+const toBoolean = (value: string) => {
+  return value === 'true';
+};
+
+const stringArrayTransformer = (params: TransformFnParams) => {
+  return toStringArray(params.value);
+};
+
+const mongoIdTransformer = (params: TransformFnParams) => {
+  return toMongoId(params.value);
+};
+
+const mongoIdArrayTransformer = (params: TransformFnParams) => {
+  return toMongoIdArray(params.value);
+};
+
+const booleanTransformer = (params: TransformFnParams) => {
+  return toBoolean(params.value);
+};
+
+export { toStringArray, toMongoId, toMongoIdArray, toBoolean, stringArrayTransformer, mongoIdTransformer, mongoIdArrayTransformer, booleanTransformer };
+export * from './validate-pid.pipe';
+export * from './validate-mongo-id.pipe';

package/src/pipes/validate-mongo-id.pipe.ts

@@ -1,8 +1,6 @@
 import { Injectable, PipeTransform } from '@nestjs/common';
 import { isMongoId } from 'class-validator';
-import {
-  RESTError,
-} from '../models/wrappers/rest-wrapper.class';
+import { RESTError } from '../models/wrappers/rest-wrapper.class';
 
 @Injectable()
 export class ValidateMongoIdPipe implements PipeTransform<string, string> {

package/src/functions/session/keyword.function.ts

@@ -1,14 +0,0 @@
-export function generateSessionKeyword(token: string) {
-  return `sessions::${token}`;
-}
-
-export function generateUserClientKeyword(userId: string) {
-  return `user-clients::${userId}`;
-}
-
-export function generateUserClientPermissionKeyword(
-  userId: string,
-  clientId: string,
-) {
-  return `user-client-permissions::${userId}::${clientId}`;
-}

package/src/models/dictionary/embedded/dictionary.embedded.ts

@@ -1,31 +0,0 @@
-import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
-import { HydratedDocument, SchemaTypes } from 'mongoose';
-import { mongo } from 'mongoose';
-import { I18n, I18nSchema } from '../../util/embedded/i18n.embedded';
-import { IDictionaryEmbedded } from '../interfaces/dictionary-embedded.interface';
-import { RecordState } from '../../util/enums/record-state.enum';
-
-@Schema({ _id: false })
-export class DictionaryEmbedded implements IDictionaryEmbedded {
-  @Prop({ type: I18nSchema, required: false })
-  title: I18n;
-
-  @Prop({ type: String, required: false })
-  keyword: string;
-
-  @Prop({ type: String, required: false, enum: RecordState })
-  record: RecordState;
-
-  @Prop({ type: SchemaTypes.ObjectId, required: false })
-  originId: mongo.ObjectId;
-
-  @Prop({ type: [SchemaTypes.ObjectId], required: false })
-  originIds: mongo.ObjectId[];
-
-  @Prop({ type: SchemaTypes.ObjectId, required: false })
-  dictionaryId: mongo.ObjectId;
-}
-
-export const DictionaryEmbeddedSchema =
-  SchemaFactory.createForClass(DictionaryEmbedded);
-export type DictionaryEmbeddedDocument = HydratedDocument<DictionaryEmbedded>;

package/src/models/dictionary/interfaces/dictionary-embedded.interface.ts

@@ -1,12 +0,0 @@
-import { mongo } from 'mongoose';
-import { II18n } from '../../util/interfaces/i18n.interface';
-import { RecordState } from '../../util/enums/record-state.enum';
-
-export interface IDictionaryEmbedded {
-  originId: mongo.ObjectId;
-  originIds: mongo.ObjectId[];
-  dictionaryId: mongo.ObjectId;
-  title: II18n;
-  keyword: string;
-  record: RecordState;
-}

package/src/models/dictionary/interfaces/dictionary-event.interface.ts

@@ -1,6 +0,0 @@
-import { IDictionary } from "./dictionary.interface";
-
-export interface IDictionaryEvent {
-  event: 'create' | 'update' | 'delete';
-  data: IDictionary;
-}

package/src/models/dictionary/interfaces/dictionary-setting.interface.ts

@@ -1,5 +0,0 @@
-import { ResourceType } from '../../emis/enums/resource-type.enum';
-
-export interface IDictionarySetting {
-  allowedTypes: ResourceType[];
-}

package/src/models/dictionary/interfaces/dictionary.interface.ts

@@ -1,13 +0,0 @@
-import { ObjectId } from 'bson';
-import { IDictionarySetting } from './dictionary-setting.interface';
-import { IBase } from '../../commons/interfaces/base.interface';
-import { II18n } from '../../util/interfaces/i18n.interface';
-
-export interface IDictionary extends IBase {
-  keyword: string;
-  originIds: ObjectId[];
-  parentIds: ObjectId[];
-  title: II18n;
-  settings: IDictionarySetting;
-  metas: Map<string, string>;
-}

package/src/models/session/interfaces/session-user-data.interface.ts

@@ -1,16 +0,0 @@
-import { IContact } from '../../../models/util/interfaces/contact.interface';
-import { IDictionaryEmbedded } from '../../dictionary/interfaces/dictionary-embedded.interface';
-
-export interface ISessionUserData {
-  userId: string;
-  username: string;
-  fistName: string;
-  lastName: string;
-  contacts: IContact[];
-  gender: number;
-  birthDate: Date;
-  pid: string;
-  subjects: IDictionaryEmbedded[];
-  level: IDictionaryEmbedded;
-  ua: any;
-}

package/src/models/um/enums/client-type.enum.ts

@@ -1,6 +0,0 @@
-export enum ClientType{
-    ADMIN = 'admin',
-    PUBLIC_SCHOOL = 'public-school',
-    PRIVATE_SCHOOL = 'private-school',
-    PROVIDER = 'provider'
-}

package/src/models/um/enums/permission-include-strategy.enum.ts

@@ -1,5 +0,0 @@
-export enum PermissionsIncludeStrategy {
-  ONLY_CHECK = 'ONLY_CHECK',
-  CHECK_AND_INCLUDE_SELECTED = 'CHECK_AND_INCLUDE_SELECTED',
-  CHECK_AND_INCLUDE_ALL = 'CHECK_AND_INCLUDE_ALL',
-}

package/src/models/um/interfaces/client.interface.ts

@@ -1,23 +0,0 @@
-import { mongo } from 'mongoose';
-import { II18n } from '../../util/interfaces/i18n.interface';
-import { IRecord } from '../../../models/util/interfaces/record.interface';
-import { IAddress } from '../../../models/util/interfaces/address.interface';
-import { IContact } from '../../../models/util/interfaces/contact.interface';
-import { IDictionaryEmbedded } from '../../dictionary/interfaces/dictionary-embedded.interface';
-
-export interface IClient {
-  _id: mongo.ObjectId;
-  originId: mongo.ObjectId;
-  type: IDictionaryEmbedded;
-  parentId: mongo.ObjectId;
-  name: II18n;
-  address: IAddress;
-  highland: boolean;
-  code: string;
-  contacts: IContact[];
-  record: IRecord;
-  region: IDictionaryEmbedded;
-  district: IDictionaryEmbedded;
-  languageSectors: IDictionaryEmbedded[];
-  levels: IDictionaryEmbedded[];
-}

package/src/models/um/interfaces/credentials.interface.ts

@@ -1,4 +0,0 @@
-export interface ICredentials{
-    username: string;
-    password: string;
-}

package/src/models/um/interfaces/permission.interface.ts

@@ -1,11 +0,0 @@
-import {  mongo } from 'mongoose';
-import { II18n } from '../../util/interfaces/i18n.interface';
-import { IRecord } from '../../util/interfaces/record.interface';
-
-export interface IPermission {
-  _id: mongo.ObjectId;
-  name: II18n;
-  description: II18n;
-  keyword: string;
-  record: IRecord;
-}

package/src/models/um/interfaces/prof-info.interface.ts

@@ -1,5 +0,0 @@
-import {  IDictionaryEmbedded } from '../../dictionary/interfaces/dictionary-embedded.interface';
-
-export interface IProfInfo {
-  subjects: IDictionaryEmbedded[];
-}

package/src/models/um/interfaces/role.interface.ts

@@ -1,14 +0,0 @@
-import { mongo } from 'mongoose';
-import { II18n } from '../../util/interfaces/i18n.interface';
-import { IPermission } from './permission.interface';
-import { IRecord } from '../../util/interfaces/record.interface';
-
-export interface IRole {
-  _id: mongo.ObjectId;
-  keyword: string;
-  name: II18n;
-  description: II18n;
-  permissions: IPermission[];
-  record: IRecord;
-  default: boolean;
-}

package/src/models/um/interfaces/user-client.interface.ts

@@ -1,10 +0,0 @@
-import { ObjectId } from 'mongoose';
-import { IDictionaryEmbedded } from '../../dictionary/interfaces/dictionary-embedded.interface';
-import { IClient } from './client.interface';
-import { IRole } from './role.interface';
-
-export interface IUserClient {
-  client: IClient;
-  roles: IRole[];
-  subjects: IDictionaryEmbedded[];
-}

package/src/models/um/interfaces/user.interface.ts

@@ -1,20 +0,0 @@
-import { ObjectId, mongo } from 'mongoose';
-import { IPerson } from '../../util/interfaces/person.interface';
-import { IContact } from '../../util/interfaces/contact.interface';
-import { IUserClient } from './user-client.interface';
-import { IRecord } from '../../util/interfaces/record.interface';
-import { IProfInfo } from './prof-info.interface';
-import { ICredentials } from './credentials.interface';
-import { IDictionaryEmbedded } from '../../dictionary/interfaces/dictionary-embedded.interface';
-
-export interface IUser {
-  _id: mongo.ObjectId;
-  person: IPerson;
-  contacts: IContact[];
-  clients: IUserClient[];
-  settings: any;
-  record: IRecord;
-  profInfo: IProfInfo;
-  credentials: ICredentials;
-  level: IDictionaryEmbedded;
-}

package/src/models/wrappers/permission-guard-config.wrapper.ts

@@ -1,5 +0,0 @@
-import { PermissionsIncludeStrategy } from '../um/enums/permission-include-strategy.enum';
-
-export class PermissionGuardConfig {
-  keyword: string;
-}

package/src/modules/cache/cache.module.ts

@@ -1,13 +0,0 @@
-import { Module } from '@nestjs/common';
-import { RedisService } from './services/redis.service';
-import { SessionService } from './services/session.service';
-import { PermissionGuard } from './guards/permission.guard';
-import { CoreModule } from '../core/core.module';
-
-@Module({
-  imports: [CoreModule],
-  controllers: [],
-  providers: [RedisService, SessionService, PermissionGuard],
-  exports: [RedisService, SessionService, PermissionGuard],
-})
-export class CacheModule {}