diff --git a/.env.development b/.env.development index 47ce20bfc..7b474799a 100644 --- a/.env.development +++ b/.env.development @@ -7,7 +7,6 @@ VITE_KC_API_WS_MODELING_URL=wss://api.dev.zoo.dev/ws/modeling/commands VITE_KC_API_BASE_URL=https://api.dev.zoo.dev VITE_KC_SITE_BASE_URL=https://dev.zoo.dev VITE_KC_SITE_APP_URL=https://app.dev.zoo.dev -VITE_KC_SKIP_AUTH=false VITE_KC_CONNECTION_TIMEOUT_MS=5000 #VITE_WASM_URL="optional way of overriding the wasm url, particular for unit tests which need this if you running not on the default 3000 port" #VITE_KC_DEV_TOKEN="optional token to skip auth in the app" diff --git a/.env.production b/.env.production index 6adcecc5d..49aee03e9 100644 --- a/.env.production +++ b/.env.production @@ -3,5 +3,4 @@ VITE_KC_API_WS_MODELING_URL=wss://api.zoo.dev/ws/modeling/commands VITE_KC_API_BASE_URL=https://api.zoo.dev VITE_KC_SITE_BASE_URL=https://zoo.dev VITE_KC_SITE_APP_URL=https://app.zoo.dev -VITE_KC_SKIP_AUTH=false VITE_KC_CONNECTION_TIMEOUT_MS=15000 diff --git a/interface.d.ts b/interface.d.ts index 8b6af29bd..1a2904e2b 100644 --- a/interface.d.ts +++ b/interface.d.ts @@ -79,7 +79,6 @@ export interface IElectronAPI { VITE_KC_API_BASE_URL: string VITE_KC_SITE_BASE_URL: string VITE_KC_SITE_APP_URL: string - VITE_KC_SKIP_AUTH: string VITE_KC_CONNECTION_TIMEOUT_MS: string VITE_KC_DEV_TOKEN: string NODE_ENV: string diff --git a/src/env.ts b/src/env.ts index bde829f58..f3f0af864 100644 --- a/src/env.ts +++ b/src/env.ts @@ -11,7 +11,6 @@ export const VITE_KC_API_WS_MODELING_URL = env.VITE_KC_API_WS_MODELING_URL as export const VITE_KC_API_BASE_URL = env.VITE_KC_API_BASE_URL export const VITE_KC_SITE_BASE_URL = env.VITE_KC_SITE_BASE_URL export const VITE_KC_SITE_APP_URL = env.VITE_KC_SITE_APP_URL -export const VITE_KC_SKIP_AUTH = env.VITE_KC_SKIP_AUTH as string | undefined export const VITE_KC_CONNECTION_TIMEOUT_MS = env.VITE_KC_CONNECTION_TIMEOUT_MS as string | undefined export const VITE_KC_DEV_TOKEN = env.VITE_KC_DEV_TOKEN as string | undefined diff --git a/src/machines/authMachine.ts b/src/machines/authMachine.ts index 45b2d328b..97acd35a4 100644 --- a/src/machines/authMachine.ts +++ b/src/machines/authMachine.ts @@ -1,10 +1,5 @@ import type { Models } from '@kittycad/lib' -import { - DEV, - VITE_KC_API_BASE_URL, - VITE_KC_DEV_TOKEN, - VITE_KC_SKIP_AUTH, -} from '@src/env' +import { VITE_KC_API_BASE_URL, VITE_KC_DEV_TOKEN } from '@src/env' import { assign, fromPromise, setup } from 'xstate' import { COOKIE_NAME, OAUTH2_DEVICE_CLIENT_ID } from '@src/lib/constants' @@ -21,26 +16,6 @@ import { } from '@src/lib/withBaseURL' import { ACTOR_IDS } from '@src/machines/machineConstants' -const SKIP_AUTH = VITE_KC_SKIP_AUTH === 'true' && DEV - -const LOCAL_USER: Models['User_type'] = { - id: '8675309', - name: 'Test User', - email: 'kittycad.sidebar.test@example.com', - image: 'https://placekitten.com/200/200', - created_at: 'yesteryear', - updated_at: 'today', - company: 'Test Company', - discord: 'Test User#1234', - github: 'testuser', - phone: '555-555-5555', - first_name: 'Test', - last_name: 'User', - can_train_on_data: false, - is_service_account: false, - deletion_scheduled: false, -} - export interface UserContext { user?: Models['User_type'] token: string @@ -165,19 +140,6 @@ async function getUser(input: { token?: string }) { if (!token && isDesktop()) return Promise.reject(new Error('No token found')) if (token) headers['Authorization'] = `Bearer ${token}` - if (SKIP_AUTH) { - // For local tests - if (localStorage.getItem('FORCE_NO_IMAGE')) { - LOCAL_USER.image = '' - } - - markOnce('code/didAuth') - return { - user: LOCAL_USER, - token, - } - } - const userPromise = isDesktop() ? getUserDesktop(token, VITE_KC_API_BASE_URL) : fetch(url, { diff --git a/src/main.ts b/src/main.ts index 27bf5b8f9..c130963b9 100644 --- a/src/main.ts +++ b/src/main.ts @@ -75,7 +75,6 @@ process.env.VITE_KC_API_WS_MODELING_URL ??= viteEnv.VITE_KC_API_WS_MODELING_URL process.env.VITE_KC_API_BASE_URL ??= viteEnv.VITE_KC_API_BASE_URL process.env.VITE_KC_SITE_BASE_URL ??= viteEnv.VITE_KC_SITE_BASE_URL process.env.VITE_KC_SITE_APP_URL ??= viteEnv.VITE_KC_SITE_APP_URL -process.env.VITE_KC_SKIP_AUTH ??= viteEnv.VITE_KC_SKIP_AUTH process.env.VITE_KC_CONNECTION_TIMEOUT_MS ??= viteEnv.VITE_KC_CONNECTION_TIMEOUT_MS diff --git a/src/preload.ts b/src/preload.ts index 5e7ebe4c5..4eb8036f7 100644 --- a/src/preload.ts +++ b/src/preload.ts @@ -292,7 +292,6 @@ contextBridge.exposeInMainWorld('electron', { 'VITE_KC_API_BASE_URL', 'VITE_KC_SITE_BASE_URL', 'VITE_KC_SITE_APP_URL', - 'VITE_KC_SKIP_AUTH', 'VITE_KC_CONNECTION_TIMEOUT_MS', 'VITE_KC_DEV_TOKEN',