Switch to org ids array

presleyp · presleyp · commit 9154a338290e · 2022-04-28T15:36:19.000Z
diff --git a/site/src/api/types.ts b/site/src/api/types.ts
@@ -23,7 +23,7 @@ export interface UserResponse {
   readonly email: string
   readonly created_at: string
   readonly status: "active" | "suspended"
-  readonly organization_id: string
+  readonly organization_ids: string[]
 }
 
 /**
diff --git a/site/src/pages/PreferencesPages/AccountPage/AccountPage.test.tsx b/site/src/pages/PreferencesPages/AccountPage/AccountPage.test.tsx
@@ -36,7 +36,7 @@ describe("AccountPage", () => {
           id: userId,
           created_at: new Date().toString(),
           status: "active",
-          organization_id: "123",
+          organization_ids: ["123"],
           ...data,
         }),
       )
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -26,7 +26,7 @@ export const MockUser: UserResponse = {
   email: "test@coder.com",
   created_at: "",
   status: "active",
-  organization_id: "123",
+  organization_ids: ["fc0774ce-cc9e-48d4-80ae-88f7a4d4a8b0"],
 }
 
 export const MockUser2: UserResponse = {
@@ -35,7 +35,7 @@ export const MockUser2: UserResponse = {
   email: "test2@coder.com",
   created_at: "",
   status: "active",
-  organization_id: "123",
+  organization_ids: ["fc0774ce-cc9e-48d4-80ae-88f7a4d4a8b0"],
 }
 
 export const MockPager: Pager = {
diff --git a/site/src/xServices/auth/authSelectors.ts b/site/src/xServices/auth/authSelectors.ts
@@ -2,5 +2,5 @@ import { State } from "xstate"
 import { AuthContext, AuthEvent } from "./authXService"
 
 export const selectOrgId = (state: State<AuthContext, AuthEvent>): string | undefined => {
-  return state.context.me?.organization_id
+  return state.context.me?.organization_ids[0]
 }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ export interface UserResponse {`
`23`	`23`	`readonly email: string`
`24`	`24`	`readonly created_at: string`
`25`	`25`	`readonly status: "active" \| "suspended"`
`26`		`- readonly organization_id: string`
	`26`	`+ readonly organization_ids: string[]`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ describe("AccountPage", () => {`
`36`	`36`	`id: userId,`
`37`	`37`	`created_at: new Date().toString(),`
`38`	`38`	`status: "active",`
`39`		`- organization_id: "123",`
	`39`	`+ organization_ids: ["123"],`
`40`	`40`	`...data,`
`41`	`41`	`}),`
`42`	`42`	`)`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ import { State } from "xstate"`
`2`	`2`	`import { AuthContext, AuthEvent } from "./authXService"`
`3`	`3`
`4`	`4`	`export const selectOrgId = (state: State<AuthContext, AuthEvent>): string \| undefined => {`
`5`		`- return state.context.me?.organization_id`
	`5`	`+ return state.context.me?.organization_ids[0]`
`6`	`6`	`}`