Skip to content

Commit

Permalink
fix(core.gbapp): Lint of all.
Browse files Browse the repository at this point in the history
  • Loading branch information
@rodrigorodriguez
rodrigorodriguez committed Nov 20, 2022
1 parent f8d2cd8 commit 4a2f8b7
Show file tree
Hide file tree
Showing 81 changed files with 11,064 additions and 6,736 deletions.
10,685 changes: 7,523 additions & 3,162 deletions package-lock.json
View file

Large diffs are not rendered by default.

11 changes: 4 additions & 7 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
"core-js": "3.26.1",
"data-forge": "1.9.6",
"date-diff": "1.0.2",
"debugger-api": "0.1.2",
"docxtemplater": "3.32.4",
"dotenv-extended": "2.9.0",
"exceljs": "4.3.0",
Expand All @@ -106,7 +105,7 @@
"luxon": "3.1.0",
"mammoth": "1.5.1",
"marked": "4.2.2",
"moment": "^1.3.0",
"moment": "1.3.0",
"ms-rest-azure": "3.0.2",
"nexmo": "2.9.1",
"node-cron": "3.0.2",
Expand Down Expand Up @@ -143,7 +142,7 @@
"swagger-client": "^3.18.5",
"tabulator-tables": "5.4.2",
"tedious": "15.1.2",
"textract": "^0.20.0",
"@nosferatu500/textract": "3.1.2",
"twitter-api-v2": "1.12.9",
"typescript": "4.9.3",
"typescript-rest-rpc": "^1.0.7",
Expand All @@ -156,13 +155,11 @@
"washyourmouthoutwithsoap": "1.0.2",
"whatsapp-web.js": "1.18.3",
"winston": "3.8.2",
"winston-logs-display": "1.0.0",
"yarn": "1.22.19"
"yarn": "^1.22.19"
},
"devDependencies": {
"@types/puppeteer": "7.0.4",
"@types/url-join": "4.0.1",
"ban-sensitive-files": "^1.3.0",
"ban-sensitive-files": "1.9.18",
"commitizen": "4.2.5",
"cz-conventional-changelog": "3.3.0",
"dependency-check": "4.1.0",
Expand Down
61 changes: 26 additions & 35 deletions packages/admin.gbapp/dialogs/AdminDialog.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ import { CollectionUtil } from 'pragmatismo-io-framework';
* Dialogs for administration tasks.
*/
export class AdminDialog extends IGBDialog {
public static isIntentYes(locale, utterance) {
public static isIntentYes (locale, utterance) {
return utterance.toLowerCase().match(Messages[locale].affirmative_sentences);
}

public static isIntentNo(locale, utterance) {
public static isIntentNo (locale, utterance) {
return utterance.toLowerCase().match(Messages[locale].negative_sentences);
}

Expand All @@ -64,7 +64,7 @@ export class AdminDialog extends IGBDialog {
* @param bot The bot adapter.
* @param min The minimal bot instance data.
*/
public static setup(min: GBMinInstance) {
public static setup (min: GBMinInstance) {
// Setup services.

const importer = new GBImporter(min.core);
Expand All @@ -77,8 +77,7 @@ export class AdminDialog extends IGBDialog {
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else {
} else {
return await step.next(step.options);
}
},
Expand Down Expand Up @@ -109,8 +108,7 @@ export class AdminDialog extends IGBDialog {
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else {
} else {
return await step.next(step.options);
}
},
Expand Down Expand Up @@ -200,8 +198,7 @@ export class AdminDialog extends IGBDialog {
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else {
} else {
return await step.next(step.options);
}
},
Expand Down Expand Up @@ -237,17 +234,15 @@ export class AdminDialog extends IGBDialog {
min.dialogs.add(
new WaterfallDialog('/publish', [
async step => {

if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else {
} else {
return await step.next(step.options);
}
},

async step => {
if (step.activeDialog.state.options.confirm || process.env.ADMIN_OPEN_PUBLISH === "true") {
if (step.activeDialog.state.options.confirm || process.env.ADMIN_OPEN_PUBLISH === 'true') {
return await step.next('sim');
} else {
const locale = step.context.activity.locale;
Expand All @@ -266,7 +261,7 @@ export class AdminDialog extends IGBDialog {
if (step.activeDialog.state.options.firstTime) {
canPublish = true;
} else {
canPublish = AdminDialog.canPublish(min, from) || process.env.ADMIN_OPEN_PUBLISH === "true";
canPublish = AdminDialog.canPublish(min, from) || process.env.ADMIN_OPEN_PUBLISH === 'true';
}

if (!canPublish) {
Expand Down Expand Up @@ -313,11 +308,14 @@ export class AdminDialog extends IGBDialog {
try {
let cmd1;
if (packageName.indexOf('.') !== -1) {
cmd1 = `deployPackage ${process.env.STORAGE_SITE} /${process.env.STORAGE_LIBRARY}/${botId}.gbai/${packageName}`;
cmd1 = `deployPackage ${process.env.STORAGE_SITE} /${
process.env.STORAGE_LIBRARY
}/${botId}.gbai/${packageName}`;
} else {
cmd1 = `deployPackage ${packageName}`;
}
if ((await (deployer as any).getStoragePackageByName(min.instance.instanceId, packageName)) !== null &&
if (
(await (deployer as any).getStoragePackageByName(min.instance.instanceId, packageName)) !== null &&
!process.env.DONT_DOWNLOAD
) {
const cmd2 = `undeployPackage ${packageName}`;
Expand Down Expand Up @@ -350,12 +348,11 @@ export class AdminDialog extends IGBDialog {
* the /broadcast command with specific phone numbers.
* @param phone Phone number to check (eg.: +5521900002233)
*/
public static canPublish(min: GBMinInstance, phone: string): Boolean {
public static canPublish (min: GBMinInstance, phone: string): Boolean {
if (process.env.SECURITY_CAN_PUBLISH !== undefined) {
let list = process.env.SECURITY_CAN_PUBLISH.split(';');

const canPublish =
min.core.getParam(min.instance, 'Can Publish', null);
const canPublish = min.core.getParam(min.instance, 'Can Publish', null);
if (canPublish) {
list = list.concat(canPublish.split(';'));
}
Expand All @@ -370,14 +367,13 @@ export class AdminDialog extends IGBDialog {
}
}

private static setupSecurityDialogs(min: GBMinInstance) {
private static setupSecurityDialogs (min: GBMinInstance) {
min.dialogs.add(
new WaterfallDialog('/setupSecurity', [
async step => {
if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
return await step.beginDialog('/auth');
}
else {
} else {
return await step.next(step.options);
}
},
Expand All @@ -398,10 +394,8 @@ export class AdminDialog extends IGBDialog {
async step => {
step.activeDialog.state.authenticatorAuthorityHostUrl = step.result;

min.instance.authenticatorTenant =
step.activeDialog.state.authenticatorTenant;
min.instance.authenticatorAuthorityHostUrl =
step.activeDialog.state.authenticatorAuthorityHostUrl;
min.instance.authenticatorTenant = step.activeDialog.state.authenticatorTenant;
min.instance.authenticatorAuthorityHostUrl = step.activeDialog.state.authenticatorAuthorityHostUrl;

await min.adminService.updateSecurityInfo(
min.instance.instanceId,
Expand All @@ -415,15 +409,12 @@ export class AdminDialog extends IGBDialog {

min.adminService.setValue(min.instance.instanceId, 'AntiCSRFAttackState', state);

const redirectUri = urlJoin(
min.instance.botEndpoint,
min.instance.botId,
'/token'
);
const url = `https://login.microsoftonline.com/${step.activeDialog.state.authenticatorTenant
}/oauth2/authorize?client_id=${min.instance.marketplaceId
}&response_type=code&redirect_uri=${redirectUri
}&scope=https://graph.microsoft.com/.default&state=${state}&response_mode=query`;
const redirectUri = urlJoin(min.instance.botEndpoint, min.instance.botId, '/token');
const url = `https://login.microsoftonline.com/${
step.activeDialog.state.authenticatorTenant
}/oauth2/authorize?client_id=${
min.instance.marketplaceId
}&response_type=code&redirect_uri=${redirectUri}&scope=https://graph.microsoft.com/.default&state=${state}&response_mode=query`;

await min.conversationalService.sendText(min, step, Messages[locale].consent(url));

Expand Down
15 changes: 7 additions & 8 deletions packages/admin.gbapp/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,28 +47,27 @@ import { GuaribasAdmin } from './models/AdminModel.js';
export class GBAdminPackage 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([GuaribasAdmin]);
}

public async loadBot(min: GBMinInstance): Promise<void> {
public async loadBot (min: GBMinInstance): Promise<void> {
AdminDialog.setup(min);
}

}
21 changes: 6 additions & 15 deletions packages/admin.gbapp/models/AdminModel.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,36 +36,27 @@

'use strict';

import {
Column,
CreatedAt,
DataType,
Model,
Table,
UpdatedAt
} from 'sequelize-typescript';
import { Column, CreatedAt, DataType, Model, Table, UpdatedAt } from 'sequelize-typescript';

/**
* General settings store.
*/
@Table
export class GuaribasAdmin extends Model<GuaribasAdmin> {

@Column(DataType.INTEGER)
declare instanceId: number;
instanceId: number;

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

@Column(DataType.STRING(4000))
declare value: string;
value: string;

@Column(DataType.DATE)
@CreatedAt
declare createdAt: Date;
createdAt: Date;

@Column(DataType.DATE)
@UpdatedAt
declare updatedAt: Date;

updatedAt: Date;
}

0 comments on commit 4a2f8b7

Please sign in to comment.