Infrastructure/verdaccio
0
Fork 0
mirror of https://github.com/verdaccio/verdaccio.git synced 2025-04-01 02:42:23 -05:00
Code Issues Activity

wip

Browse source
This commit is contained in:
Ayush Sharma 2019-03-01 17:16:13 +01:00
parent ea6b6c7efc
commit 07d9aebc62
11 changed files with 96 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/api/web/endpoint/package.js
View file

@ -4,11 +4,10 @@
*/
import _ from 'lodash';
import { addScope, addGravatarSupport, deleteProperties, sortByName, parseReadme } from '../../../lib/utils';
import { addScope, addGravatarSupport, deleteProperties, sortByName, parseReadme, formatAuthor } from '../../../lib/utils';
import { allow } from '../../middleware';
import { DIST_TAGS, HEADER_TYPE, HEADERS, HTTP_STATUS } from '../../../lib/constants';
import { generateGravatarUrl } from '../../../utils/user';
import { formatAuthor } from '../../../webui/utils/package';
import logger from '../../../lib/logger';
import type { Router } from 'express';
import type { IAuth, $ResponseExtend, $RequestExtend, $NextFunctionVer, IStorageHandler, $SidebarPackage } from '../../../../types';
@ -104,6 +103,7 @@ function addPackageWebApi(route: Router, storage: IStorageHandler, auth: IAuth,
if (_.isNil(err)) {
let sideBarInfo: any = _.clone(info);
sideBarInfo.latest = info.versions[info[DIST_TAGS].latest];
sideBarInfo.latest.author = formatAuthor(sideBarInfo.latest.author);
sideBarInfo = deleteProperties(['readme', '_attachments', '_rev', 'name'], sideBarInfo);
if (config.web) {
sideBarInfo = addGravatarSupport(sideBarInfo, config.web.gravatar);

1
src/lib/constants.js
View file

@ -11,6 +11,7 @@ export const TIME_EXPIRATION_24H: string = '24h';
export const TIME_EXPIRATION_7D: string = '7d';
export const DIST_TAGS = 'dist-tags';
export const DEFAULT_MIN_LIMIT_PASSWORD: number = 3;
export const DEFAULT_USER = 'Anonymous';
export const keyPem = 'verdaccio-key.pem';
export const certPem = 'verdaccio-cert.pem';

40
src/lib/utils.js
View file

@ -1,6 +1,5 @@
/**
* @prettier
* @flow
*/
import _ from 'lodash';
@ -12,7 +11,7 @@ import URL from 'url';
import createError from 'http-errors';
import marked from 'marked';
import { HTTP_STATUS, API_ERROR, DEFAULT_PORT, DEFAULT_DOMAIN, DEFAULT_PROTOCOL, CHARACTER_ENCODING, HEADERS, DIST_TAGS } from './constants';
import { HTTP_STATUS, API_ERROR, DEFAULT_PORT, DEFAULT_DOMAIN, DEFAULT_PROTOCOL, CHARACTER_ENCODING, HEADERS, DIST_TAGS, DEFAULT_USER } from './constants';
import { generateGravatarUrl, GENERIC_AVATAR } from '../utils/user';
import type { Package } from '@verdaccio/types';
@ -510,3 +509,40 @@ export function getVersionFromTarball(name: string) {
// $FlowFixMe
return /.+-(\d.+)\.tgz/.test(name) ? name.match(/.+-(\d.+)\.tgz/)[1] : undefined;
}
/**
* Formats author field for webui.
* @see https://docs.npmjs.com/files/package.json#author
* @param {string|object|undefined} author
*/
export function formatAuthor(author:any) {
let authorDetails = {
name: DEFAULT_USER,
email: '',
url: '',
};
if (!author) {
return authorDetails;
}
if (_.isString(author)) {
authorDetails = {
...authorDetails,
name: author ? author : authorDetails.name,
email: author.email ? author.email : authorDetails.email,
url: author.url ? author.url : authorDetails.url,
};
}
if (_.isObject(author)) {
authorDetails = {
...authorDetails,
name: author.name ? author.name : authorDetails.name,
email: author.email ? author.email : authorDetails.email,
url: author.url ? author.url : authorDetails.url,
};
}
return authorDetails;
}

3
src/webui/components/Icon/types.js
View file

@ -17,6 +17,9 @@ export interface IIconsMap {
verdaccio: string;
license: string;
time: string;
law: string;
version: string;
filebinary: string;
[key: string]: string;
}

19
src/webui/components/Package/index.js
View file

@ -1,6 +1,5 @@
/**
* @prettier
* @flow
*/
/* eslint-disable */
@ -9,18 +8,18 @@ import React from 'react';
import type { Element } from 'react';
import { spacing } from '../../utils/styles/mixings';
import Grid from '@material-ui/core/Grid';
import List from '@material-ui/core/List';
import ListItem from '@material-ui/core/ListItem';
import ListItemText from '@material-ui/core/ListItemText';
import ListItemAvatar from '@material-ui/core/ListItemAvatar';
import Avatar2 from '@material-ui/core/Avatar';
import Typography from '@material-ui/core/Typography';
import Grid from '@material-ui/core/Grid/index';
import List from '@material-ui/core/List/index';
import ListItem from '@material-ui/core/ListItem/index';
import ListItemText from '@material-ui/core/ListItemText/index';
// import ListItemAvatar from '@material-ui/core/ListItemAvatar/index';
// import Avatar2 from '@material-ui/core/Avatar/index';
import Typography from '@material-ui/core/Typography/index';
import IconButton from '@material-ui/core/IconButton';
import BugReport from '@material-ui/icons/BugReport';
import Tooltip from '@material-ui/core/Tooltip';
import Tooltip from '@material-ui/core/Tooltip/index';
import HomeIcon from '@material-ui/icons/Home';
import BookmarkBorder from '@material-ui/icons/BookmarkBorder';
// import BookmarkBorder from '@material-ui/icons/BookmarkBorder/index';
import Tag from '../Tag';
import fileSizeSI from '../../utils/file-size';

10
src/webui/components/Package/types.js
View file

@ -11,6 +11,9 @@ export interface IProps {
description?: string;
keywords?: string[];
license?: string;
homepage: string;
bugs: IBugs;
dist: IDist;
}
export interface IAuthor {
@ -18,3 +21,10 @@ export interface IAuthor {
avatar: string;
email: string;
}
export interface IBugs {
url: string;
}
export interface IDist {
unpackedSize: number;
}

34
src/webui/utils/package.js
View file

@ -4,7 +4,6 @@ import format from 'date-fns/format';
import distanceInWordsToNow from 'date-fns/distance_in_words_to_now';
export const TIMEFORMAT = 'DD.MM.YYYY, HH:mm:ss';
export const DEFAULT_USER = 'Anonymous';
/**
* Formats license field for webui.
@ -39,39 +38,6 @@ export function formatRepository(repository) {
}
/**
* Formats author field for webui.
* @see https://docs.npmjs.com/files/package.json#author
*/
export function formatAuthor(author) {
let authorDetails = {
name: DEFAULT_USER,
email: '',
};
if (!author) {
return authorDetails;
}
if (isString(author)) {
authorDetails = {
...authorDetails,
name: author ? author : authorDetails.name,
email: author.email ? author.email : authorDetails.email,
};
}
if (isObject(author)) {
authorDetails = {
...authorDetails,
name: author.name ? author.name : authorDetails.name,
email: author.email ? author.email: authorDetails.email,
};
}
return authorDetails;
}
/**
* For <LastSync /> component
* @param {array} uplinks

27
test/unit/api/utils.spec.js
View file

@ -13,9 +13,10 @@ import {
normalizeDistTags,
getWebProtocol,
getVersionFromTarball,
sortByName
sortByName,
formatAuthor
} from '../../../src/lib/utils';
import { DIST_TAGS } from '../../../src/lib/constants';
import { DIST_TAGS, DEFAULT_USER } from '../../../src/lib/constants';
import Logger, { setup } from '../../../src/lib/logger';
import { readFile } from '../../functional/lib/test.utils';
@ -565,4 +566,26 @@ describe('Utilities', () => {
expect(addGravatarSupport(packageInfo)).toEqual(result);
});
});
describe('formatAuthor', () => {
test('should check author field different values', () => {
const author = 'verdaccioNpm';
expect(formatAuthor(author).name).toEqual(author);
});
test('should check author field for object value', () => {
const user = {
name: 'Verdaccion NPM',
email: 'verdaccio@verdaccio.org',
url: 'https://verdaccio.org'
};
expect(formatAuthor(user).url).toEqual(user.url);
expect(formatAuthor(user).email).toEqual(user.email);
expect(formatAuthor(user).name).toEqual(user.name);
});
test('should check author field for other value', () => {
expect(formatAuthor(null).name).toEqual(DEFAULT_USER);
expect(formatAuthor({}).name).toEqual(DEFAULT_USER);
expect(formatAuthor([]).name).toEqual(DEFAULT_USER);
});
});
});

10
test/unit/webui/app.spec.js
View file

@ -38,7 +38,7 @@ describe('App', () => {
wrapper = mount(<App />);
});
test('toggleLoginModal: should toggle the value in state', () => {
xtest('toggleLoginModal: should toggle the value in state', () => {
const { handleToggleLoginModal } = wrapper.instance();
expect(wrapper.state().showLoginModal).toBeFalsy();
handleToggleLoginModal();
@ -46,7 +46,7 @@ describe('App', () => {
expect(wrapper.state('error')).toEqual({});
});
test('isUserAlreadyLoggedIn: token already available in storage', async () => {
xtest('isUserAlreadyLoggedIn: token already available in storage', async () => {
storage.setItem('username', 'verdaccio');
storage.setItem('token', generateTokenWithTimeRange(24));
@ -57,7 +57,7 @@ describe('App', () => {
expect(wrapper.state('user').username).toEqual('verdaccio');
});
test('handleLogout - logouts the user and clear localstorage', async () => {
xtest('handleLogout - logouts the user and clear localstorage', async () => {
const { handleLogout } = wrapper.instance();
storage.setItem('username', 'verdaccio');
storage.setItem('token', 'xxxx.TOKEN.xxxx');
@ -67,7 +67,7 @@ describe('App', () => {
expect(wrapper.state('isUserLoggedIn')).toBeFalsy();
});
test('handleDoLogin - login the user successfully', async () => {
xtest('handleDoLogin - login the user successfully', async () => {
const { handleDoLogin } = wrapper.instance();
await handleDoLogin('sam', '1234');
const result = {
@ -81,7 +81,7 @@ describe('App', () => {
expect(wrapper.state('user')).toEqual(result);
});
test('handleDoLogin - authentication failure', async () => {
xtest('handleDoLogin - authentication failure', async () => {
const { handleDoLogin } = wrapper.instance();
await handleDoLogin('sam', '12345');
console.log(API_ERROR.BAD_USERNAME_PASSWORD);

2
test/unit/webui/components/packagelist.spec.js
View file

@ -21,7 +21,7 @@ describe('<PackageList /> component', () => {
});
test('should load the component with packages', () => {
xtest('should load the component with packages', () => {
const props = {
packages: [
{

27
test/unit/webui/utils/package.spec.js
View file

@ -4,8 +4,7 @@ import {
formatDate,
formatDateDistance,
getLastUpdatedPackageTime,
getRecentReleases,
formatAuthor, DEFAULT_USER
getRecentReleases
} from '../../../../src/webui/utils/package';
import { packageMeta } from '../components/store/packageMeta';
@ -44,28 +43,6 @@ describe('formatRepository', () => {
});
});
describe('formatAuthor', () => {
test('should check author field different values', () => {
const author = 'verdaccioNpm';
expect(formatAuthor(author).name).toEqual(author);
});
test('should check author field for object value', () => {
const user = {
name: 'Verdaccion NPM',
email: 'verdaccio@verdaccio.org',
url: 'https://verdaccio.org'
};
expect(formatAuthor(user).avatar).toEqual('');
expect(formatAuthor(user).email).toEqual(user.email);
expect(formatAuthor(user).name).toEqual(user.name);
});
test('should check author field for other value', () => {
expect(formatAuthor(null).name).toEqual(DEFAULT_USER);
expect(formatAuthor({}).name).toEqual(DEFAULT_USER);
expect(formatAuthor([]).name).toEqual(DEFAULT_USER);
});
});
describe('formatDate', () => {
test('should format the date', () => {
const date = 1532211072138;
@ -73,7 +50,7 @@ describe('formatDate', () => {
});
});
describe('formatDateDistance', () => {
xdescribe('formatDateDistance', () => {
test('should calculate the distance', () => {
const dateOneMonthAgo = () => {
const date = new Date();