chore: Move all routes under routes directory (#2513)

closes #2504

server/models/AuthenticationProvider.js

@@ -1,6 +1,6 @@
 // @flow
-import providers from "../auth/providers";
 import { ValidationError } from "../errors";
+import providers from "../routes/auth/providers";
 import { DataTypes, Op, sequelize } from "../sequelize";
 
 const AuthenticationProvider = sequelize.define(

server/routes/api/apiKeys.js

@@ -1,10 +1,10 @@
 // @flow
 import Router from "koa-router";
 
-import auth from "../middlewares/authentication";
-import { ApiKey, Event } from "../models";
-import policy from "../policies";
-import { presentApiKey } from "../presenters";
+import auth from "../../middlewares/authentication";
+import { ApiKey, Event } from "../../models";
+import policy from "../../policies";
+import { presentApiKey } from "../../presenters";
 import pagination from "./middlewares/pagination";
 
 const { authorize } = policy;

server/routes/api/attachments.js

@@ -2,17 +2,17 @@
 import { format } from "date-fns";
 import Router from "koa-router";
 import { v4 as uuidv4 } from "uuid";
-import { NotFoundError } from "../errors";
-import auth from "../middlewares/authentication";
-import { Attachment, Document, Event } from "../models";
-import policy from "../policies";
+import { NotFoundError } from "../../errors";
+import auth from "../../middlewares/authentication";
+import { Attachment, Document, Event } from "../../models";
+import policy from "../../policies";
 import {
   makePolicy,
   getSignature,
   publicS3Endpoint,
   makeCredential,
   getSignedUrl,
-} from "../utils/s3";
+} from "../../utils/s3";
 
 const { authorize } = policy;
 const router = new Router();

server/routes/api/attachments.test.js

@@ -1,15 +1,15 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import { Attachment } from "../models";
-import webService from "../services/web";
+import { Attachment } from "../../models";
+import webService from "../../services/web";
 import {
   buildUser,
   buildAdmin,
   buildCollection,
   buildAttachment,
   buildDocument,
-} from "../test/factories";
-import { flushdb } from "../test/support";
+} from "../../test/factories";
+import { flushdb } from "../../test/support";
 
 const app = webService();
 const server = new TestServer(app.callback());

server/routes/api/auth.js

@@ -1,12 +1,12 @@
 // @flow
 import Router from "koa-router";
 import { find } from "lodash";
-import { parseDomain, isCustomSubdomain } from "../../shared/utils/domains";
+import { parseDomain, isCustomSubdomain } from "../../../shared/utils/domains";
+import auth from "../../middlewares/authentication";
+import { Team } from "../../models";
+import { presentUser, presentTeam, presentPolicies } from "../../presenters";
+import { isCustomDomain } from "../../utils/domains";
 import providers from "../auth/providers";
-import auth from "../middlewares/authentication";
-import { Team } from "../models";
-import { presentUser, presentTeam, presentPolicies } from "../presenters";
-import { isCustomDomain } from "../utils/domains";
 
 const router = new Router();
 

server/routes/api/auth.test.js

@@ -1,8 +1,8 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import webService from "../services/web";
-import { buildUser, buildTeam } from "../test/factories";
-import { flushdb } from "../test/support";
+import webService from "../../services/web";
+import { buildUser, buildTeam } from "../../test/factories";
+import { flushdb } from "../../test/support";
 const app = webService();
 const server = new TestServer(app.callback());
 

server/routes/api/authenticationProviders.js

@@ -1,10 +1,13 @@
 // @flow
 import Router from "koa-router";
+import auth from "../../middlewares/authentication";
+import { AuthenticationProvider, Event } from "../../models";
+import policy from "../../policies";
+import {
+  presentAuthenticationProvider,
+  presentPolicies,
+} from "../../presenters";
 import allAuthenticationProviders from "../auth/providers";
-import auth from "../middlewares/authentication";
-import { AuthenticationProvider, Event } from "../models";
-import policy from "../policies";
-import { presentAuthenticationProvider, presentPolicies } from "../presenters";
 
 const router = new Router();
 const { authorize } = policy;

server/routes/api/authenticationProviders.test.js

