fix: remove old token linking (#3900)

Author: drdelambre

cypress/e2e/shared/flowsSidebarExportToClipboard.test.ts

@@ -1,4 +1,3 @@
-import {Authorization} from 'src/client'
 import {Organization} from 'src/types'
 
 const openCopyAs = () => {
@@ -45,10 +44,6 @@ const verifyClientCode = (client: any) => {
     .scrollIntoView()
     .click()
 
-  cy.getByTestID('code-snippet')
-    .children()
-    .find('code')
-    .contains(client.token)
   cy.getByTestID('code-snippet')
     .children()
     .find('code')
@@ -61,71 +56,60 @@ const verifyClientCode = (client: any) => {
   cy.get('.cf-overlay--dismiss').click()
 }
 
-const getClients = (org: string, token: string, query: string) => {
+const getClients = (org: string, query: string) => {
   return [
     {
       name: 'arduino',
-      token: `"<INFLUX_TOKEN>"`,
       org: `"${org}"`,
       query: query.replace(/"/g, '\\"'),
     },
     {
       name: 'csharp',
-      token: `const string token = "${token}";`,
       org: `const string org = "${org}";`,
       query: query.replace(/"/g, '""'),
     },
     {
       name: 'go',
-      token: `"${token}"`,
       org: `client.QueryAPI("${org}")`,
       query,
     },
     {
       name: 'java',
-      token: `String token = "${token}";`,
       org: `String org = "${org}";`,
       query: query.replace(/"/g, '\\"'),
     },
     {
       name: 'javascript-node',
-      token: `const token = '${token}'`,
       org: `const org = '${org}'`,
       query,
     },
     {
       name: 'kotlin',
-      token: `val token = "${token}"`,
       org: `val org = "${org}"`,
       query,
     },
     {
       name: 'php',
-      token: `$token = '${token}';`,
       org: `$org = '${org}';`,
       query: query.replace(/"/g, '\\"'),
     },
     {
       name: 'python',
-      token: `token = "${token}"`,
       org: `org = "${org}"`,
       query,
     },
     {
       name: 'ruby',
-      token: `token = '${token}'`,
       org: `org = '${org}'`,
       query,
     },
     {
       name: 'scala',
-      token: `val token = "${token}"`,
       org: `val org = "${org}"`,
       query,
     },
     {
       name: 'swift',
-      token: `let token = "${token}"`,
       org: `let org = "${org}"`,
       query,
     },
@@ -140,9 +124,6 @@ describe('Flows', () => {
       cy.signin()
       cy.get('@org').then(({id}: Organization) => {
         cy.fixture('routes').then(({orgs}) => {
-          cy.request('api/v2/authorizations').then(({body}) => {
-            cy.wrap(body.authorizations).as('tokens')
-          })
           cy.visit(`${orgs}/${id}`)
         })
       })
@@ -159,10 +140,8 @@ describe('Flows', () => {
       openCopyAs()
 
       cy.get('@org').then(({name}: Organization) => {
-        cy.get<Authorization[]>('@tokens').then(tokens => {
-          getClients(name, tokens[0].token, query).forEach(client => {
-            verifyClientCode(client)
-          })
+        getClients(name, query).forEach(client => {
+          verifyClientCode(client)
         })
       })
     })
@@ -176,10 +155,8 @@ describe('Flows', () => {
       openCopyAs()
 
       cy.get('@org').then(({name}: Organization) => {
-        cy.get<Authorization[]>('@tokens').then(tokens => {
-          getClients(name, tokens[0].token, query).forEach(client => {
-            verifyClientCode(client)
-          })
+        getClients(name, query).forEach(client => {
+          verifyClientCode(client)
         })
       })
     })

src/writeData/components/ClientCodeCopyPage/index.tsx

@@ -9,15 +9,9 @@ import InstallPackageHelper from 'src/writeData/components/ClientCodeCopyPage/In
 // Constants
 import {CLIENT_DEFINITIONS} from 'src/writeData'
 
-// Types
-import {ResourceType} from 'src/types'
-
 // Styles
 import 'src/writeData/components/WriteDataDetailsView.scss'
 
-// Utils
-import GetResources from 'src/resources/components/GetResources'
-
 const codeRenderer: any = (props: any): any => {
   return <CodeSnippet text={props.value} label={props.language} />
 }
@@ -35,28 +29,24 @@ const ClientCodeCopyPage: FC<Props> = ({contentID, onCopy}) => {
     sampleCode = `${def.executeFull}`
   }
   return (
-    <GetResources
-      resources={[ResourceType.Authorizations, ResourceType.Buckets]}
-    >
-      <div className="write-data--details">
-        <div
-          className="write-data--details-content markdown-format"
-          data-testid="load-data-details-content"
-        >
-          {!!def.description && (
-            <InstallPackageHelper
-              text={def.description}
-              codeRenderer={codeRenderer}
-            />
-          )}
-          <CodeSampleBlock
-            name="Initialize and Execute Flux"
-            sample={sampleCode}
-            onCopy={onCopy}
+    <div className="write-data--details">
+      <div
+        className="write-data--details-content markdown-format"
+        data-testid="load-data-details-content"
+      >
+        {!!def.description && (
+          <InstallPackageHelper
+            text={def.description}
+            codeRenderer={codeRenderer}
           />
-        </div>
+        )}
+        <CodeSampleBlock
+          name="Initialize and Execute Flux"
+          sample={sampleCode}
+          onCopy={onCopy}
+        />
       </div>
-    </GetResources>
+    </div>
   )
 }
 

src/writeData/components/WriteDataDetailsContext.tsx

@@ -17,22 +17,21 @@ import {getAll} from 'src/resources/selectors'
 import {getOrg} from 'src/organizations/selectors'
 
 // Types
-import {AppState, ResourceType, Bucket, Authorization} from 'src/types'
+import {AppState, ResourceType, Bucket} from 'src/types'
+
+const DEFAULT_TOKEN = '<INFLUX_TOKEN>'
+const DEFAULT_BUCKET = '<BUCKET>'
 
 interface WriteDataDetailsContextType {
   bucket: Bucket
   changeBucket: (bucket: Bucket) => void
-  token: Authorization
-  changeToken: (token: Authorization) => void
   query: string
   changeQuery: (query: string) => void
 }
 
 export const DEFAULT_WRITE_DATA_DETAILS_CONTEXT: WriteDataDetailsContextType = {
   bucket: null,
   changeBucket: () => {},
-  token: null,
-  changeToken: () => {},
   query: null,
   changeQuery: () => {},
 }
@@ -44,33 +43,26 @@ const WriteDataDetailsProvider: FC = ({children}) => {
   const buckets = useSelector((state: AppState) =>
     getAll<Bucket>(state, ResourceType.Buckets).filter(b => b.type === 'user')
   )
-  const tokens = useSelector((state: AppState) =>
-    getAll<Authorization>(state, ResourceType.Authorizations)
-  )
-  const org = useSelector(getOrg)
   const bucketname = useSelector(
     (state: AppState) => state.dataLoading?.steps?.bucket
   )
+  const org = useSelector(getOrg)
   const server = window.location.origin
   const toLoadBucket = buckets?.find(b => b.name === bucketname)
   const [bucket, setBucket] = useState(
-    toLoadBucket ?? buckets[0] ?? ({name: '<BUCKET>'} as Bucket)
+    toLoadBucket ?? buckets[0] ?? ({name: DEFAULT_BUCKET} as Bucket)
   )
-  const [token, setToken] = useState(tokens[0] ?? {token: '<INFLUX_TOKEN>'})
   const [query, setQuery] = useState(null)
 
   const changeBucket = useCallback(
     (toChangeBucket: Bucket) => setBucket(toChangeBucket),
     [setBucket]
   )
+
   const changeQuery = useCallback(
     (toChangeQuery: string) => setQuery(toChangeQuery),
     [setQuery]
   )
-  const changeToken = useCallback(
-    (toChangeToken: Authorization) => setToken(toChangeToken),
-    [setToken]
-  )
 
   useEffect(() => {
     const _query = transform(query, variables)
@@ -106,28 +98,24 @@ const WriteDataDetailsProvider: FC = ({children}) => {
     }
     update({
       ...variables,
-      bucket: bucket.name,
+      bucket: bucket?.name,
     })
-  }, [variables, bucket?.name, bucket, update])
-
+  }, [variables, update, bucket])
   useEffect(() => {
-    if (token?.token === variables.token) {
+    if (DEFAULT_TOKEN === variables.token) {
       return
     }
-
     update({
       ...variables,
-      token: token.token,
+      token: DEFAULT_TOKEN,
     })
-  }, [variables, token?.token, token, update])
+  }, [variables, update])
 
   return (
     <WriteDataDetailsContext.Provider
       value={{
         bucket,
         changeBucket,
-        token,
-        changeToken,
         query,
         changeQuery,
       }}