+ {this.renderRedirect()}
+
{t("user.actions.signout")}
+
+ );
}
diff --git a/client/src/graphql/apollo-error-handling.js b/client/src/graphql/apollo-error-handling.js
index a5cd921cc..271052f78 100644
--- a/client/src/graphql/apollo-error-handling.js
+++ b/client/src/graphql/apollo-error-handling.js
@@ -28,47 +28,56 @@ const errorLink = onError(
console.log("We need a new token!");
if (access_token && access_token !== "undefined") {
// Let's refresh token through async request
- return new Observable(observer => {
- const unsubscribeFromAuth = auth.onAuthStateChanged(async user => {
- console.log("Auth change in error handling.");
- if (user) {
- user
- .getIdToken(true)
- .then(function(idToken) {
- if (!idToken) {
- window.localStorage.removeItem("token");
- return console.log("Refresh token has expired");
- }
- console.log("Got a new token", idToken);
- window.localStorage.setItem("token", idToken);
- // reset the headers
- operation.setContext(({ headers = {} }) => ({
- headers: {
- // Re-add old headers
- ...headers,
- // Switch out old access token for new one
- authorization: idToken ? `Bearer ${idToken}` : ""
- }
- }));
-
- const subscriber = {
- next: observer.next.bind(observer),
- error: observer.error.bind(observer),
- complete: observer.complete.bind(observer)
- };
- console.log("About to resend the request.");
- // Retry last failed request
- forward(operation).subscribe(subscriber);
- })
- .catch(error => {
- // No refresh or client token available, we force user to login
- console.log("Hit an error.");
- observer.error(error);
- });
- }
- });
+ auth.currentUser.getIdToken(true).then(token => {
+ if (token) {
+ window.localStorage.setItem("token", token);
+ operation.setContext(({ headers = {} }) => ({
+ headers: {
+ ...headers,
+ authorization: token ? `Bearer ${token}` : ""
+ }
+ }));
+ return forward(operation);
+ }
});
+
+ // return new Observable(observer => {
+ // auth.currentUser
+ // .getIdToken(true)
+ // .then(function(idToken) {
+ // if (!idToken) {
+ // window.localStorage.removeItem("token");
+ // return console.log("Refresh token has expired");
+ // }
+ // console.log("Got a new token", idToken);
+ // window.localStorage.setItem("token", idToken);
+
+ // // reset the headers
+ // operation.setContext(({ headers = {} }) => ({
+ // headers: {
+ // // Re-add old headers
+ // ...headers,
+ // // Switch out old access token for new one
+ // authorization: idToken ? `Bearer ${idToken}` : ""
+ // }
+ // }));
+
+ // const subscriber = {
+ // next: observer.next.bind(observer),
+ // error: observer.error.bind(observer),
+ // complete: observer.complete.bind(observer)
+ // };
+ // console.log("About to resend the request.");
+ // // Retry last failed request
+ // forward(operation).subscribe(subscriber);
+ // })
+ // .catch(error => {
+ // // No refresh or client token available, we force user to login
+ // console.log("Hit an error.");
+ // observer.error(error);
+ // });
+ // });
}
}
}
diff --git a/client/src/pages/jobs/jobs.page.jsx b/client/src/pages/jobs/jobs.page.jsx
index ee640a0e6..636a1010b 100644
--- a/client/src/pages/jobs/jobs.page.jsx
+++ b/client/src/pages/jobs/jobs.page.jsx
@@ -20,7 +20,6 @@ export default function JobsPage({ match, location }) {
const { hash } = location;
const [selectedJob, setSelectedJob] = useState(hash ? hash.substr(1) : null);
- console.log("Jobs Page Render.");
if (error) return