refactor(ui): migrate authorizations CRUD to generated client

ui/src/authorizations/actions/index.ts

@@ -2,8 +2,8 @@
 import {Dispatch} from 'react'
 
 // API
-import {client} from 'src/utils/api'
 import * as authAPI from 'src/authorizations/apis'
+import * as api from 'src/client'
 
 // Actions
 import {notify} from 'src/shared/actions/notifications'
@@ -20,8 +20,12 @@ import {
 } from 'src/shared/copy/notifications'
 
 // Types
-import {RemoteDataState, GetState, NotificationAction} from 'src/types'
-import {Authorization} from '@influxdata/influx'
+import {
+  RemoteDataState,
+  GetState,
+  NotificationAction,
+  Authorization,
+} from 'src/types'
 
 export type Action =
   | SetAuthorizations
@@ -97,7 +101,13 @@ export const getAuthorizations = () => async (
       orgs: {org},
     } = getState()
 
-    const authorizations = await client.authorizations.getAll(org.id)
+    const resp = await api.getAuthorizations({query: {orgID: org.id}})
+
+    if (resp.status !== 200) {
+      throw new Error(resp.data.message)
+    }
+
+    const {authorizations} = resp.data
 
     dispatch(setAuthorizations(RemoteDataState.Done, authorizations))
   } catch (e) {
@@ -107,10 +117,15 @@ export const getAuthorizations = () => async (
   }
 }
 
