Rename getSilentAccessToken to accessToken for clarity

src/components/AccessControlNew.tsx

@@ -96,7 +96,7 @@ const AccessControlNew = () => {
         form.validateFields()
             .then((values) => {
                 const ruleToSave = createRuleToSave()
-                dispatch(ruleActions.saveRule.request({getAccessTokenSilently:accessToken, payload: ruleToSave}))
+                dispatch(ruleActions.saveRule.request({accessToken:accessToken, payload: ruleToSave}))
             })
             .catch((errorInfo) => {
                 console.log('errorInfo', errorInfo)
@@ -210,7 +210,7 @@ const AccessControlNew = () => {
 
     // const testDeleteGroup = () => {
     //     groups.forEach(g => {
-    //         dispatch(groupsActions.deleteGroup.request({getAccessTokenSilently, payload: g.ID || ''}))
+    //         dispatch(groupsActions.deleteGroup.request({accessToken, payload: g.ID || ''}))
     //     })
     // }
 

src/components/PeerUpdate.tsx

@@ -213,11 +213,11 @@ const PeerUpdate = () => {
                 if (!noUpdateToName()) {
                     const peerUpdate = createPeerToSave()
                     setCallingPeerAPI(true)
-                    dispatch(peerActions.updatePeer.request({getAccessTokenSilently:accessToken, payload: peerUpdate}))
+                    dispatch(peerActions.updatePeer.request({accessToken:accessToken, payload: peerUpdate}))
                 }
                 if (peerGroupsToSave.groupsToRemove.length || peerGroupsToSave.groupsToAdd.length || peerGroupsToSave.groupsNoId.length) {
                     setCallingGroupAPI(true)
-                    dispatch(peerActions.saveGroups.request({getAccessTokenSilently:accessToken, payload: peerGroupsToSave}))
+                    dispatch(peerActions.saveGroups.request({accessToken:accessToken, payload: peerGroupsToSave}))
                 }
             })
             .catch((errorInfo) => {

src/components/SetupKeyNew.tsx

@@ -34,7 +34,7 @@ const SetupKeyNew = () => {
     const handleFormSubmit = () => {
         form.validateFields()
             .then((values) => {
-                dispatch(setupKeyActions.createSetupKey.request({getAccessTokenSilently:accessToken, payload: formSetupKey}))
+                dispatch(setupKeyActions.createSetupKey.request({accessToken:accessToken, payload: formSetupKey}))
             })
             .catch((errorInfo) => {
                 console.log('errorInfo', errorInfo)

src/services/api-client/api-request.ts

@@ -14,7 +14,7 @@ async function apiRequest<T>(params: ApiRequestParams): Promise<ApiResponse<T>>
   const url = `${params.urlBase}${params.url}`;
 
   const extraHeaders = params.extraHeaders || {};
-  const headers = await headersFactory((params.data as any).getAccessTokenSilently);
+  const headers = await headersFactory((params.data as any).accessToken);
 
   const builtHeader: RequestHeader = { ...headers, ...extraHeaders };
 

src/services/api-client/header-factory.ts

@@ -3,19 +3,14 @@ export interface RequestHeader {
   [key: string]: unknown;
 }
 
-const headersFactory = async (getAccessTokenSilently:any): Promise<RequestHeader> => {
+const headersFactory = async (accessToken:any): Promise<RequestHeader> => {
   const headers: RequestHeader = {
     'Content-Type': 'application/json',
     'Accept': 'application/json'
   };
 
-  //const token = await getLocalItem<string>(StorageKey.token);
+  if (accessToken) {
-  //const token = ''
+    headers.authorization = `Bearer ${accessToken}`;
-  // const token = await getAccessTokenSilently()
-  const token = getAccessTokenSilently
-
-  if (token) {
-    headers.authorization = `Bearer ${token}`;
   }
 
   return headers;

src/services/api-client/types.ts

@@ -1,7 +1,7 @@
 import { Method } from 'axios';
 
 export interface RequestPayload<T> {
-  getAccessTokenSilently: any | null;
+  accessToken: any | null;
   payload:T;
 }
 

src/store/peer/sagas.ts

@@ -118,13 +118,13 @@ export function* saveGroups(action: ReturnType<typeof actions.saveGroups.request
     }
 
     const responsesGroup = yield all(groupsToSave.map(g => call(serviceGroup.editGroup, {
-         getAccessTokenSilently: action.payload.getAccessTokenSilently,
+         accessToken: action.payload.accessToken,
          payload: g
        })
     ))
 
     const responsesGroupNoId = yield all(groupsNoId.map(g => call(serviceGroup.createGroup, {
-         getAccessTokenSilently: action.payload.getAccessTokenSilently,
+         accessToken: action.payload.accessToken,
          payload: g
        })
     ))
@@ -137,8 +137,8 @@ export function* saveGroups(action: ReturnType<typeof actions.saveGroups.request
       data: [...(responsesGroup as ApiResponse<Group>[]).map(r => r.body), ...(responsesGroupNoId as ApiResponse<Group>[]).map(r => r.body)]
     } as CreateResponse<Group[] | null>))
 
-    yield put(groupActions.getGroups.request({ getAccessTokenSilently: action.payload.getAccessTokenSilently, payload: null }));
+    yield put(groupActions.getGroups.request({ accessToken: action.payload.accessToken, payload: null }));
-    yield put(actions.getPeers.request({ getAccessTokenSilently: action.payload.getAccessTokenSilently, payload: null }));
+    yield put(actions.getPeers.request({ accessToken: action.payload.accessToken, payload: null }));
 
   } catch (err) {
     console.log(err)
@@ -166,7 +166,7 @@ export function* updatePeer(action: ReturnType<typeof actions.updatePeer.request
     const peerId = peer.id
 
     const payloadToSave = {
-      getAccessTokenSilently: action.payload.getAccessTokenSilently,
+      accessToken: action.payload.accessToken,
       payload: peer
     }
 

src/store/rule/sagas.ts

@@ -48,7 +48,7 @@ export function* saveRule(action: ReturnType<typeof actions.saveRule.request>):
     const ruleToSave = action.payload.payload
 
     const responsesGroup = yield all(ruleToSave.groupsToSave.map(g => call(serviceGroup.createGroup, {
-        getAccessTokenSilently: action.payload.getAccessTokenSilently,
+        accessToken: action.payload.accessToken,
         payload: { name: g }
       })
     ))
@@ -64,7 +64,7 @@ export function* saveRule(action: ReturnType<typeof actions.saveRule.request>):
     const newDestinations = getNewGroupIds(ruleToSave.destinationsNoId, resGroups)
 
     const payloadToSave = {
-      getAccessTokenSilently: action.payload.getAccessTokenSilently,
+      accessToken: action.payload.accessToken,
       payload: {
         name: ruleToSave.name,
         description: ruleToSave.description,
@@ -93,8 +93,8 @@ export function* saveRule(action: ReturnType<typeof actions.saveRule.request>):
       data: response.body
     } as CreateResponse<Rule | null>));
 
-    yield put(groupActions.getGroups.request({ getAccessTokenSilently: action.payload.getAccessTokenSilently, payload: null }));
+    yield put(groupActions.getGroups.request({ accessToken: action.payload.accessToken, payload: null }));
-    yield put(actions.getRules.request({ getAccessTokenSilently: action.payload.getAccessTokenSilently, payload: null }));
+    yield put(actions.getRules.request({ accessToken: action.payload.accessToken, payload: null }));
   } catch (err) {
     yield put(actions.saveRule.failure({
       loading: false,

src/views/AccessControl.tsx

@@ -106,8 +106,8 @@ export const AccessControl = () => {
     }
 
     useEffect(() => {
-        dispatch(ruleActions.getRules.request({getAccessTokenSilently:accessToken, payload: null}));
+        dispatch(ruleActions.getRules.request({accessToken:accessToken, payload: null}));
-        dispatch(groupActions.getGroups.request({getAccessTokenSilently:accessToken, payload: null}));
+        dispatch(groupActions.getGroups.request({accessToken:accessToken, payload: null}));
     }, [])
 
     useEffect(() => {
@@ -182,7 +182,7 @@ export const AccessControl = () => {
             </Space>,
             okType: 'danger',
             onOk() {
-                dispatch(ruleActions.deleteRule.request({getAccessTokenSilently:accessToken, payload: ruleToAction?.id || ''}));
+                dispatch(ruleActions.deleteRule.request({accessToken:accessToken, payload: ruleToAction?.id || ''}));
             },
             onCancel() {
                 setRuleToAction(null);
@@ -204,7 +204,7 @@ export const AccessControl = () => {
             </Space>,
             okType: 'danger',
             onOk() {
-                //dispatch(ruleActions.deleteRule.request({getAccessTokenSilently, payload: ruleToAction?.id || ''}));
+                //dispatch(ruleActions.deleteRule.request({accessToken, payload: ruleToAction?.id || ''}));
             },
             onCancel() {
                 setRuleToAction(null);

src/views/Peers.tsx

@@ -104,8 +104,8 @@ export const Peers = () => {
     }
 
     useEffect(() => {
-        dispatch(peerActions.getPeers.request({getAccessTokenSilently:accessToken, payload: null}));
+        dispatch(peerActions.getPeers.request({accessToken:accessToken, payload: null}));
-        dispatch(groupActions.getGroups.request({getAccessTokenSilently:accessToken, payload: null}));
+        dispatch(groupActions.getGroups.request({accessToken:accessToken, payload: null}));
     }, [])
 
     useEffect(() => {
@@ -198,7 +198,7 @@ export const Peers = () => {
             content: "Are you sure you want to delete peer from your account?",
             okType: 'danger',
             onOk() {
-                dispatch(peerActions.deletedPeer.request({getAccessTokenSilently:accessToken, payload: peerToAction ? peerToAction.ip : ''}));
+                dispatch(peerActions.deletedPeer.request({accessToken:accessToken, payload: peerToAction ? peerToAction.ip : ''}));
             },
             onCancel() {
                 setPeerToAction(null);
@@ -226,7 +226,7 @@ export const Peers = () => {
             ssh_enabled: checked,
             name: record.name
         } as Peer
-        dispatch(peerActions.updatePeer.request({getAccessTokenSilently:accessToken, payload: peer}));
+        dispatch(peerActions.updatePeer.request({accessToken:accessToken, payload: peer}));
 
     }
 

src/views/SetupKeys.tsx

@@ -79,7 +79,7 @@ export const SetupKeys = () => {
     }
 
     useEffect(() => {
-        dispatch(setupKeyActions.getSetupKeys.request({getAccessTokenSilently:accessToken, payload: null}));
+        dispatch(setupKeyActions.getSetupKeys.request({accessToken:accessToken, payload: null}));
     }, [])
 
     useEffect(() => {
@@ -175,7 +175,7 @@ export const SetupKeys = () => {
             </Space>,
             okType: 'danger',
             onOk() {
-                dispatch(setupKeyActions.deleteSetupKey.request({getAccessTokenSilently:accessToken, payload: setupKeyToAction ? setupKeyToAction.id : ''}));
+                dispatch(setupKeyActions.deleteSetupKey.request({accessToken:accessToken, payload: setupKeyToAction ? setupKeyToAction.id : ''}));
             },
             onCancel() {
                 setSetupKeyToAction(null);
@@ -197,7 +197,7 @@ export const SetupKeys = () => {
             </Space>,
             okType: 'danger',
             onOk() {
-                dispatch(setupKeyActions.revokeSetupKey.request({getAccessTokenSilently:accessToken, payload: { id: setupKeyToAction ? setupKeyToAction.id : null,revoked: true } as SetupKeyRevoke}));
+                dispatch(setupKeyActions.revokeSetupKey.request({accessToken:accessToken, payload: { id: setupKeyToAction ? setupKeyToAction.id : null,revoked: true } as SetupKeyRevoke}));
             },
             onCancel() {
                 setSetupKeyToAction(null);

src/views/Users.tsx

@@ -45,7 +45,7 @@ export const Users = () => {
     }
 
     useEffect(() => {
-        dispatch(userActions.getUsers.request({getAccessTokenSilently:accessToken,payload: null}));
+        dispatch(userActions.getUsers.request({accessToken:accessToken,payload: null}));
     }, [])
     useEffect(() => {
         setDataTable(transformDataTable(users))