revert changes to other files

f0ssel · f0ssel · commit 4e651422bb70 · 2022-04-18T23:37:28.000Z
diff --git a/site/src/api/index.test.ts b/site/src/api/index.test.ts
@@ -1,6 +1,6 @@
 import axios from "axios"
 import { getApiKey, login, logout } from "."
-import { GenerateAPIKeyResponse, LoginWithPasswordResponse } from "./types"
+import { APIKeyResponse, LoginResponse } from "./types"
 
 // Mock the axios module so that no real network requests are made, but rather
 // we swap in a resolved or rejected value
@@ -10,9 +10,9 @@ jest.mock("axios")
 
 describe("api.ts", () => {
   describe("login", () => {
-    it("should return LoginWithPasswordResponse", async () => {
+    it("should return LoginResponse", async () => {
       // given
-      const loginResponse: LoginWithPasswordResponse = {
+      const loginResponse: LoginResponse = {
         session_token: "abc_123_test",
       }
       const axiosMockPost = jest.fn().mockImplementationOnce(() => {
@@ -87,7 +87,7 @@ describe("api.ts", () => {
   describe("getApiKey", () => {
     it("should return APIKeyResponse", async () => {
       // given
-      const apiKeyResponse: GenerateAPIKeyResponse = {
+      const apiKeyResponse: APIKeyResponse = {
         key: "abc_123_test",
       }
       const axiosMockPost = jest.fn().mockImplementationOnce(() => {
diff --git a/site/src/api/index.ts b/site/src/api/index.ts
@@ -43,13 +43,13 @@ export namespace Workspace {
   }
 }
 
-export const login = async (email: string, password: string): Promise<Types.LoginWithPasswordResponse> => {
+export const login = async (email: string, password: string): Promise<Types.LoginResponse> => {
   const payload = JSON.stringify({
     email,
     password,
   })
 
-  const response = await axios.post<Types.LoginWithPasswordResponse>("/api/v2/users/login", payload, {
+  const response = await axios.post<Types.LoginResponse>("/api/v2/users/login", payload, {
     headers: { ...CONTENT_TYPE_JSON },
   })
 
@@ -60,8 +60,8 @@ export const logout = async (): Promise<void> => {
   await axios.post("/api/v2/users/logout")
 }
 
-export const getUser = async (): Promise<Types.User> => {
-  const response = await axios.get<Types.User>("/api/v2/users/me")
+export const getUser = async (): Promise<Types.UserResponse> => {
+  const response = await axios.get<Types.UserResponse>("/api/v2/users/me")
   return response.data
 }
 
@@ -71,7 +71,7 @@ export const getApiKey = async (): Promise<Types.APIKeyResponse> => {
 }
 
 export const getUsers = async (): Promise<Types.PagedUsers> => {
-  // const response = await axios.get<Types.User[]>("/api/v2/users")
+  // const response = await axios.get<Types.UserResponse[]>("/api/v2/users")
   // return response.data
   return Promise.resolve({
     page: [MockUser, MockUser2],
@@ -104,7 +104,7 @@ export const putWorkspaceAutostop = async (
   })
 }
 
-export const updateProfile = async (userId: string, data: Types.UpdateProfileRequest): Promise<Types.User> => {
+export const updateProfile = async (userId: string, data: Types.UpdateProfileRequest): Promise<Types.UserResponse> => {
   const response = await axios.put(`/api/v2/users/${userId}/profile`, data)
   return response.data
 }
diff --git a/site/src/test_helpers/entities.ts b/site/src/test_helpers/entities.ts
@@ -5,7 +5,7 @@ import {
   Provisioner,
   Template,
   UserAgent,
-  User,
+  UserResponse,
   Workspace,
   WorkspaceAutostartRequest,
 } from "../api/types"
@@ -19,15 +19,15 @@ export const MockBuildInfo: BuildInfoResponse = {
   version: "v99.999.9999+c9cdf14",
 }
 
-export const MockUser: User = {
+export const MockUser: UserResponse = {
   name: "Test User",
   id: "test-user",
   username: "TestUser",
   email: "test@coder.com",
   created_at: "",
 }
 
-export const MockUser2: User = {
+export const MockUser2: UserResponse = {
   id: "test-user-2",
   name: "Test User 2",
   username: "TestUser2",
diff --git a/site/src/xServices/auth/authXService.ts b/site/src/xServices/auth/authXService.ts
@@ -10,7 +10,7 @@ export interface AuthContext {
   getUserError?: Error | unknown
   authError?: Error | unknown
   updateProfileError?: Error | unknown
-  me?: Types.User
+  me?: Types.UserResponse
 }
 
 export type AuthEvent =
@@ -29,13 +29,13 @@ export const authMachine =
         events: {} as AuthEvent,
         services: {} as {
           getMe: {
-            data: Types.User
+            data: Types.UserResponse
           }
           signIn: {
-            data: Types.LoginWithPasswordResponse
+            data: Types.LoginResponse
           }
           updateProfile: {
-            data: Types.User
+            data: Types.UserResponse
           }
         },
       },

Original file line number	Diff line number	Diff line change
`@@ -43,13 +43,13 @@ export namespace Workspace {`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`46`		`-export const login = async (email: string, password: string): Promise<Types.LoginWithPasswordResponse> => {`
	`46`	`+export const login = async (email: string, password: string): Promise<Types.LoginResponse> => {`
`47`	`47`	`const payload = JSON.stringify({`
`48`	`48`	`email,`
`49`	`49`	`password,`
`50`	`50`	`})`
`51`	`51`
`52`		`- const response = await axios.post<Types.LoginWithPasswordResponse>("/api/v2/users/login", payload, {`
	`52`	`+ const response = await axios.post<Types.LoginResponse>("/api/v2/users/login", payload, {`
`53`	`53`	`headers: { ...CONTENT_TYPE_JSON },`
`54`	`54`	`})`
`55`	`55`
`@@ -60,8 +60,8 @@ export const logout = async (): Promise<void> => {`
`60`	`60`	`await axios.post("/api/v2/users/logout")`
`61`	`61`	`}`
`62`	`62`
`63`		`-export const getUser = async (): Promise<Types.User> => {`
`64`		`- const response = await axios.get<Types.User>("/api/v2/users/me")`
	`63`	`+export const getUser = async (): Promise<Types.UserResponse> => {`
	`64`	`+ const response = await axios.get<Types.UserResponse>("/api/v2/users/me")`
`65`	`65`	`return response.data`
`66`	`66`	`}`
`67`	`67`
`@@ -71,7 +71,7 @@ export const getApiKey = async (): Promise<Types.APIKeyResponse> => {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`export const getUsers = async (): Promise<Types.PagedUsers> => {`
`74`		`- // const response = await axios.get<Types.User[]>("/api/v2/users")`
	`74`	`+ // const response = await axios.get<Types.UserResponse[]>("/api/v2/users")`
`75`	`75`	`// return response.data`
`76`	`76`	`return Promise.resolve({`
`77`	`77`	`page: [MockUser, MockUser2],`
`@@ -104,7 +104,7 @@ export const putWorkspaceAutostop = async (`
`104`	`104`	`})`
`105`	`105`	`}`
`106`	`106`
`107`		`-export const updateProfile = async (userId: string, data: Types.UpdateProfileRequest): Promise<Types.User> => {`
	`107`	`+export const updateProfile = async (userId: string, data: Types.UpdateProfileRequest): Promise<Types.UserResponse> => {`
`108`	`108`	const response = await axios.put(`/api/v2/users/${userId}/profile`, data)
`109`	`109`	`return response.data`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ export interface AuthContext {`
`10`	`10`	`getUserError?: Error \| unknown`
`11`	`11`	`authError?: Error \| unknown`
`12`	`12`	`updateProfileError?: Error \| unknown`
`13`		`- me?: Types.User`
	`13`	`+ me?: Types.UserResponse`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`export type AuthEvent =`
`@@ -29,13 +29,13 @@ export const authMachine =`
`29`	`29`	`events: {} as AuthEvent,`
`30`	`30`	`services: {} as {`
`31`	`31`	`getMe: {`
`32`		`- data: Types.User`
	`32`	`+ data: Types.UserResponse`
`33`	`33`	`}`
`34`	`34`	`signIn: {`
`35`		`- data: Types.LoginWithPasswordResponse`
	`35`	`+ data: Types.LoginResponse`
`36`	`36`	`}`
`37`	`37`	`updateProfile: {`
`38`		`- data: Types.User`
	`38`	`+ data: Types.UserResponse`
`39`	`39`	`}`
`40`	`40`	`},`
`41`	`41`	`},`