@steedos/service-package-registry 2.5.3-beta.21 → 2.5.3-beta.23

package/main/default/routes/nodes.router.js

@@ -5,8 +5,6 @@ const registry = require('../manager/registry');
 const loader = require('../manager/loader');
 const objectql = require('@steedos/objectql');
 let schema = objectql.getSteedosSchema();
-
-const packageInstallationNodeID = process.env.STEEDOS_PACKAGE_INSTALLATION_NODEID || null;
 router.get('/api/nodes/install', core.requireAuthentication, async function (req, res) {
     const userSession = req.user;
     const isSpaceAdmin = userSession.is_space_admin;
@@ -15,12 +13,12 @@ router.get('/api/nodes/install', core.requireAuthentication, async function (req
         return res.status(401).send({ message: 'No permission' });
     }
     try {
-        const { module, version, label, description} = body || {};
+        const { module, version, label, description, nodeID} = body || {};
         let broker = schema.broker;
         const result = await broker.call(`~packages-project-server.installPackage`, {
             module, version, label, description
         },{
-            nodeID: packageInstallationNodeID
+            nodeID: nodeID
         })
         res.redirect(302, `/app/admin/steedos_packages/grid/all`);
         // res.status(200).send(result); //TODO 完善返回信息
@@ -45,7 +43,7 @@ router.post('/api/nodes/uninstall', core.requireAuthentication, async function (
         const result = await broker.call(`~packages-project-server.uninstallPackage`, {
             module
         },{
-            nodeID: packageInstallationNodeID
+            nodeID: nodeID
         })
         res.status(200).send(result); //TODO 完善返回信息
     } catch (error) {
@@ -67,7 +65,7 @@ router.post('/api/nodes/reload', core.requireAuthentication, async function (req
         const result = await broker.call(`~packages-project-server.reloadPackage`, {
             module
         },{
-            nodeID: packageInstallationNodeID
+            nodeID: nodeID
         })
         res.status(200).send(result);
     } catch (error) {
@@ -86,11 +84,10 @@ router.post('/api/nodes/disable', core.requireAuthentication, async function (re
     try {
         const { module, nodeID} = body || {};
         let broker = schema.broker;
-        console.log(`disablePackage ${module}, node id is`, packageInstallationNodeID)
         const result = await broker.call(`~packages-project-server.disablePackage`, {
             module
         },{
-            nodeID: packageInstallationNodeID
+            nodeID: nodeID
         })
         res.status(200).send(result);
     } catch (error) {
@@ -112,7 +109,7 @@ router.post('/api/nodes/enable', core.requireAuthentication, async function (req
         const result = await broker.call(`~packages-project-server.enablePackage`, {
             module
         },{
-            nodeID: packageInstallationNodeID
+            nodeID: nodeID
         })
         res.status(200).send(result);
     } catch (error) {
@@ -137,8 +134,6 @@ router.get('/api/nodes/versions', core.requireAuthentication, async function (re
         let broker = schema.broker;
         const result = await broker.call(`~packages-project-server.getPackageVersions`, {
             module
-        },{
-            nodeID: packageInstallationNodeID
         })
         res.status(200).send(result); //TODO 完善返回信息
     } catch (error) {
@@ -159,8 +154,6 @@ router.post('/api/nodes/upgrade', core.requireAuthentication, async function (re
         let broker = schema.broker;
         const result = await broker.call(`~packages-project-server.upgradePackage`, {
             module, version
-        },{
-            nodeID: packageInstallationNodeID
         })
         res.status(200).send(result);
     } catch (error) {
@@ -169,58 +162,5 @@ router.post('/api/nodes/upgrade', core.requireAuthentication, async function (re
     }
 });
 
-router.get('/api/nodes/cloud/saas/packages/purchased', core.requireAuthentication, async function (req, res) {
-    const userSession = req.user;
-    try {
-        let broker = schema.broker;
-        const result = await broker.call(`~packages-project-server.getCloudSaasPurchasedPackages`, {
-        }, {
-            nodeID: packageInstallationNodeID,
-            meta: {
-                user: userSession
-            }
-        })
-        res.status(200).send(result);
-    } catch (error) {
-        console.error(error);
-        res.status(500).send(error.message);
-    }
-});
-
-router.post('/api/nodes/cloud/saas/packages/purchased', core.requireAuthentication, async function(req, res){
-    const userSession = req.user;
-    try {
-        let broker = schema.broker;
-        const result = await broker.call(`~packages-project-server.installPurchasedPackages`, {}, {
-            nodeID: packageInstallationNodeID,
-            meta: {
-                user: userSession
-            }
-        })
-        res.status(200).send(result);
-    } catch (error) {
-        console.error(error);
-        res.status(500).send(error.message);
-    }
-});
-
-router.post('/api/nodes/cloud/saas/packages/url', core.requireAuthentication, async function(req, res){
-    const userSession = req.user;
-    try {
-        let broker = schema.broker;
-        const { module, version, url, auth, registry_url } = req.body;
-        const result = await broker.call(`~packages-project-server.installPackageFromUrl`, {module, version, url, auth, registry_url}, {
-            nodeID: packageInstallationNodeID,
-            meta: {
-                user: userSession
-            }
-        })
-        res.status(200).send(result);
-    } catch (error) {
-        console.error(error);
-        res.status(500).send(error.message);
-    }
-})
-
 
 exports.default = router;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-registry",
-  "version": "2.5.3-beta.21",
+  "version": "2.5.3-beta.23",
   "description": "",
   "main": "package.service.js",
   "scripts": {
@@ -9,11 +9,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "2.5.3-beta.21",
-    "@steedos/core": "2.5.3-beta.21",
-    "@steedos/metadata-core": "2.5.3-beta.21",
-    "@steedos/objectql": "2.5.3-beta.21",
-    "@steedos/service-package-loader": "2.5.3-beta.21",
+    "@steedos/auth": "2.5.3-beta.23",
+    "@steedos/core": "2.5.3-beta.23",
+    "@steedos/metadata-core": "2.5.3-beta.23",
+    "@steedos/objectql": "2.5.3-beta.23",
+    "@steedos/service-package-loader": "2.5.3-beta.23",
     "fs-extra": "8.1.0",
     "i18next": "20.3.2",
     "json-stringify-safe": "5.0.1",
@@ -31,5 +31,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b4313a2ef5d18ef1cf9271bd3c89b2d6fe52d65b"
+  "gitHead": "8fd9cf35d29f8f71e11790bd010bf5b045e7ebc4"
 }

package/project.package.service.js

@@ -16,7 +16,6 @@ const { MoleculerError } = require("moleculer").Errors;
 const validator = require('validator');
 const npa = require("npm-package-arg");
 const login = require('./main/default/manager/login');
-// const objectql = require('@steedos/objectql');
 
 const HEADER_AUTH = 'Authorization';
 const AUTH_TYPE = 'Bearer';
@@ -559,7 +558,6 @@ module.exports = {
 	 * Service started lifecycle event handler
 	 */
 	async started() {
-		// objectql.getSteedosSchema(this.broker);
 		try {
 			await this.loginSteedosRegistry();
 			console.info(`login steedos registry success`);