Updated files and added prettier

vercel · Jan 13, 2020 · b5ae357 · b5ae357
1 parent 8f44208
commit b5ae357
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 55 deletions.
diff --git a/examples/with-cookie-auth-fauna/components/layout.js b/examples/with-cookie-auth-fauna/components/layout.js
@@ -1,9 +1,8 @@
-import React from 'react'
 import Head from 'next/head'
 import Header from './header'
 
 const Layout = props => (
-  <React.Fragment>
+  <>
     <Head>
       <title>With Cookies</title>
     </Head>
@@ -34,7 +33,7 @@ const Layout = props => (
     <main>
       <div className="container">{props.children}</div>
     </main>
-  </React.Fragment>
+  </>
 )
 
 export default Layout
diff --git a/examples/with-cookie-auth-fauna/next.config.js b/examples/with-cookie-auth-fauna/next.config.js
@@ -1,7 +1,8 @@
 require('dotenv').config()
+
 module.exports = {
   env: {
     // Set the fauna server key in the .env file and make it available at Build Time.
     FAUNA_SERVER_KEY: process.env.FAUNA_SERVER_KEY,
   },
-}
+}
diff --git a/examples/with-cookie-auth-fauna/pages/api/login.js b/examples/with-cookie-auth-fauna/pages/api/login.js
@@ -8,18 +8,18 @@ export default async (req, res) => {
     if (!email || !password) {
       throw new Error('Email and password must be provided.')
     }
-    
-    const loginRes = (await serverClient.query(
+
+    const loginRes = await serverClient.query(
       q.Login(q.Match(q.Index('users_by_email'), email), {
         password,
       })
-    ))
+    )
     if (!loginRes.secret) {
-      throw new Error('No secret present in login query response.');
+      throw new Error('No secret present in login query response.')
     }
-    var cookieSerialized = serializeFaunaCookie(loginRes.secret);
-    res.setHeader('Set-Cookie', cookieSerialized);
-    res.status(200).json({ email });
+    var cookieSerialized = serializeFaunaCookie(loginRes.secret)
+    res.setHeader('Set-Cookie', cookieSerialized)
+    res.status(200).json({ email })
   } catch (error) {
     const { response } = error
     return response

diff --git a/examples/with-cookie-auth-fauna/pages/api/logout.js b/examples/with-cookie-auth-fauna/pages/api/logout.js
@@ -1,4 +1,4 @@
-import {query as q} from 'faunadb'
+import { query as q } from 'faunadb'
 import cookie from 'cookie'
 import { faunaClient, FAUNA_SECRET_COOKIE } from '../../utils/fauna-auth'
 

diff --git a/examples/with-cookie-auth-fauna/pages/api/profile.js b/examples/with-cookie-auth-fauna/pages/api/profile.js
@@ -1,8 +1,8 @@
-import {query as q} from 'faunadb'
+import { query as q } from 'faunadb'
 import cookie from 'cookie'
 import { faunaClient, FAUNA_SECRET_COOKIE } from '../../utils/fauna-auth'
 
-export const profileApi = async (faunaSecret) => {
+export const profileApi = async faunaSecret => {
   const ref = await faunaClient(faunaSecret).query(q.Identity())
   return ref.id
 }
@@ -14,5 +14,5 @@ export default async (req, res) => {
     return res.status(401).send('Auth cookie missing.')
   }
 
-  res.status(200).json({userId: await profileApi(faunaSecret)})
+  res.status(200).json({ userId: await profileApi(faunaSecret) })
 }
diff --git a/examples/with-cookie-auth-fauna/pages/api/signup.js b/examples/with-cookie-auth-fauna/pages/api/signup.js
@@ -18,22 +18,23 @@ export default async (req, res) => {
         })
       )
     } catch (err) {
-      throw new Error('User already exists.');
+      console.error('ERR', err)
+      throw new Error('User already exists.')
     }
     if (!createRes.ref) {
-      throw new Error('No ref present in create query response.');
+      throw new Error('No ref present in create query response.')
     }
-    const loginRes = (await serverClient.query(
+    const loginRes = await serverClient.query(
       q.Login(createRes.ref, {
         password,
       })
-    ))
+    )
     if (!loginRes.secret) {
-      throw new Error('No secret present in login query response.');
+      throw new Error('No secret present in login query response.')
     }
