@solidxai/core 0.1.10-beta.26 → 0.1.10-beta.28

package/src/entities/user-activity-history.entity.ts

@@ -3,6 +3,7 @@ import { Entity, JoinColumn, ManyToOne, Column, Index } from 'typeorm';
 import { User } from 'src/entities/user.entity'
 @Entity("ss_user_activity_history")
 export class UserActivityHistory extends CommonEntity {
+    @Index()
     @ManyToOne(() => User, { nullable: true })
     @JoinColumn()
     user: User;

package/src/entities/user.entity.ts

@@ -9,6 +9,7 @@ import { Exclude, Expose } from "class-transformer";
 @TableInheritance({ column: { type: "varchar", name: "type", default: "User" } })
 @Exclude()
 export class User extends CommonEntity {
+    @Index()
     @Column({ type: "varchar", nullable: true })
     @Expose()
     fullName: string;
@@ -88,6 +89,19 @@ export class User extends CommonEntity {
     // don't send to client
     microsoftProfilePicture: string;
 
+    @Column({ type: "varchar", nullable: true })
+    // don't send to client
+    microsoftActiveDirectoryId: string;
+
+    @Column({ type: "varchar", nullable: true })
+    // don't send to client
+    microsoftActiveDirectoryAccessToken: string;
+
+    @Column({ type: "varchar", nullable: true })
+    // don't send to client
+    microsoftActiveDirectoryProfilePicture: string;
+
+    @Index()
     @Column({ default: true })
     @Expose()
     active: boolean = true;
@@ -192,4 +206,4 @@ export class User extends CommonEntity {
     @Expose()
     apiKeys: UserApiKey[];
 
-}
+}

package/src/entities/view-metadata.entity.ts

@@ -11,9 +11,11 @@ export class ViewMetadata extends CommonEntity {
     @Column({ name: "name", type: "varchar"})
     name: string;
 
+    @Index()
     @Column({ name: "display_name", type: "varchar" })
     displayName: string;
 
+    @Index()
     @Column({ name: "type", type: "varchar" })
     type: string;
 

package/src/helpers/microsoft-active-directory-oauth.helper.ts

@@ -0,0 +1,83 @@
+export type MicrosoftActiveDirectoryAuthConfiguration = {
+  clientID: string;
+  clientSecret: string;
+  tenant: string;
+  callbackURL: string;
+  redirectURL: string;
+};
+
+export const DEFAULT_MICROSOFT_ACTIVE_DIRECTORY_OAUTH_TENANT = "common";
+export const MICROSOFT_ACTIVE_DIRECTORY_OAUTH_SCOPES = [
+  "openid",
+  "profile",
+  "email",
+  "User.Read",
+];
+
+type MicrosoftActiveDirectoryOauthProfileValue = {
+  value?: string;
+};
+
+export type MicrosoftActiveDirectoryOauthProfile = {
+  id?: string;
+  displayName?: string;
+  emails?: MicrosoftActiveDirectoryOauthProfileValue[];
+  photos?: MicrosoftActiveDirectoryOauthProfileValue[];
+  _json?: {
+    id?: string;
+    displayName?: string;
+    mail?: string;
+    userPrincipalName?: string;
+    email?: string;
+    preferred_username?: string;
+    picture?: string;
+  };
+};
+
+export const isMicrosoftActiveDirectoryOAuthConfigured = (
+  config: MicrosoftActiveDirectoryAuthConfiguration,
+): boolean => {
+  return !!(
+    config.clientID &&
+    config.clientSecret &&
+    config.tenant &&
+    config.callbackURL &&
+    config.redirectURL
+  );
+};
+
+export const getMicrosoftActiveDirectoryOAuthProfileId = (
+  profile: MicrosoftActiveDirectoryOauthProfile,
+): string | null => {
+  return profile.id || profile._json?.id || null;
+};
+
+export const getMicrosoftActiveDirectoryOAuthEmail = (
+  profile: MicrosoftActiveDirectoryOauthProfile,
+): string | null => {
+  const email =
+    profile.emails?.find((item) => !!item.value)?.value ||
+    profile._json?.mail ||
+    profile._json?.userPrincipalName ||
+    profile._json?.email ||
+    profile._json?.preferred_username ||
+    null;
+
+  return email?.trim().toLowerCase() || null;
+};
+
+export const getMicrosoftActiveDirectoryOAuthDisplayName = (
+  profile: MicrosoftActiveDirectoryOauthProfile,
+): string | null => {
+  return profile.displayName || profile._json?.displayName || null;
+};
+
+export const getMicrosoftActiveDirectoryOAuthPicture = (
+  profile: MicrosoftActiveDirectoryOauthProfile,
+): string | null => {
+  return (
+    profile.photos?.find((item) => !!item.value)?.value ||
+    profile._json?.picture ||
+    null
+  );
+};

package/src/helpers/module.helper.ts

@@ -54,11 +54,11 @@ export const getDynamicModuleNamesBasedOnMetadata = (): string[] => {
 
       if (!isValidDirectory) return false;
 
-      const moduleManifestPath = path.join(srcPath, dirent.name, `${dirent.name}.module.ts`);
-      const moduleManifestStats = fs.statSync(moduleManifestPath, { throwIfNoEntry: false });
-      if (!moduleManifestStats || !moduleManifestStats.isFile()) {
-        return false;
-      }
+      // const moduleManifestPath = path.join(srcPath, dirent.name, `${dirent.name}.module.ts`);
+      // const moduleManifestStats = fs.statSync(moduleManifestPath, { throwIfNoEntry: false });
+      // if (!moduleManifestStats || !moduleManifestStats.isFile()) {
+      //   return false;
+      // } // Commenting this out, since we want to rely solely on the presence of metadata files and be able to load this as a dynamic module
 
       const fullPath = path.join(srcPath, dirent.name, 'metadata', `${dirent.name}-metadata.json`);
 

package/src/helpers/user-helper.ts

@@ -15,6 +15,10 @@ export function getUserExcludedFields(): string[] {
     "facebookId",
     "microsoftAccessToken",
     "microsoftId",
+    "microsoftProfilePicture",
+    "microsoftActiveDirectoryAccessToken",
+    "microsoftActiveDirectoryId",
+    "microsoftActiveDirectoryProfilePicture",
     "forgotPasswordConfirmedAt",
     "verificationTokenOnForgotPassword",
     "verificationTokenOnForgotPasswordExpiresAt",
@@ -38,4 +42,4 @@ export function getUserExcludedFields(): string[] {
     "userViewMetadataIds",
     "userViewMetadataCommand",
   ];
-}
+}

package/src/index.ts

@@ -154,7 +154,6 @@ export * from './entities/import-transaction.entity'
 export * from './entities/import-transaction-error-log.entity'
 export * from './entities/locale.entity'
 export * from './entities/user-activity-history.entity'
-export * from './entities/ai-interaction.entity'
 export * from './entities/model-sequence.entity'
 export * from './entities/dashboard-user-layout.entity'
 export * from './entities/user-api-key.entity'
@@ -261,9 +260,6 @@ export * from './jobs/redis/test-queue-subscriber-redis.service'
 export * from './jobs/redis/three60-whatsapp-publisher-redis.service'
 export * from './jobs/redis/three60-whatsapp-queue-options-redis'
 export * from './jobs/redis/three60-whatsapp-subscriber-redis.service'
-export * from './jobs/redis/trigger-mcp-client-publisher-redis.service'
-export * from './jobs/redis/trigger-mcp-client-queue-options-redis'
-export * from './jobs/redis/trigger-mcp-client-subscriber-redis.service'
 export * from './jobs/redis/twilio-sms-publisher-redis.service'
 export * from './jobs/redis/twilio-sms-queue-options-redis'
 export * from './jobs/redis/twilio-sms-subscriber-redis.service'
@@ -273,6 +269,7 @@ export * from './listeners/user-registration.listener'
 export * from './passport-strategies/google-oauth.strategy'
 export * from './passport-strategies/facebook-oauth.strategy'
 export * from './passport-strategies/microsoft-oauth.strategy'
+export * from './passport-strategies/microsoft-active-directory-oauth.strategy'
 
 export * from './services/selection-providers/list-of-values-selection-providers.service'
 
@@ -355,7 +352,6 @@ export * from './services/dashboard-runtime.service'
 export * from './services/queues/publisher-factory.service'
 export * from './services/queues/database-publisher.service'
 export * from './services/queues/database-subscriber.service'
-export * from './services/ai-interaction.service'
 export * from './services/dashboard-providers/mq-dashboard-total-messages-kpi-provider.service'
 export * from './services/dashboard-providers/mq-dashboard-succeeded-messages-kpi-provider.service'
 export * from './services/dashboard-providers/mq-dashboard-failed-messages-kpi-provider.service'

package/src/interfaces.ts

@@ -13,7 +13,6 @@ import { CreateSecurityRuleDto } from './dtos/create-security-rule.dto';
 import { FieldMetadata } from './entities/field-metadata.entity';
 import { Media } from './entities/media.entity';
 import { ComputedFieldMetadata } from './helpers/solid-registry';
-import { AiInteraction } from './entities/ai-interaction.entity';
 import { ActiveUserData } from './interfaces/active-user-data.interface';
 import { SecurityRuleConfig } from './dtos/security-rule-config.dto';
 import { SecurityRule } from './entities/security-rule.entity';
@@ -121,10 +120,6 @@ export interface CodeGenerationOptions {
   dryRun?: boolean;
 }
 
-export interface TriggerMcpClientOptions {
-  aiInteractionId: number;
-  moduleName: string;
-}
 
 export interface McpResponse {
   success: boolean;
@@ -196,9 +191,6 @@ export interface IDashboardWidgetDataProvider<
   ): Promise<IDashboardWidgetDataResponseEnvelope<TResponse> | any>;
 }
 
-export interface IMcpToolResponseHandler {
-  apply(aiInteraction: AiInteraction);
-}
 
 /**
  * @deprecated Use `IEntityComputedFieldProvider` instead.

package/src/passport-strategies/microsoft-active-directory-oauth.strategy.ts

@@ -0,0 +1,63 @@
+import { Injectable, Logger, UnauthorizedException } from '@nestjs/common';
+import { AuthGuard, PassportStrategy } from '@nestjs/passport';
+import { Strategy } from 'passport-microsoft';
+import { DEFAULT_MICROSOFT_ACTIVE_DIRECTORY_OAUTH_TENANT, MICROSOFT_ACTIVE_DIRECTORY_OAUTH_SCOPES, MicrosoftActiveDirectoryAuthConfiguration, getMicrosoftActiveDirectoryOAuthDisplayName, getMicrosoftActiveDirectoryOAuthEmail, getMicrosoftActiveDirectoryOAuthPicture, getMicrosoftActiveDirectoryOAuthProfileId, isMicrosoftActiveDirectoryOAuthConfigured } from 'src/helpers/microsoft-active-directory-oauth.helper';
+import { v4 as uuid } from 'uuid';
+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';
+
+@Injectable()
+export class MicrosoftActiveDirectoryOauthGuard extends AuthGuard('microsoft-active-directory') { }
+
+
+@Injectable()
+export class MicrosoftActiveDirectoryOAuthStrategy extends PassportStrategy(Strategy, 'microsoft-active-directory') {
+  private readonly logger = new Logger(MicrosoftActiveDirectoryOAuthStrategy.name);
+  constructor(private readonly userService: UserService) {
+    // TODO: Have added default dummy values for the configuration, since the configuration is not mandatory.
+    // Perhaps a cleaner way needs to be figured out
+    const clientID = process.env.IAM_MICROSOFT_ACTIVE_DIRECTORY_OAUTH_CLIENT_ID || DUMMY_CLIENT_ID;
+    const clientSecret = process.env.IAM_MICROSOFT_ACTIVE_DIRECTORY_OAUTH_CLIENT_SECRET || DUMMY_CLIENT_SECRET;
+    const tenant = process.env.IAM_MICROSOFT_ACTIVE_DIRECTORY_OAUTH_TENANT_ID || DEFAULT_MICROSOFT_ACTIVE_DIRECTORY_OAUTH_TENANT;
+    const callbackURL = process.env.IAM_MICROSOFT_ACTIVE_DIRECTORY_OAUTH_CALLBACK_URL || DUMMY_CALLBACK_URL;
+    const redirectURL = process.env.IAM_MICROSOFT_ACTIVE_DIRECTORY_OAUTH_REDIRECT_URL;
+
+    super({ clientID, clientSecret, callbackURL, tenant, scope: MICROSOFT_ACTIVE_DIRECTORY_OAUTH_SCOPES, addUPNAsEmail: true });
+
+    const microsoftActiveDirectoryOauth: MicrosoftActiveDirectoryAuthConfiguration = { clientID, clientSecret, tenant, callbackURL, redirectURL }
+    if (!isMicrosoftActiveDirectoryOAuthConfigured(microsoftActiveDirectoryOauth)) {
+      this.logger.debug('Microsoft Active Directory OAuth strategy is not configured');
+    }
+  }
+
+  async validate(_accessToken: string, _refreshToken: string, profile: any, done: any): Promise<any> {
+    const providerId = getMicrosoftActiveDirectoryOAuthProfileId(profile);
+
+    if (!providerId) {
+      return done(new UnauthorizedException('Microsoft Active Directory OAuth profile is missing an id'), false);
+    }
+
+    // generate a unique access code. 
+    const loginAccessCode: string = uuid();
+
+    const user = {
+      provider: 'microsoftActiveDirectory',
+      providerId,
+      email: getMicrosoftActiveDirectoryOAuthEmail(profile),
+      name: getMicrosoftActiveDirectoryOAuthDisplayName(profile) || getMicrosoftActiveDirectoryOAuthEmail(profile) || 'Microsoft Active Directory User',
+      picture: getMicrosoftActiveDirectoryOAuthPicture(profile),
+      accessCode: loginAccessCode,
+    };
+
+    // store the access code and the access token in the database. 
+    // while doing this we also check if the user exists in the database if not we create one. 
+    // if exists then we update the user and store the specified access code & token.
+    await this.userService.resolveUserOnOauthMicrosoftActiveDirectory({ ...user, accessToken: _accessToken, refreshToken: null });
+
+    done(null, user);
+  }
+
+}