-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade frontend dependencies (#144)
* Upgrade frontend dependencies Major changes: - react 16 => 16.2 - mapbox-gl-style-spec 9 => 11 - react-apollo 1 => 2 - required some code changes to the middleware and import path to gql - https://www.apollographql.com/docs/react/2.0-migration.html - react-mapbox-gl 2 => 3 - required some changes to the layerOptions prop - https://github.com/alex3165/react-mapbox-gl/releases/tag/v3.1.0 #143 * Remove unused dependencies and peer dependency * Downgrade graphql to avoid test bug Running into this issue: graphql/graphql-js#1248. Need to wait for this PR to get merged: facebook/create-react-app#4085. * Cleanup
- Loading branch information
Luqmaan Dawoodjee
committed
Mar 1, 2018
1 parent
206035d
commit 4694655
Showing
6 changed files
with
1,803 additions
and
1,385 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,31 @@ | ||
| import ApolloClient, { createNetworkInterface } from 'apollo-client'; | ||
| import ApolloClient from 'apollo-client'; | ||
| import { ApolloLink, concat } from 'apollo-link'; | ||
| import { createHttpLink } from 'apollo-link-http'; | ||
| import { InMemoryCache } from 'apollo-cache-inmemory'; | ||
|
|
||
| import { isTokenExpired } from './jwtHelper'; | ||
|
|
||
| const networkInterface = createNetworkInterface({ | ||
| const httpLink = createHttpLink({ | ||
| uri: process.env.REACT_APP_AWS_ENDPOINT, | ||
| }); | ||
|
|
||
| networkInterface.use([ | ||
| { | ||
| applyMiddleware(req, next) { | ||
| if (!req.options.headers) { | ||
| req.options.headers = {}; // Create the header object if needed. | ||
| } | ||
| const jwtMiddleware = new ApolloLink((operation, forward) => { | ||
| const token = localStorage.getItem('jwt_user_token'); | ||
|
|
||
| var token = localStorage.getItem('jwt_user_token'); | ||
| if (token !== null && token !== 'null' && !isTokenExpired(token)) { | ||
| operation.setContext({ | ||
| headers: { | ||
| authorization: `Bearer ${token}`, | ||
| }, | ||
| }); | ||
| } | ||
|
|
||
| if (token !== null && token !== 'null') { | ||
| if (!isTokenExpired(token)) { | ||
| req.options.headers.Authorization = `Bearer ${token}`; | ||
| } else { | ||
| req.options.headers = {}; | ||
| } | ||
| } | ||
| next(); | ||
| }, | ||
| }, | ||
| ]); | ||
| return forward(operation); | ||
| }); | ||
|
|
||
| const client = new ApolloClient({ | ||
| networkInterface, | ||
| link: concat(jwtMiddleware, httpLink), | ||
| cache: new InMemoryCache(), | ||
| }); | ||
|
|
||
| export default client; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.