Update api to accept two arguments instead of one config

Author: Kadi Kraman

README.md

@@ -104,9 +104,8 @@ const config = {
   scopes: '<YOUR_SCOPES_ARRAY>',
 };
 
-const result = await refresh({
-  ...config,
-  refreshToken: `<REFRESH_TOKEN>`,
+const result = await refresh(config, {
+  refreshToken: `<REFRESH_TOKEN>`
 });
 ```
 
@@ -124,8 +123,7 @@ const config = {
   scopes: '<YOUR_SCOPES_ARRAY>',
 };
 
-const result = await revoke({
-  ...config,
+const result = await revoke(config, {
   tokenToRevoke: `<TOKEN_TO_REVOKE>`
 });
 ```
@@ -379,8 +377,7 @@ const refreshedState = await refresh({
 });
 
 // Revoke token, note that Identity Server expects a client id on revoke
-await revoke({
-  ...config,
+await revoke(config, {
   tokenToRevoke: refreshedState.refreshToken,
   sendClientId: true
 });
@@ -402,14 +399,12 @@ const config = {
 const authState = await authorize(config);
 
 // Refresh token
-const refreshedState = await refresh({
-  ...config,
+const refreshedState = await refresh(config, {
   refreshToken: authState.refreshToken
 });
 
 // Revoke token
-await revoke({
-  ...config,
+await revoke(config, {
   tokenToRevoke: refreshedState.refreshToken
 });
 ```
@@ -436,14 +431,12 @@ const config = {
 const authState = await authorize(config);
 
 // Refresh token
-const refreshedState = await refresh({
-  ...config,
+const refreshedState = await refresh(config, {
   refreshToken: authState.refreshToken,
 });
 
 // Revoke token
-await revoke({
-  ...config,
+await revoke(config, {
   tokenToRevoke: refreshedState.refreshToken
 });
 ```
@@ -466,8 +459,7 @@ const config = {
 const authState = await authorize(config);
 
 // Refresh token
-const refreshedState = await refresh({
-  ...config,
+const refreshedState = await refresh(config, {
   refreshToken: authState.refreshToken,
 });
 ```

index.js

@@ -22,14 +22,10 @@ export const authorize = ({ issuer, redirectUrl, clientId, scopes, additionalPar
   return RNAppAuth.authorize(issuer, redirectUrl, clientId, scopes, additionalParameters);
 };
 
-export const refresh = ({
-  issuer,
-  redirectUrl,
-  clientId,
-  refreshToken,
-  scopes,
-  additionalParameters,
-}) => {
+export const refresh = (
+  { issuer, redirectUrl, clientId, scopes, additionalParameters },
+  { refreshToken }
+) => {
   validateScopes(scopes);
   validateIssuer(issuer);
   validateClientId(clientId);
@@ -47,7 +43,7 @@ export const refresh = ({
   );
 };
 
-export const revoke = async ({ tokenToRevoke, sendClientId = false, clientId, issuer }) => {
+export const revoke = async ({ clientId, issuer }, { tokenToRevoke, sendClientId = false }) => {
   invariant(tokenToRevoke, 'Please include the token to revoke');
   validateClientId(clientId);
   validateIssuer(issuer);

index.spec.js

@@ -21,7 +21,7 @@ describe('AppAuth', () => {
     mockRefresh.mockReturnValue('REFRESHED');
   });
 
-  const baseConfig = {
+  const config = {
     issuer: 'test-issuer',
     redirectUrl: 'test-redirectUrl',
     clientId: 'test-clientId',
@@ -37,42 +37,42 @@ describe('AppAuth', () => {
 
     it('throws an error when issuer is not a string', () => {
       expect(() => {
-        authorize({ ...baseConfig, issuer: () => ({}) });
+        authorize({ ...config, issuer: () => ({}) });
       }).toThrow('Config error: issuer must be a string');
     });
 
     it('throws an error when redirectUrl is not a string', () => {
       expect(() => {
-        authorize({ ...baseConfig, redirectUrl: {} });
+        authorize({ ...config, redirectUrl: {} });
       }).toThrow('Config error: redirectUrl must be a string');
     });
 
     it('throws an error when clientId is not a string', () => {
       expect(() => {
-        authorize({ ...baseConfig, clientId: 123 });
+        authorize({ ...config, clientId: 123 });
       }).toThrow('Config error: clientId must be a string');
     });
 
     it('throws an error when no scopes are passed in', () => {
       expect(() => {
-        authorize({ ...baseConfig, scopes: undefined });
+        authorize({ ...config, scopes: undefined });
       }).toThrow('Scope error: please add at least one scope');
     });
 
     it('throws an error when an empty scope array is passed in', () => {
       expect(() => {
-        authorize({ ...baseConfig, scopes: [] });
+        authorize({ ...config, scopes: [] });
       }).toThrow('Scope error: please add at least one scope');
     });
 
     it('calls the native wrapper with the correct args', () => {
-      authorize(baseConfig);
+      authorize(config);
       expect(mockAuthorize).toHaveBeenCalledWith(
-        baseConfig.issuer,
-        baseConfig.redirectUrl,
-        baseConfig.clientId,
-        baseConfig.scopes,
-        baseConfig.additionalParameters
+        config.issuer,
+        config.redirectUrl,
+        config.clientId,
+        config.scopes,
+        config.additionalParameters
       );
     });
   });
@@ -85,49 +85,49 @@ describe('AppAuth', () => {
 
     it('throws an error when issuer is not a string', () => {
       expect(() => {
-        authorize({ ...baseConfig, issuer: () => ({}) });
+        authorize({ ...config, issuer: () => ({}) });
       }).toThrow('Config error: issuer must be a string');
     });
 
     it('throws an error when redirectUrl is not a string', () => {
       expect(() => {
-        authorize({ ...baseConfig, redirectUrl: {} });
+        authorize({ ...config }, { redirectUrl: {} });
       }).toThrow('Config error: redirectUrl must be a string');
     });
 
     it('throws an error when clientId is not a string', () => {
       expect(() => {
-        authorize({ ...baseConfig, clientId: 123 });
+        authorize({ ...config, clientId: 123 });
       }).toThrow('Config error: clientId must be a string');
     });
 
     it('throws an error when no refreshToken is passed in', () => {
       expect(() => {
-        refresh(baseConfig);
+        refresh(config);
       }).toThrow('Please pass in a refresh token');
     });
 
     it('throws an error when no scopes are passed in', () => {
       expect(() => {
-        refresh({ ...baseConfig, refreshToken: 'such-token', scopes: undefined });
+        refresh({ ...config, scopes: undefined }, { refreshToken: 'such-token' });
       }).toThrow('Scope error: please add at least one scope');
     });
 
     it('throws an error when an empty scope array is passed in', () => {
       expect(() => {
-        refresh({ ...baseConfig, refreshToken: 'such-token', scopes: [] });
+        refresh({ ...config, scopes: [] }, { refreshToken: 'such-token' });
       }).toThrow('Scope error: please add at least one scope');
     });
 
     it('calls the native wrapper with the correct args', () => {
-      refresh({ ...baseConfig, refreshToken: 'such-token' });
+      refresh({ ...config }, { refreshToken: 'such-token' });
       expect(mockRefresh).toHaveBeenCalledWith(
-        baseConfig.issuer,
-        baseConfig.redirectUrl,
-        baseConfig.clientId,
+        config.issuer,
+        config.redirectUrl,
+        config.clientId,
         'such-token',
-        baseConfig.scopes,
-        baseConfig.additionalParameters
+        config.scopes,
+        config.additionalParameters
       );
     });
   });