chore: move publicApi.ts contents to utils.ts

Author: jescalada

src/service/routes/auth.ts

@@ -9,8 +9,7 @@ import * as passportAD from '../passport/activeDirectory';
 import { User } from '../../db/types';
 import { AuthenticationElement } from '../../config/generated/config';
 
-import { toPublicUser } from './publicApi';
-import { isAdminUser } from './utils';
+import { isAdminUser, toPublicUser } from './utils';
 
 const router = express.Router();
 const passport = getPassport();

src/service/routes/publicApi.ts

@@ -2,7 +2,7 @@ import express, { Request, Response } from 'express';
 const router = express.Router();
 
 import * as db from '../../db';
-import { toPublicUser } from './publicApi';
+import { toPublicUser } from './utils';
 
 router.get('/', async (req: Request, res: Response) => {
   console.log('fetching users');

src/service/routes/users.ts

@@ -1,3 +1,5 @@
+import { PublicUser, User as DbUser } from '../../db/types';
+
 interface User extends Express.User {
   username: string;
   admin?: boolean;
@@ -6,3 +8,14 @@ interface User extends Express.User {
 export function isAdminUser(user?: Express.User): user is User & { admin: true } {
   return user !== null && user !== undefined && (user as User).admin === true;
 }
+
+export const toPublicUser = (user: DbUser): PublicUser => {
+  return {
+    username: user.username || '',
+    displayName: user.displayName || '',
+    email: user.email || '',
+    title: user.title || '',
+    gitAccount: user.gitAccount || '',
+    admin: user.admin || false,
+  };
+};