Tweaks, fixes, and version bump

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

lib/app.ts

@@ -7,7 +7,7 @@ import passport from './passport';
 import { performanceLogger, performanceTimer } from './middleware/performance';
 import { errorHandler } from './middleware/errorHandler';
 import { authRouter } from './controllers/auth';
-import { SESSION_KEY } from '../constants/env';
+import { SESSION_KEY } from './constants/env';
 
 const app: Koa = new Koa();
 

lib/controllers/auth.ts

@@ -3,13 +3,13 @@ import Koa from 'koa';
 import Router from 'koa-router';
 import { StringSchemaDefinition } from 'mongoose';
 
-import { Auth } from '@mifi/services-common/lib/db';
-import { create } from '@mifi/services-common/lib/db/dao/create';
-import { resetPasswordPost } from '@mifi/services-common/lib/db/api/resetPasswordPost';
-import { resetPasswordGet } from '@mifi/services-common/lib/db/api/resetPasswordGet';
-import { deleteById } from '@mifi/services-common/lib/db/dao/deleteById';
-import { deleteStrategy } from '@mifi/services-common/lib/db/api/deleteStrategy';
-import { AuthDocument } from '@mifi/services-common/lib/db/schema/auth';
+import { Auth } from '@mifi/auth-db/lib';
+import { deleteStrategy } from '@mifi/auth-db/lib/api/deleteStrategy';
+import { resetPasswordGet } from '@mifi/auth-db/lib/api/resetPasswordGet';
+import { resetPasswordPost } from '@mifi/auth-db/lib/api/resetPasswordPost';
+import { create } from '@mifi/auth-db/lib/dao/create';
+import { deleteById } from '@mifi/auth-db/lib/dao/deleteById';
+import { AuthDocument } from '@mifi/auth-db/lib/schema/auth';
 
 import { ROUTE_PREFIX as prefix, RESET_ROUTE } from '../constants/env';
 import passport from '../passport';

lib/index.ts

@@ -1,6 +1,6 @@
 import app from './app';
-import { connection } from '../db';
-import { PORT } from '../constants/env';
+import { connection } from '@mifi/auth-db/lib';
+import { PORT } from './constants/env';
 
 connection.then(
     () => {

lib/passport/index.ts

@@ -1,9 +1,9 @@
 import passport from 'koa-passport';
 import { Types } from 'mongoose';
 
-import { AuthDocument } from '@mifi/services-common/lib/db/schema/auth';
-import { readOneByRecord } from '@mifi/services-common/lib/db/dao/readOneByRecord';
-import { readOneById } from '@mifi/services-common/lib/db/dao/readOneById';
+import { AuthDocument } from '@mifi/auth-db/lib/schema/auth';
+import { readOneByRecord } from '@mifi/auth-db/lib/dao/readOneByRecord';
+import { readOneById } from '@mifi/auth-db/lib/dao/readOneById';
 
 import LocalStrategy from './strategies/local';
 import JwtStrategy from './strategies/jwt';

lib/passport/strategies/jwt.ts

@@ -1,6 +1,6 @@
 import { ExtractJwt, Strategy as JwtStrategy } from 'passport-jwt';
 
-import { readOneByRecord } from '@mifi/services-common/lib/db/dao/readOneByRecord';
+import { readOneByRecord } from '@mifi/auth-db/lib/dao/readOneByRecord';
 
 import { JWT_SECRET } from '../../constants/env';
 

lib/passport/strategies/local.ts

@@ -1,7 +1,7 @@
 // eslint-disable-next-line import/named
 import { Strategy as LocalStrategy } from 'passport-local';
 
-import { authenticate } from '@mifi/services-common/lib/db/api/authenticate';
+import { authenticate } from '@mifi/auth-db/lib/api/authenticate';
 
 export default new LocalStrategy(async (username: string, password: string, done: any) => {
     const user = await authenticate(username, password);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mifi/auth-service",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": "mifi (Mike Fitzpatrick)",
   "license": "MIT",
   "scripts": {
@@ -19,7 +19,7 @@
     "@babel/core": "^7.21.8",
     "@babel/preset-env": "^7.21.5",
     "@babel/preset-typescript": "^7.21.5",
-    "@tsconfig/node16": "^1.0.3",
+    "@tsconfig/node16": "^1.0.4",
     "@types/jest": "^29.5.1",
     "@types/jsonwebtoken": "^9.0.1",
     "@types/koa": "^2.13.5",
@@ -57,6 +57,7 @@
   },
   "dependencies": {
     "@mifi/auth-db": "^1.0.0",
+    "@mifi/services-common": "^1.0.0",
     "@simplewebauthn/server": "^7.2.0",
     "dotenv": "^16.0.3",
     "http-status-codes": "^2.2.0",