Added more tests

Author: ivome

package.json

@@ -33,7 +33,7 @@
     "@types/sinon": "^5.0.2",
     "chai": "^4.1.2",
     "coveralls": "^3.0.2",
-    "graphql-tag": "^2.10.0",
+    "graphql": "^14.0.2",
     "mocha": "^5.2.0",
     "nyc": "^13.0.1",
     "rimraf": "^2.6.2",
@@ -60,6 +60,7 @@
   },
   "dependencies": {
     "apollo-link": "^1.2.2",
-    "graphql": "^14.0.2"
-  }
+    "graphql-tag": "^2.10.0"
+  },
+  "peerDependencies": {}
 }

src/__tests__/index-test.ts

@@ -1,9 +1,9 @@
 import {ApolloLink, execute, FetchResult, GraphQLRequest, Observable} from 'apollo-link';
 import {expect} from 'chai';
-import { parse } from 'graphql';
 import gql from 'graphql-tag';
 import sinon from 'sinon';
-import SlicknodeLink from '../index';
+import SlicknodeLink, {REFRESH_TOKEN_MUTATION} from '../index';
+import {IAuthTokenSet} from '../types';
 
 describe('SlicknodeLink', () => {
   it('forwards request to next link', (done) => {
@@ -66,4 +66,119 @@ describe('SlicknodeLink', () => {
       error: done,
     });
   });
+
+  it('uses accessToken form auth token set', (done) => {
+    const data = {
+      test: true,
+    };
+    const authTokenSet: IAuthTokenSet = {
+      accessToken: 'accessToken1',
+      accessTokenLifetime: 20,
+      refreshToken: 'refresh1',
+      refreshTokenLifetime: 100,
+    };
+    const slicknodeLink = new SlicknodeLink();
+    slicknodeLink.setAuthTokenSet(authTokenSet);
+
+    const link = ApolloLink.from([
+      slicknodeLink,
+      new ApolloLink((operation) => {
+        expect(operation.getContext()).to.deep.equal({
+          headers: {
+            Authorization: `Bearer ${authTokenSet.accessToken}`,
+          },
+        });
+        done();
+        return null;
+      }),
+    ]);
+    const query = gql`{test}`;
+    const request: GraphQLRequest = {
+      query,
+      variables: {},
+    };
+    const observable = execute(link, request);
+    observable.subscribe({
+      next(result: FetchResult) {
+        expect(result.data).to.equal(data);
+      },
+      error: done,
+    });
+  });
+
+  it('does not use expired accessToken form auth token set', (done) => {
+    const data = {
+      test: true,
+    };
+    const authTokenSet: IAuthTokenSet = {
+      accessToken: 'accessToken1',
+      accessTokenLifetime: -20,
+      refreshToken: 'refresh1',
+      refreshTokenLifetime: -100,
+    };
+    const slicknodeLink = new SlicknodeLink();
+    slicknodeLink.setAuthTokenSet(authTokenSet);
+
+    const link = ApolloLink.from([
+      slicknodeLink,
+      new ApolloLink((operation) => {
+        expect(operation.getContext()).to.deep.equal({
+          headers: {},
+        });
+        done();
+        return null;
+      }),
+    ]);
+    const query = gql`{test}`;
+    const request: GraphQLRequest = {
+      query,
+      variables: {},
+    };
+    const observable = execute(link, request);
+    observable.subscribe({
+      next(result: FetchResult) {
+        expect(result.data).to.equal(data);
+      },
+      error: done,
+    });
+  });
+
+  it('executes refreshToken request in subsequent links', (done) => {
+    const data = {
+      test: true,
+    };
+    const authTokenSet: IAuthTokenSet = {
+      accessToken: 'accessToken1',
+      accessTokenLifetime: -20,
+      refreshToken: 'refresh1',
+      refreshTokenLifetime: 100,
+    };
+    const slicknodeLink = new SlicknodeLink();
+    slicknodeLink.setAuthTokenSet(authTokenSet);
+
+    const link = ApolloLink.from([
+      slicknodeLink,
+      new ApolloLink((operation) => {
+        expect(operation.query).to.deep.equal(gql`${REFRESH_TOKEN_MUTATION}`);
+        expect(operation.variables).to.deep.equal({
+          token: authTokenSet.refreshToken,
+        });
+        expect(operation.getContext()).to.deep.equal({});
+        done();
+        return null;
+      }),
+    ]);
+    const query = gql`{test}`;
+    const request: GraphQLRequest = {
+      query,
+      variables: {},
+    };
+    const observable = execute(link, request);
+    observable.subscribe({
+      next(result: FetchResult) {
+        expect(result.data).to.equal(data);
+      },
+      error: done,
+    });
+  });
 });

src/index.ts

@@ -1,5 +1,5 @@
 import {ApolloLink, createOperation, FetchResult, NextLink, Observable, Operation} from 'apollo-link';
-import {parse} from 'graphql/language/parser';
+import gql from 'graphql-tag';
 import MemoryStorage from './storage/MemoryStorage';
 import {IAuthTokenSet, ISlicknodeLinkOptions, IStorage} from './types';
 
@@ -14,7 +14,7 @@ declare var global: {
   localStorage: IStorage;
 };
 
-export const REFRESH_TOKEN_MUTATION = `mutation refreshToken($token: String!) {
+export const REFRESH_TOKEN_MUTATION = gql`mutation refreshToken($token: String!) {
   refreshAuthToken(input: {refreshToken: $token}) {
     accessToken
     refreshToken
@@ -23,7 +23,7 @@ export const REFRESH_TOKEN_MUTATION = `mutation refreshToken($token: String!) {
   }
 }`;
 
-export const LOGOUT_MUTATION = `mutation logout($refreshToken: String) {
+export const LOGOUT_MUTATION = gql`mutation logout($refreshToken: String) {
   logoutUser(input:{refreshToken:$refreshToken}) {
   	success
 	}
@@ -232,7 +232,7 @@ export default class SlicknodeLink extends ApolloLink {
       if (!accessToken && refreshToken) {
         this.debug('No valid access token found, obtaining new AuthTokenSet with refresh token');
         const refreshOperation = createOperation({}, {
-          query: parse(REFRESH_TOKEN_MUTATION),
+          query: REFRESH_TOKEN_MUTATION,
           variables: {
             token: refreshToken,
           },