From c526da414d70c90f259ee7da2fee618162f80b70 Mon Sep 17 00:00:00 2001 From: Michael Myers Date: Wed, 4 Jan 2023 16:33:21 -0600 Subject: [PATCH 1/3] Fix sessionPath --- packages/teleport/src/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/teleport/src/config.ts b/packages/teleport/src/config.ts index d1180c9da..479e57178 100644 --- a/packages/teleport/src/config.ts +++ b/packages/teleport/src/config.ts @@ -123,7 +123,7 @@ const cfg = { scp: '/v1/webapi/sites/:clusterId/nodes/:serverId/:login/scp?location=:location&filename=:filename', renewTokenPath: '/v1/webapi/sessions/renew', resetPasswordTokenPath: '/v1/webapi/users/password/token', - sessionPath: '/v1/webapi/sessions', + sessionPath: '/v1/webapi/sessions/web', userContextPath: '/v1/webapi/sites/:clusterId/context', userStatusPath: '/v1/webapi/user/status', passwordTokenPath: '/v1/webapi/users/password/token/:tokenId?', From b3cad2db98d8f0ba3e836296b16f598fc089522f Mon Sep 17 00:00:00 2001 From: Michael Myers Date: Wed, 4 Jan 2023 17:40:23 -0600 Subject: [PATCH 2/3] Update renewTokenPath --- packages/teleport/src/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/teleport/src/config.ts b/packages/teleport/src/config.ts index 479e57178..4a6a939c4 100644 --- a/packages/teleport/src/config.ts +++ b/packages/teleport/src/config.ts @@ -121,7 +121,7 @@ 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', + renewTokenPath: '/v1/webapi/sessions/web/renew', resetPasswordTokenPath: '/v1/webapi/users/password/token', sessionPath: '/v1/webapi/sessions/web', userContextPath: '/v1/webapi/sites/:clusterId/context', From d4e464be29286dd16e2b03620b6b9118fb0eabbe Mon Sep 17 00:00:00 2001 From: Michael Myers Date: Wed, 4 Jan 2023 18:10:29 -0600 Subject: [PATCH 3/3] Update key names and fix tests --- packages/teleport/src/config.ts | 6 +++--- packages/teleport/src/services/auth/auth.test.ts | 4 ++-- packages/teleport/src/services/auth/auth.ts | 2 +- packages/teleport/src/services/websession/websession.ts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/teleport/src/config.ts b/packages/teleport/src/config.ts index 4a6a939c4..7d58ee7f0 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/web/renew', + webRenewTokenPath: '/v1/webapi/sessions/web/renew', resetPasswordTokenPath: '/v1/webapi/users/password/token', - sessionPath: '/v1/webapi/sessions/web', + webSessionPath: '/v1/webapi/sessions/web', userContextPath: '/v1/webapi/sites/:clusterId/context', userStatusPath: '/v1/webapi/user/status', passwordTokenPath: '/v1/webapi/users/password/token/:tokenId?', @@ -494,7 +494,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(); });