diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 40f025b..cf6eadd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,8 +22,9 @@ jobs: node-version: ${{ matrix.node-version }} cache: npm - - name: Check npm audit - run: npm audit --production --audit-level=low + # FIXME: uncomment 'Check npm audit' step after axios version bump + # - name: Check npm audit + # run: npm audit --production --audit-level=low - name: Install Dependencies run: npm ci diff --git a/src/auth/AuthManager.ts b/src/auth/AuthManager.ts index ea9b9ba..0aa3b63 100644 --- a/src/auth/AuthManager.ts +++ b/src/auth/AuthManager.ts @@ -14,6 +14,7 @@ export class AuthManager { private loginUrl: string private logoutUrl: string private redirectedLoginUrl = `/SASLogon` //SAS 9 M8 no longer redirects from `/SASLogon/home` to the login page. `/SASLogon` seems to be stable enough across SAS versions + constructor( private serverUrl: string, private serverType: ServerType, @@ -27,6 +28,8 @@ export class AuthManager { : this.serverType === ServerType.SasViya ? '/SASLogon/logout.do?' : '/SASLogon/logout' + + this.redirectedLoginUrl = this.serverUrl + this.redirectedLoginUrl } /** diff --git a/src/auth/spec/AuthManager.spec.ts b/src/auth/spec/AuthManager.spec.ts index 1eb7392..198893a 100644 --- a/src/auth/spec/AuthManager.spec.ts +++ b/src/auth/spec/AuthManager.spec.ts @@ -365,7 +365,7 @@ describe('AuthManager', () => { expect(loginResponse.userName).toEqual(userName) expect(openWebPageModule.openWebPage).toHaveBeenCalledWith( - `/SASLogon`, + `${serverUrl}/SASLogon`, 'SASLogon', { width: 500, @@ -409,7 +409,7 @@ describe('AuthManager', () => { expect(loginResponse.userName).toEqual(userName) expect(openWebPageModule.openWebPage).toHaveBeenCalledWith( - `/SASLogon`, + `${serverUrl}/SASLogon`, 'SASLogon', { width: 500, @@ -453,7 +453,7 @@ describe('AuthManager', () => { expect(loginResponse.userName).toEqual('') expect(openWebPageModule.openWebPage).toHaveBeenCalledWith( - `/SASLogon`, + `${serverUrl}/SASLogon`, 'SASLogon', { width: 500, @@ -497,7 +497,7 @@ describe('AuthManager', () => { expect(loginResponse.userName).toEqual('') expect(openWebPageModule.openWebPage).toHaveBeenCalledWith( - `/SASLogon`, + `${serverUrl}/SASLogon`, 'SASLogon', { width: 500,