Refactor to use generated types

BrunoQuaresma · BrunoQuaresma · commit dbd9b30bde5e · 2022-05-13T13:42:06.000Z
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -76,7 +76,7 @@ export const getAuthMethods = async (): Promise<TypesGen.AuthMethods> => {
   return response.data
 }
 
-export const getUserPermissions = async (
+export const checkUserPermissions = async (
   userId: string,
   params: TypesGen.UserPermissionCheckRequest,
 ): Promise<TypesGen.UserPermissionCheckResponse> => {
diff --git a/site/src/api/types.ts b/site/src/api/types.ts
@@ -10,5 +10,3 @@ export interface ReconnectingPTYRequest {
   readonly height?: number
   readonly width?: number
 }
-
-export type UserPermissionCheckResponse = Record<string, boolean>
diff --git a/site/src/xServices/auth/authXService.ts b/site/src/xServices/auth/authXService.ts
@@ -23,8 +23,8 @@ export interface AuthContext {
   updateProfileError?: Error | unknown
   me?: TypesGen.User
   methods?: TypesGen.AuthMethods
-  permissions?: Types.UserPermissionCheckResponse
-  getPermissionsError?: Error | unknown
+  permissions?: TypesGen.UserPermissionCheckResponse
+  checkPermissionsError?: Error | unknown
 }
 
 export type AuthEvent =
@@ -61,8 +61,8 @@ export const authMachine =
           updateProfile: {
             data: TypesGen.User
           }
-          getPermissions: {
-            data: Types.UserPermissionCheckResponse
+          checkPermissions: {
+            data: TypesGen.UserPermissionCheckResponse
           }
         },
       },
@@ -117,8 +117,8 @@ export const authMachine =
         gettingPermissions: {
           entry: "clearGetPermissionsError",
           invoke: {
-            src: "getPermissions",
-            id: "getPermissions",
+            src: "checkPermissions",
+            id: "checkPermissions",
             onDone: [
               {
                 actions: ["assignPermissions"],
@@ -234,12 +234,12 @@ export const authMachine =
 
           return API.updateProfile(context.me.id, event.data)
         },
-        getPermissions: async (context) => {
+        checkPermissions: async (context) => {
           if (!context.me) {
             throw new Error("No current user found")
           }
 
-          return API.getUserPermissions(context.me.id, {
+          return API.checkUserPermissions(context.me.id, {
             checks: permissionsToCheck,
           })
         },
@@ -289,10 +289,10 @@ export const authMachine =
           permissions: (_, event) => event.data,
         }),
         assignGetPermissionsError: assign({
-          getPermissionsError: (_, event) => event.data,
+          checkPermissionsError: (_, event) => event.data,
         }),
         clearGetPermissionsError: assign({
-          getPermissionsError: (_) => undefined,
+          checkPermissionsError: (_) => undefined,
         }),
       },
     },

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ export const getAuthMethods = async (): Promise<TypesGen.AuthMethods> => {`
`76`	`76`	`return response.data`
`77`	`77`	`}`
`78`	`78`
`79`		`-export const getUserPermissions = async (`
	`79`	`+export const checkUserPermissions = async (`
`80`	`80`	`userId: string,`
`81`	`81`	`params: TypesGen.UserPermissionCheckRequest,`
`82`	`82`	`): Promise<TypesGen.UserPermissionCheckResponse> => {`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,3 @@ export interface ReconnectingPTYRequest {`
`10`	`10`	`readonly height?: number`
`11`	`11`	`readonly width?: number`
`12`	`12`	`}`
`13`		`-`
`14`		`-export type UserPermissionCheckResponse = Record<string, boolean>`