Merge pull request #805 from sasjs/webpack-fix

fix(packaging): fixed output file for Node

src/SASViyaApiClient.ts

@@ -548,6 +548,7 @@ export class SASViyaApiClient {
 
   /**
    * Exchanges the refresh token for an access token for the given client.
+   * This method can only be used by Node.
    * @param clientId - the client ID to authenticate with.
    * @param clientSecret - the client secret to authenticate with.
    * @param refreshToken - the refresh token received from the server.

src/auth/getTokens.ts

@@ -10,6 +10,7 @@ import { refreshTokensForSasjs } from './refreshTokensForSasjs'
 
 /**
  * Returns the auth configuration, refreshing the tokens if necessary.
+ * This function can only be used by Node, if a server type is SASVIYA.
  * @param requestClient - the pre-configured HTTP request client
  * @param authConfig - an object containing a client ID, secret, access token and refresh token
  * @param serverType - server type for which refreshing the tokens, defaults to SASVIYA
@@ -29,9 +30,12 @@ export async function getTokens(
       const error =
         'Unable to obtain new access token. Your refresh token has expired.'
       logger.error(error)
+
       throw new Error(error)
     }
+
     logger.info('Refreshing access and refresh tokens.')
+
     const tokens =
       serverType === ServerType.SasViya
         ? await refreshTokensForViya(

src/auth/refreshTokensForViya.ts

@@ -2,9 +2,11 @@ import { SasAuthResponse } from '@sasjs/utils/types'
 import { prefixMessage } from '@sasjs/utils/error'
 import * as NodeFormData from 'form-data'
 import { RequestClient } from '../request/RequestClient'
+import { isNode } from '../utils'
 
 /**
  * Exchanges the refresh token for an access token for the given client.
+ * This function can only be used by Node.
  * @param requestClient - the pre-configured HTTP request client
  * @param clientId - the client ID to authenticate with.
  * @param clientSecret - the client secret to authenticate with.
@@ -16,9 +18,12 @@ export async function refreshTokensForViya(
   clientSecret: string,
   refreshToken: string
 ) {
+  if (!isNode()) {
+    throw new Error(`Method 'refreshTokensForViya' can only be used by Node.`)
+  }
+
   const url = '/SASLogon/oauth/token'
-  let token
+  const token =
-  token =
     typeof Buffer === 'undefined'
       ? btoa(clientId + ':' + clientSecret)
       : Buffer.from(clientId + ':' + clientSecret).toString('base64')
@@ -27,8 +32,7 @@ export async function refreshTokensForViya(
     Authorization: 'Basic ' + token
   }
 
-  const formData =
+  const formData = new NodeFormData()
-    typeof FormData === 'undefined' ? new NodeFormData() : new FormData()
   formData.append('grant_type', 'refresh_token')
   formData.append('refresh_token', refreshToken)
 

src/auth/spec/refreshTokensForViya.spec.ts

@@ -3,6 +3,7 @@ import * as NodeFormData from 'form-data'
 import { generateToken, mockAuthResponse } from './mockResponses'
 import { RequestClient } from '../../request/RequestClient'
 import { refreshTokensForViya } from '../refreshTokensForViya'
+import * as IsNodeModule from '../../utils/isNode'
 
 const requestClient = new (<jest.Mock<RequestClient>>RequestClient)()
 
@@ -70,6 +71,18 @@ describe('refreshTokensForViya', () => {
 
     expect(error).toEqual(`Error while refreshing tokens: ${tokenError}`)
   })
+
+  it('should throw an error if environment is not Node', async () => {
+    jest.spyOn(IsNodeModule, 'isNode').mockImplementation(() => false)
+
+    const expectedError = new Error(
+      `Method 'refreshTokensForViya' can only be used by Node.`
+    )
+
+    expect(
+      refreshTokensForViya(requestClient, 'client', 'secret', 'token')
+    ).rejects.toEqual(expectedError)
+  })
 })
 
 const setupMocks = () => {

webpack.config.js

@@ -86,7 +86,8 @@ const nodeConfig = {
   entry: './node/index.ts',
   output: {
     ...browserConfig.output,
-    path: path.resolve(__dirname, 'build', 'node')
+    path: path.resolve(__dirname, 'build', 'node'),
+    filename: 'index.js'
   }
 }