diff --git a/source/server/index.ts b/source/server/index.ts index b6a7d3d..60962d0 100644 --- a/source/server/index.ts +++ b/source/server/index.ts @@ -2,7 +2,7 @@ import express from 'express'; import cookieParser from 'cookie-parser'; import path from 'path'; import { ROOT } from './rootDir'; -import { jwtMiddleware, requireAuth } from 'auth-connector/server/auth'; +import { jwtMiddleware, requireAuth } from '../auth-connector/source/server/auth'; import projectsRouter from './routes/projects'; import filesRouter from './routes/files'; import localesRouter from './routes/locales'; diff --git a/source/server/projectAccess.ts b/source/server/projectAccess.ts index 95e6c47..b42572c 100644 --- a/source/server/projectAccess.ts +++ b/source/server/projectAccess.ts @@ -1,5 +1,5 @@ import { Project, ProjectMember, projects, projectMembers } from './db'; -import type { AuthPayload } from 'auth-connector/shared/types'; +import type { AuthPayload } from '../auth-connector/source/shared/types'; export function isOwner( project: Project, user: AuthPayload ): boolean { diff --git a/source/server/routes/files.ts b/source/server/routes/files.ts index cdd3311..89792b9 100644 --- a/source/server/routes/files.ts +++ b/source/server/routes/files.ts @@ -1,6 +1,6 @@ import { Router } from 'express'; import { getFileTree, readProjectFile, writeProjectFile, createProjectFile, createProjectDirectory, renameProjectEntry, deleteProjectEntry } from '../storage'; -import { requireAuth } from 'auth-connector/server/auth'; +import { requireAuth } from '../../auth-connector/source/server/auth'; import { checkAccess } from '../projectAccess'; const router = Router(); diff --git a/source/server/routes/groups.ts b/source/server/routes/groups.ts index d292daf..3fb31f7 100644 --- a/source/server/routes/groups.ts +++ b/source/server/routes/groups.ts @@ -1,6 +1,6 @@ import { Router } from 'express'; import { groups, groupMembers } from '../db'; -import { requireAuth } from 'auth-connector/server/auth'; +import { requireAuth } from '../../auth-connector/source/server/auth'; const router = Router(); router.use(requireAuth); diff --git a/source/server/routes/layout.ts b/source/server/routes/layout.ts index a59b653..e2b0961 100644 --- a/source/server/routes/layout.ts +++ b/source/server/routes/layout.ts @@ -1,7 +1,7 @@ import { Router } from 'express'; import fs from 'fs'; import path from 'path'; -import { requireAuth } from 'auth-connector/server/auth'; +import { requireAuth } from '../../auth-connector/source/server/auth'; import { RJLog } from '../../library-ts/node/log/RJLog'; import { ROOT } from '../rootDir'; diff --git a/source/server/routes/projects.ts b/source/server/routes/projects.ts index e071926..863223a 100644 --- a/source/server/routes/projects.ts +++ b/source/server/routes/projects.ts @@ -1,6 +1,6 @@ import { Router } from 'express'; import { projects, projectMembers } from '../db'; -import { requireAuth } from 'auth-connector/server/auth'; +import { requireAuth } from '../../auth-connector/source/server/auth'; import { createProjectStorage } from '../storage'; import { isOwner, canView, getMemberRole } from '../projectAccess'; diff --git a/source/server/routes/rojos.ts b/source/server/routes/rojos.ts index dd2aee6..d64cd94 100644 --- a/source/server/routes/rojos.ts +++ b/source/server/routes/rojos.ts @@ -2,7 +2,7 @@ import { Router } from "express"; import fs from "fs"; import path from "path"; import crypto from "crypto"; -import { requireAuth } from "auth-connector/server/auth"; +import { requireAuth } from "../../auth-connector/source/server/auth"; import { getAgentStream, updateAgentConversation, AgentConfig } from "../rojos/RojosAgent"; import { readProjectFile, writeProjectFile, createProjectDirectory } from "../storage"; import { checkAccess } from "../projectAccess"; diff --git a/source/server/routes/userSettings.ts b/source/server/routes/userSettings.ts index 4dfc4bb..8d99ff7 100644 --- a/source/server/routes/userSettings.ts +++ b/source/server/routes/userSettings.ts @@ -1,5 +1,5 @@ import { Router } from 'express'; -import { requireAuth } from 'auth-connector/server/auth'; +import { requireAuth } from '../../auth-connector/source/server/auth'; import { userSettings } from '../db'; const router = Router(); diff --git a/tsconfig.json b/tsconfig.json index ecf4f3d..794b179 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,11 +6,7 @@ "strict": true, "esModuleInterop": true, "skipLibCheck": true, - "outDir": "dist", - "baseUrl": ".", - "paths": { - "auth-connector/*": ["./source/auth-connector/source/*"] - } + "outDir": "dist" }, "include": ["source/server/**/*"] }