Lint rules and flow annotations for rest of the files

This commit is contained in:
Jori Lallo 2017-11-15 22:56:40 -08:00
parent c9b710cbee
commit 0441e92d08
36 changed files with 77 additions and 51 deletions

1
.eslintignore Normal file
View File

@ -0,0 +1 @@
server/migrations/*.js

View File

@ -36,6 +36,7 @@
"prettier/prettier": [
"error",
{
"printWidth": 80,
"trailingComma": "es5",
"singleQuote": true
}

View File

@ -1,3 +1,4 @@
// @flow
import Router from 'koa-router';
import httpErrors from 'http-errors';

View File

@ -1,3 +1,4 @@
// @flow
import Router from 'koa-router';
import httpErrors from 'http-errors';
import { Document, User } from '../models';

View File

@ -1,3 +1,4 @@
// @flow
import bodyParser from 'koa-bodyparser';
import Koa from 'koa';
import Router from 'koa-router';

View File

@ -1,9 +1,16 @@
export default function apiWrapper(_options) {
return async function apiWrapperMiddleware(ctx, next) {
// @flow
import { type Context } from 'koa';
export default function apiWrapper() {
return async function apiWrapperMiddleware(
ctx: Context,
next: () => Promise<void>
) {
await next();
const ok = ctx.status < 400;
// $FlowFixMe
ctx.body = {
...ctx.body,
status: ctx.status,

View File

@ -1,10 +1,15 @@
// @flow
import httpErrors from 'http-errors';
import JWT from 'jsonwebtoken';
import { type Context } from 'koa';
import { User, ApiKey } from '../../models';
export default function auth({ require = true } = {}) {
return async function authMiddleware(ctx, next) {
export default function auth({ require = true }: { require?: boolean } = {}) {
return async function authMiddleware(
ctx: Context,
next: () => Promise<void>
) {
let token;
const authorizationHeader = ctx.request.get('authorization');
@ -25,6 +30,7 @@ export default function auth({ require = true } = {}) {
);
}
}
// $FlowFixMe
} else if (ctx.body.token) {
token = ctx.body.token;
} else if (ctx.request.query.token) {
@ -38,7 +44,7 @@ export default function auth({ require = true } = {}) {
if (token) {
let user;
if (token.match(/^[\w]{38}$/)) {
if (String(token).match(/^[\w]{38}$/)) {
// API key
let apiKey;
try {
@ -83,6 +89,7 @@ export default function auth({ require = true } = {}) {
ctx.state.token = token;
ctx.state.user = user;
// $FlowFixMe
ctx.cache[user.id] = user;
}

View File

@ -1,8 +1,13 @@
// @flow
import httpErrors from 'http-errors';
import querystring from 'querystring';
import { type Context } from 'koa';
export default function pagination(options) {
return async function paginationMiddleware(ctx, next) {
export default function pagination(options?: Object) {
return async function paginationMiddleware(
ctx: Context,
next: () => Promise<void>
) {
const opts = {
defaultLimit: 15,
maxLimit: 100,
@ -11,7 +16,9 @@ export default function pagination(options) {
let query = ctx.request.query;
let body = ctx.request.body;
// $FlowFixMe
let limit = parseInt(query.limit || body.limit, 10);
// $FlowFixMe
let offset = parseInt(query.offset || body.offset, 10);
limit = isNaN(limit) ? opts.defaultLimit : limit;
offset = isNaN(offset) ? 0 : offset;
@ -27,9 +34,13 @@ export default function pagination(options) {
offset: offset,
};
// $FlowFixMe
query.limit = ctx.state.pagination.limit;
// $FlowFixMe
query.offset = ctx.state.pagination.offset + query.limit;
ctx.state.pagination.nextPath = `/api${ctx.request.path}?${querystring.stringify(query)}`;
ctx.state.pagination.nextPath = `/api${
ctx.request.path
}?${querystring.stringify(query)}`;
return next();
};

View File

@ -1,3 +1,4 @@
// @flow
import uuid from 'uuid';
import Router from 'koa-router';

View File

@ -1,3 +1,4 @@
/* eslint-disable flowtype/require-valid-file-annotation */
import TestServer from 'fetch-test-server';
import app from '..';

View File

