github.com/verdaccio
1
0
Fork 0
mirror of https://github.com/verdaccio/verdaccio.git synced 2024-11-13 03:35:52 +01:00
Code Releases Wiki Activity

fix: avoid issues with missing token #693

Browse Source 
also refactor other parts as string and constants
This commit is contained in:
Juan Picado @jotadeveloper 2018-05-14 20:08:49 +02:00
parent 752d129207
commit 08f6a64063
No known key found for this signature in database
GPG Key ID: 18AC54485952D158
3 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/lib/up-storage.js
View File

@ -38,6 +38,10 @@ const setConfig = (config, key, def) => {
return _.isNil(config[key]) === false ? config[key] : def; return _.isNil(config[key]) === false ? config[key] : def;
}; };
export const TOKEN_BASIC = 'basic';
export const TOKEN_BEARER = 'bearer';
export const DEFAULT_REGISTRY = 'https://registry.npmjs.org/';
/** /**
* Implements Storage interface * Implements Storage interface
* (same for storage.js, local-storage.js, up-storage.js) * (same for storage.js, local-storage.js, up-storage.js)
@ -266,33 +270,45 @@ class ProxyStorage implements IProxy {
* @private * @private
*/ */
_setAuth(headers: any) { _setAuth(headers: any) {
const auth = this.config.auth; const {auth} = this.config;
if (typeof auth === 'undefined' || headers['authorization']) { if (_.isNil(auth) || headers['authorization']) {
return headers; return headers;
} }
if (!_.isObject(this.config.auth)) { // $FlowFixMe
if (_.isObject(auth) === false && _.isObject(auth.token) === false) {
this._throwErrorAuth('Auth invalid'); this._throwErrorAuth('Auth invalid');
} }
// get NPM_TOKEN http://blog.npmjs.org/post/118393368555/deploying-with-npm-private-modules // get NPM_TOKEN http://blog.npmjs.org/post/118393368555/deploying-with-npm-private-modules
// or get other variable export in env // or get other variable export in env
let token: any = process.env.NPM_TOKEN; // https://github.com/verdaccio/verdaccio/releases/tag/v2.5.0
let token: any;
const tokenConf: any = auth;
if (auth.token) { if (_.isNil(tokenConf.token) === false && _.isString(tokenConf.token)) {
token = auth.token; token = tokenConf.token;
} else if (auth.token_env ) { } else if (_.isNil(tokenConf.token_env) === false) {
// $FlowFixMe // $FlowFixMe
token = process.env[auth.token_env]; if (_.isString(tokenConf.token_env)) {
token = process.env[tokenConf.token_env];
} else if (_.isBoolean(tokenConf.token_env) && tokenConf.token_env) {
token = process.env.NPM_TOKEN;
} else {
this.logger.error('token is required' );
this._throwErrorAuth('token is required');
}
} else {
token = process.env.NPM_TOKEN;
} }
if (_.isNil(token)) { if (_.isNil(token)) {
this._throwErrorAuth('Token is required'); this._throwErrorAuth('token is required');
} }
// define type Auth allow basic and bearer // define type Auth allow basic and bearer
const type = auth.type; const type = tokenConf.type || TOKEN_BASIC;
this._setHeaderAuthorization(headers, type, token); this._setHeaderAuthorization(headers, type, token);
return headers; return headers;
@ -315,8 +331,8 @@ class ProxyStorage implements IProxy {
* @param {string} token * @param {string} token
* @private * @private
*/ */
_setHeaderAuthorization(headers: any, type: string, token: string) { _setHeaderAuthorization(headers: any, type: string, token: any) {
if (type !== 'bearer' && type !== 'basic') { if (type !== TOKEN_BEARER && type !== TOKEN_BASIC) {
this._throwErrorAuth(`Auth type '${type}' not allowed`); this._throwErrorAuth(`Auth type '${type}' not allowed`);
} }

4
test/functional/uplink.auth.spec.js
View File

@ -1,9 +1,9 @@
import assert from 'assert'; import assert from 'assert';
import ProxyStorage from '../../src/lib/up-storage'; import ProxyStorage, {DEFAULT_REGISTRY} from '../../src/lib/up-storage';
function createUplink(config) { function createUplink(config) {
const defaultConfig = { const defaultConfig = {
url: 'https://registry.npmjs.org/' url: DEFAULT_REGISTRY
}; };
let mergeConfig = Object.assign({}, defaultConfig, config); let mergeConfig = Object.assign({}, defaultConfig, config);
return new ProxyStorage(mergeConfig, {}); return new ProxyStorage(mergeConfig, {});

4
test/unit/up-storage.spec.js
View File

@ -1,6 +1,6 @@
// @flow // @flow
import _ from 'lodash'; import _ from 'lodash';
import ProxyStorage from '../../src/lib/up-storage'; import ProxyStorage, {DEFAULT_REGISTRY} from '../../src/lib/up-storage';
import AppConfig from '../../src/lib/config'; import AppConfig from '../../src/lib/config';
// $FlowFixMe // $FlowFixMe
import configExample from './partials/config'; import configExample from './partials/config';
@ -15,7 +15,7 @@ describe('UpStorge', () => {
jest.setTimeout(10000); jest.setTimeout(10000);
const uplinkDefault = { const uplinkDefault = {
url: 'https://registry.npmjs.org/' url: DEFAULT_REGISTRY
}; };
const generateProxy = (config: UpLinkConf = uplinkDefault) => { const generateProxy = (config: UpLinkConf = uplinkDefault) => {
const appConfig: Config = new AppConfig(configExample); const appConfig: Config = new AppConfig(configExample);