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

Functioning login process.

Browse Source
This commit is contained in:
Patrick Fic
2019-12-06 14:24:36 -08:00
parent 78c43fa1e5
commit 1176b62d0b
24 changed files with 354 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.vscode/launch.json vendored Normal file
View File

@@ -0,0 +1,12 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Chrome",
"type": "chrome",
"request": "launch",
"url": "http://localhost:3000",
"webRoot": "${workspaceRoot}/src"
}
]
}

0
client/src/.env → client/.env
View File

1
client/package.json
View File

@@ -4,6 +4,7 @@
"private": true,
"license": "UNLICENSED",
"dependencies": {
"@apollo/react-hooks": "^3.1.3",
"antd": "^3.26.0",
"apollo-boost": "^0.4.4",
"dotenv": "^8.2.0",

45
client/src/App/App.container.jsx
View File

@@ -4,19 +4,60 @@ import React, { useState, useEffect } from "react";
import firebase from "../firebase/firebase.utils";
import App from "./App";
import { Spin } from "antd";
import { gql } from "apollo-boost";
import { useMutation } from "@apollo/react-hooks";
import { HttpLink } from "apollo-link-http";
import ApolloClient from "apollo-client";
import { InMemoryCache } from "apollo-cache-inmemory";
//import gql from "graphql-tag";
// on_conflict: { constraint: users_pkey, update_columns: [authid] }
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
}
}
}
`;
const client = new ApolloClient({
link: new HttpLink({
uri: process.env.REACT_APP_GRAPHQL_ENDPOINT
}),
cache: new InMemoryCache()
});
export default function Auth() {
const [authState, setAuthState] = useState({ status: "loading" });
// const [upsertUser] = useMutation(UPSERT_USER, {
// client
// });
useEffect(() => {
return firebase.auth().onAuthStateChanged(async user => {
if (user) {
console.log('Current User:', user)
console.log("Current User:", user);
client
.mutate({
mutation: UPSERT_USER,
variables: { authEmail: user.email, authToken: user.uid }
})
.then(r => console.log(r))
.catch(error => console.log("ERROR!!!!", error));
const token = await user.getIdToken();
const idTokenResult = await user.getIdTokenResult();
const hasuraClaim =
idTokenResult.claims["https://hasura.io/jwt/claims"];
console.log("idTokenResult", idTokenResult);
if (hasuraClaim) {
setAuthState({ status: "in", user, token });
} else {

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

@@ -14,9 +14,7 @@ import initialState from "../graphql/initial-state";
import JobListContainer from "../components/job-list/job-list.container";
//Todo: Issue with this line. Not sure why.
const graphqlEndpoint =
process.env.REACT_APP_GRAPHQL_ENDPOINT ||
"https://bodyshop-dev-db.herokuapp.com/v1/graphql";
const graphqlEndpoint = process.env.REACT_APP_GRAPHQL_ENDPOINT;
export default function App({ authState }) {
const isIn = authState.status === "in";

30
firebase/functions/index.js
View File

@@ -1,7 +1,6 @@
const functions = require("firebase-functions");
const admin = require("firebase-admin");
admin.initializeApp(functions.config().firebase);
const fetch = require("node-fetch");
//Todo: Move this to an environment parameter.
const GRAPHQL_ENDPOINT = functions.config().auth.graphql_endpoint;
@@ -50,22 +49,19 @@ exports.processSignUp = functions.auth.user().onCreate(user => {
}
};
}
//update the AuthId in the graphql server.
fetch(GRAPHQL_ENDPOINT, {
method: "POST",
headers: {
"Content-Type": "application/json",
Accept: "application/json",
"x-hasura-admin-secret": HASURA_SECRET_ADMIN_KEY
},
body: JSON.stringify({
query: UPSERT_USER,
variables: { authEmail: user.email, authToken: user.uid }
})
});
// .then(r => r.json())
// .then(data => {
// console.log("data returned:", data);
//Removed for now - outbound connections are not free on firebase.
// fetch(GRAPHQL_ENDPOINT, {
// method: "POST",
// headers: {
// "Content-Type": "application/json",
// Accept: "application/json",
// "x-hasura-admin-secret": HASURA_SECRET_ADMIN_KEY
// },
// body: JSON.stringify({
// query: UPSERT_USER,
// variables: { authEmail: user.email, authToken: user.uid }
// })
// });
// Set custom user claims on this newly created user.

6
hasura/migrations/1575664673911_update_permission_anonymous_public_table_users/down.yaml Normal file
View File

@@ -0,0 +1,6 @@
- args:
role: anonymous
table:
name: users
schema: public
type: drop_insert_permission

18
hasura/migrations/1575664673911_update_permission_anonymous_public_table_users/up.yaml Normal file
View File

@@ -0,0 +1,18 @@
- args:
permission:
allow_upsert: true
check: {}
columns:
- authid
- created_at
- email
- updated_at
localPresets:
- key: ""
value: ""
set: {}
role: anonymous
table:
name: users
schema: public
type: create_insert_permission

19
hasura/migrations/1575667732220_update_permission_user_public_table_users/down.yaml Normal file
View File

@@ -0,0 +1,19 @@
- args:
role: user
table:
name: users
schema: public
type: drop_update_permission
- args:
permission:
columns: []
filter: {}
localPresets:
- key: ""
value: ""
set: {}
role: user
table:
name: users
schema: public
type: create_update_permission

23
hasura/migrations/1575667732220_update_permission_user_public_table_users/up.yaml Normal file
View File

@@ -0,0 +1,23 @@
- args:
role: user
table:
name: users
schema: public
type: drop_update_permission
- args:
permission:
columns:
- email
- authid
- created_at
- updated_at
filter: {}
localPresets:
- key: ""
value: ""
set: {}
role: user
table:
name: users
schema: public
type: create_update_permission

19
hasura/migrations/1575667738815_update_permission_user_public_table_users/down.yaml Normal file
View File

@@ -0,0 +1,19 @@
- args:
role: user
table:
name: users
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- authid
- email
computed_fields: []
filter: {}
role: user
table:
name: users
schema: public
type: create_select_permission

21
hasura/migrations/1575667738815_update_permission_user_public_table_users/up.yaml Normal file
View File

@@ -0,0 +1,21 @@
- args:
role: user
table:
name: users
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- authid
- email
- created_at
- updated_at
computed_fields: []
filter: {}
role: user
table:
name: users
schema: public
type: create_select_permission

6
hasura/migrations/1575668596604_update_permission_user_public_table_users/down.yaml Normal file
View File

@@ -0,0 +1,6 @@
- args:
role: user
table:
name: users
schema: public
type: drop_insert_permission

14
hasura/migrations/1575668596604_update_permission_user_public_table_users/up.yaml Normal file
View File

@@ -0,0 +1,14 @@
- args:
permission:
allow_upsert: true
check: {}
columns: []
localPresets:
- key: ""
value: ""
set: {}
role: user
table:
name: users
schema: public
type: create_insert_permission

19
hasura/migrations/1575668601516_update_permission_user_public_table_users/down.yaml Normal file
View File

@@ -0,0 +1,19 @@
- args:
role: user
table:
name: users
schema: public
type: drop_insert_permission
- args:
permission:
check: {}
columns: []
localPresets:
- key: ""
value: ""
set: {}
role: user
table:
name: users
schema: public
type: create_insert_permission

23
hasura/migrations/1575668601516_update_permission_user_public_table_users/up.yaml Normal file
View File

@@ -0,0 +1,23 @@
- args:
role: user
table:
name: users
schema: public
type: drop_insert_permission
- args:
permission:
check: {}
columns:
- authid
- email
- created_at
- updated_at
localPresets:
- key: ""
value: ""
set: {}
role: user
table:
name: users
schema: public
type: create_insert_permission

6
hasura/migrations/1575668794454_update_permission_anonymous_public_table_users/down.yaml Normal file
View File

@@ -0,0 +1,6 @@
- args:
role: anonymous
table:
name: users
schema: public
type: drop_update_permission

13
hasura/migrations/1575668794454_update_permission_anonymous_public_table_users/up.yaml Normal file
View File

@@ -0,0 +1,13 @@
- args:
permission:
columns: []
filter: {}
localPresets:
- key: ""
value: ""
set: {}
role: anonymous
table:
name: users
schema: public
type: create_update_permission

6
hasura/migrations/1575668798166_update_permission_anonymous_public_table_users/down.yaml Normal file
View File

@@ -0,0 +1,6 @@
- args:
role: anonymous
table:
name: users
schema: public
type: drop_select_permission

11
hasura/migrations/1575668798166_update_permission_anonymous_public_table_users/up.yaml Normal file
View File

@@ -0,0 +1,11 @@
- args:
permission:
allow_aggregations: false
columns: []
filter: {}
limit: null
role: anonymous
table:
name: users
schema: public
type: create_select_permission

17
hasura/migrations/1575668801857_update_permission_anonymous_public_table_users/down.yaml Normal file
View File

@@ -0,0 +1,17 @@
- args:
role: anonymous
table:
name: users
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns: []
computed_fields: []
filter: {}
role: anonymous
table:
name: users
schema: public
type: create_select_permission

21
hasura/migrations/1575668801857_update_permission_anonymous_public_table_users/up.yaml Normal file
View File

@@ -0,0 +1,21 @@
- args:
role: anonymous
table:
name: users
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- authid
- email
- created_at
- updated_at
computed_fields: []
filter: {}
role: anonymous
table:
name: users
schema: public
type: create_select_permission

19
hasura/migrations/1575668805312_update_permission_anonymous_public_table_users/down.yaml Normal file
View File

@@ -0,0 +1,19 @@
- args:
role: anonymous
table:
name: users
schema: public
type: drop_update_permission
- args:
permission:
columns: []
filter: {}
localPresets:
- key: ""
value: ""
set: {}
role: anonymous
table:
name: users
schema: public
type: create_update_permission

23
hasura/migrations/1575668805312_update_permission_anonymous_public_table_users/up.yaml Normal file
View File

@@ -0,0 +1,23 @@
- args:
role: anonymous
table:
name: users
schema: public
type: drop_update_permission
- args:
permission:
columns:
- authid
- email
- created_at
- updated_at
filter: {}
localPresets:
- key: ""
value: ""
set: {}
role: anonymous
table:
name: users
schema: public
type: create_update_permission