@fdm-monster/client-next 0.0.1 → 0.0.2

package/src/router/index.ts

@@ -1,192 +0,0 @@
-import { createRouter, createWebHistory } from 'vue-router'
-import PrinterGridView from '@/components/PrinterGrid/PrinterGridView.vue'
-import PrintersView from '@/components/PrinterList/PrintersView.vue'
-import Settings from '@/components/Settings/SettingsView.vue'
-import UserManagementSettings from '@/components/Settings/UserManagementSettings.vue'
-import OctoPrintSettings from '@/components/Settings/OctoPrintSettings.vue'
-import FloorSettings from '@/components/Settings/FloorSettings.vue'
-import AboutView from '@/components/AboutHelp/AboutView.vue'
-import EmergencyCommands from '@/components/Settings/EmergencyCommands.vue'
-import NotFoundView from '@/components/NotFound/NotFoundView.vue'
-import { useAuthStore } from '@/store/auth.store'
-import { RouteNames } from './route-names'
-import PermissionDenied from '../components/Login/PermissionDenied.vue'
-import LoginView from '../components/Login/LoginView.vue'
-import RegistrationView from '../components/Login/RegistrationView.vue'
-import CameraGridView from '../components/CameraGrid/CameraGridView.vue'
-import FirstTimeSetupView from '../components/FirstTimeSetup/FirstTimeSetupView.vue'
-import AccountSettings from '../components/Settings/AccountSettings.vue'
-import GridSettings from '../components/Settings/GridSettings.vue'
-import ServerProtectionSettings from '../components/Settings/ServerProtectionSettings.vue'
-import SoftwareUpgradeSettings from '../components/Settings/SoftwareUpgradeSettings.vue'
-import DiagnosticsSettings from '../components/Settings/DiagnosticsSettings.vue'
-import PrintStatisticsView from '../components/PrintStatistics/PrintStatisticsView.vue'
-
-const NeedsAuth = {
-  requiresAuth: true
-}
-
-const NoAuth = {
-  requiresAuth: false
-}
-
-const router = createRouter({
-  history: createWebHistory(import.meta.env.BASE_URL),
-  routes: [
-    {
-      path: '/',
-      name: RouteNames.Home,
-      meta: NeedsAuth,
-      component: PrinterGridView
-    },
-    {
-      path: '/first-time-setup',
-      name: RouteNames.FirstTimeSetup,
-      meta: NoAuth,
-      component: FirstTimeSetupView
-    },
-    {
-      path: '/login',
-      name: RouteNames.Login,
-      meta: NoAuth,
-      component: LoginView
-    },
-    {
-      path: '/registration',
-      name: RouteNames.Registration,
-      meta: NoAuth,
-      component: RegistrationView
-    },
-    {
-      path: '/printers',
-      name: RouteNames.PrintersView,
-      meta: NeedsAuth,
-      component: PrintersView
-    },
-    {
-      path: '/cameras',
-      name: RouteNames.CameraGridView,
-      component: CameraGridView
-    },
-    {
-      path: '/settings',
-      component: Settings,
-      meta: NeedsAuth,
-      children: [
-        {
-          path: '',
-          meta: NeedsAuth,
-          redirect: '/settings/grid'
-        },
-        {
-          path: 'account',
-          meta: NeedsAuth,
-          component: AccountSettings
-        },
-        {
-          path: 'server-protection',
-          meta: NeedsAuth,
-          component: ServerProtectionSettings
-        },
-        {
-          path: 'grid',
-          meta: NeedsAuth,
-          component: GridSettings
-        },
-        {
-          path: 'floors',
-          meta: NeedsAuth,
-          component: FloorSettings
-        },
-        {
-          path: 'user-management',
-          meta: NeedsAuth,
-          component: UserManagementSettings
-        },
-        {
-          path: 'octoprint',
-          meta: NeedsAuth,
-          component: OctoPrintSettings
-        },
-        {
-          path: 'emergency-commands',
-          meta: NeedsAuth,
-          component: EmergencyCommands
-        },
-        {
-          path: 'software-upgrade',
-          meta: NeedsAuth,
-          component: SoftwareUpgradeSettings
-        },
-        {
-          path: 'diagnostics',
-          meta: NeedsAuth,
-          component: DiagnosticsSettings
-        }
-      ]
-    },
-    // {
-    //   path: "/repair-log",
-    //   name: "Repair Log",
-    //   component: RepairLogView,
-    // },
-    {
-      path: '/statistics',
-      name: RouteNames.PrintStatistics,
-      meta: NeedsAuth,
-      component: PrintStatisticsView
-    },
-    {
-      path: '/about',
-      name: 'About',
-      component: AboutView
-    },
-    {
-      path: '/permission-denied',
-      name: RouteNames.PermissionDenied,
-      meta: NeedsAuth,
-      component: PermissionDenied
-    },
-    {
-      path: '/:pathMatch(.*)*',
-      name: 'NotFound',
-      component: NotFoundView
-    }
-  ]
-})
-
-router.beforeEach(async (to, from, next) => {
-  // This prevents login page from being shown when already logged in
-  const authStore = useAuthStore()
-
-  // Note that we do not let loginRequired === null coerce to false as that means its not loaded
-  if (!to?.meta?.requiresAuth || authStore.loginRequired === false) {
-    console.debug(`No auth required on route ${to.fullPath}`)
-    return next()
-  }
-  // TODO why is this here again? This causes the app not to initialize properly (SocketIO/settings in AppLoader)
-  // else if (authStore.loginRequired === null) {
-  //   return next();
-  // }
-  else {
-    console.debug(
-      `Auth required on route ${to.fullPath} (loginRequired=${authStore.loginRequired}, registration=${authStore.registration}, wizardState=${authStore.wizardState}, requiresAuth=${to?.meta?.requiresAuth})`
-    )
-  }
-
-  authStore.loadTokens()
-  if (!authStore.hasAuthToken && !authStore.hasRefreshToken) {
-    console.debug('Not logged in, redirecting to login page')
-    if (from.path == '/login') {
-      throw new Error('Already on login page, cannot redirect')
-    }
-    return next({
-      path: '/login',
-      query: { redirect: to.fullPath }
-    })
-  }
-
-  return next()
-})
-
-export default router

