diff --git a/src/config/supportedApps.js b/src/config/supportedApps.js index ce76d56..d885e1c 100644 --- a/src/config/supportedApps.js +++ b/src/config/supportedApps.js @@ -2,10 +2,18 @@ * Pick parameters which are significant for including into license file */ exports.pickParams = function (appId, systemParams) { -// if (appId === 'coc') { - const appParams = ['biosSerialNum', 'osId', 'mainboardSerialNum', 'diskSerialNum', 'nicMac']; - const requiredParams = 2; -// } + let appParams = ['biosSerialNum', 'osId', 'mainboardSerialNum', 'diskSerialNum', 'nicMac']; + let requiredParams = 2; + + if (appId === 'cocserver') { + if (systemParams.hasOwnProperty("cpuIdHypervisor"))) { + appParams = ['osId', 'computerUUID', 'cpuIdModel', 'nicMac', 'diskSerialNum', 'nicMac', 'mainboardSerialNum', 'computerSerial']; + requiredParams = 3 + } + else { + appParams = ['osId', 'computerUUID', 'mainboardSerialNum', 'computerSerial', 'diskSerialNum', 'nicMac', 'cpuIdModel']; + } + } let resParams = {}; console.log(systemParams) @@ -20,4 +28,4 @@ exports.pickParams = function (appId, systemParams) { } return null; -}; \ No newline at end of file +}; diff --git a/src/controllers/temp-controller.js b/src/controllers/temp-controller.js index c9b8530..fb2c78d 100644 --- a/src/controllers/temp-controller.js +++ b/src/controllers/temp-controller.js @@ -29,7 +29,7 @@ module.exports = { async parseOfflineActivationRequest(ctx) { const { body } = ctx.request - + console.log(body) ctx.body = await parseOfflinePreactivationRequest(checkRequestString(body.requestString)) } diff --git a/test/nodb-services.js b/test/nodb-services.js new file mode 100644 index 0000000..32f24cf --- /dev/null +++ b/test/nodb-services.js @@ -0,0 +1,30 @@ +const Koa = require('koa') +const Router = require('koa-router') +const app = new Koa() +const cors = require('kcors') +const bodyParser = require('koa-bodyparser') +const { generateNewLicense, parseOfflineActivationRequest } = require("../src/controllers/temp-controller.js") + +const router = new Router() + +router.get('/temp/generate-new-license', generateNewLicense) +router.post('/temp/parse-offline-activation-request', parseOfflineActivationRequest); + +app.use(cors({ + origin: '*', + exposeHeaders: ['Authorization'], + credentials: true, + allowMethods: ['GET', 'PUT', 'POST', 'DELETE'], + allowHeaders: ['Authorization', 'Content-Type'], + keepHeadersOnError: true +})) + +app.use(bodyParser({ + enableTypes: ['json'] +})) + + +// response +app.use(router.routes()) + +app.listen(3001, () => console.log('server started 3001'))