admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Reports Server Authorization to client side. IO-390

Browse Source
This commit is contained in:
Patrick Fic
2021-01-07 10:02:09 -08:00
parent 2d260dceb8
commit bf507821c0
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/utils/GraphQLClient.js
View File

@@ -19,8 +19,7 @@ const wsLink = new WebSocketLink({
lazy: true,
reconnect: true,
connectionParams: async () => {
const token =
auth.currentUser && (await auth.currentUser.getIdToken(true));
const token = auth.currentUser && (await auth.currentUser.getIdToken());
if (token) {
return {
headers: {
@@ -35,7 +34,7 @@ const wsLink = new WebSocketLink({
const subscriptionMiddleware = {
applyMiddleware: async (options, next) => {
options.authToken =
auth.currentUser && (await auth.currentUser.getIdToken(true));
auth.currentUser && (await auth.currentUser.getIdToken());
next();
},
};

16
client/src/utils/RenderTemplate.js
View File

@@ -1,11 +1,10 @@
import gql from "graphql-tag";
import jsreport from "jsreport-browser-client-dist";
import client from "../utils/GraphQLClient";
import cleanAxios from "./CleanAxios";
const server = "https://reports.bodyshop.app";
import axios from "axios";
import { auth } from "../firebase/firebase.utils";
const server = process.env.REACT_APP_REPORTS_SERVER_URL;
jsreport.serverUrl = server;
jsreport.headers["Authorization"] = "Basic " + btoa("admin:admin");
export default async function RenderTemplate(
templateObject,
@@ -21,9 +20,12 @@ export default async function RenderTemplate(
// },
//Query assets that match the template name. Must be in format <<templateName>>.query
const jsReportQueries = await cleanAxios.get(
`${server}/odata/assets?$filter=name eq '${templateObject.name}.query'`,
{ headers: { Authorization: "Basic " + btoa("admin:admin") } }
jsreport.headers["Authorization"] =
"Bearer " + (await auth.currentUser.getIdToken());
const jsReportQueries = await axios.get(
`${server}/odata/assets?$filter=name eq '${templateObject.name}.query'`
);
let templateQueryToExecute,