yaml-admin-api 0.0.111 → 0.0.112

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml-admin-api",
-  "version": "0.0.111",
+  "version": "0.0.112",
   "license": "MIT",
   "description": "YAML Admin API package",
   "type": "commonjs",

package/src/common/Uploader.js

@@ -6,8 +6,8 @@ class Uploader {
         this._uploader = uploader;
     }
 
-    async getSecureUrl(key, auth) {
-        return await this._uploader.getUrlSecure(key, auth);
+    async getSecureUrl(key) {
+        return await this._uploader.getUrlSecure(key);
     }
 
     async upload(key, stream) {
@@ -22,7 +22,7 @@ class Uploader {
         return await this._uploader.getUrl(key);
     }
 
-    static init(yml) {
+    static init(yml, auth) {
         const api_host = yml['api-host']?.uri;
         const raw = yml.upload.s3
             ? withConfigS3({
@@ -39,6 +39,7 @@ class Uploader {
                 path_private: yml.upload.local.path_private,
                 base_url: yml.upload.local.base_url,
                 api_host,
+                auth,
             });
         Uploader._instance = new Uploader(raw);
         return Uploader._instance;

package/src/crud/entity-api-generator.js

@@ -193,7 +193,7 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
             url= host_image + '/' + url
 
         if(private) {
-            url = await uploader.getSecureUrl(key, auth);
+            url = await uploader.getSecureUrl(key);
         }
 
         return url
@@ -580,7 +580,7 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
             const currentTime = moment().format('YYYYMMDD_HHmmss');
             const key = `excel/${filename}${currentTime}.xlsx`;
             await uploader.uploadSecure(key, excelBuffer);
-            let url = await uploader.getSecureUrl(key, auth);
+            let url = await uploader.getSecureUrl(key);
             return res.json({ r: true, url });
         }))
     }

package/src/upload/localUpload.js

@@ -1,7 +1,7 @@
 const moment = require('moment')
 const fs = require('fs')
 
-const withConfigLocal = ({path, path_private, base_url, api_host}) => {
+const withConfigLocal = ({path, path_private, base_url, api_host, auth}) => {
 
     const upload = async (key, stream) => {
         return await fs.writeFileSync(path + '/' + key, stream)
@@ -11,7 +11,7 @@ const withConfigLocal = ({path, path_private, base_url, api_host}) => {
         return await fs.writeFileSync(path_private + '/' + key, stream)
     }
 
-    const getUrlSecure = async (Key, auth) => { 
+    const getUrlSecure = async (Key) => {
         let r = `${api_host}/local-secure-download?key=${Key}`
         let shortToken = await auth.genenrateShortToken()
         r += `&token=${shortToken}`

package/src/yml-admin-api.js

@@ -44,8 +44,6 @@ async function registerRoutes(app, options = {}) {
 
   
 
-  const uploader = Uploader.init(yml);
-
   const {database, entity} = yml;
   let db = null;
   if(database) {
@@ -57,9 +55,14 @@ async function registerRoutes(app, options = {}) {
     }
   }
 
+  //local secure download api
+  const auth = withConfig({ db, jwt_secret: yml.login["jwt-secret"] });
+
+  const uploader = Uploader.init(yml, auth);
+
   await generateLoginApi(app, db, yml, api_prefix)
   await generateChartApi(app, db, yml, api_prefix)
-  
+
   entity && Object.keys(entity).forEach(async (entity_name) => {
     await generateEntityApi({
       app, db,
@@ -75,9 +78,6 @@ async function registerRoutes(app, options = {}) {
     yml,
     options,
   })
-  
-  //local secure download api
-  const auth = withConfig({ db, jwt_secret: yml.login["jwt-secret"] });
   app.get(api_prefix + '/local-secure-download', auth.isAuthenticated, async (req, res) => {
     const {key} = req.query;
     const a = `${yml.upload.local.path_private}/${key}`