package/src/router/route-names.ts

@@ -1,14 +0,0 @@
-export const RouteNames = {
-  Home: 'Home',
-  Login: 'Login',
-  Registration: 'Registration',
-  PrintersView: 'PrintersView',
-  Settings: 'Settings',
-  CameraGridView: 'CameraGridView',
-  PrintStatistics: 'Print Statistics',
-  About: 'About',
-  PermissionDenied: 'PermissionDenied',
-  NotFound: 'NotFound',
-  FirstTimeSetup: 'FirstTimeSetup',
-  ServerProtection: 'ServerProtection'
-}

package/src/router/utils.ts

@@ -1,23 +0,0 @@
-import { Router } from 'vue-router'
-import { RouteNames } from './route-names'
-
-export async function routeToPath(router: Router, name: string) {
-  return router.push({ name })
-}
-
-export async function routeToLogin(router: Router) {
-  // Prevent redundant or circular routing
-  if (router.currentRoute.value.path === '/login') {
-    console.log('routeToLogin: already at login page')
-    return
-  }
-  return routeToPath(router, RouteNames.Login)
-}
-
-export async function routeToHome(router: Router) {
-  // Prevent redundant or circular routing
-  if (router.currentRoute.value.path === '/') {
-    return
-  }
-  return routeToPath(router, RouteNames.Home)
-}

package/src/shared/alert.events.ts

