@solidxai/core 0.1.9-beta.8 → 0.1.10-alpha.0

package/src/controllers/user.controller.ts

@@ -20,37 +20,37 @@ export class UserController {
   @ApiBearerAuth("jwt")
   @Post()
   @UseInterceptors(AnyFilesInterceptor())
-  create(@Body() createDto: CreateUserDto, @UploadedFiles() files: Array<Express.Multer.File>,@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.create(createDto, files,solidRequestContext);
+  create(@Body() createDto: CreateUserDto, @UploadedFiles() files: Array<Express.Multer.File>, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.create(createDto, files, solidRequestContext);
   }
 
   @ApiBearerAuth("jwt")
   @Post('/bulk')
   @UseInterceptors(AnyFilesInterceptor())
-  insertMany(@Body() createDtos: CreateUserDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = [],@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.insertMany(createDtos, filesArray,solidRequestContext);
+  insertMany(@Body() createDtos: CreateUserDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = [], @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.insertMany(createDtos, filesArray, solidRequestContext);
   }
 
 
   @ApiBearerAuth("jwt")
   @Put(':id')
   @UseInterceptors(AnyFilesInterceptor())
-  update(@Param('id') id: number, @Body() updateDto: UpdateUserDto, @UploadedFiles() files: Array<Express.Multer.File> ,@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.update(id, updateDto, files,false,solidRequestContext);
+  update(@Param('id') id: number, @Body() updateDto: UpdateUserDto, @UploadedFiles() files: Array<Express.Multer.File>, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.update(id, updateDto, files, false, solidRequestContext);
   }
 
 
   @ApiBearerAuth("jwt")
   @Patch(':id/update-user-and-roles')
-  updateUser(@Param('id') id: number,@Body() updateDto: any, @UploadedFiles() files: Array<Express.Multer.File>, @SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.updateUser(id, updateDto, files,solidRequestContext);
+  updateUser(@Param('id') id: number, @Body() updateDto: any, @UploadedFiles() files: Array<Express.Multer.File>, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.updateUser(id, updateDto, files, solidRequestContext);
   }
 
 
   @ApiBearerAuth("jwt")
   @Patch(':id')
   @UseInterceptors(AnyFilesInterceptor())
-  partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateUserDto, @UploadedFiles() files: Array<Express.Multer.File>,@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
+  partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateUserDto, @UploadedFiles() files: Array<Express.Multer.File>, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
     return this.service.update(id, updateDto, files, true, solidRequestContext);
   }
 
@@ -67,8 +67,8 @@ export class UserController {
   @ApiQuery({ name: 'populateMedia', required: false, type: Array })
   @ApiQuery({ name: 'filters', required: false, type: Array })
   @Get()
-  async findMany(@Query() query: any, @SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.find(query,solidRequestContext);
+  async findMany(@Query() query: any, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.find(query, solidRequestContext);
   }
 
   @ApiBearerAuth("jwt")
@@ -81,18 +81,18 @@ export class UserController {
 
   @ApiBearerAuth("jwt")
   @Get(':id')
-  async findOne(@Param('id') id: string, @Query() query: any,@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.findOne(+id, query,solidRequestContext);
+  async findOne(@Param('id') id: string, @Query() query: any, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.findOne(+id, query, solidRequestContext);
   }
 
   @Delete('/bulk')
-  async deleteMany(@Body() ids: number[],@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.deleteMany(ids,solidRequestContext);
+  async deleteMany(@Body() ids: number[], @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.deleteMany(ids, solidRequestContext);
   }
 
   @ApiBearerAuth("jwt")
   @Delete(':id')
-  async delete(@Param('id') id: number,@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
+  async delete(@Param('id') id: number, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
     return this.service.delete(id, solidRequestContext);
   }
 

package/src/controllers/view-metadata.controller.ts

@@ -9,7 +9,7 @@ import { SolidRequestContextDto } from 'src/dtos/solid-request-context.dto';
 import { ActiveUser } from 'src/decorators/active-user.decorator';
 import { ActiveUserData } from 'src/interfaces/active-user-data.interface';
 
-@ApiTags('App Builder')
+@ApiTags('Solid Core')
 @Controller('view-metadata') //FIXME: Change this to the model plural name 
 export class ViewMetadataController {
   constructor(private readonly service: ViewMetadataService) { }

package/src/helpers/bootstrap.helper.ts

@@ -1,5 +1,6 @@
 import { ValidationPipe } from '@nestjs/common';
 import { NestFactory } from '@nestjs/core';
+import { WsAdapter } from '@nestjs/platform-ws';
 import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
 import { NextFunction, Request, Response } from 'express';
 import helmet from 'helmet';
@@ -178,6 +179,8 @@ export async function bootstrapSolidApp(
   const types = require('pg').types;
   types.setTypeParser(types.builtins.INT8, (val: string) => parseInt(val));
 
+  app.useWebSocketAdapter(new WsAdapter(app));
+
   await app.listen(port);
 }
 

package/src/helpers/field-crud-managers/BigIntFieldCrudManager.ts

@@ -20,7 +20,7 @@ export class BigIntFieldCrudManager implements FieldCrudManager {
                 if (typeof fieldValue === 'string' || typeof fieldValue === 'number') {
                     fieldValue = BigInt(fieldValue);
                 }
-            } catch (err) {
+            } catch (err: any) {
                 return [{ field: this.options.fieldName, error: 'Invalid numeric value' }];
             }
         }

package/src/helpers/field-crud-managers/SelectionDynamicFieldCrudManager.ts

@@ -119,7 +119,7 @@ export class SelectionDynamicFieldCrudManager implements FieldCrudManager {
             }
             return false;
         }
-        catch (error) {
+        catch (error: any) {
             // Use the values method as a fallback, if the value method is not implemented
             const values = await providerInstance.values('', ctxt);
             const isValid = values.some(v => v.value === fieldValue);

package/src/helpers/module-metadata-helper.service.ts

@@ -23,7 +23,7 @@ export class ModuleMetadataHelperService {
             const fileContent = await fs.readFile(configFilePath, 'utf8');
             return JSON.parse(fileContent);
         }
-        catch (error) {
+        catch (error: any) {
             this.logger.error(`module metadata configuration non existent at: ${configFilePath}`);
         }
 

package/src/jobs/database/trigger-mcp-client-subscriber-database.service.ts

@@ -60,7 +60,7 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
                 // Fallback
                 nestedResponse = String(raw);
             }
-        } catch (err) {
+        } catch (err: any) {
             this.triggerMcpClientSubscriberLogger.error("Error processing AI response:", err);
             nestedResponse = `Error handling response: ${err?.message || String(err)}`;
         }

package/src/passport-strategies/facebook-oauth.strategy.ts

@@ -1,64 +1,115 @@
-import { Injectable, Logger } from '@nestjs/common';
-import { AuthGuard, PassportStrategy } from '@nestjs/passport';
-import { Strategy } from 'passport-facebook';
-import { FacebookAuthConfiguration, isFacebookOAuthConfigured } from 'src/helpers/facebook-oauth.helper';
-import { v4 as uuid } from 'uuid';
-import { UserService } from '../services/user.service';
+import { Injectable, Logger } from "@nestjs/common";
+import { AuthGuard, PassportStrategy } from "@nestjs/passport";
+import { Strategy } from "passport-facebook";
+import {
+  FacebookAuthConfiguration,
+  isFacebookOAuthConfigured,
+} from "src/helpers/facebook-oauth.helper";
+import { v4 as uuid } from "uuid";
+import type { SolidCoreSetting } from "../services/settings/default-settings-provider.service";
+import { SettingService } from "../services/setting.service";
+import { UserService } from "../services/user.service";
 
-const DUMMY_CLIENT_ID = 'DUMMY_CLIENT_ID';
-const DUMMY_CLIENT_SECRET = 'DUMMY_CLIENT_SECRET';
-const DUMMY_CALLBACK_URL = 'DUMMY_CALLBACK_URL';
+const DUMMY_CLIENT_ID = "DUMMY_CLIENT_ID";
+const DUMMY_CLIENT_SECRET = "DUMMY_CLIENT_SECRET";
+const DUMMY_CALLBACK_URL = "DUMMY_CALLBACK_URL";
 
 @Injectable()
-export class FacebookOauthGuard extends AuthGuard('facebook') { }
+export class FacebookOauthGuard extends AuthGuard("facebook") {}
 
 @Injectable()
-export class FacebookOAuthStrategy extends PassportStrategy(Strategy, 'facebook') {
+export class FacebookOAuthStrategy extends PassportStrategy(
+  Strategy,
+  "facebook",
+) {
   private readonly logger = new Logger(FacebookOAuthStrategy.name);
 
-  constructor(private readonly userService: UserService) {
-    // Reading configuration from environment variables (Static approach like Google)
-    const clientID = process.env.IAM_FACEBOOK_OAUTH_CLIENT_ID ?? DUMMY_CLIENT_ID;
-    const clientSecret = process.env.IAM_FACEBOOK_OAUTH_CLIENT_SECRET ?? DUMMY_CLIENT_SECRET;
-    const callbackURL = process.env.IAM_FACEBOOK_OAUTH_CALLBACK_URL ?? DUMMY_CALLBACK_URL;
-    const redirectURL = process.env.IAM_FACEBOOK_OAUTH_REDIRECT_URL;
+  constructor(
+    private readonly userService: UserService,
+    private readonly settingService: SettingService,
+  ) {
+    // Prefer settings cache (same source used by controller validation), fall back to env.
+    const clientID =
+      settingService.getConfigValue<SolidCoreSetting>("FACEBOOK_CLIENT_ID") ??
+      process.env.IAM_FACEBOOK_OAUTH_CLIENT_ID ??
+      DUMMY_CLIENT_ID;
+    const clientSecret =
+      settingService.getConfigValue<SolidCoreSetting>(
+        "FACEBOOK_CLIENT_SECRET",
+      ) ??
+      process.env.IAM_FACEBOOK_OAUTH_CLIENT_SECRET ??
+      DUMMY_CLIENT_SECRET;
+    const callbackURL =
+      settingService.getConfigValue<SolidCoreSetting>(
+        "FACEBOOK_CALLBACK_URL",
+      ) ??
+      process.env.IAM_FACEBOOK_OAUTH_CALLBACK_URL ??
+      DUMMY_CALLBACK_URL;
+    const redirectURL =
+      settingService.getConfigValue<SolidCoreSetting>(
+        "FACEBOOK_REDIRECT_URL",
+      ) ?? process.env.IAM_FACEBOOK_OAUTH_REDIRECT_URL;
 
     super({
       clientID,
       clientSecret,
       callbackURL,
-      scope: ['email'],
-      profileFields: ['id', 'emails', 'name', 'photos'],
+      scope: ["email"],
+      // Facebook Graph API expects "email" and "picture", not "emails"/"photos".
+      profileFields: ["id", "name", "email", "picture.type(large)"],
     });
 
-    const facebookOauth: FacebookAuthConfiguration = { clientID, clientSecret, callbackURL, redirectURL };
+    const facebookOauth: FacebookAuthConfiguration = {
+      clientID,
+      clientSecret,
+      callbackURL,
+      redirectURL,
+    };
     if (!isFacebookOAuthConfigured(facebookOauth)) {
-      this.logger.debug('Facebook OAuth strategy is not configured');
+      this.logger.debug("Facebook OAuth strategy is not configured");
+    } else {
+      this.logger.debug(
+        `Facebook OAuth configured with callbackURL=${callbackURL}`,
+      );
     }
   }
 
-  async validate(_accessToken: string, _refreshToken: string, profile: any, done: any): Promise<any> {
+  async validate(
+    _accessToken: string,
+    _refreshToken: string,
+    profile: any,
+    done: any,
+  ): Promise<any> {
     const { id, name, emails, photos } = profile;
 
-    // generate a unique access code. 
+    // generate a unique access code.
     const loginAccessCode: string = uuid();
 
+    const email = emails && emails.length > 0 ? emails[0].value : null;
+
+    const firstName = name?.givenName || "";
+    const lastName = name?.familyName || "";
+    const fullName =
+      firstName || lastName
+        ? `${firstName} ${lastName}`.trim()
+        : profile.displayName;
+
     const user = {
-      provider: 'facebook',
+      provider: "facebook",
       providerId: id,
-      email: emails?.[0]?.value,
+      email: email,
       name: `${name.givenName} ${name.familyName}`,
       picture: photos?.[0]?.value,
       accessCode: loginAccessCode,
     };
 
-    // store the access code and the access token in the database. 
-    await this.userService.resolveUserOnOauthFacebook({ 
-        ...user, 
-        accessToken: _accessToken, 
-        refreshToken: null 
+    // store the access code and the access token in the database.
+    await this.userService.resolveUserOnOauthFacebook({
+      ...user,
+      accessToken: _accessToken,
+      refreshToken: null,
     });
 
     done(null, user);
   }
-}
+}

package/src/repository/security-rule.repository.ts

@@ -56,7 +56,7 @@ export class SecurityRuleRepository extends SolidBaseRepository<SecurityRule> {
 
                 evaluatedRules.push(evaluatedRule);
 
-            } catch (error) {
+            } catch (error: any) {
                 this.logger.error(`Error parsing security rule: ${rule.securityRuleConfig}`, error);
                 this.logger.error(error.stack);
                 throw error;

package/src/seeders/module-metadata-seeder.service.ts

@@ -238,7 +238,7 @@ export class ModuleMetadataSeederService {
 
             //FIXME: Handle displaying the created users credentials in a better way.
             // this.logger.log(`Newly created username is: ${usersDetail?.length > 0 ? usersDetail[0]?.username : ''} and password is ${usersDetail?.length > 0 ? usersDetail[0]?.password : ''}`);
-        } catch (error) {
+        } catch (error: any) {
             this.logSeedFailureForCli(error, {
                 moduleName: currentModule,
                 step: currentStep,
@@ -463,7 +463,7 @@ export class ModuleMetadataSeederService {
                     await this.createPermissionIfNotExists(permissionName);
                 }
 
-            } catch (error) {
+            } catch (error: any) {
                 this.logger.error(error);
             }
         }
@@ -544,7 +544,7 @@ export class ModuleMetadataSeederService {
                     moduleRoot = path.dirname(
                         require.resolve('@solidxai/core/package.json'),
                     );
-                } catch (err) {
+                } catch (err: any) {
                     this.logger.debug(
                         'Could not resolve @solidxai/core from node_modules, assuming local execution',
                     );
@@ -610,7 +610,7 @@ export class ModuleMetadataSeederService {
                     moduleRoot = path.dirname(
                         require.resolve('@solidxai/core/package.json'),
                     );
-                } catch (err) {
+                } catch (err: any) {
                     this.logger.debug(
                         'Could not resolve @solidxai/core from node_modules, assuming local execution',
                     );

package/src/seeders/permission-metadata-seeder.service.ts

@@ -52,7 +52,7 @@ export class PermissionMetadataSeederService {
           }
         }
 
-      } catch (error) {
+      } catch (error: any) {
         this.logger.error(error);
       }
     }

package/src/seeders/seed-data/solid-core-metadata.json

@@ -3900,7 +3900,7 @@
             "type": "selectionStatic",
             "defaultValue": "pending",
             "length": 256,
-            "required": true,
+            "required": false,
             "index": false,
             "isSystem": false,
             "selectionValueType": "string",
@@ -11552,7 +11552,7 @@
           "enableGlobalSearch": true,
           "create": true,
           "edit": true,
-          "delete": false
+          "delete": true
         },
         "children": [
           {
@@ -11570,7 +11570,18 @@
               "name": "name",
               "label": "Name",
               "sortable": true,
-              "filterable": true
+              "filterable": true,
+              "isSearchable": true
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "description",
+              "label": "Description",
+              "sortable": true,
+              "filterable": true,
+              "isSearchable": true
             }
           }
         ]