Skip to content
This repository was archived by the owner on Feb 8, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/teleterm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,6 @@ lib/teleterm/api/protogen/

```sh
$ cd teleport
$ rm -rf ./../webapps/packages/teleterm/src/services/tshd/v1/ && cp -R lib/teleterm/api/protogen/js/v1/ ./../webapps/packages/teleterm/src/services/tshd/
$ rm -rf ./../webapps/packages/teleterm/src/services/tshd/v1/ && cp -R lib/teleterm/api/protogen/js/v1 ./../webapps/packages/teleterm/src/services/tshd/v1
```

19 changes: 12 additions & 7 deletions packages/teleterm/src/services/tshd/createClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,10 @@ export default function createClient(addr: string) {
},

async login(params: types.LoginParams, abortSignal?: types.TshAbortSignal) {
const ssoParams = params.oss
const ssoParams = params.sso
? new api.LoginRequest.SsoParams()
.setProviderName(params.oss.providerName)
.setProviderType(params.oss.providerType)
.setProviderName(params.sso.providerName)
.setProviderType(params.sso.providerType)
: null;

const localParams = params.local
Expand All @@ -163,10 +163,15 @@ export default function createClient(addr: string) {
: null;

return withAbort(abortSignal, callRef => {
const req = new api.LoginRequest()
.setClusterUri(params.clusterUri)
.setSso(ssoParams)
.setLocal(localParams);
const req = new api.LoginRequest().setClusterUri(params.clusterUri);

// LoginRequest has oneof on `Local` and `Sso`, which means that setting one of them clears
// the other.
if (ssoParams) {
req.setSso(ssoParams);
} else {
req.setLocal(localParams);
}

return new Promise<void>((resolve, reject) => {
callRef.current = tshd.login(req, err => {
Expand Down
2 changes: 1 addition & 1 deletion packages/teleterm/src/services/tshd/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export type TshAbortSignal = {

export type LoginParams = {
clusterUri: string;
oss?: {
sso?: {
providerType: string;
providerName: string;
};
Expand Down

This file was deleted.

108 changes: 0 additions & 108 deletions packages/teleterm/src/services/tshd/v1/auth_challenge_pb.d.ts

This file was deleted.

Loading