-    var cookieSerialized = serializeFaunaCookie(loginRes.secret);
-    res.setHeader('Set-Cookie', cookieSerialized);
-    res.status(200).json({ email });
+    var cookieSerialized = serializeFaunaCookie(loginRes.secret)
+    res.setHeader('Set-Cookie', cookieSerialized)
+    res.status(200).json({ email })
   } catch (error) {
     const { response } = error
     return response

diff --git a/examples/with-cookie-auth-fauna/pages/login.js b/examples/with-cookie-auth-fauna/pages/login.js
@@ -7,10 +7,10 @@ const signin = async (email, password) => {
   const url = '/api/login'
   const response = await fetch(url, {
     method: 'POST',
-
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({ email, password }),
   })
+
   if (response.status === 200) {
     const { email } = await response.json()
     login({ email })
@@ -19,13 +19,17 @@ const signin = async (email, password) => {
     console.log('Login failed.')
     // https://github.com/developit/unfetch#caveats
     const { message } = await response.json()
-    let error = new Error(message ? message : response.statusText)
+    let error = new Error(message || response.statusText)
     throw error
   }
-};
+}
 
 function Login() {
-  const [userData, setUserData] = useState({ email: '', password: '', error: '' })
+  const [userData, setUserData] = useState({
+    email: '',
+    password: '',
+    error: '',
+  })
 
   async function handleSubmit(event) {
     event.preventDefault()

diff --git a/examples/with-cookie-auth-fauna/pages/profile.js b/examples/with-cookie-auth-fauna/pages/profile.js
@@ -13,7 +13,6 @@ const Profile = props => {
       <h1>Your user id is {userId}</h1>
 
       <style jsx>{`
-
         h1 {
           margin-bottom: 0;
         }
@@ -24,34 +23,32 @@ const Profile = props => {
 
 Profile.getInitialProps = async ctx => {
   if (ctx.req) {
-    console.log(ctx.req.headers.cookie)
-    var cookies = cookie.parse(ctx.req.headers.cookie ?? '')
-    var faunaSecret = cookies[FAUNA_SECRET_COOKIE]
+    const cookies = cookie.parse(ctx.req.headers.cookie ?? '')
+    const faunaSecret = cookies[FAUNA_SECRET_COOKIE]
+
     if (!faunaSecret) {
-      // If `ctx.req` is available it means we are on the server.
-      ctx.res.writeHead(302, { Location: '/login' });
-      ctx.res.end();
-    }
-    var profileInfo = await profileApi(faunaSecret);
-    return {userId: profileInfo};
-  } else {
-    const response = await fetch('/api/profile', {
-      method: 'POST',
-
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({}),
-    })
-    if (response.status === 200) {
-      const { userId } = await response.json()
-      return { userId }
-    } else {
-      console.log('Profile lookup failed.')
-      // https://github.com/developit/unfetch#caveats
-      const { message } = await response.json()
-      let error = new Error(message ? message : response.statusText)
-      throw error
+      ctx.res.writeHead(302, { Location: '/login' })
+      ctx.res.end()
+      return {}
     }
+
+    const profileInfo = await profileApi(faunaSecret)
+
+    return { userId: profileInfo }
   }
+
+  const response = await fetch('/api/profile', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({}),
+  })
+  const data = await response.json()
+
+  if (response.status !== 200) {
+    throw new Error(data.message || response.statusText)
+  }
+
+  return { userId: data.userId }
 }
 
 export default withAuthSync(Profile)
diff --git a/examples/with-cookie-auth-fauna/pages/signup.js b/examples/with-cookie-auth-fauna/pages/signup.js
@@ -5,7 +5,11 @@ import { login } from '../utils/auth'
 import Router from 'next/router'
 
 function Signup() {
-  const [userData, setUserData] = useState({ email: '', password: '', error: '' })
+  const [userData, setUserData] = useState({
+    email: '',
+    password: '',
+    error: '',
+  })
 
   async function handleSubmit(event) {
     event.preventDefault()
@@ -28,7 +32,6 @@ function Signup() {
         Router.push('/profile')
       } else {
         console.log('Signup failed.')
-        // https://github.com/developit/unfetch#caveats
         const { message } = await response.json()
         let error = new Error(message ? message : response.statusText)
         throw error