-export const getAuthorization = async (authorizationID: string) => {
+export const getAuthorization = async (authID: string) => {
   try {
-    const authorization = await client.authorizations.get(authorizationID)
-    return authorization
+    const resp = await api.getAuthorization({authID})
+
+    if (resp.status !== 200) {
+      throw new Error(resp.data.message)
+    }
+
+    return resp.data
   } catch (e) {
     console.error(e)
   }
@@ -134,7 +149,14 @@ export const updateAuthorization = (authorization: Authorization) => async (
   dispatch: Dispatch<Action | NotificationAction | GetAuthorizations>
 ) => {
   try {
-    await client.authorizations.update(authorization.id, authorization)
+    const resp = await api.patchAuthorization({
+      authID: authorization.id,
+      data: authorization,
+    })
+
+    if (resp.status !== 200) {
+      throw new Error(resp.data.message)
+    }
 
     dispatch(getAuthorizations())
     dispatch(notify(authorizationUpdateSuccess()))
@@ -148,7 +170,11 @@ export const deleteAuthorization = (id: string, name: string = '') => async (
   dispatch: Dispatch<Action | NotificationAction>
 ) => {
   try {
-    await client.authorizations.delete(id)
+    const resp = await api.deleteAuthorization({authID: id})
+
+    if (resp.status !== 204) {
+      throw new Error(resp.data.message)
+    }
 
     dispatch(removeAuthorization(id))
     dispatch(notify(authorizationDeleteSuccess()))

ui/src/authorizations/components/AllAccessTokenOverlay.tsx

@@ -26,7 +26,9 @@ import {allAccessPermissions} from 'src/authorizations/utils/permissions'
 
 // Decorators
 import {ErrorHandling} from 'src/shared/decorators/errors'
-import {Authorization} from '@influxdata/influx'
+
+// Types
+import {Authorization} from 'src/types'
 
 interface DispatchProps {
   onCreateAuthorization: typeof createAuthorization

ui/src/authorizations/components/BucketsTokenOverlay.tsx

@@ -36,8 +36,7 @@ import {createAuthorization} from 'src/authorizations/actions'
 import {ErrorHandling} from 'src/shared/decorators/errors'
 
 // Types
-import {AppState, Bucket} from 'src/types'
-import {Permission, Authorization} from '@influxdata/influx'
+import {AppState, Bucket, Permission, Authorization} from 'src/types'
 
 interface StateProps {
   buckets: Bucket[]
@@ -236,7 +235,7 @@ class BucketsTokenOverlay extends PureComponent<Props, State> {
       return buckets.find(b => b.name === bucketName)
     })
 
-    return specificBucketsPermissions(writeBuckets, Permission.ActionEnum.Write)
+    return specificBucketsPermissions(writeBuckets, 'write')
   }
 
   private get readBucketPermissions(): Permission[] {
@@ -246,23 +245,23 @@ class BucketsTokenOverlay extends PureComponent<Props, State> {
       return buckets.find(b => b.name === bucketName)
     })
 
-    return specificBucketsPermissions(readBuckets, Permission.ActionEnum.Read)
+    return specificBucketsPermissions(readBuckets, 'read')
   }
 
   private get allReadBucketPermissions(): Permission[] {
     const {
       params: {orgID},
     } = this.props
 
-    return allBucketsPermissions(orgID, Permission.ActionEnum.Read)
+    return allBucketsPermissions(orgID, 'read')
   }
 
   private get allWriteBucketPermissions(): Permission[] {
     const {
       params: {orgID},
     } = this.props
 
-    return allBucketsPermissions(orgID, Permission.ActionEnum.Write)
+    return allBucketsPermissions(orgID, 'write')
   }
 
   private handleInputChange = (e: ChangeEvent<HTMLInputElement>) => {

ui/src/authorizations/components/TokenList.tsx

@@ -9,7 +9,7 @@ import TokenRow from 'src/authorizations/components/TokenRow'
 import ViewTokenOverlay from 'src/authorizations/components/ViewTokenOverlay'
 
 // Types
-import {Authorization} from '@influxdata/influx'
+import {Authorization} from 'src/types'
 import {SortTypes} from 'src/shared/utils/sort'
 import {ComponentSize, Sort} from '@influxdata/clockface'
 

ui/src/authorizations/components/TokenRow.tsx

@@ -21,7 +21,7 @@ import {
 import EditableName from 'src/shared/components/EditableName'
 
 // Types
-import {Authorization, AuthorizationUpdateRequest} from '@influxdata/influx'
+import {Authorization} from 'src/types'
 import {DEFAULT_TOKEN_DESCRIPTION} from 'src/dashboards/constants'
 
 interface OwnProps {
@@ -78,15 +78,15 @@ class TokenRow extends PureComponent<Props> {
 
   private get isTokenEnabled(): boolean {
     const {auth} = this.props
-    return auth.status === AuthorizationUpdateRequest.StatusEnum.Active
+    return auth.status === 'active'
   }
 
   private changeToggle = () => {
     const {auth, onUpdate} = this.props
-    if (auth.status === AuthorizationUpdateRequest.StatusEnum.Active) {
-      auth.status = AuthorizationUpdateRequest.StatusEnum.Inactive
+    if (auth.status === 'active') {
+      auth.status = 'inactive'
     } else {
-      auth.status = AuthorizationUpdateRequest.StatusEnum.Active
+      auth.status = 'active'
     }
     onUpdate(auth)
   }

ui/src/authorizations/components/TokensTab.tsx

@@ -12,8 +12,7 @@ import TabbedPageHeader from 'src/shared/components/tabbed_page/TabbedPageHeader
 import GenerateTokenDropdown from 'src/authorizations/components/GenerateTokenDropdown'
 
 // Types
-import {Authorization} from '@influxdata/influx'
-import {AppState} from 'src/types'
+import {AppState, Authorization} from 'src/types'
 import {SortTypes} from 'src/shared/utils/sort'
 
 enum AuthSearchKeys {

ui/src/authorizations/components/ViewTokenOverlay.tsx

@@ -11,7 +11,7 @@ import PermissionsWidget, {
 import CodeSnippet from 'src/shared/components/CodeSnippet'
 
 // Types
-import {Authorization, Permission} from '@influxdata/influx'
+import {Authorization, Permission} from 'src/types'
 
 interface Props {
   auth: Authorization
@@ -58,7 +58,7 @@ export default class ViewTokenOverlay extends PureComponent<Props> {
     )
   }
 
-  private get permissions(): {[x: string]: Permission.ActionEnum[]} {
+  private get permissions(): {[x: string]: Permission['action'][]} {
     const p = this.props.auth.permissions.reduce((acc, {action, resource}) => {
       const {type} = resource
       const name = get(resource, 'name', '')
@@ -82,7 +82,7 @@ export default class ViewTokenOverlay extends PureComponent<Props> {
 
   private itemID = (
     permission: string,
-    action: Permission.ActionEnum
+    action: Permission['action']
   ): string => {
     return `${permission}-${action}-${permission || '*'}-${permission || '*'}`
   }

ui/src/authorizations/reducers/index.ts

@@ -2,9 +2,8 @@
 import {produce} from 'immer'
 
 // Types
-import {RemoteDataState} from 'src/types'
+import {RemoteDataState, Authorization} from 'src/types'
 import {Action} from 'src/authorizations/actions'
-import {Authorization} from '@influxdata/influx'
 
 const initialState = (): AuthorizationsState => ({
   status: RemoteDataState.NotStarted,