move auth to separate utils folder

Author: Allicolyer

packages/gatsby-theme/src/Apollo.ts

@@ -4,7 +4,7 @@ import { HttpLink } from 'apollo-link-http';
 import { InMemoryCache } from 'apollo-cache-inmemory';
 import fetch from 'isomorphic-fetch';
 import config from '../config';
-import { getAuthToken } from './utils/auth';
+import { getAuthToken } from './utils/auth/auth';
 
 const authLink = setContext((_, { headers }) => {
     // get the authentication token from local storage if it exists

packages/gatsby-theme/src/components/Account.tsx

@@ -2,8 +2,8 @@ import React from 'react';
 import { Text, Image, Flex } from './shared/base';
 import { Link } from 'gatsby';
 import CustomButton from './CustomButton';
-import { loginUser } from '../utils/auth';
-import WithCurrentUser from '../utils/WithCurrentUser';
+import { loginUser } from '../utils/auth/auth';
+import WithCurrentUser from '../utils/auth/WithCurrentUser';
 import { CenteredLoader } from '../components/Loader';
 
 const Account = () => {

packages/gatsby-theme/src/components/Upvote.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { Heading, Flex } from './shared/base';
 import CustomButton from './CustomButton';
-import { loginUser } from '../utils/auth';
-import WithCurrentUser from '../utils/WithCurrentUser';
+import { loginUser } from '../utils/auth/auth';
+import WithCurrentUser from '../utils/auth/WithCurrentUser';
 
 const Upvote = () => {
   return (

packages/gatsby-theme/src/components/queries/userQueries.ts

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import Layout from '../components/layout';
 import { Text, Image, Flex } from '../components/shared/base';
-import { logoutUser } from '../utils/auth';
+import { logoutUser } from '../utils/auth/auth';
 import { navigate } from 'gatsby';
-import WithCurrentUser from '../utils/WithCurrentUser';
+import WithCurrentUser from '../utils/auth/WithCurrentUser';
 import { CenteredLoader } from '../components/Loader';
 
 const Profile = () => {

packages/gatsby-theme/src/pages/profile.tsx

@@ -4,13 +4,8 @@ import { navigate } from 'gatsby';
 import { CenteredLoader } from '../components/Loader';
 import { Flex, Text, Box } from '../components/shared/base';
 import CustomButton from '../components/CustomButton';
-import { loginUser } from '../utils/auth';
-<<<<<<< HEAD
-import { CURRENT_USER } from '../components/queries/userQueries';
-import { optionalChaining } from '../utils/helpers';
-=======
-import WithCurrentUser from '../utils/WithCurrentUser';
->>>>>>> create WithCurrentUser component
+import WithCurrentUser from '../utils/auth/WithCurrentUser';
+import { loginUser } from '../utils/auth/auth';
 
 const Signup = () => {
   return (

packages/gatsby-theme/src/pages/signup.tsx

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { Query } from 'react-apollo';
-import { CURRENT_USER } from '../components/queries/userQueries';
-import { optionalChaining } from './helpers';
+import { optionalChaining } from '../helpers';
+import gql from 'graphql-tag';
 
 const WithCurrentUser = ({ children }) => {
   return (
@@ -20,4 +20,18 @@ const WithCurrentUser = ({ children }) => {
   );
 };
 
+export const CURRENT_USER = gql`
+  query currentUser {
+    viewer {
+      id
+      user {
+        id
+        name
+        avatarUrl
+        githubHandle
+      }
+    }
+  }
+`;
+
 export default WithCurrentUser;

packages/gatsby-theme/src/utils/WithCurrentUser.js renamed to packages/gatsby-theme/src/utils/auth/WithCurrentUser.js

@@ -1,6 +1,6 @@
 import gql from 'graphql-tag';
-import { client } from '../Apollo';
-import config from '../../config';
+import { client } from '../../Apollo';
+import config from '../../../config';
 
 const TOKEN_KEY = 'token';
 

packages/gatsby-theme/src/utils/auth.ts renamed to packages/gatsby-theme/src/utils/auth/auth.ts

@@ -21,5 +21,5 @@
     "baseUrl": "."
   },
   "exclude": ["node_modules"],
-  "include": ["./src/**/*.tsx", "./src/**/*.ts", "./images.d.ts"]
+  "include": ["./src/**/*.tsx", "./src/**/*.ts", "./images.d.ts", "src/utils/WithCurrentUser.js"]
 }