this seems to work a lot better

aslilac · aslilac · commit 3d4e398133f1 · 2023-08-16T18:41:37.000Z
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -13,6 +13,15 @@ axios.defaults.validateStatus = (status) => {
   return (status >= 200 && status < 300) || status === 304
 }
 
+axios.interceptors.response.use((response) => {
+  // If we encountered an authentication error, reset the app back to the /login route
+  if (response.status === 401) {
+    location.pathname = "/login"
+  }
+
+  return response
+})
+
 export const hardCodedCSRFCookie = (): string => {
   // This is a hard coded CSRF token/cookie pair for local development. In prod,
   // the GoLang webserver generates a random cookie with a new token for each
diff --git a/site/src/api/errors.ts b/site/src/api/errors.ts
@@ -88,6 +88,3 @@ export const getErrorDetail = (error: unknown): string | undefined | null =>
     : error instanceof Error
     ? `Please check the developer console for more details.`
     : null
-
-export const isAuthenticationError = (error: unknown): boolean =>
-  isApiError(error) && error.response.status === 401
diff --git a/site/src/components/Alert/ErrorAlert.tsx b/site/src/components/Alert/ErrorAlert.tsx
@@ -1,19 +1,11 @@
 import { AlertProps, Alert, AlertDetail } from "./Alert"
 import AlertTitle from "@mui/material/AlertTitle"
-import {
-  getErrorMessage,
-  getErrorDetail,
-  isAuthenticationError,
-} from "api/errors"
+import { getErrorMessage, getErrorDetail } from "api/errors"
 import { FC } from "react"
 
 export const ErrorAlert: FC<
   Omit<AlertProps, "severity" | "children"> & { error: unknown }
 > = ({ error, ...alertProps }) => {
-  if (isAuthenticationError(error)) {
-    location.href = "/login"
-  }
-
   const message = getErrorMessage(error, "Something went wrong.")
   const detail = getErrorDetail(error)
 
diff --git a/site/src/xServices/auth/authXService.ts b/site/src/xServices/auth/authXService.ts
@@ -192,7 +192,7 @@ export type AuthEvent =
   | { type: "UPDATE_PROFILE"; data: TypesGen.UpdateUserProfileRequest }
 
 export const authMachine =
-  /** @xstate-layout N4IgpgJg5mDOIC5QEMCuAXAFgZXc9YAdLAJZQB2kA8hgMTYCSA4gHID6DLioADgPal0JPuW4gAHogBsATimEAzDIAcAFgUB2VTJ26ANCACeiAIwaADKsLKFtu-dsBfRwbRZc+IqQolyUBuS0ECJEvgBufADWXmTkAWL8gsKiSBKICubKhKpSyhoArAbGCGaqGoRSlVXVlfnOrhg4eATEsb7+gWAATl18XYQ8ADb4AGZ9ALatFPGpiSRCImKSCLLySmqa2ro6RaYFAEzWDscK9SBuTZ6EMOhCfgCqsN1BIYThUUQ3ALJgCQLzySW6Uy2VyBV2JXyUhMFRqcLqLnOjQ8LRudygj2e3V6-SGowm1zA6B+fySi1Sy32MnyhHyyksYK2ug0EJM1IURxO9jOFxRnyJ6IACt1xiRYKQRLAXpQ3uQItFCABjTBgRWRYVdUXi5LwWb-BYpUDLZRScygvKFIyIGQaQ4FHnI5r827tDVaiXkKXYvoDYboMaapUqtVusUe3W8fWAimIE1mnIW1l0rImOE1BENdxOwkuvw-LB8CBS4Iy94K75EzCFiMgOYGoEIZRUwgyVT5BQmfaW4omGxZGxcuwOrNXNHtfNVou0b24v0ByYVgtF0kA8lG2PN1vtzvd0zszmD06I3nZ7yUCABAa9EYkQahCB32j3QUAEQAggAVACibEFACUqAAMQYAAZL8V3rGMSjbGQKihLsISkOlaWHS4WjPSBLx4a9byIVAeAgfBXRwx8S1COUPkIE8rgwi9yCvPgbzvQh8MIoUSLABB3kVIiRAAbXMABdCDo3XaD8lgpCpAQq0EA0eTUL5KZzywjiWIIoi-EFDjpx6H08X9AlqPQ2JMPo7DGNw9S2OIyy7y4iieINAThL1MlDTScTJPg3dGxkfZFNPUy6OIWBMDeB8wFoJgvw-NhsGwAAJNgAGkvwATREtdPM7VQrE0XyTF7coB0PQKaOCy9xXCsc-ASxKUrAQxpXI+UiGMmIKDM0KaoFdp6sawwHIiJzkhcrKPOWIqkOscFZNTfYOXtY9HQqrqQuqnN0QGprdJxX18UDDrlO6zbaqgHahu43jyHGtzV0m0x9jyxQ5p7ExzBhUrB3Kkz1qqsLCEGPhkAgSAIsfP8vxilgvz-T8f3q1KMomht9g+8ocnMGQCtZDRZAPLkMyREc-pU+jNuB0HwcVEQb01S6-zAGBKC6TxaAAYTfFgOa-EC2ChmG4YR+KkuRzL7sgsT0bMQhzCUcxpMK20vsPBRieO2iAfCqmwYgJU6ZIBmksGpmWe6dmOaoFhgL-L4Behr9Yfh79ReStKJcjdy0Yx0Fsdx+b23MX7OvJnqgZBvXCC6ZmwFZzSLpN3ayNlNqqNWsnTsB3XwZj822e2pOrscm67q9h6GzMBQrDy7cZJ7DR1ZQlbSdDrOdcj3PY-jwuGt2mcDsMo6M7bjbs87-W87ji3e8G4a+FG-ihNRqCq5rtsO3r0wpG0ZvMzQ0eqtVVAunmQwIai5931d7Avw5+4-wYD9PdrKNsqmsoOQyBM3sQZ6pBDidDax9T7oHPqxBO2AQFnxaqnSimtKoU2gWA6ykDkHFxGqXZektRI5U-ooBkiZZIKFyHvEmB8gFH0VCfM+qDtroL2vpOcRkR6UKQdQ0B4CNL0I4Wfeei9brYPLlLPBjcCE-18m2KwGtWFa0CIwVgbAqD3A-CvaWWgYSEN-iUDIZpUxpiqBoQBZ52g0HQLAssoczFqM8k2WCW5N6+X2OYeShMTgyNbspUxdAB4GXnMpaxOD35-w0XLCRrJ0ZWH0QYqQRiW4UOVKqSI7RAJG1gOgTEXQLEUQVMdRJaoUlpIyU8Lo-CsGuWEbg5YmhCD7B3nU-YA5lA6HVhCZxYjoRshyDvJQ+NVCAIAO7IABH4QCfQPwqlSV0dJmT6DMHYJwGx1Sm7Yx0I3SwziTBOLqWaLQdIpC2HyKoLZ5gESInIIWOAYgEHrUCZU4JJRsY0iIT2akZoPEUJMX4GY9zHoIDbIcdGLzt4qFhDEpCgDzqZKWYgVQ+xWSyCyOC2okK+paRFGGHUML-mmnNNorZbIwUxI+Upc6E5qzYq2LUuQwKSitnymrI8+8lJyIYkxe8zELlfj0l0bFVcaRlCklvRspzjGILZVZEgkVCAzj5Y3AV+MfIQjyEy8hLLxUWXZRfOVRVsiKqVhCRuhxtgaBVY3A5MgxX-XMmpCB7E7K-CCX8oq+RnnaIKJa+J6rrUSrvHykwHZZq+X2bScwYbzUSTUBCr1QUfWbSlX6p1lctlusKp2Q4JLY1hzOmixOfdii-MrlIiotKPpyCtdm8e1N9YJsdYWqCmyshyH9vigoVhkWxIre3CO1aDbkHpuMRm3cZ51tft7BtqhzAZoVga+aGhexuOOJmtalaO69qnj3fqRc+UKHpIQIq87S25GXZnMea69Y7qhPuswxVCptnKNsOQ7Z2xUhPYfCmYV-WBtLVOjkJqzUkP6TGldp10EX0IFynlcroRywsI4iEu6ArAdPVQmhKDa0yqg0m1e+NNFwZ3BCNswdkPvuIGB2tcqakuPlgR4h2MWzMgAxartwDeEoLtf1dB-rXVBoQyQljqHOFfq+q2v9jHG7mqUKqm55N-UuN4-NT6DGdD5C0Gp-Ypq31eL8HcsdFcG0yA+rB5QtHijOKOYoNWgD8nJNGUU6F2GxK9LlvSTIcLGn5C2ZUNpLj5CxIUFSD6XmuyDOGeiMZXQJlgCmTMkp2LGm1OUFCHQORGkyEVqoZQbTNly2-poaERy6kh0pYl5LrZpLNIy1l2Sm5dAkPRs4wz+NlDOGcEAA */
+  /** @xstate-layout N4IgpgJg5mDOIC5QEMCuAXAFgZXc9YAdADYD2yEAlgHZQCS1l6lyxAghpgCL7IDEEUtSI0AbqQDWRNFlz4iZCjXqNmrDlh54EY0gGN8lIQG0ADAF0z5xKAAOpWEyPUbIAB6IAzABYAbIQBWUwB2AA4ARgAmAIAaEABPRHCQgE5AgF90uJkcPAIScipaBid1Ti1+QWFCXSlCHLl8xSKVUvZy3h1qcQNmEwtjcOskEHtHPpcRjwQffyCwqNiEpMiownCA32jM7M5GhULlErV2zV4BIRFuyWk9vIOlYtUWU+5O3V7nK2NI4bsHJxCVzTWaBEIRaJxRIIcI+byECEBHYgBr3AqPVonDRvPB8MAAJ3xpHxhFsxHwADNiQBbep3eTolrHF7YipdHqGfqWCyuMaAyagEF+MELSHLGHeYLBQh+ULBJFZFH0-KOKDCCAAeQwfGwdAA4gA5AD6dANVl5AImwKSnki8I2WyW0OSwTSCt2sjRqsYTwu1VqRG9DHNIz5VqmiClpkIplCARSnnlUKSqQyitRDO9R2oeMJxNJ5PQVPxtKD1BD-3GzmtCCjMbjCaT4vC4TjMdF7qVnszlDVkAYOv1xo1AFUACoV0aW6sjaEAWnCTemkUicplwV8m226eVgd76oYpKJFMoxBEEDPfBHAAUuGwxwBRI3XgBKGoAYnQADIPydhmegNCwSLoEcTLuEKThOum6OsiGYqvu-bUEepAnmehCoLYECGLQ17HqeYB+lc4h1PBe59hAh62Ph6GYdhzC4TRYDsvonLlgMPKhtOQKzpG8ZgUkATRIQq6LHBu6EN6SEoWhRB0ThUB4ahBG5kSJJkpSNJ0t2CEUVRTEYVhClKbJLGfFyf7cQK7iCcJolikBLbiTp5E+lAWroERNTXHU3oeZZVY8YKXjhL4ngypEwSeCkCaeAEnhRMEyYIKsraBJB0TePFAThN4zm5D2arKB5XkBpJ+7+UMFqBdZQqbIQvhZaEtpZRskreMlqWhA1pi+KEm4JgmWX5fs5VFbQJUEmpBaaSWY3UP5nGVvyNa2j4hBxb4KTymFEQpPFyWtlsIkbikpiRL4jUBBEngjWiehCCeUCoPiyhjpgYDvpQ+KwOgI6wASg6GiaZpLVONWuNCkSeAlCIw-DCMwwJKUw+sW4Koq1CkBAcCuGR1UrRGCALt4HXinOF2RGCpg06EpOmCkkSmHlO4uYy2ZtKyvAE+GwUIKYnUbNGiMi7drMFbp6oeTzAE2TCDMBAiTbOvt0admR83ZjLQVy1lVOrHKTpJFt3WXWb5tm+rElSZR1n-jr0zJPGStGwg2WEDFnspM1LbAcEd2FQeyHUcpZ7a7VSQui7yVbOFQSmC2trxllMUB5L0kh7JNQXmA4c1qFa6SjBDmRiB8eJ9EKQpykaeuRnBmUDnhBYw+eb4nnROLnF0Ho8loSmFbbM2-pofnuhU3Eh3fNd4rRe9+Kcpix6Et17bMkEYZ9HKCZBFT3LLYBIrhvJfKNfi6NWYTRge-LpB0bgosnUD-CouI7XhAPdQT0vW9H1fT9f0Abty4hDImc4Ui+E6jDKCzVX4w0yJkIAA */
   createMachine(
     {
       id: "authState",

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ export type AuthEvent =`
`192`	`192`	`\| { type: "UPDATE_PROFILE"; data: TypesGen.UpdateUserProfileRequest }`
`193`	`193`
`194`	`194`	`export const authMachine =`
`195`		- /** @xstate-layout N4IgpgJg5mDOIC5QEMCuAXAFgZXc9YAdLAJZQB2kA8hgMTYCSA4gHID6DLioADgPal0JPuW4gAHogBsATimEAzDIAcAFgUB2VTJ26ANCACeiAIwaADKsLKFtu-dsBfRwbRZc+IqQolyUBuS0ECJEvgBufADWXmTkAWL8gsKiSBKICubKhKpSyhoArAbGCGaqGoRSlVXVlfnOrhg4eATEsb7+gWAATl18XYQ8ADb4AGZ9ALatFPGpiSRCImKSCLLySmqa2ro6RaYFAEzWDscK9SBuTZ6EMOhCfgCqsN1BIYThUUQ3ALJgCQLzySW6Uy2VyBV2JXyUhMFRqcLqLnOjQ8LRudygj2e3V6-SGowm1zA6B+fySi1Sy32MnyhHyyksYK2ug0EJM1IURxO9jOFxRnyJ6IACt1xiRYKQRLAXpQ3uQItFCABjTBgRWRYVdUXi5LwWb-BYpUDLZRScygvKFIyIGQaQ4FHnI5r827tDVaiXkKXYvoDYboMaapUqtVusUe3W8fWAimIE1mnIW1l0rImOE1BENdxOwkuvw-LB8CBS4Iy94K75EzCFiMgOYGoEIZRUwgyVT5BQmfaW4omGxZGxcuwOrNXNHtfNVou0b24v0ByYVgtF0kA8lG2PN1vtzvd0zszmD06I3nZ7yUCABAa9EYkQahCB32j3QUAEQAggAVACibEFACUqAAMQYAAZL8V3rGMSjbGQKihLsISkOlaWHS4WjPSBLx4a9byIVAeAgfBXRwx8S1COUPkIE8rgwi9yCvPgbzvQh8MIoUSLABB3kVIiRAAbXMABdCDo3XaD8lgpCpAQq0EA0eTUL5KZzywjiWIIoi-EFDjpx6H08X9AlqPQ2JMPo7DGNw9S2OIyy7y4iieINAThL1MlDTScTJPg3dGxkfZFNPUy6OIWBMDeB8wFoJgvw-NhsGwAAJNgAGkvwATREtdPM7VQrE0XyTF7coB0PQKaOCy9xXCsc-ASxKUrAQxpXI+UiGMmIKDM0KaoFdp6sawwHIiJzkhcrKPOWIqkOscFZNTfYOXtY9HQqrqQuqnN0QGprdJxX18UDDrlO6zbaqgHahu43jyHGtzV0m0x9jyxQ5p7ExzBhUrB3Kkz1qqsLCEGPhkAgSAIsfP8vxilgvz-T8f3q1KMomht9g+8ocnMGQCtZDRZAPLkMyREc-pU+jNuB0HwcVEQb01S6-zAGBKC6TxaAAYTfFgOa-EC2ChmG4YR+KkuRzL7sgsT0bMQhzCUcxpMK20vsPBRieO2iAfCqmwYgJU6ZIBmksGpmWe6dmOaoFhgL-L4Behr9Yfh79ReStKJcjdy0Yx0Fsdx+b23MX7OvJnqgZBvXCC6ZmwFZzSLpN3ayNlNqqNWsnTsB3XwZj822e2pOrscm67q9h6GzMBQrDy7cZJ7DR1ZQlbSdDrOdcj3PY-jwuGt2mcDsMo6M7bjbs87-W87ji3e8G4a+FG-ihNRqCq5rtsO3r0wpG0ZvMzQ0eqtVVAunmQwIai5931d7Avw5+4-wYD9PdrKNsqmsoOQyBM3sQZ6pBDidDax9T7oHPqxBO2AQFnxaqnSimtKoU2gWA6ykDkHFxGqXZektRI5U-ooBkiZZIKFyHvEmB8gFH0VCfM+qDtroL2vpOcRkR6UKQdQ0B4CNL0I4Wfeei9brYPLlLPBjcCE-18m2KwGtWFa0CIwVgbAqD3A-CvaWWgYSEN-iUDIZpUxpiqBoQBZ52g0HQLAssoczFqM8k2WCW5N6+X2OYeShMTgyNbspUxdAB4GXnMpaxOD35-w0XLCRrJ0ZWH0QYqQRiW4UOVKqSI7RAJG1gOgTEXQLEUQVMdRJaoUlpIyU8Lo-CsGuWEbg5YmhCD7B3nU-YA5lA6HVhCZxYjoRshyDvJQ+NVCAIAO7IABH4QCfQPwqlSV0dJmT6DMHYJwGx1Sm7Yx0I3SwziTBOLqWaLQdIpC2HyKoLZ5gESInIIWOAYgEHrUCZU4JJRsY0iIT2akZoPEUJMX4GY9zHoIDbIcdGLzt4qFhDEpCgDzqZKWYgVQ+xWSyCyOC2okK+paRFGGHUML-mmnNNorZbIwUxI+Upc6E5qzYq2LUuQwKSitnymrI8+8lJyIYkxe8zELlfj0l0bFVcaRlCklvRspzjGILZVZEgkVCAzj5Y3AV+MfIQjyEy8hLLxUWXZRfOVRVsiKqVhCRuhxtgaBVY3A5MgxX-XMmpCB7E7K-CCX8oq+RnnaIKJa+J6rrUSrvHykwHZZq+X2bScwYbzUSTUBCr1QUfWbSlX6p1lctlusKp2Q4JLY1hzOmixOfdii-MrlIiotKPpyCtdm8e1N9YJsdYWqCmyshyH9vigoVhkWxIre3CO1aDbkHpuMRm3cZ51tft7BtqhzAZoVga+aGhexuOOJmtalaO69qnj3fqRc+UKHpIQIq87S25GXZnMea69Y7qhPuswxVCptnKNsOQ7Z2xUhPYfCmYV-WBtLVOjkJqzUkP6TGldp10EX0IFynlcroRywsI4iEu6ArAdPVQmhKDa0yqg0m1e+NNFwZ3BCNswdkPvuIGB2tcqakuPlgR4h2MWzMgAxartwDeEoLtf1dB-rXVBoQyQljqHOFfq+q2v9jHG7mqUKqm55N-UuN4-NT6DGdD5C0Gp-Ypq31eL8HcsdFcG0yA+rB5QtHijOKOYoNWgD8nJNGUU6F2GxK9LlvSTIcLGn5C2ZUNpLj5CxIUFSD6XmuyDOGeiMZXQJlgCmTMkp2LGm1OUFCHQORGkyEVqoZQbTNly2-poaERy6kh0pYl5LrZpLNIy1l2Sm5dAkPRs4wz+NlDOGcEAA */
	`195`	+ /** @xstate-layout N4IgpgJg5mDOIC5QEMCuAXAFgZXc9YAdADYD2yEAlgHZQCS1l6lyxAghpgCL7IDEEUtSI0AbqQDWRNFlz4iZCjXqNmrDlh54EY0gGN8lIQG0ADAF0z5xKAAOpWEyPUbIAB6IAzABYAbIQBWUwB2AA4ARgAmAIAaEABPRHCQgE5AgF90uJkcPAIScipaBid1Ti1+QWFCXSlCHLl8xSKVUvZy3h1qcQNmEwtjcOskEHtHPpcRjwQffyCwqNiEpMiownCA32jM7M5GhULlErV2zV4BIRFuyWk9vIOlYtUWU+5O3V7nK2NI4bsHJxCVzTWaBEIRaJxRIIcI+byECEBHYgBr3AqPVonDRvPB8MAAJ3xpHxhFsxHwADNiQBbep3eTolrHF7YipdHqGfqWCyuMaAyagEF+MELSHLGHeYLBQh+ULBJFZFH0-KOKDCCAAeQwfGwdAA4gA5AD6dANVl5AImwKSnki8I2WyW0OSwTSCt2sjRqsYTwu1VqRG9DHNIz5VqmiClpkIplCARSnnlUKSqQyitRDO9R2oeMJxNJ5PQVPxtKD1BD-3GzmtCCjMbjCaT4vC4TjMdF7qVnszlDVkAYOv1xo1AFUACoV0aW6sjaEAWnCTemkUicplwV8m226eVgd76oYpKJFMoxBEEDPfBHAAUuGwxwBRI3XgBKGoAYnQADIPydhmegNCwSLoEcTLuEKThOum6OsiGYqvu-bUEepAnmehCoLYECGLQ17HqeYB+lc4h1PBe59hAh62Ph6GYdhzC4TRYDsvonLlgMPKhtOQKzpG8ZgUkATRIQq6LHBu6EN6SEoWhRB0ThUB4ahBG5kSJJkpSNJ0t2CEUVRTEYVhClKbJLGfFyf7cQK7iCcJolikBLbiTp5E+lAWroERNTXHU3oeZZVY8YKXjhL4ngypEwSeCkCaeAEnhRMEyYIKsraBJB0TePFAThN4zm5D2arKB5XkBpJ+7+UMFqBdZQqbIQvhZaEtpZRskreMlqWhA1pi+KEm4JgmWX5fs5VFbQJUEmpBaaSWY3UP5nGVvyNa2j4hBxb4KTymFEQpPFyWtlsIkbikpiRL4jUBBEngjWiehCCeUCoPiyhjpgYDvpQ+KwOgI6wASg6GiaZpLVONWuNCkSeAlCIw-DCMwwJKUw+sW4Koq1CkBAcCuGR1UrRGCALt4HXinOF2RGCpg06EpOmCkkSmHlO4uYy2ZtKyvAE+GwUIKYnUbNGiMi7drMFbp6oeTzAE2TCDMBAiTbOvt0admR83ZjLQVy1lVOrHKTpJFt3WXWb5tm+rElSZR1n-jr0zJPGStGwg2WEDFnspM1LbAcEd2FQeyHUcpZ7a7VSQui7yVbOFQSmC2trxllMUB5L0kh7JNQXmA4c1qFa6SjBDmRiB8eJ9EKQpykaeuRnBmUDnhBYw+eb4nnROLnF0Ho8loSmFbbM2-pofnuhU3Eh3fNd4rRe9+Kcpix6Et17bMkEYZ9HKCZBFT3LLYBIrhvJfKNfi6NWYTRge-LpB0bgosnUD-CouI7XhAPdQT0vW9H1fT9f0Abty4hDImc4Ui+E6jDKCzVX4w0yJkIAA */
`196`	`196`	`createMachine(`
`197`	`197`	`{`
`198`	`198`	`id: "authState",`