@@ -1,14 +0,0 @@
-export enum InfoEventType {
-  UPLOAD_BACKEND,
-  UPLOAD_FRONTEND
-}
-
-export const eventTypeToMessage = (type: InfoEventType, count: number) => {
-  if (type === InfoEventType.UPLOAD_BACKEND) {
-    return `Server is sending file(s) (${count})`
-  } else if (type === InfoEventType.UPLOAD_FRONTEND) {
-    return `Uploading file(s) to server (${count})`
-  } else {
-    return 'Uploading file(s)'
-  }
-}

package/src/shared/app.constants.ts

@@ -1,23 +0,0 @@
-export const isDevEnv = true // process.env.NODE_ENV === 'development'
-export const isProdEnv = false // process.env.NODE_ENV === 'production'
-
-export interface AppConstants {
-  apiKeyLength: number
-  maxPort: number
-  maxPrinterNameLength: number
-  maxPrinterGroupNameLength: number
-  maxPrinterGroupLocationX: number
-  maxPrinterGroupLocationY: number
-  minPrinterFloorNameLength: number
-}
-
-export const generateAppConstants = (): Readonly<AppConstants> =>
-  Object.freeze({
-    apiKeyLength: 32,
-    maxPort: 65535,
-    maxPrinterNameLength: 25,
-    maxPrinterGroupNameLength: 30, // Doesn't exist on backend
-    maxPrinterGroupLocationX: 4,
-    maxPrinterGroupLocationY: 4,
-    minPrinterFloorNameLength: 3
-  }) as Readonly<AppConstants>

package/src/shared/auth.constants.ts

@@ -1,34 +0,0 @@
-export interface PermissionDeniedEvent {
-  roles?: string[]
-  permissions?: string[]
-  error?: string
-  url?: string
-}
-
-export const AUTH_ERROR_REASON = {
-  IncorrectCredentials: 'IncorrectCredentials',
-  InvalidOrExpiredRefreshToken: 'InvalidOrExpiredRefreshToken',
-  InvalidOrExpiredAuthToken: 'InvalidOrExpiredAuthToken',
-  PasswordChangeRequired: 'PasswordChangeRequired',
-  LoginRequired: 'LoginRequired',
-  AccountNotVerified: 'AccountNotVerified'
-}
-
-export function convertAuthErrorReason(error: string) {
-  switch (error) {
-    case AUTH_ERROR_REASON.IncorrectCredentials:
-      return 'Incorrect credentials'
-    case AUTH_ERROR_REASON.InvalidOrExpiredRefreshToken:
-      return 'Invalid or expired refresh token'
-    case AUTH_ERROR_REASON.InvalidOrExpiredAuthToken:
-      return 'Invalid or expired auth token'
-    case AUTH_ERROR_REASON.PasswordChangeRequired:
-      return 'Password change required'
-    case AUTH_ERROR_REASON.LoginRequired:
-      return 'Login required'
-    case AUTH_ERROR_REASON.AccountNotVerified:
-      return 'Account not verified'
-    default:
-      return 'Authentication error'
-  }
-}

package/src/shared/dialog.composable.ts

@@ -1,41 +0,0 @@
-import { useDialogsStore } from '@/store/dialog.store'
-import { DialogName } from '@/components/Generic/Dialogs/dialog.constants'
-import { watchEffect } from 'vue'
-
-export function useDialog<T = any, O = any>(dialogId: DialogName) {
-  const dialogStore = useDialogsStore()
-
-  async function openDialog(context?: T) {
-    const beforeOpenedCallback = dialogStore.getBeforeOpenedCallback(dialogId)
-    if (beforeOpenedCallback) {
-      await beforeOpenedCallback(context)
-    }
-
-    dialogStore.openDialogWithContext(dialogId, context)
-
-    const openedCallback = dialogStore.getOpenedCallback(dialogId)
-    if (openedCallback) {
-      await openedCallback(context)
-    }
-  }
-
-  return {
-    dialogId,
-    dialogStore,
-    openDialog,
-    context: () => dialogStore.getContext(dialogId),
-    closeDialog: (output?: O) => dialogStore.closeDialog(dialogId, output),
-    isDialogOpened: () => dialogStore.isDialogOpened(dialogId),
-    handleAsync: async (input: T): Promise<O> => {
-      await openDialog(input)
-
-      return new Promise<O>((resolve) => {
-        watchEffect(() => {
-          if (!dialogStore.isDialogOpened(dialogId)) {
-            resolve(dialogStore.getOutput(dialogId))
-          }
-        })
-      })
-    }
-  }
-}

