@app-connect/core 1.7.37 → 1.7.38
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +17 -16
- package/dist/connector/developerPortal.d.ts +6 -0
- package/{connector → dist/connector}/developerPortal.js +29 -12
- package/dist/connector/mock.d.ts +1 -0
- package/{connector → dist/connector}/mock.js +33 -17
- package/dist/connector/proxy/engine.d.ts +10 -0
- package/dist/connector/proxy/engine.js +222 -0
- package/dist/connector/proxy/index.d.ts +5 -0
- package/dist/connector/proxy/index.js +511 -0
- package/dist/connector/registry.d.ts +1 -0
- package/dist/connector/registry.js +243 -0
- package/dist/handlers/admin.d.ts +1 -0
- package/{handlers → dist/handlers}/admin.js +137 -78
- package/dist/handlers/appointment.d.ts +9 -0
- package/{handlers → dist/handlers}/appointment.js +58 -29
- package/dist/handlers/auth.d.ts +9 -0
- package/{handlers → dist/handlers}/auth.js +68 -40
- package/dist/handlers/calldown.d.ts +10 -0
- package/dist/handlers/calldown.js +134 -0
- package/dist/handlers/contact.d.ts +1 -0
- package/{handlers → dist/handlers}/contact.js +61 -39
- package/dist/handlers/disposition.d.ts +1 -0
- package/{handlers → dist/handlers}/disposition.js +20 -10
- package/dist/handlers/log.d.ts +1 -0
- package/{handlers → dist/handlers}/log.js +91 -124
- package/dist/handlers/managedAuth.d.ts +1 -0
- package/{handlers → dist/handlers}/managedAuth.js +134 -61
- package/dist/handlers/managedOAuth.d.ts +13 -0
- package/{handlers → dist/handlers}/managedOAuth.js +102 -30
- package/dist/handlers/plugin.d.ts +1 -0
- package/{handlers → dist/handlers}/plugin.js +59 -27
- package/dist/handlers/user.d.ts +1 -0
- package/{handlers → dist/handlers}/user.js +45 -27
- package/dist/index.d.ts +1 -0
- package/{index.js → dist/index.js} +538 -449
- package/dist/jest.config.d.ts +1 -0
- package/dist/jest.config.js +65 -0
- package/dist/lib/analytics.d.ts +4 -0
- package/{lib → dist/lib}/analytics.js +8 -6
- package/dist/lib/authSession.d.ts +5 -0
- package/{lib → dist/lib}/authSession.js +15 -43
- package/dist/lib/cacheCleanup.d.ts +4 -0
- package/{lib → dist/lib}/cacheCleanup.js +5 -17
- package/dist/lib/callLogComposer.d.ts +109 -0
- package/{lib → dist/lib}/callLogComposer.js +157 -197
- package/dist/lib/callLogLookup.d.ts +6 -0
- package/{lib → dist/lib}/callLogLookup.js +12 -34
- package/dist/lib/constants.d.ts +6 -0
- package/dist/lib/constants.js +9 -0
- package/dist/lib/debugTracer.d.ts +17 -0
- package/{lib → dist/lib}/debugTracer.js +7 -83
- package/dist/lib/encode.d.ts +3 -0
- package/dist/lib/encode.js +50 -0
- package/dist/lib/errorHandler.d.ts +7 -0
- package/dist/lib/errorHandler.js +161 -0
- package/dist/lib/generalErrorMessage.d.ts +7 -0
- package/{lib → dist/lib}/generalErrorMessage.js +6 -6
- package/dist/lib/jwt.d.ts +4 -0
- package/dist/lib/jwt.js +18 -0
- package/dist/lib/logger.d.ts +24 -0
- package/dist/lib/logger.js +126 -0
- package/dist/lib/migrateCallLogsSchema.d.ts +32 -0
- package/{lib → dist/lib}/migrateCallLogsSchema.js +75 -160
- package/dist/lib/oauth.d.ts +4 -0
- package/{lib → dist/lib}/oauth.js +157 -160
- package/dist/lib/ringcentral.d.ts +24 -0
- package/dist/lib/ringcentral.js +226 -0
- package/dist/lib/s3ErrorLogReport.d.ts +4 -0
- package/{lib → dist/lib}/s3ErrorLogReport.js +11 -23
- package/dist/lib/sharedSMSComposer.d.ts +7 -0
- package/{lib → dist/lib}/sharedSMSComposer.js +21 -107
- package/dist/lib/util.d.ts +7 -0
- package/{lib → dist/lib}/util.js +9 -20
- package/dist/mcp/lib/oauthError.d.ts +1 -0
- package/dist/mcp/lib/oauthError.js +25 -0
- package/dist/mcp/lib/validator.d.ts +1 -0
- package/{mcp → dist/mcp}/lib/validator.js +16 -20
- package/dist/mcp/lib/widgetSessionToken.d.ts +1 -0
- package/dist/mcp/lib/widgetSessionToken.js +46 -0
- package/dist/mcp/mcpHandler.d.ts +8 -0
- package/{mcp → dist/mcp}/mcpHandler.js +98 -88
- package/dist/mcp/tools/cancelAppointment.d.ts +1 -0
- package/{mcp → dist/mcp}/tools/cancelAppointment.js +7 -16
- package/dist/mcp/tools/checkAuthStatus.d.ts +1 -0
- package/{mcp → dist/mcp}/tools/checkAuthStatus.js +21 -14
- package/dist/mcp/tools/confirmAppointment.d.ts +1 -0
- package/{mcp → dist/mcp}/tools/confirmAppointment.js +7 -16
- package/dist/mcp/tools/createAppointment.d.ts +1 -0
- package/{mcp → dist/mcp}/tools/createAppointment.js +7 -19
- package/dist/mcp/tools/createCallLog.d.ts +1 -0
- package/{mcp → dist/mcp}/tools/createCallLog.js +18 -29
- package/dist/mcp/tools/createContact.d.ts +1 -0
- package/{mcp → dist/mcp}/tools/createContact.js +8 -20
- package/dist/mcp/tools/createMessageLog.d.ts +1 -0
- package/{mcp → dist/mcp}/tools/createMessageLog.js +14 -26
- package/dist/mcp/tools/doAuth.d.ts +1 -0
- package/{mcp → dist/mcp}/tools/doAuth.js +17 -13
- package/dist/mcp/tools/findContactByName.d.ts +1 -0
- package/{mcp → dist/mcp}/tools/findContactByName.js +9 -15
- package/dist/mcp/tools/findContactByPhone.d.ts +1 -0
- package/{mcp → dist/mcp}/tools/findContactByPhone.js +8 -15
- package/dist/mcp/tools/getCallLog.d.ts +1 -0
- package/{mcp → dist/mcp}/tools/getCallLog.js +12 -21
- package/dist/mcp/tools/getGoogleFilePicker.d.ts +1 -0
- package/{mcp → dist/mcp}/tools/getGoogleFilePicker.js +9 -18
- package/dist/mcp/tools/getHelp.d.ts +1 -0
- package/{mcp → dist/mcp}/tools/getHelp.js +5 -6
- package/dist/mcp/tools/getPublicConnectors.d.ts +1 -0
- package/{mcp → dist/mcp}/tools/getPublicConnectors.js +19 -18
- package/dist/mcp/tools/getSessionInfo.d.ts +1 -0
- package/{mcp → dist/mcp}/tools/getSessionInfo.js +10 -16
- package/dist/mcp/tools/index.d.ts +8 -0
- package/dist/mcp/tools/index.js +50 -0
- package/dist/mcp/tools/listAppointments.d.ts +1 -0
- package/{mcp → dist/mcp}/tools/listAppointments.js +7 -19
- package/dist/mcp/tools/logout.d.ts +1 -0
- package/{mcp → dist/mcp}/tools/logout.js +16 -14
- package/dist/mcp/tools/rcGetCallLogs.d.ts +1 -0
- package/{mcp → dist/mcp}/tools/rcGetCallLogs.js +10 -8
- package/dist/mcp/tools/updateAppointment.d.ts +1 -0
- package/{mcp → dist/mcp}/tools/updateAppointment.js +17 -22
- package/dist/mcp/tools/updateCallLog.d.ts +1 -0
- package/{mcp → dist/mcp}/tools/updateCallLog.js +16 -26
- package/dist/models/accountDataModel.d.ts +3 -0
- package/dist/models/accountDataModel.js +39 -0
- package/dist/models/adminConfigModel.d.ts +2 -0
- package/dist/models/adminConfigModel.js +39 -0
- package/dist/models/cacheModel.d.ts +2 -0
- package/{models → dist/models}/cacheModel.js +7 -3
- package/dist/models/callDownListModel.d.ts +2 -0
- package/{models → dist/models}/callDownListModel.js +8 -4
- package/dist/models/callLogModel.d.ts +2 -0
- package/dist/models/callLogModel.js +43 -0
- package/dist/models/dynamo/connectorSchema.d.ts +2 -0
- package/dist/models/dynamo/connectorSchema.js +141 -0
- package/dist/models/dynamo/lockSchema.d.ts +2 -0
- package/{models → dist/models}/dynamo/lockSchema.js +5 -7
- package/dist/models/dynamo/noteCacheSchema.d.ts +2 -0
- package/{models → dist/models}/dynamo/noteCacheSchema.js +4 -6
- package/dist/models/llmSessionModel.d.ts +2 -0
- package/dist/models/llmSessionModel.js +21 -0
- package/dist/models/messageLogModel.d.ts +2 -0
- package/{models → dist/models}/messageLogModel.js +8 -4
- package/dist/models/sequelize.d.ts +2 -0
- package/dist/models/sequelize.js +68 -0
- package/dist/models/userModel.d.ts +2 -0
- package/dist/models/userModel.js +49 -0
- package/dist/package.json +100 -0
- package/dist/releaseNotes.json +1222 -0
- package/dist/tsconfig.json +14 -0
- package/dist/types/admin.d.ts +141 -0
- package/dist/types/analytics.d.ts +14 -0
- package/dist/types/appointment.d.ts +50 -0
- package/dist/types/auth.d.ts +137 -0
- package/dist/types/authSession.d.ts +35 -0
- package/dist/types/cacheCleanup.d.ts +12 -0
- package/dist/types/calldown.d.ts +54 -0
- package/dist/types/common.d.ts +46 -0
- package/dist/types/connector.d.ts +165 -0
- package/dist/types/contact.d.ts +125 -0
- package/dist/types/errorHandler.d.ts +60 -0
- package/dist/types/index.d.ts +76 -0
- package/dist/types/json.d.ts +9 -0
- package/dist/types/jwt.d.ts +8 -0
- package/dist/types/logging.d.ts +224 -0
- package/dist/types/managedAuth.d.ts +114 -0
- package/dist/types/managedOAuth.d.ts +59 -0
- package/dist/types/manifest.d.ts +120 -0
- package/dist/types/migration.d.ts +15 -0
- package/dist/types/plugin.d.ts +74 -0
- package/dist/types/ringcentral.d.ts +61 -0
- package/dist/types/s3ErrorLogReport.d.ts +16 -0
- package/dist/types/sharedSMSComposer.d.ts +105 -0
- package/dist/types/user.d.ts +46 -0
- package/dist/types/util.d.ts +7 -0
- package/package.json +34 -6
- package/releaseNotes.json +8 -0
- package/.env.test +0 -5
- package/connector/proxy/engine.js +0 -165
- package/connector/proxy/index.js +0 -500
- package/connector/registry.js +0 -252
- package/docs/README.md +0 -50
- package/docs/architecture.md +0 -94
- package/docs/connectors.md +0 -116
- package/docs/handlers.md +0 -128
- package/docs/libraries.md +0 -98
- package/docs/models.md +0 -146
- package/docs/routes.md +0 -119
- package/docs/tests.md +0 -73
- package/handlers/calldown.js +0 -99
- package/jest.config.js +0 -57
- package/lib/constants.js +0 -9
- package/lib/encode.js +0 -30
- package/lib/errorHandler.js +0 -218
- package/lib/jwt.js +0 -18
- package/lib/logger.js +0 -190
- package/lib/ringcentral.js +0 -267
- package/mcp/README.md +0 -420
- package/mcp/tools/index.js +0 -51
- package/mcp/ui/App/App.tsx +0 -358
- package/mcp/ui/App/components/AuthInfoForm.tsx +0 -113
- package/mcp/ui/App/components/AuthSuccess.tsx +0 -22
- package/mcp/ui/App/components/ConnectorList.tsx +0 -82
- package/mcp/ui/App/components/DebugPanel.tsx +0 -43
- package/mcp/ui/App/components/OAuthConnect.tsx +0 -270
- package/mcp/ui/App/lib/callTool.ts +0 -130
- package/mcp/ui/App/lib/debugLog.ts +0 -41
- package/mcp/ui/App/lib/developerPortal.ts +0 -111
- package/mcp/ui/App/main.css +0 -6
- package/mcp/ui/App/root.tsx +0 -13
- package/mcp/ui/dist/index.html +0 -53
- package/mcp/ui/vite.config.ts +0 -16
- package/models/accountDataModel.js +0 -34
- package/models/adminConfigModel.js +0 -35
- package/models/callLogModel.js +0 -39
- package/models/dynamo/connectorSchema.js +0 -146
- package/models/llmSessionModel.js +0 -17
- package/models/sequelize.js +0 -17
- package/models/userModel.js +0 -45
- package/test/connector/developerPortal.test.js +0 -166
- package/test/connector/mock.test.js +0 -131
- package/test/connector/proxy/engine.test.js +0 -211
- package/test/connector/proxy/index.test.js +0 -525
- package/test/connector/proxy/sample.json +0 -162
- package/test/connector/registry.test.js +0 -416
- package/test/handlers/admin.test.js +0 -960
- package/test/handlers/appointment.test.js +0 -260
- package/test/handlers/auth.test.js +0 -1096
- package/test/handlers/calldown.test.js +0 -310
- package/test/handlers/contact.test.js +0 -1014
- package/test/handlers/disposition.test.js +0 -396
- package/test/handlers/log.test.js +0 -1847
- package/test/handlers/managedAuth.test.js +0 -458
- package/test/handlers/managedOAuth.test.js +0 -262
- package/test/handlers/plugin.test.js +0 -429
- package/test/handlers/user.test.js +0 -381
- package/test/index.test.js +0 -301
- package/test/lib/analytics.test.js +0 -146
- package/test/lib/authSession.test.js +0 -173
- package/test/lib/cacheCleanup.test.js +0 -127
- package/test/lib/callLogComposer.test.js +0 -1231
- package/test/lib/debugTracer.test.js +0 -328
- package/test/lib/encode.test.js +0 -59
- package/test/lib/errorHandler.test.js +0 -246
- package/test/lib/generalErrorMessage.test.js +0 -82
- package/test/lib/jwt.test.js +0 -176
- package/test/lib/logger.test.js +0 -206
- package/test/lib/oauth.test.js +0 -359
- package/test/lib/ringcentral.test.js +0 -467
- package/test/lib/s3ErrorLogReport.test.js +0 -187
- package/test/lib/sharedSMSComposer.test.js +0 -1084
- package/test/lib/util.test.js +0 -329
- package/test/mcp/mcpHandler.test.js +0 -73
- package/test/mcp/mcpHandlerMore.test.js +0 -384
- package/test/mcp/tools/appointmentTools.test.js +0 -362
- package/test/mcp/tools/checkAuthStatus.test.js +0 -83
- package/test/mcp/tools/createCallLog.test.js +0 -436
- package/test/mcp/tools/createContact.test.js +0 -58
- package/test/mcp/tools/createMessageLog.test.js +0 -595
- package/test/mcp/tools/doAuth.test.js +0 -113
- package/test/mcp/tools/findContactByName.test.js +0 -275
- package/test/mcp/tools/findContactByPhone.test.js +0 -296
- package/test/mcp/tools/getCallLog.test.js +0 -298
- package/test/mcp/tools/getGoogleFilePicker.test.js +0 -281
- package/test/mcp/tools/getPublicConnectors.test.js +0 -107
- package/test/mcp/tools/getSessionInfo.test.js +0 -127
- package/test/mcp/tools/logout.test.js +0 -233
- package/test/mcp/tools/rcGetCallLogs.test.js +0 -56
- package/test/mcp/tools/updateCallLog.test.js +0 -360
- package/test/models/accountDataModel.test.js +0 -98
- package/test/models/callDownListModel.test.js +0 -125
- package/test/models/dynamo/connectorSchema.test.js +0 -189
- package/test/models/dynamo/lockSchema.test.js +0 -37
- package/test/models/dynamo/noteCacheSchema.test.js +0 -45
- package/test/models/llmSessionModel.test.js +0 -91
- package/test/models/models.test.js +0 -660
- package/test/routes/calldownRoutes.test.js +0 -224
- package/test/routes/coreRouterBroadRoutes.test.js +0 -855
- package/test/routes/dispositionRoutes.test.js +0 -192
- package/test/routes/managedAuthRoutes.test.js +0 -386
- package/test/routes/pluginRoutes.test.js +0 -262
- package/test/setup.js +0 -178
- /package/{mcp → dist/mcp}/ui/index.html +0 -0
- /package/{mcp → dist/mcp}/ui/package-lock.json +0 -0
- /package/{mcp → dist/mcp}/ui/package.json +0 -0
- /package/{mcp → dist/mcp}/ui/tsconfig.json +0 -0
package/mcp/ui/vite.config.ts
DELETED
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
import { defineConfig } from 'vite'
|
|
2
|
-
import react from '@vitejs/plugin-react'
|
|
3
|
-
import tailwindcss from '@tailwindcss/vite'
|
|
4
|
-
import { viteSingleFile } from 'vite-plugin-singlefile'
|
|
5
|
-
|
|
6
|
-
export default defineConfig({
|
|
7
|
-
plugins: [
|
|
8
|
-
react(),
|
|
9
|
-
tailwindcss(),
|
|
10
|
-
viteSingleFile(),
|
|
11
|
-
],
|
|
12
|
-
build: {
|
|
13
|
-
outDir: 'dist',
|
|
14
|
-
}
|
|
15
|
-
})
|
|
16
|
-
|
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
const Sequelize = require('sequelize');
|
|
2
|
-
const { sequelize } = require('./sequelize');
|
|
3
|
-
|
|
4
|
-
// Model for account data with composite primary key
|
|
5
|
-
exports.AccountDataModel = sequelize.define('accountData', {
|
|
6
|
-
rcAccountId: {
|
|
7
|
-
type: Sequelize.STRING,
|
|
8
|
-
primaryKey: true,
|
|
9
|
-
},
|
|
10
|
-
platformName: {
|
|
11
|
-
type: Sequelize.STRING,
|
|
12
|
-
primaryKey: true,
|
|
13
|
-
},
|
|
14
|
-
dataKey: {
|
|
15
|
-
type: Sequelize.STRING,
|
|
16
|
-
primaryKey: true,
|
|
17
|
-
},
|
|
18
|
-
data: {
|
|
19
|
-
type: Sequelize.JSON,
|
|
20
|
-
}
|
|
21
|
-
});
|
|
22
|
-
|
|
23
|
-
exports.getOrRefreshAccountData = async function getOrRefreshAccountData({ rcAccountId, platformName, dataKey, forceRefresh, fetchFn }) {
|
|
24
|
-
const existing = await exports.AccountDataModel.findOne({ where: { rcAccountId, platformName, dataKey } });
|
|
25
|
-
if (existing && !forceRefresh) return existing.data;
|
|
26
|
-
|
|
27
|
-
const fresh = await fetchFn();
|
|
28
|
-
if (existing) {
|
|
29
|
-
await existing.update({ data: fresh });
|
|
30
|
-
} else {
|
|
31
|
-
await exports.AccountDataModel.create({ rcAccountId, platformName, dataKey, data: fresh });
|
|
32
|
-
}
|
|
33
|
-
return fresh;
|
|
34
|
-
}
|
|
@@ -1,35 +0,0 @@
|
|
|
1
|
-
const Sequelize = require('sequelize');
|
|
2
|
-
const { sequelize } = require('./sequelize');
|
|
3
|
-
|
|
4
|
-
// Model for Admin data
|
|
5
|
-
exports.AdminConfigModel = sequelize.define('adminConfigs', {
|
|
6
|
-
// hashed rc account ID
|
|
7
|
-
id: {
|
|
8
|
-
type: Sequelize.STRING,
|
|
9
|
-
primaryKey: true,
|
|
10
|
-
},
|
|
11
|
-
userSettings: {
|
|
12
|
-
type: Sequelize.JSON
|
|
13
|
-
},
|
|
14
|
-
// Obsolete
|
|
15
|
-
customAdapter: {
|
|
16
|
-
type: Sequelize.JSON
|
|
17
|
-
},
|
|
18
|
-
adminAccessToken: {
|
|
19
|
-
type: Sequelize.STRING(512),
|
|
20
|
-
},
|
|
21
|
-
adminRefreshToken: {
|
|
22
|
-
type: Sequelize.STRING(512),
|
|
23
|
-
},
|
|
24
|
-
adminTokenExpiry: {
|
|
25
|
-
type: Sequelize.DATE
|
|
26
|
-
},
|
|
27
|
-
// Array of:
|
|
28
|
-
// {
|
|
29
|
-
// crmUserId: string,
|
|
30
|
-
// rcExtensionId: array of strings
|
|
31
|
-
// }
|
|
32
|
-
userMappings: {
|
|
33
|
-
type: Sequelize.JSON
|
|
34
|
-
}
|
|
35
|
-
});
|
package/models/callLogModel.js
DELETED
|
@@ -1,39 +0,0 @@
|
|
|
1
|
-
const Sequelize = require('sequelize');
|
|
2
|
-
const { sequelize } = require('./sequelize');
|
|
3
|
-
|
|
4
|
-
// Model for User data
|
|
5
|
-
exports.CallLogModel = sequelize.define('callLogs', {
|
|
6
|
-
// callId
|
|
7
|
-
id: {
|
|
8
|
-
type: Sequelize.STRING,
|
|
9
|
-
primaryKey: true,
|
|
10
|
-
},
|
|
11
|
-
sessionId: {
|
|
12
|
-
type: Sequelize.STRING,
|
|
13
|
-
primaryKey: true,
|
|
14
|
-
},
|
|
15
|
-
extensionNumber: {
|
|
16
|
-
type: Sequelize.STRING,
|
|
17
|
-
primaryKey: true,
|
|
18
|
-
allowNull: false,
|
|
19
|
-
defaultValue: '',
|
|
20
|
-
},
|
|
21
|
-
hashedExtensionId: {
|
|
22
|
-
type: Sequelize.STRING,
|
|
23
|
-
primaryKey: true,
|
|
24
|
-
allowNull: false,
|
|
25
|
-
defaultValue: '',
|
|
26
|
-
},
|
|
27
|
-
platform: {
|
|
28
|
-
type: Sequelize.STRING,
|
|
29
|
-
},
|
|
30
|
-
thirdPartyLogId: {
|
|
31
|
-
type: Sequelize.STRING,
|
|
32
|
-
},
|
|
33
|
-
userId: {
|
|
34
|
-
type: Sequelize.STRING,
|
|
35
|
-
},
|
|
36
|
-
contactId: {
|
|
37
|
-
type: Sequelize.STRING,
|
|
38
|
-
}
|
|
39
|
-
});
|
|
@@ -1,146 +0,0 @@
|
|
|
1
|
-
const dynamoose = require('dynamoose');
|
|
2
|
-
const crypto = require('crypto');
|
|
3
|
-
|
|
4
|
-
const CONNECTOR_STATUS = {
|
|
5
|
-
PRIVATE: 'private',
|
|
6
|
-
UNDER_REVIEW: 'under_review',
|
|
7
|
-
APPROVED: 'approved',
|
|
8
|
-
REJECTED: 'rejected',
|
|
9
|
-
};
|
|
10
|
-
|
|
11
|
-
const connectorSchema = new dynamoose.Schema({
|
|
12
|
-
accountId: {
|
|
13
|
-
type: String,
|
|
14
|
-
hashKey: true,
|
|
15
|
-
},
|
|
16
|
-
id: {
|
|
17
|
-
type: String,
|
|
18
|
-
rangeKey: true,
|
|
19
|
-
},
|
|
20
|
-
// Reference to original connector (for partition records)
|
|
21
|
-
originalAccountId: {
|
|
22
|
-
type: String,
|
|
23
|
-
required: false, // Only set for partition records (under_review, approved)
|
|
24
|
-
},
|
|
25
|
-
// Basic Information
|
|
26
|
-
name: {
|
|
27
|
-
type: String,
|
|
28
|
-
required: true,
|
|
29
|
-
},
|
|
30
|
-
displayName: String,
|
|
31
|
-
description: String,
|
|
32
|
-
iconUrl: String,
|
|
33
|
-
// Status and Workflow
|
|
34
|
-
status: {
|
|
35
|
-
type: String,
|
|
36
|
-
required: true,
|
|
37
|
-
enum: Object.values(CONNECTOR_STATUS),
|
|
38
|
-
default: CONNECTOR_STATUS.PRIVATE,
|
|
39
|
-
index: {
|
|
40
|
-
name: 'statusIdIndex',
|
|
41
|
-
global: true,
|
|
42
|
-
rangeKey: 'id',
|
|
43
|
-
project: ['accountId', 'name', 'displayName', 'developer', 'originalAccountId'],
|
|
44
|
-
},
|
|
45
|
-
},
|
|
46
|
-
creatorId: String,
|
|
47
|
-
// Developer Information
|
|
48
|
-
developer: {
|
|
49
|
-
type: Object,
|
|
50
|
-
schema: {
|
|
51
|
-
name: String,
|
|
52
|
-
websiteUrl: String,
|
|
53
|
-
supportUrl: String,
|
|
54
|
-
},
|
|
55
|
-
},
|
|
56
|
-
// Manifest Management
|
|
57
|
-
manifest: {
|
|
58
|
-
type: Object,
|
|
59
|
-
required: true,
|
|
60
|
-
},
|
|
61
|
-
proxyConfig: {
|
|
62
|
-
type: Object,
|
|
63
|
-
required: false,
|
|
64
|
-
},
|
|
65
|
-
proxyId: {
|
|
66
|
-
type: String,
|
|
67
|
-
index: {
|
|
68
|
-
name: 'proxyIdIndex',
|
|
69
|
-
global: true,
|
|
70
|
-
project: ['id', 'accountId', 'creatorId', 'name', 'displayName', 'status', 'developer', 'originalAccountId', 'proxyConfig'],
|
|
71
|
-
}
|
|
72
|
-
},
|
|
73
|
-
// Review and Approval
|
|
74
|
-
submittedAt: Number,
|
|
75
|
-
reviewedBy: String,
|
|
76
|
-
reviewedAt: Number,
|
|
77
|
-
reviewNotes: String,
|
|
78
|
-
rejectionReason: String,
|
|
79
|
-
demoAccounts: String,
|
|
80
|
-
// Usage and Analytics
|
|
81
|
-
usageCount: {
|
|
82
|
-
type: Number,
|
|
83
|
-
default: 0,
|
|
84
|
-
},
|
|
85
|
-
lastUsedAt: Number,
|
|
86
|
-
allowedAccounts: {
|
|
87
|
-
type: Array,
|
|
88
|
-
schema: [String],
|
|
89
|
-
},
|
|
90
|
-
encodedSecretKey: String,
|
|
91
|
-
}, {
|
|
92
|
-
saveUnknown: ['manifest.**', 'proxyConfig.**'],
|
|
93
|
-
timestamps: true,
|
|
94
|
-
});
|
|
95
|
-
|
|
96
|
-
const tableOptions = {
|
|
97
|
-
prefix: process.env.DEVELOPER_DYNAMODB_TABLE_PREFIX,
|
|
98
|
-
};
|
|
99
|
-
|
|
100
|
-
if (process.env.NODE_ENV === 'production') {
|
|
101
|
-
tableOptions.create = false;
|
|
102
|
-
tableOptions.waitForActive = false;
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
const Connector = dynamoose.model('connectors', connectorSchema, tableOptions);
|
|
106
|
-
|
|
107
|
-
function getDeveloperCipherKey() {
|
|
108
|
-
if (!process.env.DEVELOPER_APP_SERVER_SECRET_KEY) {
|
|
109
|
-
throw new Error('DEVELOPER_APP_SERVER_SECRET_KEY is not defined');
|
|
110
|
-
}
|
|
111
|
-
if (process.env.DEVELOPER_APP_SERVER_SECRET_KEY.length < 32) {
|
|
112
|
-
// pad secret key with spaces if it is less than 32 bytes
|
|
113
|
-
return process.env.DEVELOPER_APP_SERVER_SECRET_KEY.padEnd(32, ' ');
|
|
114
|
-
}
|
|
115
|
-
if (process.env.DEVELOPER_APP_SERVER_SECRET_KEY.length > 32) {
|
|
116
|
-
// truncate secret key if it is more than 32 bytes
|
|
117
|
-
return process.env.DEVELOPER_APP_SERVER_SECRET_KEY.slice(0, 32);
|
|
118
|
-
}
|
|
119
|
-
return process.env.DEVELOPER_APP_SERVER_SECRET_KEY;
|
|
120
|
-
}
|
|
121
|
-
|
|
122
|
-
function decode(encryptedData) {
|
|
123
|
-
const decipher = crypto.createDecipheriv('aes-256-cbc', getDeveloperCipherKey(), Buffer.alloc(16, 0));
|
|
124
|
-
return decipher.update(encryptedData, 'hex', 'utf8') + decipher.final('utf8');
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
// ADD static method to get connector by proxyId
|
|
128
|
-
Connector.getProxyConfig = async (proxyId) => {
|
|
129
|
-
const connectors = await Connector
|
|
130
|
-
.query('proxyId')
|
|
131
|
-
.eq(proxyId)
|
|
132
|
-
.using('proxyIdIndex')
|
|
133
|
-
.exec();
|
|
134
|
-
if (connectors.length > 0) {
|
|
135
|
-
const proxyConfig = connectors[0].proxyConfig;
|
|
136
|
-
const encodedSecretKey = connectors[0].encodedSecretKey;
|
|
137
|
-
const secretKey = encodedSecretKey ? decode(encodedSecretKey) : null;
|
|
138
|
-
if (secretKey) {
|
|
139
|
-
proxyConfig.secretKey = secretKey;
|
|
140
|
-
}
|
|
141
|
-
return proxyConfig;
|
|
142
|
-
}
|
|
143
|
-
return null;
|
|
144
|
-
};
|
|
145
|
-
|
|
146
|
-
exports.Connector = Connector;
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
const Sequelize = require('sequelize');
|
|
2
|
-
const { sequelize } = require('./sequelize');
|
|
3
|
-
|
|
4
|
-
// Model for Admin data
|
|
5
|
-
exports.LlmSessionModel = sequelize.define('llmSessions', {
|
|
6
|
-
// LLM session ID
|
|
7
|
-
id: {
|
|
8
|
-
type: Sequelize.STRING,
|
|
9
|
-
primaryKey: true,
|
|
10
|
-
},
|
|
11
|
-
jwtToken: {
|
|
12
|
-
type: Sequelize.STRING,
|
|
13
|
-
},
|
|
14
|
-
expiry: {
|
|
15
|
-
type: Sequelize.DATE
|
|
16
|
-
}
|
|
17
|
-
});
|
package/models/sequelize.js
DELETED
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
const { Sequelize } = require('sequelize');
|
|
2
|
-
|
|
3
|
-
const sequelize = new Sequelize(process.env.DATABASE_URL,
|
|
4
|
-
{
|
|
5
|
-
dialect: 'postgres',
|
|
6
|
-
protocol: 'postgres',
|
|
7
|
-
dialectOptions:{
|
|
8
|
-
ssl: {
|
|
9
|
-
rejectUnauthorized: false
|
|
10
|
-
}
|
|
11
|
-
},
|
|
12
|
-
logging: false
|
|
13
|
-
}
|
|
14
|
-
);
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
exports.sequelize = sequelize;
|
package/models/userModel.js
DELETED
|
@@ -1,45 +0,0 @@
|
|
|
1
|
-
const Sequelize = require('sequelize');
|
|
2
|
-
const { sequelize } = require('./sequelize');
|
|
3
|
-
|
|
4
|
-
// Model for User data
|
|
5
|
-
exports.UserModel = sequelize.define('users', {
|
|
6
|
-
// id = {crmName}-{crmUserId}
|
|
7
|
-
id: {
|
|
8
|
-
type: Sequelize.STRING,
|
|
9
|
-
primaryKey: true,
|
|
10
|
-
},
|
|
11
|
-
rcAccountId: {
|
|
12
|
-
type: Sequelize.STRING,
|
|
13
|
-
},
|
|
14
|
-
hostname: {
|
|
15
|
-
type: Sequelize.STRING,
|
|
16
|
-
},
|
|
17
|
-
timezoneName: {
|
|
18
|
-
type: Sequelize.STRING,
|
|
19
|
-
},
|
|
20
|
-
timezoneOffset: {
|
|
21
|
-
type: Sequelize.STRING,
|
|
22
|
-
},
|
|
23
|
-
platform: {
|
|
24
|
-
type: Sequelize.STRING,
|
|
25
|
-
},
|
|
26
|
-
// in apiKey auth, accessToken will be API key
|
|
27
|
-
accessToken: {
|
|
28
|
-
type: Sequelize.STRING(2000),
|
|
29
|
-
},
|
|
30
|
-
refreshToken: {
|
|
31
|
-
type: Sequelize.STRING(2000),
|
|
32
|
-
},
|
|
33
|
-
tokenExpiry: {
|
|
34
|
-
type: Sequelize.DATE
|
|
35
|
-
},
|
|
36
|
-
platformAdditionalInfo: {
|
|
37
|
-
type: Sequelize.JSON
|
|
38
|
-
},
|
|
39
|
-
hashedRcExtensionId: {
|
|
40
|
-
type: Sequelize.STRING,
|
|
41
|
-
},
|
|
42
|
-
userSettings: {
|
|
43
|
-
type: Sequelize.JSON
|
|
44
|
-
}
|
|
45
|
-
});
|
|
@@ -1,166 +0,0 @@
|
|
|
1
|
-
jest.mock('axios', () => ({
|
|
2
|
-
get: jest.fn(),
|
|
3
|
-
}));
|
|
4
|
-
|
|
5
|
-
jest.mock('../../lib/logger', () => ({
|
|
6
|
-
logger: {
|
|
7
|
-
error: jest.fn(),
|
|
8
|
-
},
|
|
9
|
-
}));
|
|
10
|
-
|
|
11
|
-
const axios = require('axios');
|
|
12
|
-
const { logger } = require('../../lib/logger');
|
|
13
|
-
const {
|
|
14
|
-
getPublicConnectorList,
|
|
15
|
-
getConnectorManifest,
|
|
16
|
-
} = require('../../connector/developerPortal');
|
|
17
|
-
|
|
18
|
-
describe('developerPortal connector', () => {
|
|
19
|
-
beforeEach(() => {
|
|
20
|
-
axios.get.mockReset();
|
|
21
|
-
logger.error.mockReset();
|
|
22
|
-
});
|
|
23
|
-
|
|
24
|
-
test('loads the public connector list', async () => {
|
|
25
|
-
axios.get.mockResolvedValueOnce({
|
|
26
|
-
data: {
|
|
27
|
-
connectors: [
|
|
28
|
-
{ id: 'public-a' },
|
|
29
|
-
{ id: 'public-b' },
|
|
30
|
-
],
|
|
31
|
-
},
|
|
32
|
-
});
|
|
33
|
-
|
|
34
|
-
await expect(getPublicConnectorList()).resolves.toEqual({
|
|
35
|
-
connectors: [
|
|
36
|
-
{ id: 'public-a' },
|
|
37
|
-
{ id: 'public-b' },
|
|
38
|
-
],
|
|
39
|
-
});
|
|
40
|
-
expect(axios.get).toHaveBeenCalledWith('https://appconnect.labs.ringcentral.com/public-api/connectors');
|
|
41
|
-
expect(logger.error).not.toHaveBeenCalled();
|
|
42
|
-
});
|
|
43
|
-
|
|
44
|
-
test('returns null when public connector list loading fails', async () => {
|
|
45
|
-
const error = new Error('network down');
|
|
46
|
-
axios.get.mockRejectedValueOnce(error);
|
|
47
|
-
|
|
48
|
-
await expect(getPublicConnectorList()).resolves.toBeNull();
|
|
49
|
-
|
|
50
|
-
expect(logger.error).toHaveBeenCalledWith('Error getting public connector list:', error);
|
|
51
|
-
});
|
|
52
|
-
|
|
53
|
-
test('loads a public connector manifest by id', async () => {
|
|
54
|
-
axios.get.mockResolvedValueOnce({
|
|
55
|
-
data: {
|
|
56
|
-
id: 'salesforce',
|
|
57
|
-
name: 'Salesforce',
|
|
58
|
-
},
|
|
59
|
-
});
|
|
60
|
-
|
|
61
|
-
await expect(getConnectorManifest({
|
|
62
|
-
connectorId: 'salesforce',
|
|
63
|
-
})).resolves.toEqual({
|
|
64
|
-
id: 'salesforce',
|
|
65
|
-
name: 'Salesforce',
|
|
66
|
-
});
|
|
67
|
-
expect(axios.get).toHaveBeenCalledWith('https://appconnect.labs.ringcentral.com/public-api/connectors/salesforce/manifest');
|
|
68
|
-
});
|
|
69
|
-
|
|
70
|
-
test('loads a private connector manifest for the requesting account', async () => {
|
|
71
|
-
axios.get
|
|
72
|
-
.mockResolvedValueOnce({
|
|
73
|
-
data: {
|
|
74
|
-
privateConnectors: [
|
|
75
|
-
{ id: 'private-crm' },
|
|
76
|
-
],
|
|
77
|
-
sharedConnectors: [],
|
|
78
|
-
},
|
|
79
|
-
})
|
|
80
|
-
.mockResolvedValueOnce({
|
|
81
|
-
data: {
|
|
82
|
-
id: 'private-crm',
|
|
83
|
-
access: 'internal',
|
|
84
|
-
},
|
|
85
|
-
});
|
|
86
|
-
|
|
87
|
-
await expect(getConnectorManifest({
|
|
88
|
-
rcAccountId: 'rc-account-1',
|
|
89
|
-
connectorId: 'private-crm',
|
|
90
|
-
isPrivate: true,
|
|
91
|
-
})).resolves.toEqual({
|
|
92
|
-
id: 'private-crm',
|
|
93
|
-
access: 'internal',
|
|
94
|
-
});
|
|
95
|
-
|
|
96
|
-
expect(axios.get).toHaveBeenNthCalledWith(
|
|
97
|
-
1,
|
|
98
|
-
'https://appconnect.labs.ringcentral.com/public-api/connectors/internal?accountId=rc-account-1',
|
|
99
|
-
);
|
|
100
|
-
expect(axios.get).toHaveBeenNthCalledWith(
|
|
101
|
-
2,
|
|
102
|
-
'https://appconnect.labs.ringcentral.com/public-api/connectors/private-crm/manifest?access=internal&type=connector&accountId=rc-account-1',
|
|
103
|
-
);
|
|
104
|
-
});
|
|
105
|
-
|
|
106
|
-
test('loads a shared private connector manifest from the owner account', async () => {
|
|
107
|
-
axios.get
|
|
108
|
-
.mockResolvedValueOnce({
|
|
109
|
-
data: {
|
|
110
|
-
privateConnectors: [],
|
|
111
|
-
sharedConnectors: [
|
|
112
|
-
{ id: 'shared-crm', accountId: 'owner-account' },
|
|
113
|
-
],
|
|
114
|
-
},
|
|
115
|
-
})
|
|
116
|
-
.mockResolvedValueOnce({
|
|
117
|
-
data: {
|
|
118
|
-
id: 'shared-crm',
|
|
119
|
-
ownerAccountId: 'owner-account',
|
|
120
|
-
},
|
|
121
|
-
});
|
|
122
|
-
|
|
123
|
-
await expect(getConnectorManifest({
|
|
124
|
-
rcAccountId: 'viewer-account',
|
|
125
|
-
connectorId: 'shared-crm',
|
|
126
|
-
isPrivate: true,
|
|
127
|
-
})).resolves.toEqual({
|
|
128
|
-
id: 'shared-crm',
|
|
129
|
-
ownerAccountId: 'owner-account',
|
|
130
|
-
});
|
|
131
|
-
|
|
132
|
-
expect(axios.get).toHaveBeenNthCalledWith(
|
|
133
|
-
2,
|
|
134
|
-
'https://appconnect.labs.ringcentral.com/public-api/connectors/shared-crm/manifest?access=internal&type=connector&accountId=owner-account',
|
|
135
|
-
);
|
|
136
|
-
});
|
|
137
|
-
|
|
138
|
-
test('returns null when a private connector is not visible to the account', async () => {
|
|
139
|
-
axios.get.mockResolvedValueOnce({
|
|
140
|
-
data: {
|
|
141
|
-
privateConnectors: [],
|
|
142
|
-
sharedConnectors: [],
|
|
143
|
-
},
|
|
144
|
-
});
|
|
145
|
-
|
|
146
|
-
await expect(getConnectorManifest({
|
|
147
|
-
rcAccountId: 'rc-account-2',
|
|
148
|
-
connectorId: 'missing-crm',
|
|
149
|
-
isPrivate: true,
|
|
150
|
-
})).resolves.toBeNull();
|
|
151
|
-
|
|
152
|
-
expect(logger.error.mock.calls[0][0]).toBe('Error getting connector manifest:');
|
|
153
|
-
expect(logger.error.mock.calls[0][1].message).toBe('Connector not found');
|
|
154
|
-
});
|
|
155
|
-
|
|
156
|
-
test('returns null when public manifest loading fails', async () => {
|
|
157
|
-
const error = new Error('manifest unavailable');
|
|
158
|
-
axios.get.mockRejectedValueOnce(error);
|
|
159
|
-
|
|
160
|
-
await expect(getConnectorManifest({
|
|
161
|
-
connectorId: 'broken-crm',
|
|
162
|
-
})).resolves.toBeNull();
|
|
163
|
-
|
|
164
|
-
expect(logger.error).toHaveBeenCalledWith('Error getting connector manifest:', error);
|
|
165
|
-
});
|
|
166
|
-
});
|
|
@@ -1,131 +0,0 @@
|
|
|
1
|
-
jest.mock('shortid', () => ({
|
|
2
|
-
generate: jest.fn(() => 'mock-log-id'),
|
|
3
|
-
}));
|
|
4
|
-
|
|
5
|
-
const mockConnector = require('../../connector/mock');
|
|
6
|
-
const { UserModel } = require('../../models/userModel');
|
|
7
|
-
const { CallLogModel } = require('../../models/callLogModel');
|
|
8
|
-
|
|
9
|
-
describe('mock connector', () => {
|
|
10
|
-
beforeEach(async () => {
|
|
11
|
-
await CallLogModel.destroy({ where: {} });
|
|
12
|
-
await UserModel.destroy({ where: {} });
|
|
13
|
-
});
|
|
14
|
-
|
|
15
|
-
test('creates and deletes the mock user idempotently', async () => {
|
|
16
|
-
const firstUser = await mockConnector.createUser();
|
|
17
|
-
const secondUser = await mockConnector.createUser();
|
|
18
|
-
|
|
19
|
-
expect(firstUser.id).toBe('mockUser');
|
|
20
|
-
expect(secondUser.id).toBe('mockUser');
|
|
21
|
-
await expect(UserModel.count({ where: { id: 'mockUser' } })).resolves.toBe(1);
|
|
22
|
-
|
|
23
|
-
await expect(mockConnector.deleteUser()).resolves.toBe(true);
|
|
24
|
-
await expect(mockConnector.deleteUser()).resolves.toBe(false);
|
|
25
|
-
await expect(UserModel.findByPk('mockUser')).resolves.toBeNull();
|
|
26
|
-
});
|
|
27
|
-
|
|
28
|
-
test('creates a mock call log only once for the same session identity', async () => {
|
|
29
|
-
await mockConnector.createCallLog({
|
|
30
|
-
sessionId: 'session-1',
|
|
31
|
-
extensionNumber: 101,
|
|
32
|
-
hashedExtensionId: 'hash-101',
|
|
33
|
-
});
|
|
34
|
-
await mockConnector.createCallLog({
|
|
35
|
-
sessionId: 'session-1',
|
|
36
|
-
extensionNumber: '101',
|
|
37
|
-
hashedExtensionId: 'hash-101',
|
|
38
|
-
});
|
|
39
|
-
|
|
40
|
-
const records = await CallLogModel.findAll({
|
|
41
|
-
where: {
|
|
42
|
-
sessionId: 'session-1',
|
|
43
|
-
},
|
|
44
|
-
});
|
|
45
|
-
expect(records).toHaveLength(1);
|
|
46
|
-
expect(records[0]).toMatchObject({
|
|
47
|
-
id: 'mock-log-id',
|
|
48
|
-
sessionId: 'session-1',
|
|
49
|
-
extensionNumber: '101',
|
|
50
|
-
hashedExtensionId: 'hash-101',
|
|
51
|
-
userId: 'mockUser',
|
|
52
|
-
});
|
|
53
|
-
});
|
|
54
|
-
|
|
55
|
-
test('returns matched and unmatched call logs in requested session order', async () => {
|
|
56
|
-
await mockConnector.createCallLog({
|
|
57
|
-
sessionId: 'session-1',
|
|
58
|
-
extensionNumber: '101',
|
|
59
|
-
hashedExtensionId: 'hash-101',
|
|
60
|
-
});
|
|
61
|
-
await mockConnector.createCallLog({
|
|
62
|
-
sessionId: 'session-3',
|
|
63
|
-
extensionNumber: '101',
|
|
64
|
-
hashedExtensionId: 'hash-101',
|
|
65
|
-
});
|
|
66
|
-
|
|
67
|
-
await expect(mockConnector.getCallLog({
|
|
68
|
-
sessionIds: 'session-1,session-2,session-3',
|
|
69
|
-
extensionNumber: '101',
|
|
70
|
-
hashedExtensionId: 'hash-101',
|
|
71
|
-
})).resolves.toEqual([
|
|
72
|
-
{ sessionId: 'session-1', matched: true, logId: 'mockThirdPartyLogId' },
|
|
73
|
-
{ sessionId: 'session-2', matched: false },
|
|
74
|
-
{ sessionId: 'session-3', matched: true, logId: 'mockThirdPartyLogId' },
|
|
75
|
-
]);
|
|
76
|
-
});
|
|
77
|
-
|
|
78
|
-
test('falls back to legacy extension matching when hashed extension id does not match', async () => {
|
|
79
|
-
await CallLogModel.create({
|
|
80
|
-
id: 'legacy-log-id',
|
|
81
|
-
sessionId: 'session-legacy',
|
|
82
|
-
extensionNumber: '101',
|
|
83
|
-
hashedExtensionId: '',
|
|
84
|
-
userId: 'mockUser',
|
|
85
|
-
});
|
|
86
|
-
|
|
87
|
-
await expect(mockConnector.getCallLog({
|
|
88
|
-
sessionIds: 'session-legacy',
|
|
89
|
-
extensionNumber: '101',
|
|
90
|
-
hashedExtensionId: 'new-hash-101',
|
|
91
|
-
})).resolves.toEqual([
|
|
92
|
-
{ sessionId: 'session-legacy', matched: true, logId: 'mockThirdPartyLogId' },
|
|
93
|
-
]);
|
|
94
|
-
});
|
|
95
|
-
|
|
96
|
-
test('cleanUpMockLogs removes only mock user call logs', async () => {
|
|
97
|
-
await CallLogModel.bulkCreate([
|
|
98
|
-
{
|
|
99
|
-
id: 'mock-log',
|
|
100
|
-
sessionId: 'mock-session',
|
|
101
|
-
extensionNumber: '',
|
|
102
|
-
hashedExtensionId: '',
|
|
103
|
-
userId: 'mockUser',
|
|
104
|
-
},
|
|
105
|
-
{
|
|
106
|
-
id: 'real-log',
|
|
107
|
-
sessionId: 'real-session',
|
|
108
|
-
extensionNumber: '',
|
|
109
|
-
hashedExtensionId: '',
|
|
110
|
-
userId: 'realUser',
|
|
111
|
-
},
|
|
112
|
-
]);
|
|
113
|
-
|
|
114
|
-
await mockConnector.cleanUpMockLogs();
|
|
115
|
-
|
|
116
|
-
await expect(CallLogModel.findOne({
|
|
117
|
-
where: {
|
|
118
|
-
userId: 'mockUser',
|
|
119
|
-
},
|
|
120
|
-
})).resolves.toBeNull();
|
|
121
|
-
const realLog = await CallLogModel.findOne({
|
|
122
|
-
where: {
|
|
123
|
-
userId: 'realUser',
|
|
124
|
-
},
|
|
125
|
-
});
|
|
126
|
-
expect(realLog).toMatchObject({
|
|
127
|
-
id: 'real-log',
|
|
128
|
-
sessionId: 'real-session',
|
|
129
|
-
});
|
|
130
|
-
});
|
|
131
|
-
});
|