diff --git a/packages/teleport/src/config.ts b/packages/teleport/src/config.ts index b0dc9181d..c484bdc63 100644 --- a/packages/teleport/src/config.ts +++ b/packages/teleport/src/config.ts @@ -121,9 +121,9 @@ const cfg = { checkAccessToRegisteredResource: `/v1/webapi/sites/:clusterId/resources/check`, scp: '/v1/webapi/sites/:clusterId/nodes/:serverId/:login/scp?location=:location&filename=:filename', - renewTokenPath: '/v1/webapi/sessions/renew', + webRenewTokenPath: '/v1/webapi/sessions/web/renew', resetPasswordTokenPath: '/v1/webapi/users/password/token', - sessionPath: '/v1/webapi/sessions', + webSessionPath: '/v1/webapi/sessions/web', userContextPath: '/v1/webapi/sites/:clusterId/context', userStatusPath: '/v1/webapi/user/status', passwordTokenPath: '/v1/webapi/users/password/token/:tokenId?', @@ -501,7 +501,7 @@ const cfg = { }, getRenewTokenUrl() { - return cfg.api.renewTokenPath; + return cfg.api.webRenewTokenPath; }, getGithubConnectorsUrl(name?: string) { diff --git a/packages/teleport/src/services/auth/auth.test.ts b/packages/teleport/src/services/auth/auth.test.ts index db2af3063..04a2a415f 100644 --- a/packages/teleport/src/services/auth/auth.test.ts +++ b/packages/teleport/src/services/auth/auth.test.ts @@ -33,7 +33,7 @@ describe('services/auth', () => { jest.spyOn(api, 'post').mockResolvedValue({}); await auth.login(email, password, ''); - expect(api.post).toHaveBeenCalledWith(cfg.api.sessionPath, { + expect(api.post).toHaveBeenCalledWith(cfg.api.webSessionPath, { user: email, pass: password, second_factor_token: '', @@ -49,7 +49,7 @@ describe('services/auth', () => { }; await auth.login(email, password, 'xxx'); - expect(api.post).toHaveBeenCalledWith(cfg.api.sessionPath, data); + expect(api.post).toHaveBeenCalledWith(cfg.api.webSessionPath, data); }); test('resetPassword()', async () => { diff --git a/packages/teleport/src/services/auth/auth.ts b/packages/teleport/src/services/auth/auth.ts index 1eb6751b0..cfcda7a74 100644 --- a/packages/teleport/src/services/auth/auth.ts +++ b/packages/teleport/src/services/auth/auth.ts @@ -89,7 +89,7 @@ const auth = { second_factor_token: otpCode, }; - return api.post(cfg.api.sessionPath, data); + return api.post(cfg.api.webSessionPath, data); }, loginWithWebauthn(creds?: UserCredentials) { diff --git a/packages/teleport/src/services/websession/websession.ts b/packages/teleport/src/services/websession/websession.ts index 1ece7ac9a..71ea6e5f4 100644 --- a/packages/teleport/src/services/websession/websession.ts +++ b/packages/teleport/src/services/websession/websession.ts @@ -37,7 +37,7 @@ export class WebSession extends StoreWebSession { _isRenewing = false; logout() { - api.delete(cfg.api.sessionPath).finally(() => { + api.delete(cfg.api.webSessionPath).finally(() => { history.goToLogin(); });