feat(GBMinService, MainService): integrate Stripe payment success handling and update dialog flow
This commit is contained in:
parent
ec8b0d44df
commit
feb7939387
2 changed files with 27296 additions and 213 deletions
|
|
@ -461,24 +461,24 @@ export class GBMinService {
|
||||||
this.createCheckHealthAddress(GBServer.globals.server, min, min.instance);
|
this.createCheckHealthAddress(GBServer.globals.server, min, min.instance);
|
||||||
|
|
||||||
GBServer.globals.server
|
GBServer.globals.server
|
||||||
.all(`/${min.instance.botId}/paymentSuccess`, async (req, res) => {
|
.all(`/${min.instance.botId}/paymentSuccess`, async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const stripe = new Stripe(process.env.STRIPE_SECRET_KEY);
|
const stripe = new Stripe(process.env.STRIPE_SECRET_KEY);
|
||||||
GBLogEx.info(min, `Payment success webhook received for bot ${min.instance.botId}`);
|
GBLogEx.info(min, `Payment success webhook received for bot ${min.instance.botId}`);
|
||||||
|
|
||||||
const sessionId = req.query.session_id;
|
const sessionId = req.query.session_id;
|
||||||
if (!sessionId) {
|
if (!sessionId) {
|
||||||
GBLogEx.info(min, 'No session_id parameter found in payment success callback');
|
GBLogEx.info(min, 'No session_id parameter found in payment success callback');
|
||||||
return res.status(400).json({ success: false, error: 'Missing session_id parameter' });
|
return res.status(400).json({ success: false, error: 'Missing session_id parameter' });
|
||||||
}
|
}
|
||||||
|
|
||||||
const session = await stripe.checkout.sessions.retrieve(sessionId);
|
const session = await stripe.checkout.sessions.retrieve(sessionId);
|
||||||
|
|
||||||
if (session.payment_status === 'paid') {
|
if (session.payment_status === 'paid') {
|
||||||
GBLogEx.info(min, `Payment confirmed for session ${sessionId}`);
|
GBLogEx.info(min, `Payment confirmed for session ${sessionId}`);
|
||||||
|
|
||||||
// Only for successful payment - send HTML to close window
|
// Only for successful payment - send HTML to close window
|
||||||
res.send(`
|
res.send(`
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
|
|
@ -497,24 +497,24 @@ export class GBMinService {
|
||||||
</html>
|
</html>
|
||||||
`);
|
`);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
GBLogEx.info(min, `Payment not completed for session ${sessionId}`);
|
GBLogEx.info(min, `Payment not completed for session ${sessionId}`);
|
||||||
res.status(402).json({
|
res.status(402).json({
|
||||||
|
success: false,
|
||||||
|
error: 'Payment not completed',
|
||||||
|
sessionId: sessionId
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
GBLogEx.error(min, `Error processing payment success: ${error.message}`);
|
||||||
|
res.status(500).json({
|
||||||
success: false,
|
success: false,
|
||||||
error: 'Payment not completed',
|
error: error.message
|
||||||
sessionId: sessionId
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} catch (error) {
|
})
|
||||||
GBLogEx.error(min, `Error processing payment success: ${error.message}`);
|
.bind(min);
|
||||||
res.status(500).json({
|
|
||||||
success: false,
|
|
||||||
error: error.message
|
|
||||||
|
|
||||||
});
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.bind(min);
|
|
||||||
// Setups official handler for WhatsApp.
|
// Setups official handler for WhatsApp.
|
||||||
|
|
||||||
GBServer.globals.server
|
GBServer.globals.server
|
||||||
|
|
@ -1117,11 +1117,18 @@ export class GBMinService {
|
||||||
|
|
||||||
const step = await min.dialogs.createContext(context);
|
const step = await min.dialogs.createContext(context);
|
||||||
step.context.activity.locale = 'pt-BR';
|
step.context.activity.locale = 'pt-BR';
|
||||||
|
|
||||||
|
|
||||||
const sec = new SecService();
|
const sec = new SecService();
|
||||||
let member = context.activity.recipient;
|
let member = context.activity.recipient;
|
||||||
|
|
||||||
|
if (context.activity.type === 'conversationUpdate') {
|
||||||
|
if (context.activity.membersAdded && context.activity.membersAdded.length > 0 &&
|
||||||
|
context.activity.membersAdded[0].id !== context.activity.recipient.id) {
|
||||||
|
GBLogEx.info(min, `Bot added to conversation: ${member.name}`);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (process.env.GB_MODE === 'legacy' || !member) {
|
if (process.env.GB_MODE === 'legacy' || !member) {
|
||||||
member = context.activity.from;
|
member = context.activity.from;
|
||||||
}
|
}
|
||||||
|
|
@ -1150,7 +1157,7 @@ export class GBMinService {
|
||||||
GBMinService.pidsConversation[conversationId] = pid;
|
GBMinService.pidsConversation[conversationId] = pid;
|
||||||
step.context.activity['pid'] = pid;
|
step.context.activity['pid'] = pid;
|
||||||
|
|
||||||
const auth = false; // min.core.getParam(min.instance, 'Enable Authentication', null);
|
const auth = min.core.getParam(min.instance, 'Enable Authentication', false);
|
||||||
|
|
||||||
if (auth) {
|
if (auth) {
|
||||||
const res = await t.find({ pid: pid, handle: "users.csv", args: [`key={member.id}`] });
|
const res = await t.find({ pid: pid, handle: "users.csv", args: [`key={member.id}`] });
|
||||||
|
|
@ -1167,209 +1174,202 @@ export class GBMinService {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// First time processing.
|
// First time processing.
|
||||||
|
|
||||||
if (!params.loaded) {
|
if (!params.loaded) {
|
||||||
if (step.context.activity.channelId !== 'msteams') {
|
if (step.context.activity.channelId !== 'msteams') {
|
||||||
await min.conversationalService.sendEvent(min, step, 'loadInstance', {});
|
await min.conversationalService.sendEvent(min, step, 'loadInstance', {});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Default params.
|
// Default params.
|
||||||
|
|
||||||
await sec.setParam(userId, 'loaded', true);
|
await sec.setParam(userId, 'loaded', true);
|
||||||
await sec.setParam(userId, 'subjects', '[]');
|
await sec.setParam(userId, 'subjects', '[]');
|
||||||
await sec.setParam(userId, 'cb', null);
|
await sec.setParam(userId, 'cb', null);
|
||||||
await sec.setParam(userId, 'welcomed', 'false');
|
await sec.setParam(userId, 'welcomed', 'false');
|
||||||
await sec.setParam(userId, 'maxLines', 100);
|
await sec.setParam(userId, 'maxLines', 100);
|
||||||
await sec.setParam(userId, 'translatorOn', true);
|
await sec.setParam(userId, 'translatorOn', true);
|
||||||
await sec.setParam(userId, 'wholeWord', true);
|
await sec.setParam(userId, 'wholeWord', true);
|
||||||
await sec.setParam(userId, 'theme', 'white');
|
await sec.setParam(userId, 'theme', 'white');
|
||||||
await sec.setParam(userId, 'maxColumns', 40);
|
await sec.setParam(userId, 'maxColumns', 40);
|
||||||
|
|
||||||
// This same event is dispatched either to all participants
|
// This same event is dispatched either to all participants
|
||||||
// including the bot, that is filtered bellow.
|
// including the bot, that is filtered bellow.
|
||||||
|
|
||||||
if (context.activity.from.id !== min.botId) {
|
if (context.activity.from.id !== min.botId) {
|
||||||
// Creates a new row in user table if it does not exists.
|
// Creates a new row in user table if it does not exists.
|
||||||
if (process.env.PRIVACY_STORE_MESSAGES === 'true') {
|
if (process.env.PRIVACY_STORE_MESSAGES === 'true') {
|
||||||
// Stores conversation associated to the user to group each message.
|
// Stores conversation associated to the user to group each message.
|
||||||
|
|
||||||
const analytics = new AnalyticsService();
|
const analytics = new AnalyticsService();
|
||||||
await analytics.createConversation(user);
|
await analytics.createConversation(user);
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
await sec.updateConversationReferenceById(userId, conversationReference);
|
|
||||||
|
|
||||||
if (step.context.activity.channelId !== 'msteams') {
|
|
||||||
const service = new KBService(min.core.sequelize);
|
|
||||||
const data = await service.getFaqBySubjectArray(min.instance.instanceId, 'faq', undefined);
|
|
||||||
await min.conversationalService.sendEvent(min, step, 'play', {
|
|
||||||
playerType: 'bullet',
|
|
||||||
data: data.slice(0, 10)
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await sec.updateConversationReferenceById(userId, conversationReference);
|
||||||
|
|
||||||
const notes = min.core.getParam(min.instance, 'Notes', null);
|
if (step.context.activity.channelId !== 'msteams') {
|
||||||
if (await this.handleUploads(min, step, user, params, notes != null)) {
|
const service = new KBService(min.core.sequelize);
|
||||||
return;
|
const data = await service.getFaqBySubjectArray(min.instance.instanceId, 'faq', undefined);
|
||||||
|
await min.conversationalService.sendEvent(min, step, 'play', {
|
||||||
|
playerType: 'bullet',
|
||||||
|
data: data.slice(0, 10)
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// Required for MSTEAMS handling of persisted conversations.
|
|
||||||
|
|
||||||
if (step.context.activity.channelId === 'msteams') {
|
|
||||||
if (step.context.activity.attachments && step.context.activity.attachments.length > 1) {
|
|
||||||
const file = context.activity.attachments[0];
|
|
||||||
const credentials = new MicrosoftAppCredentials(
|
|
||||||
min.instance.marketplaceId,
|
|
||||||
min.instance.marketplacePassword
|
|
||||||
);
|
|
||||||
const botToken = await credentials.getToken();
|
|
||||||
const headers = { Authorization: `Bearer ${botToken}` };
|
|
||||||
const data = await t.getByHttp({
|
|
||||||
pid: 0,
|
|
||||||
url: file.contentUrl,
|
|
||||||
headers,
|
|
||||||
username: null,
|
|
||||||
ps: null,
|
|
||||||
qs: null
|
|
||||||
});
|
|
||||||
const packagePath = GBUtil.getGBAIPath(min.botId);
|
|
||||||
const folder = `work/${path}/cache`;
|
|
||||||
const filename = `${GBAdminService.generateUuid()}.png`;
|
|
||||||
|
|
||||||
await fs.writeFile(urlJoin(folder, filename), data);
|
|
||||||
step.context.activity.text = urlJoin(
|
|
||||||
GBServer.globals.publicAddress,
|
|
||||||
`${min.instance.botId}`,
|
|
||||||
'cache',
|
|
||||||
filename
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(await sec.getParam(user, 'welcomed'))) {
|
|
||||||
const startDialog = min.core.getParam(min.instance, 'Start Dialog', null);
|
|
||||||
if (startDialog) {
|
|
||||||
await sec.setParam(userId, 'welcomed', 'true');
|
|
||||||
GBLogEx.info(
|
|
||||||
min,
|
|
||||||
`Auto start (teams) dialog is now being called: ${startDialog} for ${min.instance.botId}...`
|
|
||||||
);
|
|
||||||
|
|
||||||
await GBVMService.callVM(startDialog.toLowerCase(), min, step, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Answer to specific BOT Framework event conversationUpdate to auto start dialogs.
|
|
||||||
// Skips if the bot is talking.
|
|
||||||
|
|
||||||
const startDialog = min.core.getParam(min.instance, 'Start Dialog', null);
|
|
||||||
|
|
||||||
if (context.activity.type === 'installationUpdate') {
|
|
||||||
GBLogEx.info(min, `Bot installed on Teams.`);
|
|
||||||
} else if (context.activity.type === 'conversationUpdate' &&
|
|
||||||
context.activity.membersAdded.length > 0) {
|
|
||||||
// Check if a bot or a human participant is being added to the conversation.
|
|
||||||
|
|
||||||
const member = context.activity.membersAdded[0];
|
|
||||||
if (context.activity.membersAdded[0].id === context.activity.recipient.id) {
|
|
||||||
GBLogEx.info(min, `Bot added to conversation, starting chat...`);
|
|
||||||
|
|
||||||
// Calls onNewSession event on each .gbapp package.
|
|
||||||
|
|
||||||
await CollectionUtil.asyncForEach(appPackages, async e => {
|
|
||||||
await e.onNewSession(min, step);
|
|
||||||
});
|
|
||||||
|
|
||||||
// Auto starts dialogs if any is specified.
|
|
||||||
|
|
||||||
if (!startDialog && !(await sec.getParam(user, 'welcomed'))) {
|
|
||||||
// Otherwise, calls / (root) to default welcome users.
|
|
||||||
|
|
||||||
await step.beginDialog('/');
|
|
||||||
} else {
|
|
||||||
if (
|
|
||||||
!GBMinService.userMobile(step) &&
|
|
||||||
!min['conversationWelcomed'][step.context.activity.conversation.id]
|
|
||||||
) {
|
|
||||||
|
|
||||||
const pid = GBVMService.createProcessInfo(user, min, step.context.activity.channelId, null, step);
|
|
||||||
step.context.activity['pid'] = pid;
|
|
||||||
|
|
||||||
min['conversationWelcomed'][step.context.activity.conversation.id] = true;
|
|
||||||
|
|
||||||
GBLogEx.info(
|
|
||||||
min,
|
|
||||||
`Auto start (web 1) dialog is now being called: ${startDialog} for ${min.instance.instanceId}...`
|
|
||||||
);
|
|
||||||
await GBVMService.callVM(startDialog.toLowerCase(), min, step, pid);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
GBLogEx.info(min, `Person added to conversation: ${member.name}`);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} else if (context.activity.type === 'message') {
|
|
||||||
|
|
||||||
|
|
||||||
|
const notes = min.core.getParam(min.instance, 'Notes', null);
|
||||||
|
if (await this.handleUploads(min, step, user, params, notes != null)) {
|
||||||
|
return;
|
||||||
|
|
||||||
// Required for F0 handling of persisted conversations.
|
}
|
||||||
|
|
||||||
GBLogEx.info(
|
// Required for MSTEAMS handling of persisted conversations.
|
||||||
min,
|
|
||||||
`Human: pid:${pid} ${context.activity.from.id} ${GBUtil.toYAML(WhatsappDirectLine.pidByNumber)} ${context.activity.text} (type: ${context.activity.type}, name: ${context.activity.name}, channelId: ${context.activity.channelId})`
|
if (step.context.activity.channelId === 'msteams') {
|
||||||
|
if (step.context.activity.attachments && step.context.activity.attachments.length > 1) {
|
||||||
|
const file = context.activity.attachments[0];
|
||||||
|
const credentials = new MicrosoftAppCredentials(
|
||||||
|
min.instance.marketplaceId,
|
||||||
|
min.instance.marketplacePassword
|
||||||
);
|
);
|
||||||
|
const botToken = await credentials.getToken();
|
||||||
|
const headers = { Authorization: `Bearer ${botToken}` };
|
||||||
|
const data = await t.getByHttp({
|
||||||
|
pid: 0,
|
||||||
|
url: file.contentUrl,
|
||||||
|
headers,
|
||||||
|
username: null,
|
||||||
|
ps: null,
|
||||||
|
qs: null
|
||||||
|
});
|
||||||
|
const packagePath = GBUtil.getGBAIPath(min.botId);
|
||||||
|
const folder = `work/${path}/cache`;
|
||||||
|
const filename = `${GBAdminService.generateUuid()}.png`;
|
||||||
|
|
||||||
|
await fs.writeFile(urlJoin(folder, filename), data);
|
||||||
// Processes messages activities.
|
step.context.activity.text = urlJoin(
|
||||||
|
GBServer.globals.publicAddress,
|
||||||
await this.processMessageActivity(context, min, step, pid);
|
`${min.instance.botId}`,
|
||||||
} else if (context.activity.type === 'event') {
|
'cache',
|
||||||
// Processes events activities.
|
filename
|
||||||
|
);
|
||||||
await this.processEventActivity(min, user, context, step);
|
|
||||||
}
|
}
|
||||||
} catch (error) {
|
|
||||||
GBLog.error(`Receiver: ${GBUtil.toYAML(error)}`);
|
|
||||||
|
|
||||||
await min.conversationalService.sendText(
|
if (!(await sec.getParam(user, 'welcomed'))) {
|
||||||
|
const startDialog = min.core.getParam(min.instance, 'Start Dialog', null);
|
||||||
|
if (startDialog) {
|
||||||
|
await sec.setParam(userId, 'welcomed', 'true');
|
||||||
|
GBLogEx.info(
|
||||||
|
min,
|
||||||
|
`Auto start (teams) dialog is now being called: ${startDialog} for ${min.instance.botId}...`
|
||||||
|
);
|
||||||
|
|
||||||
|
await GBVMService.callVM(startDialog.toLowerCase(), min, step, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Answer to specific BOT Framework event conversationUpdate to auto start dialogs.
|
||||||
|
// Skips if the bot is talking.
|
||||||
|
|
||||||
|
const startDialog = min.core.getParam(min.instance, 'Start Dialog', null);
|
||||||
|
|
||||||
|
if (context.activity.type === 'installationUpdate') {
|
||||||
|
GBLogEx.info(min, `Bot installed on Teams.`);
|
||||||
|
} else if (context.activity.type === 'conversationUpdate' &&
|
||||||
|
context.activity.membersAdded.length > 0) {
|
||||||
|
// Check if a bot or a human participant is being added to the conversation.
|
||||||
|
|
||||||
|
const member = context.activity.membersAdded[0];
|
||||||
|
|
||||||
|
// Calls onNewSession event on each .gbapp package.
|
||||||
|
|
||||||
|
await CollectionUtil.asyncForEach(appPackages, async e => {
|
||||||
|
await e.onNewSession(min, step);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Auto starts dialogs if any is specified.
|
||||||
|
|
||||||
|
if (!startDialog && !(await sec.getParam(user, 'welcomed'))) {
|
||||||
|
// Otherwise, calls / (root) to default welcome users.
|
||||||
|
|
||||||
|
await step.beginDialog('/');
|
||||||
|
} else {
|
||||||
|
if (
|
||||||
|
!GBMinService.userMobile(step) &&
|
||||||
|
!min['conversationWelcomed'][step.context.activity.conversation.id]
|
||||||
|
) {
|
||||||
|
|
||||||
|
const pid = GBVMService.createProcessInfo(user, min, step.context.activity.channelId, null, step);
|
||||||
|
step.context.activity['pid'] = pid;
|
||||||
|
|
||||||
|
min['conversationWelcomed'][step.context.activity.conversation.id] = true;
|
||||||
|
|
||||||
|
GBLogEx.info(
|
||||||
|
min,
|
||||||
|
`Auto start (web 1) dialog is now being called: ${startDialog} for ${min.instance.instanceId}...`
|
||||||
|
);
|
||||||
|
await GBVMService.callVM(startDialog.toLowerCase(), min, step, pid);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (context.activity.type === 'message') {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// Required for F0 handling of persisted conversations.
|
||||||
|
|
||||||
|
GBLogEx.info(
|
||||||
min,
|
min,
|
||||||
step,
|
`Human: pid:${pid} ${context.activity.from.id} ${GBUtil.toYAML(WhatsappDirectLine.pidByNumber)} ${context.activity.text} (type: ${context.activity.type}, name: ${context.activity.name}, channelId: ${context.activity.channelId})`
|
||||||
Messages[step.context.activity.locale].very_sorry_about_error
|
|
||||||
);
|
);
|
||||||
|
|
||||||
await step.beginDialog('/ask', { isReturning: true });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
try {
|
// Processes messages activities.
|
||||||
if (GBConfigService.get('GB_MODE') !== 'legacy') {
|
|
||||||
const context = adapter['createContext'](req);
|
|
||||||
context['_activity'] = context.activity.body;
|
|
||||||
await adapter['processActivity'](req, res, handler);
|
|
||||||
|
|
||||||
// Return status
|
await this.processMessageActivity(context, min, step, pid);
|
||||||
res.status(200);
|
} else if (context.activity.type === 'event') {
|
||||||
|
// Processes events activities.
|
||||||
|
|
||||||
res.end();
|
await this.processEventActivity(min, user, context, step);
|
||||||
} else {
|
|
||||||
await adapter['processActivity'](req, res, handler);
|
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error.code === 401) {
|
GBLog.error(`Receiver: ${GBUtil.toYAML(error)}`);
|
||||||
GBLog.error('Calling processActivity due to Signing Key could not be retrieved error.');
|
|
||||||
await adapter['processActivity'](req, res, handler);
|
await min.conversationalService.sendText(
|
||||||
} else {
|
min,
|
||||||
GBLog.error(`Error processing activity: ${GBUtil.toYAML(error)}`);
|
step,
|
||||||
throw error;
|
Messages[step.context.activity.locale].very_sorry_about_error
|
||||||
}
|
);
|
||||||
|
|
||||||
|
await step.beginDialog('/ask', { isReturning: true });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (GBConfigService.get('GB_MODE') !== 'legacy') {
|
||||||
|
const context = adapter['createContext'](req);
|
||||||
|
context['_activity'] = context.activity.body;
|
||||||
|
await adapter['processActivity'](req, res, handler);
|
||||||
|
|
||||||
|
// Return status
|
||||||
|
res.status(200);
|
||||||
|
|
||||||
|
res.end();
|
||||||
|
} else {
|
||||||
|
await adapter['processActivity'](req, res, handler);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
if (error.code === 401) {
|
||||||
|
GBLog.error('Calling processActivity due to Signing Key could not be retrieved error.');
|
||||||
|
await adapter['processActivity'](req, res, handler);
|
||||||
|
} else {
|
||||||
|
GBLog.error(`Error processing activity: ${GBUtil.toYAML(error)}`);
|
||||||
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called to handle all event sent by .gbui clients.
|
* Called to handle all event sent by .gbui clients.
|
||||||
|
|
|
||||||
27083
pnpm-lock.yaml
generated
Normal file
27083
pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue