From b3c38087977b414d122f20410fed4714b1b0a691 Mon Sep 17 00:00:00 2001 From: Douglas Barone Date: Mon, 23 Oct 2023 14:52:31 -0400 Subject: [PATCH] Organize code --- src/server/auth/FakeAuth.ts | 2 +- src/server/auth/LdapAuth.ts | 2 +- src/server/lib/login.ts | 2 +- src/server/lib/logout.ts | 2 +- src/server/{interfaces => schemas}/Auth.ts | 0 src/server/{paloalto => services}/PaFirewall.ts | 0 src/web/components/LoggedCard.vue | 2 +- src/web/views/Login.vue | 2 +- 8 files changed, 6 insertions(+), 6 deletions(-) rename src/server/{interfaces => schemas}/Auth.ts (100%) rename src/server/{paloalto => services}/PaFirewall.ts (100%) diff --git a/src/server/auth/FakeAuth.ts b/src/server/auth/FakeAuth.ts index 31d46df..be2e416 100644 --- a/src/server/auth/FakeAuth.ts +++ b/src/server/auth/FakeAuth.ts @@ -1,4 +1,4 @@ -import { Auth, LoginResult } from '../interfaces/Auth' +import { Auth, LoginResult } from '../schemas/Auth' export class FakeAuth implements Auth { constructor() {} diff --git a/src/server/auth/LdapAuth.ts b/src/server/auth/LdapAuth.ts index b88673a..1541ed7 100644 --- a/src/server/auth/LdapAuth.ts +++ b/src/server/auth/LdapAuth.ts @@ -1,5 +1,5 @@ import { Client } from 'ldapts' -import { Auth, LoginResult } from '../interfaces/Auth' +import { Auth, LoginResult } from '../schemas/Auth' export class LdapAuth implements Auth { constructor( diff --git a/src/server/lib/login.ts b/src/server/lib/login.ts index c99ed96..010c72b 100644 --- a/src/server/lib/login.ts +++ b/src/server/lib/login.ts @@ -1,7 +1,7 @@ import { Client } from 'ldapts' import { LdapAuth } from '../auth/LdapAuth' -import { PaFirewall } from '../paloalto/PaFirewall' +import { PaFirewall } from '../services/PaFirewall' import { paHosts } from '../db/pa' diff --git a/src/server/lib/logout.ts b/src/server/lib/logout.ts index c67ce1f..1ebc39e 100644 --- a/src/server/lib/logout.ts +++ b/src/server/lib/logout.ts @@ -1,4 +1,4 @@ -import { PaFirewall } from '../paloalto/PaFirewall' +import { PaFirewall } from '../services/PaFirewall' import { paHosts } from '../db/pa' diff --git a/src/server/interfaces/Auth.ts b/src/server/schemas/Auth.ts similarity index 100% rename from src/server/interfaces/Auth.ts rename to src/server/schemas/Auth.ts diff --git a/src/server/paloalto/PaFirewall.ts b/src/server/services/PaFirewall.ts similarity index 100% rename from src/server/paloalto/PaFirewall.ts rename to src/server/services/PaFirewall.ts diff --git a/src/web/components/LoggedCard.vue b/src/web/components/LoggedCard.vue index e04bba1..b6fd21f 100644 --- a/src/web/components/LoggedCard.vue +++ b/src/web/components/LoggedCard.vue @@ -43,7 +43,7 @@ import { PropType } from 'vue' import { trpc } from '../trpc' -import { LoginResult } from '@/server/interfaces/Auth' +import { LoginResult } from '@/server/schemas/Auth' const props = defineProps({ loginResult: { diff --git a/src/web/views/Login.vue b/src/web/views/Login.vue index 0e73261..df08605 100644 --- a/src/web/views/Login.vue +++ b/src/web/views/Login.vue @@ -18,7 +18,7 @@ import IpAlert from '../components/IpAlert.vue' import Logo from '../components/Logo.vue' import LoggedCard from '../components/LoggedCard.vue' import { ref } from 'vue' -import { LoginResult } from '@/server/interfaces/Auth' +import { LoginResult } from '@/server/schemas/Auth' const loginResult = ref(null)