Sam/duress duress

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - fixed: Disabling pin-login while in duress mode disables pin-login for the main login.
 - fixed: `loginWithPassword` bug disabled duress mode when doing an online login.
+- fixed: Properly fake duress mode settings while in duress mode.
 
 ## 2.27.4 (2025-05-13)
 

src/core/account/account-api.ts

@@ -108,6 +108,9 @@ export function makeAccountApi(ai: ApiInput, accountId: string): EdgeAccount {
     }
   }
 
+  // This is used to fake duress mode settings while in duress mode:
+  let fakeDuressModeSetup = false
+
   const out: EdgeAccount = {
     on: onMethod,
     watch: watchMethod,
@@ -188,6 +191,9 @@ export function makeAccountApi(ai: ApiInput, accountId: string): EdgeAccount {
 
     get canDuressLogin(): boolean {
       const { activeAppId } = accountState()
+      if (ai.props.state.clientInfo.duressEnabled) {
+        return fakeDuressModeSetup
+      }
       const duressAppId = activeAppId.endsWith('.duress')
         ? activeAppId
         : activeAppId + '.duress'
@@ -257,6 +263,11 @@ export function makeAccountApi(ai: ApiInput, accountId: string): EdgeAccount {
         : activeAppId + '.duress'
       // Ensure the duress account exists:
       if (forDuressAccount) {
+        if (ai.props.state.clientInfo.duressEnabled) {
+          fakeDuressModeSetup = opts.enableLogin ?? opts.pin != null
+          ai.props.dispatch({ type: 'UPDATE_NEXT' })
+          return ''
+        }
         await ensureAccountExists(
           ai,
           accountState().stashTree,

test/core/login/login.test.ts

@@ -752,6 +752,27 @@ describe('duress', function () {
     expect(topicAccount.appId).equals('.duress')
   })
 
+  it('fake duress mode settings while in duress mode', async function () {
+    const world = await makeFakeEdgeWorld([fakeUser], quiet)
+    const context = await world.makeEdgeContext(contextOptions)
+    let account = await context.loginWithPIN(fakeUser.username, fakeUser.pin)
+    await account.changePin({ pin: '0000', forDuressAccount: true })
+    await account.logout()
+
+    let duressAccount = await context.loginWithPIN(fakeUser.username, '0000')
+    expect(duressAccount.canDuressLogin).equals(false)
+    await duressAccount.changePin({ forDuressAccount: true, enableLogin: true })
+    expect(duressAccount.canDuressLogin).equals(true)
+    await duressAccount.logout()
+
+    duressAccount = await context.loginWithPIN(fakeUser.username, '0000')
+    expect(duressAccount.canDuressLogin).equals(false)
+
+    // Doesn't impact main account:
+    account = await context.loginWithPIN(fakeUser.username, fakeUser.pin)
+    expect(account.canDuressLogin).equals(true)
+  })
+
   it('Avoid creating duress account when using loginWithPassword', async function () {
     const world = await makeFakeEdgeWorld([fakeUser], quiet)
     const context = await world.makeEdgeContext(contextOptions)