Browse Source

Merge 4ea16e3e0e into cc80f689ed

pull/6761/merge
Timshel 3 days ago
committed by GitHub
parent
commit
ef53451d45
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 20
      src/api/identity.rs

20
src/api/identity.rs

@ -482,14 +482,18 @@ async fn authenticated_response(
Value::Null Value::Null
}; };
let account_keys = json!({ let account_keys = if user.private_key.is_some() {
"publicKeyEncryptionKeyPair": { json!({
"wrappedPrivateKey": user.private_key, "publicKeyEncryptionKeyPair": {
"publicKey": user.public_key, "wrappedPrivateKey": user.private_key,
"Object": "publicKeyEncryptionKeyPair" "publicKey": user.public_key,
}, "Object": "publicKeyEncryptionKeyPair"
"Object": "privateKeys" },
}); "Object": "privateKeys"
})
} else {
Value::Null
};
let mut result = json!({ let mut result = json!({
"access_token": auth_tokens.access_token(), "access_token": auth_tokens.access_token(),

Loading…
Cancel
Save