Skip to content

Commit

Permalink
fix: don't hydrate client with server token
Browse files Browse the repository at this point in the history
  • Loading branch information
lionelB committed Jun 3, 2020
1 parent 251a0b9 commit 7263c02
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
16 changes: 6 additions & 10 deletions src/hooks/useAuth.js
Expand Up @@ -25,19 +25,15 @@ query getUser {
}
`;

export function AuthProvider({ token, children }) {
// hydrate jwt-token from server
if (token && !getToken()) {
setToken(token);
}
console.log("[AuthProvider] token", token ? "✅" : "❌");
export function AuthProvider({ children }) {
console.log("[AuthProvider] token", getToken() ? "✅" : "❌");
const [user, setUser] = useState(null);
const [result] = useQuery({ query: getUserQuery });
useEffect(() => {
if (result.data) {
setUser(result.data.user[0]);
}
}, [result.data, token]);
}, [result.data]);

return (
<AuthContext.Provider value={{ user, setUser }}>
Expand Down Expand Up @@ -96,12 +92,12 @@ export function withAuthProvider(WrappedComponent) {
const componentProps =
WrappedComponent.getInitialProps &&
(await WrappedComponent.getInitialProps(ctx));
const rawToken = getRawtoken();
return { ...componentProps, rawToken };

return { ...componentProps };
}
render() {
return (
<AuthProvider token={this.props.rawToken}>
<AuthProvider>
<WrappedComponent {...this.props} />
</AuthProvider>
);
Expand Down
4 changes: 3 additions & 1 deletion src/pages/_app.js
Expand Up @@ -22,7 +22,9 @@ class MyApp extends App {
}

render() {
console.log("_app render");
console.log("_app render", {
NEXT_PUBLIC_FRONTEND_URL: process.env.NEXT_PUBLIC_FRONTEND_URL,
});
const { Component, pageProps } = this.props;

// Workaround for https://github.com/zeit/next.js/issues/8592
Expand Down

0 comments on commit 7263c02

Please sign in to comment.