@solidxai/core 0.1.9-beta.6 → 0.1.9-beta.8

package/src/services/solid-introspect.service.ts

@@ -1,4 +1,4 @@
-import { classify } from '@angular-devkit/core/src/utils/strings';
+import { classify } from '../helpers/string.helper';
 import { Injectable, Logger, OnApplicationBootstrap } from '@nestjs/common';
 import { DiscoveryService, MetadataScanner, ModuleRef, Reflector } from '@nestjs/core';
 import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';

package/src/services/user.service.ts

@@ -239,6 +239,93 @@ export class UserService extends CRUDService<User> {
     return user;
   }
 
+  async resolveUserOnOauthFacebook(oauthUserDto: OauthUserDto): Promise<User> {
+    const user = await this.repo.findOne({
+      where: {
+        email: oauthUserDto.email,
+      },
+      relations: {
+        roles: true,
+      },
+    });
+
+    if (!user) {
+      const newUser = new User();
+      newUser.username = oauthUserDto.email;
+      newUser.email = oauthUserDto.email;
+      newUser.fullName = oauthUserDto.name;
+      newUser.lastLoginProvider = oauthUserDto.provider;
+      newUser.accessCode = oauthUserDto.accessCode;
+      newUser.facebookAccessToken = oauthUserDto.accessToken;
+      newUser.facebookId = oauthUserDto.providerId;
+      newUser.facebookProfilePicture = oauthUserDto.picture;
+
+      const savedUser = await this.repo.save(newUser);
+
+      await this.initializeRolesForNewUser(
+        [this.settingService.getConfigValue<SolidCoreSetting>('defaultRole')],
+        savedUser,
+      );
+      return savedUser;
+    } else {
+      const entity = await this.repo.preload({
+        id: user.id,
+        lastLoginProvider: oauthUserDto.provider,
+        accessCode: oauthUserDto.accessCode,
+        facebookAccessToken: oauthUserDto.accessToken,
+        facebookId: oauthUserDto.providerId,
+        facebookProfilePicture: oauthUserDto.picture,
+      });
+
+      await this.repo.save(entity);
+      return entity;
+    }
+  }
+
+
+  async resolveUserOnOauthMicrosoft(oauthUserDto: OauthUserDto): Promise<User> {
+    const user = await this.repo.findOne({
+      where: {
+        email: oauthUserDto.email,
+      },
+      relations: {
+        roles: true,
+      },
+    });
+
+    if (!user) {
+      const newUser = new User();
+      newUser.username = oauthUserDto.email;
+      newUser.email = oauthUserDto.email;
+      newUser.fullName = oauthUserDto.name;
+      newUser.lastLoginProvider = oauthUserDto.provider;
+      newUser.accessCode = oauthUserDto.accessCode;
+      newUser.microsoftAccessToken = oauthUserDto.accessToken;
+      newUser.microsoftId = oauthUserDto.providerId;
+      newUser.microsoftProfilePicture = oauthUserDto.picture;
+
+      const savedUser = await this.repo.save(newUser);
+
+      await this.initializeRolesForNewUser(
+        [this.settingService.getConfigValue<SolidCoreSetting>('defaultRole')],
+        savedUser,
+      );
+      return savedUser;
+    } else {
+      const entity = await this.repo.preload({
+        id: user.id,
+        lastLoginProvider: oauthUserDto.provider,
+        accessCode: oauthUserDto.accessCode,
+        microsoftAccessToken: oauthUserDto.accessToken,
+        microsoftId: oauthUserDto.providerId,
+        microsoftProfilePicture: oauthUserDto.picture,
+      });
+
+      await this.repo.save(entity);
+      return entity;
+    }
+  }
+
   async findUsersByRole(roleName: string, relations: any = {}): Promise<User[]> {
     return await this.repo.find({
       where: {

package/src/services/view-metadata.service.ts

@@ -4,8 +4,7 @@ import { InjectEntityManager } from '@nestjs/typeorm';
 import { CRUDService } from 'src/services/crud.service';
 import { EntityManager } from 'typeorm';
 
-
-import { classify } from '@angular-devkit/core/src/utils/strings';
+import { classify } from '../helpers/string.helper';
 import { Locale } from 'src/entities/locale.entity';
 import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';
 import { SolidRegistry } from 'src/helpers/solid-registry';
@@ -111,7 +110,6 @@ export class ViewMetadataService extends CRUDService<ViewMetadata> {
   async getLayout(query, activeUser) {
     let { modelName, moduleName, viewType, id, populate, menuItemId, menuItemName, actionId, actionName } = query;
 
-
     // 1. Fetch the action based on actionId.
     const solidRequestContext = {
       activeUser: activeUser
@@ -156,7 +154,6 @@ export class ViewMetadataService extends CRUDService<ViewMetadata> {
       }));
     }
 
-
     const viewId = action?.view?.id
     // 3. Fetch the view based on module, model & view name.
     const entity = await this.repo.findOne({
@@ -203,7 +200,6 @@ export class ViewMetadataService extends CRUDService<ViewMetadata> {
       entity.layout = JSON.parse(entity.layout);
     }
 
-
     // 6. We are resolving the create & edit actions if specified in the layout.
     if (entity?.layout?.attrs?.createAction) {
       const actionName: string = entity.layout.attrs.createAction;

package/src/solid-core.module.ts

@@ -26,7 +26,7 @@ import { ModuleMetadata } from './entities/module-metadata.entity';
 import { CommandService } from './helpers/command.service';
 import { SchematicService } from './helpers/schematic.service';
 import { ListOfValuesSelectionProvider } from './services/selection-providers/list-of-values-selection-providers.service';
-import { PseudoForeignKeySelectionProvider } from './services/selection-providers/pseudo-foreign-key-selection-provider.service'
+import { PseudoForeignKeySelectionProvider } from './services/selection-providers/pseudo-foreign-key-selection-provider.service';
 import { ModuleMetadataSeederService } from './seeders/module-metadata-seeder.service';
 import { ModuleTestDataService } from './seeders/module-test-data.service';
 import { CrudHelperService } from './services/crud-helper.service';
@@ -55,6 +55,11 @@ import { ActionMetadataController } from './controllers/action-metadata.controll
 import { ActionMetadata } from './entities/action-metadata.entity';
 import { ActionMetadataService } from './services/action-metadata.service';
 
+import { FacebookAuthenticationController } from './controllers/facebook-authentication.controller';
+import { MicrosoftAuthenticationController } from './controllers/microsoft-authentication.controller';
+import { FacebookOAuthStrategy } from './passport-strategies/facebook-oauth.strategy';
+import { MicrosoftOAuthStrategy } from './passport-strategies/microsoft-oauth.strategy';
+
 import { HttpModule } from '@nestjs/axios';
 import { JwtModule } from '@nestjs/jwt';
 import { SeedCommand } from './commands/seed.command';
@@ -133,7 +138,14 @@ import { BcryptService } from './services/bcrypt.service';
 import { UuidExternalIdEntityComputedFieldProvider } from './services/computed-fields/entity/uuid-externalid-entity-computed-field-provider.service';
 import { UuidExternalIdComputedFieldProvider } from './services/computed-fields/uuid-external-id-computed-field-provider.service';
 import { EmailTemplateService } from './services/email-template.service';
-import { DiskFileService, S3FileService, FileServiceFactory, DiskStoragePathBuilder, S3StoragePathBuilder, StoragePathBuilderFactory } from './services/file';
+import {
+  DiskFileService,
+  S3FileService,
+  FileServiceFactory,
+  DiskStoragePathBuilder,
+  S3StoragePathBuilder,
+  StoragePathBuilderFactory,
+} from './services/file';
 import { HashingService } from './services/hashing.service';
 import { ElasticEmailService } from './services/mail/elastic-email.service';
 import { SMTPEMailService } from './services/mail/smtp-email.service';
@@ -229,7 +241,6 @@ import { SmtpEmailQueueSubscriberDatabase } from './jobs/database/smtp-email-sub
 import { TwilioSmsQueuePublisherDatabase } from './jobs/database/twilio-sms-publisher-database.service';
 import { TwilioSmsQueueSubscriberDatabase } from './jobs/database/twilio-sms-subscriber-database.service';
 
-
 // import { ThrottlerModule } from '@nestjs/throttler';
 import { IngestCommand } from './commands/ingest.command';
 import { MailFactory } from './factories/mail.factory';
@@ -380,7 +391,6 @@ import { InfoCommand } from './commands/info.command';
 import { ListOfRolesSelectionProvider } from './services/selection-providers/list-of-roles-selectionproviders.service';
 import { Entity } from 'typeorm';
 
-
 @Global()
 @Module({
   imports: [
@@ -442,12 +452,12 @@ import { Entity } from 'typeorm';
           // you can also expose CORS here (not needed for simple <img>):
           // res.setHeader('Access-Control-Allow-Origin', 'http://localhost:3000');
         },
-      }
+      },
     }),
     MulterModule.registerAsync({
       imports: [ConfigModule],
       useFactory: async (configService: ConfigService) => ({
-        dest: process.env.AB_MEDIA_UPLOAD_DIR ?? "media-uploads",
+        dest: process.env.AB_MEDIA_UPLOAD_DIR ?? 'media-uploads',
       }),
       inject: [ConfigService],
     }),
@@ -474,6 +484,8 @@ import { Entity } from 'typeorm';
     ExportTransactionController,
     FieldMetadataController,
     GoogleAuthenticationController,
+    FacebookAuthenticationController,
+    MicrosoftAuthenticationController,
     ImportTransactionController,
     ImportTransactionErrorLogController,
     ListOfValuesController,
@@ -524,7 +536,7 @@ import { Entity } from 'typeorm';
     },
     {
       provide: APP_FILTER,
-      useClass: HttpExceptionFilter
+      useClass: HttpExceptionFilter,
     },
     ModuleMetadataService,
     ModuleMetadataHelperService,
@@ -640,6 +652,8 @@ import { Entity } from 'typeorm';
     RefreshTokenIdsStorageService,
     SsoCodeStorageService,
     GoogleOauthStrategy,
+    FacebookOAuthStrategy,
+    MicrosoftOAuthStrategy,
     UserRegistrationListener,
     TestQueuePublisher,
     TestQueueSubscriber,
@@ -873,7 +887,10 @@ import { Entity } from 'typeorm';
 export class SolidCoreModule implements NestModule {
   configure(consumer: MiddlewareConsumer) {
     consumer
-      .apply(express.json({ limit: '10mb' }), express.urlencoded({ limit: '10mb', extended: true }))
+      .apply(
+        express.json({ limit: '10mb' }),
+        express.urlencoded({ limit: '10mb', extended: true }),
+      )
       .forRoutes('*');
   }
 }

package/src/subscribers/computed-entity-field.subscriber.ts

@@ -1,4 +1,4 @@
-import { camelize } from "@angular-devkit/core/src/utils/strings";
+import { camelCase } from 'lodash';
 import { Delete } from "@aws-sdk/client-s3";
 import { forwardRef, Inject, Injectable, InternalServerErrorException, Logger, Scope } from "@nestjs/common";
 import { model } from "mongoose";
@@ -35,33 +35,33 @@ export class ComputedEntityFieldSubscriber implements EntitySubscriberInterface
     }
 
     async beforeInsert(event: InsertEvent<any>): Promise<any> {
-        const modelName = camelize(event.metadata?.name ?? event.entity?.constructor?.name ?? '');
+        const modelName = camelCase(event.metadata?.name ?? event.entity?.constructor?.name ?? '');
         const eventContext = this.sanitizeEventContext(event, 'beforeInsert');
         await this.handleComputedFieldEvaluation(event.entity, ComputedFieldTriggerOperation.beforeInsert, modelName, eventContext);
     }
 
     async beforeUpdate(event: UpdateEvent<any>): Promise<any> {
-        const modelName = camelize(event.metadata?.name ?? event.entity?.constructor?.name ?? '');
+        const modelName = camelCase(event.metadata?.name ?? event.entity?.constructor?.name ?? '');
         const eventContext = this.sanitizeEventContext(event, 'beforeUpdate');
         // await this.handleComputedFieldEvaluation(event.databaseEntity, ComputedFieldTriggerOperation.beforeUpdate, modelName, eventContext);
         await this.handleComputedFieldEvaluation(event.entity, ComputedFieldTriggerOperation.beforeUpdate, modelName, eventContext);
     }
 
     afterInsert(event: InsertEvent<any>) {
-        const modelName = camelize(event.metadata?.name ?? event.entity?.constructor?.name ?? '');
+        const modelName = camelCase(event.metadata?.name ?? event.entity?.constructor?.name ?? '');
         const eventContext = this.sanitizeEventContext(event, 'afterInsert');
         this.handleComputedFieldEvaluationJob(event.entity, ComputedFieldTriggerOperation.afterInsert, modelName, eventContext);
     }
 
     afterUpdate(event: UpdateEvent<any>) {
-        const modelName = camelize(event.metadata?.name ?? event.entity?.constructor?.name ?? event.databaseEntity?.constructor?.name ?? '');
+        const modelName = camelCase(event.metadata?.name ?? event.entity?.constructor?.name ?? event.databaseEntity?.constructor?.name ?? '');
         const eventContext = this.sanitizeEventContext(event, 'afterUpdate');
         // this.handleComputedFieldEvaluationJob(event.databaseEntity, ComputedFieldTriggerOperation.afterUpdate, modelName, eventContext);
         this.handleComputedFieldEvaluationJob(event.entity, ComputedFieldTriggerOperation.afterUpdate, modelName, eventContext);
     }
 
     afterRemove(event: RemoveEvent<any>) {
-        const modelName = camelize(event.metadata?.name ?? event.entity?.constructor?.name ?? event.databaseEntity?.constructor?.name ?? '');
+        const modelName = camelCase(event.metadata?.name ?? event.entity?.constructor?.name ?? event.databaseEntity?.constructor?.name ?? '');
         const eventContext = this.sanitizeEventContext(event, 'afterRemove');
         this.handleComputedFieldEvaluationJob(event.databaseEntity, ComputedFieldTriggerOperation.afterRemove, modelName, eventContext);
     }

package/.claude/settings.local.json

@@ -1,15 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(node -e:*)",
-      "WebFetch(domain:docs.solidxai.com)",
-      "WebFetch(domain:github.com)",
-      "Read(//Users/oswald/projects/Solid_Starters/solidctl/**)",
-      "Read(//Users/oswald/projects/Solid_Starters/**)",
-      "Bash(find /Users/oswald/projects/Solid_Starters/solid-core-module -type d -name migration* -o -name *database*)"
-    ],
-    "additionalDirectories": [
-      "/Users/oswald/projects/Solid_Starters/solidctl"
-    ]
-  }
-}

package/src/services/1.js

@@ -1,6 +0,0 @@
-1. Do i need to create a storeStreams method for aws service too?
-    - Handle later
-2. queues handling -> if queues is enabled by default, i.e triggerExport(exportTransactionEntity.id).
-    - startExport should either return the data or return the transaction id
-3. How to handle scenarios wherein, nested related exist.(do i need to only get the userkey)
-    - show the userKey