fix: improve plugin auth structure

verdaccio · Jun 14, 2022 · cb333bb · cb333bb
1 parent 41dde4b
commit cb333bb
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 12 deletions.
diff --git a/.changeset/forty-keys-suffer.md b/.changeset/forty-keys-suffer.md
@@ -0,0 +1,6 @@
+---
+"generator-verdaccio-plugin": minor
+---
+
+fix: improve plugin structure auth
+
diff --git a/src/app/index.ts b/src/app/index.ts
@@ -43,7 +43,6 @@ class VerdaccioPluginGenerator extends Generator {
           {value: 'auth'},
           {value: 'storage'},
           {value: 'middleware'},
-          {value: 'theme'},
         ],
       },
       {

diff --git a/src/app/templates/typescript/auth/_package.json b/src/app/templates/typescript/auth/_package.json
@@ -2,8 +2,8 @@
   "name": "<%= name %>",
   "version": "0.0.1",
   "description": "<%= description %>",
-  "main": "src/index.js",
-  "types": "src/index.d.ts",
+  "main": "lib/src/index.js",
+  "types": "lib/src/index.d.ts",
   "engines": {
     "node": ">=12"
   },

diff --git a/src/app/templates/typescript/auth/src/index.ts b/src/app/templates/typescript/auth/src/index.ts
@@ -7,6 +7,7 @@ import {
   RemoteUser,
   Logger,
 } from '@verdaccio/types';
+import {getInternalError} from '@verdaccio/commons-api';
 
 import {CustomConfig} from '../types/index';
 
@@ -33,7 +34,7 @@ export default class AuthCustomPlugin implements IPluginAuth<CustomConfig> {
       if (this.foo) {
         cb(null, ['group-foo', 'group-bar']);
       } else {
-        cb('error, try again', false);
+        cb(getInternalError("error, try again"), false);
       }
     */
   }
@@ -52,7 +53,7 @@ export default class AuthCustomPlugin implements IPluginAuth<CustomConfig> {
       cb(null, true)
     } else {
       this.logger.error({name: user.name}, '@{name} is not allowed to access this package');
-      cb('error, try again', false);
+       cb(getInternalError("error, try again"), false);
     }
      */
   }
@@ -71,7 +72,7 @@ export default class AuthCustomPlugin implements IPluginAuth<CustomConfig> {
       cb(null, true)
     } else {
       this.logger.error({name: user.name}, '@{name} is not allowed to publish this package');
-      cb('error, try again', false);
+       cb(getInternalError("error, try again"), false);
     }
      */
   }
@@ -84,7 +85,7 @@ export default class AuthCustomPlugin implements IPluginAuth<CustomConfig> {
       cb(null, true)
     } else {
       this.logger.error({name: user.name}, '@{name} is not allowed to publish this package');
-      cb('error, try again', false);
+      cb(getInternalError("error, try again"), false);
     }
      */
   }

diff --git a/src/app/templates/typescript/common/eslintignore b/src/app/templates/typescript/common/eslintignore
@@ -1 +1,2 @@
 node_modules
+lib/
diff --git a/src/app/templates/typescript/common/tsconfig.json b/src/app/templates/typescript/common/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "esnext",
+    "target": "es6",
     "module": "commonjs",
     "declaration": true,
     "allowJs": false,

diff --git a/src/app/templates/typescript/middleware/_package.json b/src/app/templates/typescript/middleware/_package.json
@@ -2,8 +2,8 @@
   "name": "<%= name %>",
   "version": "0.0.1",
   "description": "<%= description %>",
-  "main": "src/index.js",
-  "types": "src/index.d.ts",
+  "main": "lib/src/index.js",
+  "types": "lib/src/index.d.ts",
   "engines": {
     "node": ">=12"
   },

diff --git a/src/app/templates/typescript/storage/_package.json b/src/app/templates/typescript/storage/_package.json
@@ -2,8 +2,8 @@
   "name": "<%= name %>",
   "version": "0.0.1",
   "description": "<%= description %>",
-  "main": "src/index.js",
-  "types": "src/index.d.ts",
+  "main": "lib/src/index.js",
+  "types": "lib/src/index.d.ts",
   "engines": {
     "node": ">=12"
   },