Skip to content

Commit

Permalink
fix(app.ts): Preparing to use 4 or more SSL certificates.
Browse files Browse the repository at this point in the history
  • Loading branch information
AlanPerdomo committed May 26, 2023
1 parent a969abb commit 72b645f
Show file tree
Hide file tree
Showing 19 changed files with 142 additions and 98 deletions.
2 changes: 1 addition & 1 deletion packages/basic.gblib/services/DialogKeywords.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ import QrScanner from 'qr-scanner';
import pkg from 'whatsapp-web.js';
import { ActivityTypes } from 'botbuilder';
const { List, Buttons } = pkg;
import mime from 'mime';
import mime from 'mime-types';

/**
* Default check interval for user replay
Expand Down
14 changes: 7 additions & 7 deletions packages/hubspot.gblib/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,26 +45,26 @@ import { Sequelize } from 'sequelize-typescript';
export class GBHubSpotPackage implements IGBPackage {
public sysPackages: IGBPackage[];

public async loadBot (min: GBMinInstance): Promise<void> {
public async loadBot(min: GBMinInstance): Promise<void> {
GBLog.verbose(`loadBot called.`);
}

public async getDialogs (min: GBMinInstance) {
public async getDialogs(min: GBMinInstance) {
GBLog.verbose(`getDialogs called.`);
}
public async loadPackage (core: IGBCoreService, sequelize: Sequelize): Promise<void> {
public async loadPackage(core: IGBCoreService, sequelize: Sequelize): Promise<void> {
GBLog.verbose(`loadPackage called.`);
}
public async unloadPackage (core: IGBCoreService): Promise<void> {
public async unloadPackage(core: IGBCoreService): Promise<void> {
GBLog.verbose(`unloadPackage called.`);
}
public async unloadBot (min: GBMinInstance): Promise<void> {
public async unloadBot(min: GBMinInstance): Promise<void> {
GBLog.verbose(`unloadBot called.`);
}
public async onNewSession (min: GBMinInstance, step: GBDialogStep): Promise<void> {
public async onNewSession(min: GBMinInstance, step: GBDialogStep): Promise<void> {
GBLog.verbose(`onNewSession called.`);
}
public async onExchangeData (min: GBMinInstance, kind: string, data: any) {
public async onExchangeData(min: GBMinInstance, kind: string, data: any) {
GBLog.verbose(`onExchangeData called.`);
}
}
2 changes: 1 addition & 1 deletion packages/hubspot.gblib/services/HubSpotServices.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ import * as hubspot from '@hubspot/api-client';
/**
* Support for Hub Spot XRM.
*/
export class HubSpotServices extends GBService {}
export class HubSpotServices extends GBService { }
22 changes: 11 additions & 11 deletions packages/kb.gbapp/dialogs/AskDialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@ export class AskDialog extends IGBDialog {

if (step.options && step.options.firstTime) {
text = Messages[locale].ask_first_time;
}
else if (step.options && step.options.isReturning && !step.context.activity.group) {
text = Messages[locale].anything_else;
}
else if (step.context.activity.group || (step.options && step.options.emptyPrompt)) {
}
else if (step.options && step.options.isReturning && !step.context.activity.group) {
text = Messages[locale].anything_else;
}
else if (step.context.activity.group || (step.options && step.options.emptyPrompt)) {
text = '';
} else if (user.subjects.length > 0) {
text = Messages[locale].which_question;
Expand Down Expand Up @@ -391,14 +391,14 @@ export class AskDialog extends IGBDialog {
async step => {
if (GBServer.globals.chatGPT) {
let input = `Write a BASIC program that ${step.options.dialog.toLowerCase()}. And does not explain.`;

await min.conversationalService.sendText(min, step, 'Thank you. The dialog is being written right now...');

const CHATGPT_TIMEOUT = 3 * 60 * 1000;
GBLog.info(`ChatGPT Code: ${input}`);
let response = await GBServer.globals.chatGPT.sendMessage(input, {
timeoutMs: CHATGPT_TIMEOUT
});
});

// Removes instructions, just code.

Expand All @@ -409,17 +409,17 @@ export class AskDialog extends IGBDialog {

// Gets dialog name and file handling

let dialogName = step.result.replace('.', '');
let dialogName = step.result.replace('.', '');
const docx = urlJoin(`${min.botId}.gbdialog`, `${dialogName}.docx`);
const sys = new SystemKeywords();
const document = await sys.internalCreateDocument(min, docx, response);
await service.addQA(min, dialogName, dialogName);
await service.addQA(min, dialogName, dialogName);

let message = `Waiting for publishing...`;
await min.conversationalService.sendText(min, step, message);

await step.replaceDialog('/publish', { confirm: true });

message = `Dialog is ready! Let's run:`;
await min.conversationalService.sendText(min, step, message);

Expand All @@ -439,7 +439,7 @@ export class AskDialog extends IGBDialog {
await step.endDialog();

await GBVMService.callVM(dialogName.toLowerCase(),
min, step, user, this.deployer, false);
min, step, user, this.deployer, false);
}
}
];
Expand Down
2 changes: 1 addition & 1 deletion packages/kb.gbapp/dialogs/FaqDialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export class FaqDialog extends IGBDialog {
* @param bot The bot adapter.
* @param min The minimal bot instance data.
*/
public static setup (bot: BotAdapter, min: GBMinInstance) {
public static setup(bot: BotAdapter, min: GBMinInstance) {
const service = new KBService(min.core.sequelize);

min.dialogs.add(
Expand Down
4 changes: 2 additions & 2 deletions packages/kb.gbapp/dialogs/MenuDialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ export class MenuDialog extends IGBDialog {
* @param bot The bot adapter.
* @param min The minimal bot instance data.
*/
public static setup (bot: BotAdapter, min: GBMinInstance) {
public static setup(bot: BotAdapter, min: GBMinInstance) {
const service = new KBService(min.core.sequelize);

min.dialogs.add(new WaterfallDialog('/menu', MenuDialog.getMenuDialog(min, service)));
}

private static getMenuDialog (min: GBMinInstance, service: KBService) {
private static getMenuDialog(min: GBMinInstance, service: KBService) {
return [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
Expand Down
14 changes: 7 additions & 7 deletions packages/kb.gbapp/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,26 +48,26 @@ import { GuaribasAnswer, GuaribasQuestion, GuaribasSubject } from './models/inde
*/
export class GBKBPackage implements IGBPackage {
public sysPackages: IGBPackage[];
public async getDialogs (min: GBMinInstance) {
public async getDialogs(min: GBMinInstance) {
GBLog.verbose(`getDialogs called.`);
}
public async unloadPackage (core: IGBCoreService): Promise<void> {
public async unloadPackage(core: IGBCoreService): Promise<void> {
GBLog.verbose(`unloadPackage called.`);
}
public async unloadBot (min: GBMinInstance): Promise<void> {
public async unloadBot(min: GBMinInstance): Promise<void> {
GBLog.verbose(`unloadBot called.`);
}
public async onNewSession (min: GBMinInstance, step: GBDialogStep): Promise<void> {
public async onNewSession(min: GBMinInstance, step: GBDialogStep): Promise<void> {
GBLog.verbose(`onNewSession called.`);
}
public async onExchangeData (min: GBMinInstance, kind: string, data: any) {
public async onExchangeData(min: GBMinInstance, kind: string, data: any) {
GBLog.verbose(`onExchangeData called.`);
}

public async loadPackage (core: IGBCoreService, sequelize: Sequelize): Promise<void> {
public async loadPackage(core: IGBCoreService, sequelize: Sequelize): Promise<void> {
core.sequelize.addModels([GuaribasAnswer, GuaribasQuestion, GuaribasSubject]);
}
public async loadBot (min: GBMinInstance): Promise<void> {
public async loadBot(min: GBMinInstance): Promise<void> {
AskDialog.setup(min.bot, min);
FaqDialog.setup(min.bot, min);
MenuDialog.setup(min.bot, min);
Expand Down
4 changes: 2 additions & 2 deletions packages/kb.gbapp/services/KBService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -646,10 +646,10 @@ export class KBService implements IGBKBService {
packageId: pkg.packageId,
prevId: 0
};
const a =await GuaribasAnswer.create(answer);
const a = await GuaribasAnswer.create(answer);
question['answerId'] = a.answerId;
const q = await GuaribasQuestion.create(question);

}

public async importKbPackage(
Expand Down
2 changes: 1 addition & 1 deletion packages/security.gbapp/dialogs/OAuthDialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import { Messages } from '../strings.js';
* Dialogs for handling Menu control.
*/
export class OAuthDialog extends IGBDialog {
public static getOAuthDialog (min: GBMinInstance) {
public static getOAuthDialog(min: GBMinInstance) {
return {
id: '/auth',
waterfall: [
Expand Down
10 changes: 5 additions & 5 deletions packages/security.gbapp/dialogs/ProfileDialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
import { GBLog, GBMinInstance, IGBDialog } from 'botlib';
import { GBAdminService } from '../../admin.gbapp/services/GBAdminService.js';
import { Messages } from '../strings.js';
import * as phone from 'google-libphonenumber';
import * as phone from 'google-libphonenumber';

/**
* Dialogs for handling Menu control.
*/
export class ProfileDialog extends IGBDialog {
public static getNameDialog (min: GBMinInstance) {
public static getNameDialog(min: GBMinInstance) {
return {
id: '/profile_name',
waterfall: [
Expand Down Expand Up @@ -83,7 +83,7 @@ export class ProfileDialog extends IGBDialog {
};
}

public static getMobileDialog (min: GBMinInstance) {
public static getMobileDialog(min: GBMinInstance) {
return {
id: '/profile_mobile',
waterfall: [
Expand Down Expand Up @@ -126,7 +126,7 @@ export class ProfileDialog extends IGBDialog {
};
}

public static getMobileConfirmDialog (min: GBMinInstance) {
public static getMobileConfirmDialog(min: GBMinInstance) {
return {
id: '/profile_mobile_confirm',
waterfall: [
Expand Down Expand Up @@ -167,7 +167,7 @@ export class ProfileDialog extends IGBDialog {
};
}

public static getEmailDialog (min: GBMinInstance) {
public static getEmailDialog(min: GBMinInstance) {
return {
id: '/profile_email',
waterfall: [
Expand Down
14 changes: 7 additions & 7 deletions packages/security.gbapp/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import { GuaribasGroup, GuaribasUser, GuaribasUserGroup } from './models/index.j
*/
export class GBSecurityPackage implements IGBPackage {
public sysPackages: IGBPackage[];
public async getDialogs (min: GBMinInstance) {
public async getDialogs(min: GBMinInstance) {
const out = [
ProfileDialog.getNameDialog(min),
ProfileDialog.getEmailDialog(min),
Expand All @@ -60,23 +60,23 @@ export class GBSecurityPackage implements IGBPackage {
}
return out;
}
public async unloadPackage (core: IGBCoreService): Promise<void> {
public async unloadPackage(core: IGBCoreService): Promise<void> {
GBLog.verbose(`unloadPackage called.`);
}
public async loadBot (min: GBMinInstance): Promise<void> {
public async loadBot(min: GBMinInstance): Promise<void> {
GBLog.verbose(`loadBot called.`);
}
public async unloadBot (min: GBMinInstance): Promise<void> {
public async unloadBot(min: GBMinInstance): Promise<void> {
GBLog.verbose(`unloadBot called.`);
}
public async onNewSession (min: GBMinInstance, step: GBDialogStep): Promise<void> {
public async onNewSession(min: GBMinInstance, step: GBDialogStep): Promise<void> {
GBLog.verbose(`onNewSession called.`);
}
public async onExchangeData (min: GBMinInstance, kind: string, data: any) {
public async onExchangeData(min: GBMinInstance, kind: string, data: any) {
GBLog.verbose(`onExchangeData called.`);
}

public async loadPackage (core: IGBCoreService, sequelize: Sequelize): Promise<void> {
public async loadPackage(core: IGBCoreService, sequelize: Sequelize): Promise<void> {
core.sequelize.addModels([GuaribasGroup, GuaribasUser, GuaribasUserGroup]);
}
}
2 changes: 1 addition & 1 deletion packages/security.gbapp/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export class GuaribasUser extends Model<GuaribasUser> {

@Column(DataType.STRING(255))
declare userSystemId: string;

@Column(DataType.STRING(255))
declare userName: string;

Expand Down

0 comments on commit 72b645f

Please sign in to comment.