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

In progress changes for ensuring that new clients are written to the database.

Browse Source
This commit is contained in:
Patrick Fic
2019-12-10 18:43:46 -08:00
parent 88857800e6
commit 0cb9065dba
11 changed files with 97 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
client/src/App/App.container.jsx.bak
View File

@@ -1,78 +0,0 @@
//Baselined on https://blog.hasura.io/authentication-and-authorization-using-hasura-and-firebase/
import React, { useState, useEffect } from "react";
import firebase from "../firebase/firebase.utils";
import App from "./App";
import { gql } from "apollo-boost";
import { HttpLink } from "apollo-link-http";
import ApolloClient from "apollo-client";
import { InMemoryCache } from "apollo-cache-inmemory";
import Spin from "../components/loading-spinner/loading-spinner.component";
const UPSERT_USER = gql`
mutation upsert_user($authEmail: String!, $authToken: String!) {
insert_users(
objects: [{ email: $authEmail, authid: $authToken }]
on_conflict: { constraint: users_pkey, update_columns: [authid] }
) {
returning {
authid
}
}
}
`;
export default function Auth() {
const [authState, setAuthState] = useState({ status: "loading" });
useEffect(() => {
return firebase.auth().onAuthStateChanged(async user => {
if (user) {
console.log("Current User:", user);
client
.mutate({
mutation: UPSERT_USER,
variables: { authEmail: user.email, authToken: user.uid }
})
.then(r => console.log("Successful Upsert", r))
.catch(error => console.log("Upsert error!!!!", error));
const token = await user.getIdToken();
const idTokenResult = await user.getIdTokenResult();
const hasuraClaim =
idTokenResult.claims["https://hasura.io/jwt/claims"];
if (hasuraClaim) {
setAuthState({ status: "in", user, token });
} else {
// Check if refresh is required.
const metadataRef = firebase
.database()
.ref("metadata/" + user.uid + "/refreshTime");
metadataRef.on("value", async () => {
// Force refresh to pick up the latest custom claims changes.
const token = await user.getIdToken(true);
setAuthState({ status: "in", user, token });
});
}
} else {
setAuthState({ status: "out" });
}
});
}, []);
let content;
if (authState.status === "loading") {
content = <Spin />;
} else {
content = (
<>
<App authState={authState} />
</>
);
}
return <div className="app-container">{content}</div>;
}

7
client/src/App/App.js
View File

@@ -22,13 +22,6 @@ class App extends React.Component {
this.unsubscribeFromAuth = auth.onAuthStateChanged(async user => {
console.log("Current User:", user);
if (user) {
// client
// .mutate({
// mutation: UPSERT_USER,
// variables: { authEmail: user.email, authToken: user.uid }
// })
// .then(r => console.log("Successful Upsert", r))
// .catch(error => console.log("Upsert error!!!!", error));
const token = await user.getIdToken();
const idTokenResult = await user.getIdTokenResult();