Adding helper for auth key resolution

This commit is contained in:
Peter Morton 2023-10-11 19:21:58 -05:00
parent 902189c34d
commit e4f4766f5f
2 changed files with 36 additions and 48 deletions

View File

@ -1,5 +1,6 @@
<script setup> <script setup>
import { ref, onMounted } from "vue"; import { ref, onMounted } from "vue";
import { getAuthKeyFromProperties } from '../helpers/index'
import * as d3 from "d3"; import * as d3 from "d3";
import * as align from "d3-sankey"; import * as align from "d3-sankey";
@ -34,20 +35,15 @@ function fetchData() {
//clear errors //clear errors
errorMessage.value = null; errorMessage.value = null;
var authKey; try {
var authKey = getAuthKeyFromProperties(props);
if (props.sessionIdentifier.length > 0) { } catch (error) {
authKey = props.sessionIdentifier; console.error(error);
} else if (props.username.length > 0) { errorMessage.value = error;
authKey = props.username; return;
} else {
errorMessage.value =
"_sessionIdentifier or username must be passed as query params.";
} }
if (authKey) {
fetch( fetch(
`${import.meta.env.VITE_EO_SERVICES_URL}/api/interactions-flow?filter=${ `${import.meta.env.VITE_EO_SERVICES_URL}/api/interactions-flow?filter=${multiSelected.value
multiSelected.value
}&authKey=${authKey}`, }&authKey=${authKey}`,
{ {
credentials: "include", // fetch won't send cookies unless you set credentials credentials: "include", // fetch won't send cookies unless you set credentials
@ -65,11 +61,10 @@ function fetchData() {
}); });
}) })
.catch((error) => { .catch((error) => {
console.log(error); console.error(error);
errorMessage.value = error; errorMessage.value = error;
}); });
} }
}
function generateSankey(data) { function generateSankey(data) {
// filter data // filter data

View File

@ -1,5 +1,6 @@
<script setup> <script setup>
import { ref } from "vue"; import { ref } from "vue";
import { getAuthKeyFromProperties } from '../helpers/index'
import ContactTable from "../components/ContactTable.vue"; import ContactTable from "../components/ContactTable.vue";
import ContactsSummary from "../components/ContactsSummary.vue"; import ContactsSummary from "../components/ContactsSummary.vue";
@ -23,16 +24,8 @@ function fetchData() {
errorMessage.value = null; errorMessage.value = null;
contactData.value = null; contactData.value = null;
var authKey; var authKey = getAuthKeyFromProperties(props);
if (props.sessionIdentifier.length > 0) {
authKey = props.sessionIdentifier;
} else if (props.username.length > 0) {
authKey = props.username;
} else {
errorMessage.value =
"_sessionIdentifier or username must be passed as query params.";
}
if (authKey) { if (authKey) {
fetch( fetch(
`${ `${