OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

only show verify button if user has uploaded cross-signing keys

pull/21833/head
Bruno Windels 2020-03-04 16:10:06 +01:00
parent f08d034f84
commit 29af8add5d
1 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/components/views/right_panel/UserInfo.js
View File

@ -136,6 +136,27 @@ function useIsEncrypted(cli, room) {
return isEncrypted;
}
function useHasCrossSigningKeys(cli, member, canVerify) {
const [waitingForCrossSigningKeys, setWaitingForCrossSigningKeys] = useState(false);
const [hasCrossSigningKeys, setHasCrossSigningKeys] = useState(false);
useEffect(() => {
if (canVerify) {
setWaitingForCrossSigningKeys(true);
(async () => {
try {
await cli.downloadKeys([member.userId]);
const xsi = cli.getStoredCrossSigningForUser(member.userId);
const key = xsi && xsi.getId();
setHasCrossSigningKeys(!!key);
} finally {
setWaitingForCrossSigningKeys(false);
}
})();
}
}, [canVerify, cli, member]);
return {waitingForCrossSigningKeys, hasCrossSigningKeys};
}
async function verifyDevice(userId, device) {
const cli = MatrixClientPeg.get();
const member = cli.getUser(userId);
@ -1324,20 +1345,27 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
let verifyButton;
const homeserverSupportsCrossSigning = useHomeserverSupportsCrossSigning(cli);
if (
SettingsStore.isFeatureEnabled("feature_cross_signing") &&
homeserverSupportsCrossSigning
) {
const userTrust = cli.checkUserTrust(member.userId);
const userVerified = userTrust.isCrossSigningVerified();
const isMe = member.userId === cli.getUserId();
if (isRoomEncrypted && !userVerified && !isMe) {
const userTrust = cli.checkUserTrust(member.userId);
const userVerified = userTrust.isCrossSigningVerified();
const isMe = member.userId === cli.getUserId();
const canVerify = SettingsStore.isFeatureEnabled("feature_cross_signing") &&
homeserverSupportsCrossSigning &&
isRoomEncrypted && !userVerified && !isMe;
const {hasCrossSigningKeys, waitingForCrossSigningKeys} =
useHasCrossSigningKeys(cli, member, canVerify);
if (canVerify) {
if (hasCrossSigningKeys) {
verifyButton = (
<AccessibleButton className="mx_UserInfo_field" onClick={() => verifyUser(member)}>
{_t("Verify")}
</AccessibleButton>
);
} else if (waitingForCrossSigningKeys) {
const Spinner = sdk.getComponent("elements.Spinner");
verifyButton = <Spinner />;
}
}