@@ -1,9 +1,9 @@
 // @flow
 import TestServer from "fetch-test-server";
 import { v4 as uuidv4 } from "uuid";
-import webService from "../services/web";
-import { buildUser, buildAdmin, buildTeam } from "../test/factories";
-import { flushdb } from "../test/support";
+import webService from "../../services/web";
+import { buildUser, buildAdmin, buildTeam } from "../../test/factories";
+import { flushdb } from "../../test/support";
 
 const app = webService();
 const server = new TestServer(app.callback());

server/routes/api/collections.js

@@ -1,9 +1,9 @@
 // @flow
 import fractionalIndex from "fractional-index";
 import Router from "koa-router";
-import { ValidationError } from "../errors";
-import { exportCollections } from "../exporter";
-import auth from "../middlewares/authentication";
+import { ValidationError } from "../../errors";
+import { exportCollections } from "../../exporter";
+import auth from "../../middlewares/authentication";
 import {
   Collection,
   CollectionUser,
@@ -14,8 +14,8 @@ import {
   Group,
   Attachment,
   FileOperation,
-} from "../models";
-import policy from "../policies";
+} from "../../models";
+import policy from "../../policies";
 import {
   presentCollection,
   presentUser,
@@ -24,12 +24,12 @@ import {
   presentGroup,
   presentCollectionGroupMembership,
   presentFileOperation,
-} from "../presenters";
-import { Op, sequelize } from "../sequelize";
+} from "../../presenters";
+import { Op, sequelize } from "../../sequelize";
 
-import collectionIndexing from "../utils/collectionIndexing";
-import removeIndexCollision from "../utils/removeIndexCollision";
-import { getAWSKeyForFileOp } from "../utils/s3";
+import collectionIndexing from "../../utils/collectionIndexing";
+import removeIndexCollision from "../../utils/removeIndexCollision";
+import { getAWSKeyForFileOp } from "../../utils/s3";
 import pagination from "./middlewares/pagination";
 
 const { authorize } = policy;

server/routes/api/collections.test.js

@@ -1,15 +1,15 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import { Document, CollectionUser, CollectionGroup } from "../models";
-import webService from "../services/web";
+import { Document, CollectionUser, CollectionGroup } from "../../models";
+import webService from "../../services/web";
 import {
   buildUser,
   buildAdmin,
   buildGroup,
   buildCollection,
   buildDocument,
-} from "../test/factories";
-import { flushdb, seed } from "../test/support";
+} from "../../test/factories";
+import { flushdb, seed } from "../../test/support";
 
 const app = webService();
 const server = new TestServer(app.callback());

server/routes/api/documents.js

@@ -1,18 +1,18 @@
 // @flow
 import Router from "koa-router";
 import Sequelize from "sequelize";
-import { subtractDate } from "../../shared/utils/date";
-import documentCreator from "../commands/documentCreator";
-import documentImporter from "../commands/documentImporter";
-import documentMover from "../commands/documentMover";
-import { documentPermanentDeleter } from "../commands/documentPermanentDeleter";
-import env from "../env";
+import { subtractDate } from "../../../shared/utils/date";
+import documentCreator from "../../commands/documentCreator";
+import documentImporter from "../../commands/documentImporter";
+import documentMover from "../../commands/documentMover";
+import { documentPermanentDeleter } from "../../commands/documentPermanentDeleter";
+import env from "../../env";
 import {
   NotFoundError,
   InvalidRequestError,
   AuthorizationError,
-} from "../errors";
-import auth from "../middlewares/authentication";
+} from "../../errors";
+import auth from "../../middlewares/authentication";
 import {
   Backlink,
   Collection,
@@ -25,14 +25,14 @@ import {
   User,
   View,
   Team,
-} from "../models";
-import policy from "../policies";
+} from "../../models";
+import policy from "../../policies";
 import {
   presentCollection,
   presentDocument,
   presentPolicies,
-} from "../presenters";
-import { sequelize } from "../sequelize";
+} from "../../presenters";
+import { sequelize } from "../../sequelize";
 import pagination from "./middlewares/pagination";
 
 const Op = Sequelize.Op;

server/routes/api/documents.test.js

