Fix: access token theme change (#586)

* change access token theme * refresh tokens every 10 minutes to get the latest one
microsoftgraph · Jun 23, 2020 · 413465e · 413465e
1 parent a324abd
commit 413465e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/src/app/views/query-runner/request/auth/Auth.tsx b/src/app/views/query-runner/request/auth/Auth.tsx
@@ -3,16 +3,17 @@ import React from 'react';
 import { FormattedMessage } from 'react-intl';
 import { useSelector } from 'react-redux';
 import { classNames } from '../../../classnames';
-import { copy } from '../../../common/copy';
+import { genericCopy } from '../../../common/copy';
 import { authStyles } from './Auth.styles';
 
-async function handleCopy() {
-  await copy('access-token');
-}
 
 export function Auth(props: any) {
   const accessToken = useSelector((state: any) => state.authToken);
 
+  const handleCopy = async () => {
+    await genericCopy(accessToken);
+  };
+
   const classes = classNames(props);
   const copyIcon: IIconProps = {
     iconName: 'copy'
@@ -25,7 +26,7 @@ export function Auth(props: any) {
           <Label className={classes.accessTokenLabel}><FormattedMessage id='Access Token' /></Label>
           <IconButton onClick={handleCopy} iconProps={copyIcon} title='Copy' ariaLabel='Copy' />
         </div>
-        <textarea className={classes.accessToken} id='access-token' value={accessToken} readOnly={true} />
+        <Label className={classes.accessToken} >{accessToken}</Label>
       </div>
       :
       <Label className={classes.emptyStateLabel}>

diff --git a/src/index.tsx b/src/index.tsx
@@ -68,14 +68,19 @@ const appState: any = store({
 
 });
 
-msalApplication.acquireTokenSilent({ scopes: DEFAULT_USER_SCOPES.split(' ') }).then((authResponse: any) => {
-  if (authResponse && authResponse.accessToken) {
-    appState.dispatch(getAuthTokenSuccess(authResponse.accessToken));
-    appState.dispatch(getConsentedScopesSuccess(authResponse.scopes));
-  }
-}).catch(() => {
-  // ignore the error as it means that a User login is required
-});
+function refreshAccessToken() {
+  msalApplication.acquireTokenSilent({ scopes: DEFAULT_USER_SCOPES.split(' ') }).then((authResponse: any) => {
+    if (authResponse && authResponse.accessToken) {
+      appState.dispatch(getAuthTokenSuccess(authResponse.accessToken));
+      appState.dispatch(getConsentedScopesSuccess(authResponse.scopes));
+    }
+  }).catch(() => {
+    // ignore the error as it means that a User login is required
+  });
+}
+refreshAccessToken();
+
+setInterval(refreshAccessToken, 1000 * 60 * 10); // refresh access token every 10 minutes
 
 addLocaleData([
   ...pt,