package/src/shared/drag.constants.ts

@@ -1,19 +0,0 @@
-import { IdType } from '@/utils/id.type'
-
-export const dragAppId = 'FDM-Monster-Client-Vue2'
-
-export enum INTENT {
-  PRINTER_PLACE = 'PRINTER_PLACE'
-}
-
-export function isPrinterPlaceDataTransfer(data: PrinterPlace) {
-  if (!data?.appId?.length || !data?.intent?.length) return false
-
-  return data.appId === dragAppId && data.intent === INTENT.PRINTER_PLACE
-}
-
-export interface PrinterPlace {
-  appId: string
-  intent: string
-  printerId: IdType
-}

package/src/shared/experimental.constants.ts

@@ -1 +0,0 @@
-export const whitelistSettingsHidden = true

package/src/shared/http-client.ts

@@ -1,162 +0,0 @@
-import axios, { AxiosError, AxiosRequestConfig, HttpStatusCode } from 'axios'
-import { useAuthStore } from '@/store/auth.store'
-import { useEventBus } from '@vueuse/core'
-import {
-  convertAuthErrorReason,
-  PermissionDeniedEvent
-} from '@/shared/auth.constants'
-import { captureException } from '@sentry/vue'
-
-/**
- * Made async for future possibility of getting base URI externally or asynchronously
- */
-export async function getBaseUri() {
-  // return process.env.NODE_ENV === "development" ? "https://demo.fdm-monster.net" : "";
-  return process.env.NODE_ENV === 'development' ? 'http://localhost:4000/' : '/' // Same-origin policy
-}
-
-export async function getHttpClient(
-  withAuth: boolean = true,
-  autoHandle401: boolean = true
-) {
-  const instance = axios.create({
-    baseURL: await getBaseUri()
-  })
-
-  instance.interceptors.request.use((config) => {
-    console.debug(
-      `${config.method?.toUpperCase().padEnd(6)} ${config.url?.padEnd(
-        25
-      )} WithAuth: ${withAuth
-        ?.toString()
-        .padEnd(7)} AutoHandle401: ${autoHandle401
-        ?.toString()
-        .padEnd(7)} BaseURL: ${config.baseURL}`
-    )
-    return config
-  })
-
-  if (withAuth) {
-    instance.interceptors.request.use(
-      async (config) => {
-        const authStore = useAuthStore()
-        authStore.loadTokens()
-        if (authStore.hasAuthToken) {
-          config.headers.Authorization = `Bearer ${authStore.token}`
-        }
-
-        return config
-      },
-      (error) => {
-        console.error('Error in axios request interceptor', error)
-        return Promise.reject(error)
-      }
-    )
-  }
-
-  if (!autoHandle401) {
-    return instance
-  }
-
-  instance.interceptors.response.use(
-    (response) => response,
-    async (error: AxiosError) => {
-      const { response, config } = error
-      if (!response) {
-        console.error('No response was returned by axios', error)
-        return Promise.reject({
-          message: `No response was returned by axios - URL ${config?.url}`,
-          stack: error.stack
-        })
-      }
-
-      // Special code
-      if (response.status === HttpStatusCode.FailedDependency) {
-        return Promise.reject(error)
-      }
-
-      if (
-        ![HttpStatusCode.Unauthorized, HttpStatusCode.Forbidden].includes(
-          response.status
-        )
-      ) {
-        // Timeout issues etc?
-        console.error(
-          'Error in axios response interceptor which is not 401 or 403',
-          error
-        )
-        captureException(error)
-        return Promise.reject({
-          message: `${error.message} - URL ${config?.url}`,
-          stack: error.stack
-        })
-      }
-
-      if (response.status === HttpStatusCode.Forbidden) {
-        const data = error?.response?.data as {
-          error?: string
-          roles?: string[]
-          permissions?: string[]
-        }
-        console.error('[HttpClient] 403 Forbidden', data)
-        useEventBus<PermissionDeniedEvent>('auth:permission-denied').emit({
-          roles: data?.roles,
-          permissions: data?.permissions,
-          error: data?.error,
-          url: config?.url
-        })
-        return Promise.reject(error)
-      }
-
-      const authStore = useAuthStore()
-      authStore.loadTokens()
-
-      // Detect if this is a special reason code, and if so, don't handle it here
-      const { reasonCode, url } = authStore.extractSpecialReasonCode(error)
-      if (reasonCode) {
-        await authStore.logout(false, convertAuthErrorReason(reasonCode))
-        console.error(
-          `[AuthStore] 401 Unauthorized - emitting 'auth:${reasonCode}' with reason ${reasonCode}`
-        )
-        useEventBus(`auth:${reasonCode}`).emit({
-          url,
-          error: error.message,
-          reasonCode
-        })
-        return Promise.reject(error)
-      }
-
-      // If this is called on AppLoader and failing, poll it if status 0
-      await authStore.checkAuthenticationRequirements()
-
-      // If this fails, the server is just confused
-      const { success, handled } =
-        await authStore.verifyOrRefreshLoginOnceOrLogout()
-      if (handled) {
-        return Promise.reject(error)
-      }
-      if (success) {
-        if (!config?.url) {
-          throw new Error('No URL in axios config, cannot retry')
-        }
-
-        console.debug('Redoing request without interceptors', config?.url)
-        const newConfig: AxiosRequestConfig = config
-        if (!newConfig.headers) {
-          newConfig.headers = {}
-        }
-        newConfig.headers.Authorization = `Bearer ${authStore.token}`
-        return axios(newConfig)
-      }
-
-      console.error("[HttpClient] 401 Unauthorized - emitting 'auth:failure'")
-      useEventBus('auth:failure').emit({
-        url: config?.url,
-        error: error.message
-      })
-
-      return Promise.reject(error)
-    }
-  )
-  return instance
-}