@@ -8,15 +8,15 @@ import {
   Backlink,
   CollectionUser,
   SearchQuery,
-} from "../models";
-import webService from "../services/web";
+} from "../../models";
+import webService from "../../services/web";
 import {
   buildShare,
   buildCollection,
   buildUser,
   buildDocument,
-} from "../test/factories";
-import { flushdb, seed } from "../test/support";
+} from "../../test/factories";
+import { flushdb, seed } from "../../test/support";
 const app = webService();
 const server = new TestServer(app.callback());
 

server/routes/api/events.js

@@ -1,10 +1,10 @@
 // @flow
 import Router from "koa-router";
 import Sequelize from "sequelize";
-import auth from "../middlewares/authentication";
-import { Event, User, Collection } from "../models";
-import policy from "../policies";
-import { presentEvent } from "../presenters";
+import auth from "../../middlewares/authentication";
+import { Event, User, Collection } from "../../models";
+import policy from "../../policies";
+import { presentEvent } from "../../presenters";
 import pagination from "./middlewares/pagination";
 
 const Op = Sequelize.Op;

server/routes/api/events.test.js

@@ -1,8 +1,8 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import webService from "../services/web";
-import { buildEvent, buildUser } from "../test/factories";
-import { flushdb, seed } from "../test/support";
+import webService from "../../services/web";
+import { buildEvent, buildUser } from "../../test/factories";
+import { flushdb, seed } from "../../test/support";
 const app = webService();
 const server = new TestServer(app.callback());
 

server/routes/api/fileOperations.js

@@ -1,11 +1,11 @@
 // @flow
 import Router from "koa-router";
-import { NotFoundError, ValidationError } from "../errors";
-import auth from "../middlewares/authentication";
-import { FileOperation, Team } from "../models";
-import policy from "../policies";
-import { presentFileOperation } from "../presenters";
-import { getSignedUrl } from "../utils/s3";
+import { NotFoundError, ValidationError } from "../../errors";
+import auth from "../../middlewares/authentication";
+import { FileOperation, Team } from "../../models";
+import policy from "../../policies";
+import { presentFileOperation } from "../../presenters";
+import { getSignedUrl } from "../../utils/s3";
 import pagination from "./middlewares/pagination";
 
 const { authorize } = policy;

server/routes/api/fileOperations.test.js

@@ -1,16 +1,16 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
 
-import { Collection, User } from "../models";
-import webService from "../services/web";
+import { Collection, User } from "../../models";
+import webService from "../../services/web";
 import {
   buildAdmin,
   buildCollection,
   buildFileOperation,
   buildTeam,
   buildUser,
-} from "../test/factories";
-import { flushdb } from "../test/support";
+} from "../../test/factories";
+import { flushdb } from "../../test/support";
 
 const app = webService();
 const server = new TestServer(app.callback());

server/routes/api/groups.js

@@ -1,17 +1,17 @@
 // @flow
 import Router from "koa-router";
-import { MAX_AVATAR_DISPLAY } from "../../shared/constants";
-import auth from "../middlewares/authentication";
+import { MAX_AVATAR_DISPLAY } from "../../../shared/constants";
+import auth from "../../middlewares/authentication";
 
-import { User, Event, Group, GroupUser } from "../models";
-import policy from "../policies";
+import { User, Event, Group, GroupUser } from "../../models";
+import policy from "../../policies";
 import {
   presentGroup,
   presentPolicies,
   presentUser,
   presentGroupMembership,
-} from "../presenters";
-import { Op } from "../sequelize";
+} from "../../presenters";
+import { Op } from "../../sequelize";
 import pagination from "./middlewares/pagination";
 
 const { authorize } = policy;

server/routes/api/groups.test.js

@@ -1,9 +1,9 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import { Event } from "../models";
-import webService from "../services/web";
-import { buildUser, buildAdmin, buildGroup } from "../test/factories";
-import { flushdb } from "../test/support";
+import { Event } from "../../models";
+import webService from "../../services/web";
+import { buildUser, buildAdmin, buildGroup } from "../../test/factories";
+import { flushdb } from "../../test/support";
 const app = webService();
 const server = new TestServer(app.callback());
 

server/routes/api/hooks.js

@@ -1,7 +1,7 @@
 // @flow
 import Router from "koa-router";
 import { escapeRegExp } from "lodash";
