Resolve merge conflicts

Author: sqrrrl

test/test.js

@@ -415,6 +415,8 @@ describe('Service', () => {
       assert.equal(storedToken.access_token, 'token');
       assert.equal(storedToken.refresh_token, 'bar');
       assert.equal(storedToken.refreshTokenExpiresAt, NOW_SECONDS + 360);
+      assert.equal(storedToken.granted_time, NOW_SECONDS);
+      assert.equal(storedToken.refresh_token_expires_in, 360);
     });
 
     it('should retain refresh expiry', () => {