package/src/shared/noun-adjectives.data.ts

@@ -1,24 +0,0 @@
-import adjectives from '../assets/adjectives.json'
-import nouns from '../assets/nouns.json'
-
-function capitalize(val: string) {
-  if (!val) return ''
-  return val.charAt(0).toUpperCase() + val.slice(1)
-}
-
-export function newRandomNamePair() {
-  const randomAdjective = Math.round(Math.random() * 1124)
-  const randomNoun = Math.round(Math.random() * 3260)
-
-  return `${capitalize(adjectives[randomAdjective])} ${capitalize(nouns[randomNoun])}`
-}
-
-export function generateInitials(name: string) {
-  if (name === null) return '?'
-  const initials = name
-    ?.replace(/[^a-zA-Z ]/g, '')
-    ?.split(' ')
-    .slice(0, 3)
-    .reduce((acc, subname) => acc + subname[0], '')
-  return initials?.replace('undefined', '')
-}

package/src/shared/printer-grid.constants.ts

@@ -1,5 +0,0 @@
-// Should not be adjusted unless the grid system is changed to support other than 12
-export const totalVuetifyColumnCount = 12
-
-export const rowOptions = [1, 2, 3, 4, 5, 6, 7, 8].map((v) => v * 2)
-export const colOptions = [1, 2, 3, 4, 6].map((v) => v * 2)