-import { AuthenticationError, InvalidRequestError } from "../errors";
+import { AuthenticationError, InvalidRequestError } from "../../errors";
 import {
   UserAuthentication,
   AuthenticationProvider,
@@ -11,9 +11,9 @@ import {
   SearchQuery,
   Integration,
   IntegrationAuthentication,
-} from "../models";
-import { presentSlackAttachment } from "../presenters";
-import * as Slack from "../slack";
+} from "../../models";
+import { presentSlackAttachment } from "../../presenters";
+import * as Slack from "../../slack";
 const router = new Router();
 
 // triggered by a user posting a getoutline.com link in Slack

server/routes/api/hooks.test.js

@@ -1,10 +1,10 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import { IntegrationAuthentication, SearchQuery } from "../models";
-import webService from "../services/web";
-import * as Slack from "../slack";
-import { buildDocument, buildIntegration } from "../test/factories";
-import { flushdb, seed } from "../test/support";
+import { IntegrationAuthentication, SearchQuery } from "../../models";
+import webService from "../../services/web";
+import * as Slack from "../../slack";
+import { buildDocument, buildIntegration } from "../../test/factories";
+import { flushdb, seed } from "../../test/support";
 
 const app = webService();
 const server = new TestServer(app.callback());
@@ -12,7 +12,7 @@ const server = new TestServer(app.callback());
 beforeEach(() => flushdb());
 afterAll(() => server.close());
 
