fix access token api

Author: Francesca-Bit

packages/tdb-dashboard/src/hooks/AcceptInvitationHook.js

@@ -1,19 +1,9 @@
 import { useState } from "react"
 import   axios  from "axios"
 import {WOQLClientObj} from '../init-woql-client'
-import {getOptions} from "./hookUtils"
+import {getOptions,getBaseUrl} from "./hookUtils"
 //import history from "../routing/history"
 //use access control 
-function getBaseUrl(){
-	/*
-    * link to the node server
-    */
-	let remote_url = ''
-    if(process.env.TERMINUSDB_SERVER){
-        remote_url += process.env.TERMINUSDB_SERVER.endsWith('/') ? process.env.TERMINUSDB_SERVER : process.env.TERMINUSDB_SERVER+'/'
-    }
-    return `${remote_url}api`
-}
 export const AcceptInvitationHook=()=> {
 	const axiosHub=axios.create();
 

packages/tdb-dashboard/src/hooks/AccessTokenHook.js

@@ -32,7 +32,6 @@ export const AccessTokenHook=(organization)=> {
 			const token = await getTokenSilently()
 			const options = getOptions(token);
 			const response = await axiosHub.get(`${baseUrl}/organizations/${organization}/tokens`, options)
-			console.log(response)
 			if(response.data){
 				setTokenList(response.data)
 			}
@@ -51,8 +50,8 @@ export const AccessTokenHook=(organization)=> {
 			*/
 			const Auth0token = await getTokenSilently()			
 			const options = getOptions(Auth0token);
-			await axiosHub.delete(`${baseUrl}/organizations/${organization}/tokens/${tokenId}`, options)	
-			await getTokenList()
+		 	await axiosHub.delete(`${baseUrl}/organizations/${organization}/tokens/${tokenId}`, options)
+			getTokenList()	
 			setToken(null)
 
 		}catch(err){

packages/tdb-dashboard/src/hooks/CreateNewOrg.js

@@ -1,18 +1,8 @@
 import { useState, useEffect } from "react"
 import   axios  from "axios"
 import { useAuth0 } from "../react-auth0-spa"
-import {getOptions} from "./hookUtils"
+import {getOptions,getBaseUrl} from "./hookUtils"
 
-function getBaseUrl(){
-	/*
-    * link to the node server
-    */
-	let remote_url = ''
-    if(process.env.TERMINUSDB_SERVER){
-        remote_url += process.env.TERMINUSDB_SERVER.endsWith('/') ? process.env.TERMINUSDB_SERVER : process.env.TERMINUSDB_SERVER+'/'
-    }
-    return `${remote_url}api`
-}
 export const CreateNewOrg=()=> {
 	const axiosHub=axios.create();
     const {getTokenSilently } = useAuth0()

packages/tdb-dashboard/src/hooks/SendEmailHook.js

@@ -1,6 +1,6 @@
 import { useState, useEffect } from "react"
 import axios from "axios" 
-import {getBaseUrl,getOptions} from "./hookUtils"
+import {getBaseUrlFeedback,getOptions} from "./hookUtils"
 import {WOQLClientObj} from '../init-woql-client'
 
 export function SendEmailHook(props) {
@@ -11,7 +11,7 @@ export function SendEmailHook(props) {
     const [emailError,setEmailError]=useState(false)
     const [loadingEmail, setEmailLoading] = useState(false)
 
-	const baseUrl = getBaseUrl()
+	const baseUrl = getBaseUrlFeedback()
 
 	useEffect(() => {
 		 async function callEmailServer() {

packages/tdb-dashboard/src/hooks/hookUtils.js

@@ -15,6 +15,17 @@ export function getOptions(token){
 export function getBaseUrl(){
 	/*
     * link to the node server
+    */
+	let remote_url = ''
+    if(process.env.TERMINUSDB_SERVER){
+        remote_url += process.env.TERMINUSDB_SERVER.endsWith('/') ? process.env.TERMINUSDB_SERVER : process.env.TERMINUSDB_SERVER+'/'
+    }
+    return `${remote_url}api`
+}
+
+export function getBaseUrlFeedback(){
+	/*
+    * link to the node server
     */
 	let remote_url = ''
     if(process.env.FEEDBACK_URL){