Ensure Connect shows Connect My Computer only to local users #29804
Conversation
| @@ -333,5 +333,7 @@ export type CreateConnectMyComputerRoleResponse = | |||
| export type CreateConnectMyComputerNodeTokenResponse = | |||
| apiService.CreateConnectMyComputerNodeTokenResponse.AsObject; | |||
|
|
|||
| export const UserType = apiCluster.LoggedInUser.UserType; | |||
There was a problem hiding this comment.
We can export value and type at the same time (we may need the type in the future).
| export const UserType = apiCluster.LoggedInUser.UserType; | |
| export { UserType } |
I did it for export { FileTransferDirection } above.
There was a problem hiding this comment.
I wanted to do this but I didn't know how to reexport something that's defined in a namespace. I think I found a solution, let me know what you think.
There was a problem hiding this comment.
Ah, I didn't notice that it is defined in a namespace. Your solution is fine, I was afraid that clicking on UserType somewhere in the code will open the types.ts file, not the actual definition. But it work as it should!
| @@ -333,5 +333,7 @@ export type CreateConnectMyComputerRoleResponse = | |||
| export type CreateConnectMyComputerNodeTokenResponse = | |||
| apiService.CreateConnectMyComputerNodeTokenResponse.AsObject; | |||
|
|
|||
| export const UserType = apiCluster.LoggedInUser.UserType; | |||
There was a problem hiding this comment.
I wanted to do this but I didn't know how to reexport something that's defined in a namespace. I think I found a solution, let me know what you think.
There was a problem hiding this comment.
I don't know if those tests add enough value to warrant having them. It'd probably be better to test it indirectly through some more integrated tests.
There was a problem hiding this comment.
Probably they don't, but I would keep them for now, until we do something better.
Connect My Computer won't work in its current form for SSO users. That's because the implementation depends on updating the role list of a user which isn't as straightforward for SSO users as it is for local users.
The RPC in tshd already returns an error if it detects that the user is an SSO user, however the Electron app was still showing the UI to everybody.
Checking for an SSO user is done by grabbing
GetUserType()from a user resource we get from the cluster on calls toGetClusterand then returning it withLoggedInUser, next to ACL.UserTypeFromStringwas based onResourceDeviceEnrollStatusFromString.