-jest.mock("../slack", () => ({
+jest.mock("../../slack", () => ({
   post: jest.fn(),
 }));
 

server/routes/api/index.js

@@ -3,10 +3,10 @@ import Koa from "koa";
 import bodyParser from "koa-body";
 import Router from "koa-router";
 
-import { NotFoundError } from "../errors";
-import errorHandling from "../middlewares/errorHandling";
-import methodOverride from "../middlewares/methodOverride";
-import validation from "../middlewares/validation";
+import { NotFoundError } from "../../errors";
+import errorHandling from "../../middlewares/errorHandling";
+import methodOverride from "../../middlewares/methodOverride";
+import validation from "../../middlewares/validation";
 import apiKeys from "./apiKeys";
 import attachments from "./attachments";
 import auth from "./auth";

server/routes/api/index.test.js

@@ -1,7 +1,7 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import webService from "../services/web";
-import { flushdb } from "../test/support";
+import webService from "../../services/web";
+import { flushdb } from "../../test/support";
 const app = webService();
 const server = new TestServer(app.callback());
 

server/routes/api/integrations.js

@@ -1,10 +1,10 @@
 // @flow
 import Router from "koa-router";
-import auth from "../middlewares/authentication";
-import { Event } from "../models";
-import Integration from "../models/Integration";
-import policy from "../policies";
-import { presentIntegration } from "../presenters";
+import auth from "../../middlewares/authentication";
+import { Event } from "../../models";
+import Integration from "../../models/Integration";
+import policy from "../../policies";
+import { presentIntegration } from "../../presenters";
 import pagination from "./middlewares/pagination";
 
 const { authorize } = policy;

server/routes/api/middlewares/editor.js

@@ -2,7 +2,7 @@
 import { type Context } from "koa";
 import pkg from "rich-markdown-editor/package.json";
 import semver from "semver";
-import { EditorUpdateError } from "../../errors";
+import { EditorUpdateError } from "../../../errors";
 
 export default function editor() {
   return async function editorMiddleware(ctx: Context, next: () => Promise<*>) {

server/routes/api/middlewares/pagination.js

@@ -1,7 +1,7 @@
 // @flow
 import querystring from "querystring";
 import { type Context } from "koa";
-import { InvalidRequestError } from "../../errors";
+import { InvalidRequestError } from "../../../errors";
 
 export default function pagination(options?: Object) {
   return async function paginationMiddleware(

server/routes/api/middlewares/pagination.test.js

@@ -1,7 +1,7 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import webService from "../../services/web";
-import { flushdb, seed } from "../../test/support";
+import webService from "../../../services/web";
+import { flushdb, seed } from "../../../test/support";
 const app = webService();
 const server = new TestServer(app.callback());
 

server/routes/api/notificationSettings.js

@@ -1,10 +1,10 @@
 // @flow
 import Router from "koa-router";
 
-import auth from "../middlewares/authentication";
-import { Team, NotificationSetting } from "../models";
-import policy from "../policies";
-import { presentNotificationSetting } from "../presenters";
+import auth from "../../middlewares/authentication";
+import { Team, NotificationSetting } from "../../models";
+import policy from "../../policies";
+import { presentNotificationSetting } from "../../presenters";
 
 const { authorize } = policy;
 const router = new Router();

server/routes/api/revisions.js

@@ -1,10 +1,10 @@
 // @flow
 import Router from "koa-router";
-import { NotFoundError } from "../errors";
-import auth from "../middlewares/authentication";
-import { Document, Revision } from "../models";
-import policy from "../policies";
-import { presentRevision } from "../presenters";
+import { NotFoundError } from "../../errors";
+import auth from "../../middlewares/authentication";
+import { Document, Revision } from "../../models";
+import policy from "../../policies";
+import { presentRevision } from "../../presenters";
 import pagination from "./middlewares/pagination";
 
 const { authorize } = policy;

server/routes/api/revisions.test.js

@@ -1,9 +1,9 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import { Revision } from "../models";
-import webService from "../services/web";
-import { buildDocument, buildUser } from "../test/factories";
-import { flushdb, seed } from "../test/support";
+import { Revision } from "../../models";
+import webService from "../../services/web";
+import { buildDocument, buildUser } from "../../test/factories";
+import { flushdb, seed } from "../../test/support";
 
 const app = webService();
 const server = new TestServer(app.callback());

server/routes/api/shares.js

@@ -1,11 +1,11 @@
 // @flow
 import Router from "koa-router";
 import Sequelize from "sequelize";
-import { NotFoundError } from "../errors";
-import auth from "../middlewares/authentication";
-import { Document, User, Event, Share, Team, Collection } from "../models";
-import policy from "../policies";
-import { presentShare, presentPolicies } from "../presenters";
+import { NotFoundError } from "../../errors";
+import auth from "../../middlewares/authentication";
+import { Document, User, Event, Share, Team, Collection } from "../../models";
+import policy from "../../policies";
+import { presentShare, presentPolicies } from "../../presenters";
 import pagination from "./middlewares/pagination";
 
 const Op = Sequelize.Op;

server/routes/api/shares.test.js

@@ -1,9 +1,9 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import { CollectionUser } from "../models";
-import webService from "../services/web";
-import { buildUser, buildDocument, buildShare } from "../test/factories";
-import { flushdb, seed } from "../test/support";
+import { CollectionUser } from "../../models";
+import webService from "../../services/web";
+import { buildUser, buildDocument, buildShare } from "../../test/factories";
+import { flushdb, seed } from "../../test/support";
 
 const app = webService();
 const server = new TestServer(app.callback());

server/routes/api/team.js

@@ -1,10 +1,10 @@
 // @flow
 import Router from "koa-router";
-import auth from "../middlewares/authentication";
-import { Event, Team } from "../models";
+import auth from "../../middlewares/authentication";
+import { Event, Team } from "../../models";
 
-import policy from "../policies";
-import { presentTeam, presentPolicies } from "../presenters";
+import policy from "../../policies";
+import { presentTeam, presentPolicies } from "../../presenters";
 
 const { authorize } = policy;
 const router = new Router();

server/routes/api/team.test.js

@@ -1,8 +1,8 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import webService from "../services/web";
+import webService from "../../services/web";
 
-import { flushdb, seed } from "../test/support";
+import { flushdb, seed } from "../../test/support";
 const app = webService();
 const server = new TestServer(app.callback());
 

server/routes/api/users.js

@@ -1,13 +1,13 @@
 // @flow
 import Router from "koa-router";
-import userDestroyer from "../commands/userDestroyer";
-import userInviter from "../commands/userInviter";
-import userSuspender from "../commands/userSuspender";
-import auth from "../middlewares/authentication";
-import { Event, User, Team } from "../models";
-import policy from "../policies";
-import { presentUser, presentPolicies } from "../presenters";
-import { Op } from "../sequelize";
+import userDestroyer from "../../commands/userDestroyer";
+import userInviter from "../../commands/userInviter";
+import userSuspender from "../../commands/userSuspender";
+import auth from "../../middlewares/authentication";
+import { Event, User, Team } from "../../models";
+import policy from "../../policies";
+import { presentUser, presentPolicies } from "../../presenters";
+import { Op } from "../../sequelize";
 import pagination from "./middlewares/pagination";
 
 const { can, authorize } = policy;

server/routes/api/users.test.js

@@ -1,10 +1,10 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import webService from "../services/web";
+import webService from "../../services/web";
 
-import { buildTeam, buildAdmin, buildUser } from "../test/factories";
+import { buildTeam, buildAdmin, buildUser } from "../../test/factories";
 
-import { flushdb, seed } from "../test/support";
+import { flushdb, seed } from "../../test/support";
 const app = webService();
 const server = new TestServer(app.callback());
 

server/routes/api/utils.js

@@ -2,10 +2,10 @@
 import { subDays } from "date-fns";
 import debug from "debug";
 import Router from "koa-router";
-import { documentPermanentDeleter } from "../commands/documentPermanentDeleter";
-import { AuthenticationError } from "../errors";
-import { Document, FileOperation } from "../models";
-import { Op } from "../sequelize";
+import { documentPermanentDeleter } from "../../commands/documentPermanentDeleter";
+import { AuthenticationError } from "../../errors";
+import { Document, FileOperation } from "../../models";
+import { Op } from "../../sequelize";
 
 const router = new Router();
 const log = debug("utils");

server/routes/api/utils.test.js

@@ -1,11 +1,11 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import { subDays } from "date-fns";
 import TestServer from "fetch-test-server";
-import { Document, FileOperation } from "../models";
-import { Op } from "../sequelize";
-import webService from "../services/web";
-import { buildDocument, buildFileOperation } from "../test/factories";
-import { flushdb } from "../test/support";
+import { Document, FileOperation } from "../../models";
+import { Op } from "../../sequelize";
+import webService from "../../services/web";
+import { buildDocument, buildFileOperation } from "../../test/factories";
+import { flushdb } from "../../test/support";
 
 const app = webService();
 const server = new TestServer(app.callback());

server/routes/api/views.js

@@ -1,9 +1,9 @@
 // @flow
 import Router from "koa-router";
-import auth from "../middlewares/authentication";
-import { View, Document, Event } from "../models";
-import policy from "../policies";
-import { presentView } from "../presenters";
+import auth from "../../middlewares/authentication";
+import { View, Document, Event } from "../../models";
+import policy from "../../policies";
+import { presentView } from "../../presenters";
 
 const { authorize } = policy;
 const router = new Router();

server/routes/api/views.test.js

@@ -1,9 +1,9 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
-import { View, CollectionUser } from "../models";
-import webService from "../services/web";
-import { buildUser } from "../test/factories";
-import { flushdb, seed } from "../test/support";
+import { View, CollectionUser } from "../../models";
+import webService from "../../services/web";
+import { buildUser } from "../../test/factories";
+import { flushdb, seed } from "../../test/support";
 
 const app = webService();
 const server = new TestServer(app.callback());

server/routes/auth/index.js

@@ -5,10 +5,10 @@ import debug from "debug";
 import Koa from "koa";
 import bodyParser from "koa-body";
 import Router from "koa-router";
-import { AuthenticationError } from "../errors";
-import auth from "../middlewares/authentication";
-import validation from "../middlewares/validation";
-import { Collection, Team, View } from "../models";
+import { AuthenticationError } from "../../errors";
+import auth from "../../middlewares/authentication";
+import validation from "../../middlewares/validation";
+import { Collection, Team, View } from "../../models";
 import providers from "./providers";
 
 const log = debug("server");

server/routes/auth/providers/azure.js

@@ -4,11 +4,11 @@ import { Strategy as AzureStrategy } from "@outlinewiki/passport-azure-ad-oauth2
 import fetch from "fetch-with-proxy";
 import jwt from "jsonwebtoken";
 import Router from "koa-router";
-import accountProvisioner from "../../commands/accountProvisioner";
-import env from "../../env";
-import { MicrosoftGraphError } from "../../errors";
-import passportMiddleware from "../../middlewares/passport";
-import { StateStore } from "../../utils/passport";
+import accountProvisioner from "../../../commands/accountProvisioner";
+import env from "../../../env";
+import { MicrosoftGraphError } from "../../../errors";
+import passportMiddleware from "../../../middlewares/passport";
+import { StateStore } from "../../../utils/passport";
 
 const router = new Router();
 const providerName = "azure";

server/routes/auth/providers/email.js

@@ -2,16 +2,19 @@
 import { subMinutes } from "date-fns";
 import Router from "koa-router";
 import { find } from "lodash";
-import { parseDomain, isCustomSubdomain } from "../../../shared/utils/domains";
-import { AuthorizationError } from "../../errors";
-import mailer from "../../mailer";
-import errorHandling from "../../middlewares/errorHandling";
-import methodOverride from "../../middlewares/methodOverride";
-import validation from "../../middlewares/validation";
-import { User, Team } from "../../models";
-import { signIn } from "../../utils/authentication";
-import { isCustomDomain } from "../../utils/domains";
-import { getUserForEmailSigninToken } from "../../utils/jwt";
+import {
+  parseDomain,
+  isCustomSubdomain,
+} from "../../../../shared/utils/domains";
+import { AuthorizationError } from "../../../errors";
+import mailer from "../../../mailer";
+import errorHandling from "../../../middlewares/errorHandling";
+import methodOverride from "../../../middlewares/methodOverride";
+import validation from "../../../middlewares/validation";
+import { User, Team } from "../../../models";
+import { signIn } from "../../../utils/authentication";
+import { isCustomDomain } from "../../../utils/domains";
+import { getUserForEmailSigninToken } from "../../../utils/jwt";
 
 const router = new Router();
 

server/routes/auth/providers/email.test.js

@@ -1,14 +1,14 @@
 // @flow
 import TestServer from "fetch-test-server";
-import mailer from "../../mailer";
-import webService from "../../services/web";
-import { buildUser, buildGuestUser, buildTeam } from "../../test/factories";
-import { flushdb } from "../../test/support";
+import mailer from "../../../mailer";
+import webService from "../../../services/web";
+import { buildUser, buildGuestUser, buildTeam } from "../../../test/factories";
+import { flushdb } from "../../../test/support";
 
 const app = webService();
 const server = new TestServer(app.callback());
 
-jest.mock("../../mailer");
+jest.mock("../../../mailer");
 
 beforeEach(async () => {
   await flushdb();

server/routes/auth/providers/google.js

@@ -3,15 +3,15 @@ import passport from "@outlinewiki/koa-passport";
 import Router from "koa-router";
 import { capitalize } from "lodash";
 import { Strategy as GoogleStrategy } from "passport-google-oauth2";
-import accountProvisioner from "../../commands/accountProvisioner";
-import env from "../../env";
+import accountProvisioner from "../../../commands/accountProvisioner";
+import env from "../../../env";
 import {
   GoogleWorkspaceRequiredError,
   GoogleWorkspaceInvalidError,
-} from "../../errors";
-import passportMiddleware from "../../middlewares/passport";
-import { getAllowedDomains } from "../../utils/authentication";
-import { StateStore } from "../../utils/passport";
+} from "../../../errors";
+import passportMiddleware from "../../../middlewares/passport";
+import { getAllowedDomains } from "../../../utils/authentication";
+import { StateStore } from "../../../utils/passport";
 
 const router = new Router();
 const providerName = "google";

server/routes/auth/providers/index.js

@@ -1,6 +1,6 @@
 // @flow
-import { signin } from "../../../shared/utils/routeHelpers";
-import { requireDirectory } from "../../utils/fs";
+import { signin } from "../../../../shared/utils/routeHelpers";
+import { requireDirectory } from "../../../utils/fs";
 
 let providers = [];
 

server/routes/auth/providers/slack.js

@@ -2,18 +2,18 @@
 import passport from "@outlinewiki/koa-passport";
 import Router from "koa-router";
 import { Strategy as SlackStrategy } from "passport-slack-oauth2";
-import accountProvisioner from "../../commands/accountProvisioner";
-import env from "../../env";
-import auth from "../../middlewares/authentication";
-import passportMiddleware from "../../middlewares/passport";
+import accountProvisioner from "../../../commands/accountProvisioner";
+import env from "../../../env";
+import auth from "../../../middlewares/authentication";
+import passportMiddleware from "../../../middlewares/passport";
 import {
   IntegrationAuthentication,
   Collection,
   Integration,
   Team,
-} from "../../models";
-import * as Slack from "../../slack";
-import { StateStore } from "../../utils/passport";
+} from "../../../models";
+import * as Slack from "../../../slack";
+import { StateStore } from "../../../utils/passport";
 
 const router = new Router();
 const providerName = "slack";

server/routes/index.js

@@ -7,14 +7,14 @@ import Router from "koa-router";
 import sendfile from "koa-sendfile";
 import serve from "koa-static";
 import isUUID from "validator/lib/isUUID";
-import { languages } from "../shared/i18n";
-import env from "./env";
-import apexRedirect from "./middlewares/apexRedirect";
-import Share from "./models/Share";
-import presentEnv from "./presenters/env";
-import { opensearchResponse } from "./utils/opensearch";
-import prefetchTags from "./utils/prefetchTags";
-import { robotsResponse } from "./utils/robots";
+import { languages } from "../../shared/i18n";
+import env from "../env";
+import apexRedirect from "../middlewares/apexRedirect";
+import Share from "../models/Share";
+import presentEnv from "../presenters/env";
+import { opensearchResponse } from "../utils/opensearch";
+import prefetchTags from "../utils/prefetchTags";
+import { robotsResponse } from "../utils/robots";
 
 const isProduction = process.env.NODE_ENV === "production";
 const isTest = process.env.NODE_ENV === "test";
@@ -24,10 +24,10 @@ const readFile = util.promisify(fs.readFile);
 
 const readIndexFile = async (ctx) => {
   if (isProduction) {
-    return readFile(path.join(__dirname, "../app/index.html"));
+    return readFile(path.join(__dirname, "../../app/index.html"));
   }
   if (isTest) {
-    return readFile(path.join(__dirname, "/static/index.html"));
+    return readFile(path.join(__dirname, "../static/index.html"));
   }
 
   const middleware = ctx.devMiddleware;
@@ -88,7 +88,7 @@ const renderShare = async (ctx, next) => {
 
 // serve static assets
 koa.use(
-  serve(path.resolve(__dirname, "../../public"), {
+  serve(path.resolve(__dirname, "../../../public"), {
     maxage: 60 * 60 * 24 * 30 * 1000,
   })
 );
@@ -103,7 +103,10 @@ if (process.env.NODE_ENV === "production") {
       "Cache-Control": `max-age=${356 * 24 * 60 * 60}`,
     });
 
-    await sendfile(ctx, path.join(__dirname, "../app/", ctx.path.substring(8)));
+    await sendfile(
+      ctx,
+      path.join(__dirname, "../../app/", ctx.path.substring(8))
+    );
   });
 }
 
@@ -123,7 +126,7 @@ router.get("/locales/:lng.json", async (ctx) => {
 
   await sendfile(
     ctx,
-    path.join(__dirname, "../shared/i18n/locales", lng, "translation.json")
+    path.join(__dirname, "../../shared/i18n/locales", lng, "translation.json")
   );
 });
 

server/routes/index.test.js

@@ -1,8 +1,8 @@
 // @flow
 import TestServer from "fetch-test-server";
-import webService from "./services/web";
-import { buildShare, buildDocument } from "./test/factories";
-import { flushdb } from "./test/support";
+import webService from "../services/web";
+import { buildShare, buildDocument } from "../test/factories";
+import { flushdb } from "../test/support";
 
 const app = webService();
 const server = new TestServer(app.callback());

server/services/web.js

@@ -9,11 +9,11 @@ import {
 import mount from "koa-mount";
 import onerror from "koa-onerror";
 import enforceHttps from "koa-sslify";
-import api from "../api";
-import auth from "../auth";
 import emails from "../emails";
 import env from "../env";
 import routes from "../routes";
+import api from "../routes/api";
+import auth from "../routes/auth";
 import Sentry from "../sentry";
 
 const isProduction = env.NODE_ENV === "production";