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

Merge pull request #4174 from matrix-org/bwindels/showverifyifuserhasxsignkeys 

only show verify button if user has uploaded cross-signing keys
pull/21833/head
Bruno Windels 2020-03-05 09:24:09 +00:00 committed by GitHub
parent 9836a7a655 a5cd0a7d5f
commit 5df35ea432
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,6 +136,23 @@ function useIsEncrypted(cli, room) {
return isEncrypted; return isEncrypted;
} }
function useHasCrossSigningKeys(cli, member, canVerify, setUpdating) {
return useAsyncMemo(async () => {
if (!canVerify) {
return false;
}
setUpdating(true);
try {
await cli.downloadKeys([member.userId]);
const xsi = cli.getStoredCrossSigningForUser(member.userId);
const key = xsi && xsi.getId();
return !!key;
} finally {
setUpdating(false);
}
}, [cli, member, canVerify], false);
}
async function verifyDevice(userId, device) { async function verifyDevice(userId, device) {
const cli = MatrixClientPeg.get(); const cli = MatrixClientPeg.get();
const member = cli.getUser(userId); const member = cli.getUser(userId);
@ -1324,21 +1341,26 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
let verifyButton; let verifyButton;
const homeserverSupportsCrossSigning = useHomeserverSupportsCrossSigning(cli); 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);
verifyButton = ( const userVerified = userTrust.isCrossSigningVerified();
<AccessibleButton className="mx_UserInfo_field" onClick={() => verifyUser(member)}> const isMe = member.userId === cli.getUserId();
{_t("Verify")} const canVerify = SettingsStore.isFeatureEnabled("feature_cross_signing") &&
</AccessibleButton> homeserverSupportsCrossSigning &&
); isRoomEncrypted && !userVerified && !isMe;
}
const setUpdating = (updating) => {
setPendingUpdateCount(count => count + (updating ? 1 : -1));
};
const hasCrossSigningKeys =
useHasCrossSigningKeys(cli, member, canVerify, setUpdating );
if (canVerify && hasCrossSigningKeys) {
verifyButton = (
<AccessibleButton className="mx_UserInfo_field" onClick={() => verifyUser(member)}>
{_t("Verify")}
</AccessibleButton>
);
} }
let devicesSection; let devicesSection;