@@ -139,14 +139,14 @@ export async function checkDeviceIsCrossSigned(app: ElementAppPage): Promise<voi
139
139
* Check that the current device is connected to the expected key backup.
140
140
* Also checks that the decryption key is known and cached locally.
141
141
*
142
- * @param app - app page
142
+ * @param app -` ElementAppPage` wrapper for the playwright `Page`.
143
143
* @param expectedBackupVersion - the version of the backup we expect to be connected to.
144
- * @param checkBackupKeyInCache - whether to check that the backup key is cached locally.
144
+ * @param checkBackupPrivateKeyInCache - whether to check that the backup decryption key is cached locally
145
145
*/
146
146
export async function checkDeviceIsConnectedKeyBackup (
147
147
app : ElementAppPage ,
148
148
expectedBackupVersion : string ,
149
- checkBackupKeyInCache : boolean ,
149
+ checkBackupPrivateKeyInCache : boolean ,
150
150
) : Promise < void > {
151
151
// Sanity check the given backup version: if it's null, something went wrong earlier in the test.
152
152
if ( ! expectedBackupVersion ) {
@@ -160,20 +160,27 @@ export async function checkDeviceIsConnectedKeyBackup(
160
160
if ( ! crypto ) return ;
161
161
162
162
const backupInfo = await crypto . getKeyBackupInfo ( ) ;
163
- const backupKeyStored = Boolean ( await client . isKeyBackupKeyStored ( ) ) ;
164
- const backupKeyFromCache = await crypto . getSessionBackupPrivateKey ( ) ;
165
- const backupKeyCached = Boolean ( backupKeyFromCache ) ;
166
- const backupKeyWellFormed = backupKeyFromCache instanceof Uint8Array ;
163
+ const backupKeyIn4S = Boolean ( await client . isKeyBackupKeyStored ( ) ) ;
164
+ const backupPrivateKeyFromCache = await crypto . getSessionBackupPrivateKey ( ) ;
165
+ const hasBackupPrivateKeyFromCache = Boolean ( backupPrivateKeyFromCache ) ;
166
+ const backupPrivateKeyWellFormed = backupPrivateKeyFromCache instanceof Uint8Array ;
167
167
const activeBackupVersion = await crypto . getActiveSessionBackupVersion ( ) ;
168
168
169
- return { backupInfo, backupKeyStored, backupKeyCached, backupKeyWellFormed, activeBackupVersion } ;
169
+ return {
170
+ backupInfo,
171
+ hasBackupPrivateKeyFromCache,
172
+ backupPrivateKeyWellFormed,
173
+ backupKeyIn4S,
174
+ activeBackupVersion,
175
+ } ;
170
176
} ) ;
171
177
172
178
if ( ! backupData ) {
173
- throw new Error ( "Crypo module is not available" ) ;
179
+ throw new Error ( "Crypto module is not available" ) ;
174
180
}
175
181
176
- const { backupInfo, backupKeyStored, backupKeyCached, backupKeyWellFormed, activeBackupVersion } = backupData ;
182
+ const { backupInfo, backupKeyIn4S, hasBackupPrivateKeyFromCache, backupPrivateKeyWellFormed, activeBackupVersion } =
183
+ backupData ;
177
184
178
185
// We have a key backup
179
186
expect ( backupInfo ) . toBeDefined ( ) ;
@@ -182,13 +189,13 @@ export async function checkDeviceIsConnectedKeyBackup(
182
189
// The active backup version is as expected
183
190
expect ( activeBackupVersion ) . toBe ( expectedBackupVersion ) ;
184
191
// The backup key is stored in 4S
185
- expect ( backupKeyStored ) . toBe ( true ) ;
192
+ expect ( backupKeyIn4S ) . toBe ( true ) ;
186
193
187
- if ( checkBackupKeyInCache ) {
194
+ if ( checkBackupPrivateKeyInCache ) {
188
195
// The backup key is available locally
189
- expect ( backupKeyCached ) . toBe ( true ) ;
196
+ expect ( hasBackupPrivateKeyFromCache ) . toBe ( true ) ;
190
197
// The backup key is well-formed
191
- expect ( backupKeyWellFormed ) . toBe ( true ) ;
198
+ expect ( backupPrivateKeyWellFormed ) . toBe ( true ) ;
192
199
}
193
200
}
194
201
0 commit comments