@ -1,6 +1,7 @@
// @flow
import httpErrors from 'http-errors';
const apiError = (code, id, message) => {
const apiError = (code: number, id: string, message: string) => {
return httpErrors(code, message, { id });
};

View File

@ -1,8 +1,14 @@
// @flow
import queryString from 'query-string';
import { type Context } from 'koa';
export default function methodOverride(_options) {
return async function methodOverrideMiddleware(ctx, next) {
export default function methodOverride() {
return async function methodOverrideMiddleware(
ctx: Context,
next: () => Promise<void>
) {
if (ctx.method === 'POST') {
// $FlowFixMe
ctx.body = ctx.request.body;
} else if (ctx.method === 'GET') {
ctx.method = 'POST'; // eslint-disable-line

View File

@ -1,5 +1,11 @@
export default function subdomainRedirect(options) {
return async function subdomainRedirectMiddleware(ctx, next) {
// @flow
import { type Context } from 'koa';
export default function subdomainRedirect() {
return async function subdomainRedirectMiddleware(
ctx: Context,
next: () => Promise<void>
) {
if (ctx.headers.host === 'getoutline.com') {
ctx.redirect(`https://www.${ctx.headers.host}${ctx.path}`);
} else {

View File

@ -1,5 +1,3 @@
'use strict';
module.exports = {
up: function(queryInterface, Sequelize) {
queryInterface.createTable('teams', {

View File

@ -1,5 +1,3 @@
'use strict';
module.exports = {
up: function(queryInterface, Sequelize) {
queryInterface.addColumn('documents', 'parentDocumentId', {

View File

@ -1,5 +1,3 @@
'use strict';
module.exports = {
up: function(queryInterface, Sequelize) {
queryInterface.addIndex('documents', ['urlId']);

View File

@ -1,5 +1,3 @@
'use strict';
module.exports = {
up: function(queryInterface, Sequelize) {
queryInterface.createTable('revisions', {

View File

@ -1,5 +1,3 @@
'use strict';
module.exports = {
up: function(queryInterface, Sequelize) {
const searchDocument = `

View File

@ -1,5 +1,3 @@
'use strict';
module.exports = {
up: function(queryInterface, Sequelize) {
queryInterface.addColumn('atlases', 'creatorId', {

View File

@ -1,5 +1,3 @@
'use strict';
module.exports = {
up: function(queryInterface, Sequelize) {
queryInterface.addColumn('atlases', 'deletedAt', {

View File

@ -1,5 +1,3 @@
'use strict';
module.exports = {
up: function(queryInterface, Sequelize) {
// Remove old indeces

View File

@ -1,5 +1,3 @@
'use strict';
module.exports = {
up: function(queryInterface, Sequelize) {
queryInterface.addColumn('documents', 'createdById', {

View File

@ -1,5 +1,3 @@
'use strict';
module.exports = {
up: function(queryInterface, Sequelize) {
queryInterface.addColumn('documents', 'collaboratorIds', {

View File

@ -1,5 +1,3 @@
'use strict';
module.exports = {
up: function(queryInterface, Sequelize) {
queryInterface.addColumn('atlases', 'urlId', {

View File

@ -1,5 +1,3 @@
'use strict';
module.exports = {
up: function(queryInterface, Sequelize) {
queryInterface.addIndex('revisions', ['documentId']);

View File

@ -1,5 +1,3 @@
'use strict';
module.exports = {
up: function(queryInterface, Sequelize) {
queryInterface.addIndex('apiKeys', ['secret', 'deletedAt']);

View File

@ -1,3 +1,4 @@
// @flow
import { DataTypes, sequelize } from '../sequelize';
import randomstring from 'randomstring';

View File

@ -1,3 +1,4 @@
/* eslint-disable flowtype/require-valid-file-annotation */
import { flushdb, seed } from '../test/support';
beforeEach(flushdb);

View File

@ -12,9 +12,7 @@ export default function About() {
</Helmet>
<Hero>
<h1>About Outline</h1>
<p>
Just a proof of concept for multiple pages.
</p>
<p>Just a proof of concept for multiple pages.</p>
</Hero>
</Grid>
);

View File

@ -13,7 +13,8 @@ export default function Pricing() {
<Hero>
<h1>Pricing</h1>
<p>
Explore Outline with a 14 day trial, free forever for teams smaller than 5.
Explore Outline with a 14 day trial, free forever for teams smaller
than 5.
</p>
</Hero>
</Grid>

View File

@ -1,4 +1,8 @@
function present(ctx, key) {
// @flow
import { type Context } from 'koa';
import { ApiKey } from '../models';
function present(ctx: Context, key: ApiKey) {
return {
id: key.id,
name: key.name,

View File

@ -8,8 +8,8 @@ function present(ctx: Object, user: User) {
id: user.id,
username: user.username,
name: user.name,
avatarUrl: user.avatarUrl ||
(user.slackData ? user.slackData.image_192 : null),
avatarUrl:
user.avatarUrl || (user.slackData ? user.slackData.image_192 : null),
};
}

View File

@ -1,5 +1,5 @@
/* eslint-disable flowtype/require-valid-file-annotation */
import presentUser from './user';
import ctx from '../../__mocks__/ctx';
it('presents a user', async () => {

View File

@ -1,3 +1,4 @@
// @flow
import redis from 'redis';
import redisLock from 'redis-lock';

View File

@ -10,9 +10,7 @@ const sheet = new ServerStyleSheet();
export default function renderpage(ctx: Object, children: React$Element<*>) {
const html = ReactDOMServer.renderToString(
<StyleSheetManager sheet={sheet.instance}>
<Layout>
{children}
</Layout>
<Layout>{children}</Layout>
</StyleSheetManager>
);

View File

@ -16,7 +16,10 @@ export default async () => {
'SECRET_KEY or URL env var is not set'
);
const secret = process.env.SECRET_KEY.slice(0, 6) + process.env.URL;
const id = crypto.createHash('sha256').update(secret).digest('hex');
const id = crypto
.createHash('sha256')
.update(secret)
.digest('hex');
const [
userCount,