@ -49,7 +49,7 @@ import {
type Settings , type Settings ,
type SettingsWithJsonStrings , type SettingsWithJsonStrings ,
} from "@/db/tables/settings" ; } from "@/db/tables/settings" ;
import { DEFAULT_SCOPE , type ActiveIdentity } from "@/db/tables/activeIdentity" ; import { type ActiveIdentity } from "@/db/tables/activeIdentity" ;
import { FLAGS } from "@/config/featureFlags" ; import { FLAGS } from "@/config/featureFlags" ;
import { logger } from "@/utils/logger" ; import { logger } from "@/utils/logger" ;
import { Contact , ContactMaybeWithJsonStrings } from "@/db/tables/contacts" ; import { Contact , ContactMaybeWithJsonStrings } from "@/db/tables/contacts" ;
@ -974,17 +974,15 @@ export const PlatformServiceMixin = {
* Get the current active DID from the active_identity table * Get the current active DID from the active_identity table
* Falls back to legacy settings . activeDid during Phase A transition * Falls back to legacy settings . activeDid during Phase A transition
* *
* @param scope Scope identifier ( default : 'default' )
* @returns Promise < string | null > The active DID or null if not found * @returns Promise < string | null > The active DID or null if not found
* / * /
async $getActiveDid ( scope : string = DEFAULT_SCOPE ) : Promise < string | null > { async $getActiveDid ( ) : Promise < string | null > {
try { try {
logger . debug ( "[ActiveDid] Getting activeDid for scope: " , scope ) ; logger . debug ( "[ActiveDid] Getting activeDid" ) ;
// Try new active_identity table first
// Try new active_identity table first
const row = await this . $first < ActiveIdentity > ( const row = await this . $first < ActiveIdentity > (
"SELECT active_did FROM active_identity WHERE scope = ? LIMIT 1" , "SELECT active_did FROM active_identity LIMIT 1" ,
[ scope ] ,
) ; ) ;
logger . debug ( "[ActiveDid] New system result:" , row ? . active_did || "null" ) ; logger . debug ( "[ActiveDid] New system result:" , row ? . active_did || "null" ) ;
@ -1014,108 +1012,86 @@ export const PlatformServiceMixin = {
// Log current database state for debugging
// Log current database state for debugging
try { try {
const activeIdentityCount = await this . $first < { count : number } > ( const activeIdentityCount = await this . $first < { count : number } > (
"SELECT COUNT(*) as count FROM active_identity" "SELECT COUNT(*) as count FROM active_identity" ,
) ; ) ;
const settingsCount = await this . $first < { count : number } > ( logger . debug ( "[ActiveDid] Active identity records:" , activeIdentityCount ? . count || 0 ) ;
"SELECT COUNT(*) as count FROM settings" } catch ( error ) {
) ; logger . debug ( "[ActiveDid] Could not count active identity records:" , error ) ;
const accountsCount = await this . $first < { count : number } > (
"SELECT COUNT(*) as count FROM accounts"
) ;
// Also check actual values
const activeIdentityValue = await this . $first < { active_did : string } > (
"SELECT active_did FROM active_identity WHERE scope = 'default' LIMIT 1"
) ;
const settingsValue = await this . $first < { activeDid : string } > (
"SELECT activeDid FROM settings WHERE id = 1 LIMIT 1"
) ;
const firstAccount = await this . $first < { did : string } > (
"SELECT did FROM accounts LIMIT 1"
) ;
logger . debug ( "[ActiveDid] Database state - active_identity:" , activeIdentityCount ? . count , "value:" , activeIdentityValue ? . active_did || "null" ) ;
logger . debug ( "[ActiveDid] Database state - settings:" , settingsCount ? . count , "value:" , settingsValue ? . activeDid || "null" ) ;
logger . debug ( "[ActiveDid] Database state - accounts:" , accountsCount ? . count , "first:" , firstAccount ? . did || "null" ) ;
} catch ( dbError ) {
logger . debug ( "[ActiveDid] Could not log database state:" , dbError ) ;
} }
return null ; return null ;
} catch ( error ) { } catch ( error ) {
logger . error ( "[PlatformServiceMixin] Error getting activeDid:" , error ) ; logger . error ( "[ActiveDid] Error getting activeDid:" , error ) ;
// Fallback to legacy settings.activeDid during Phase A/B
if ( ! FLAGS . DROP_SETTINGS_ACTIVEDID ) {
try {
const legacy = await this . $first < Settings > (
"SELECT activeDid FROM settings WHERE id = ? LIMIT 1" ,
[ MASTER_SETTINGS_KEY ] ,
) ;
return legacy ? . activeDid || null ;
} catch ( fallbackError ) {
logger . error ( "[ActiveDid] Legacy fallback also failed:" , fallbackError ) ;
return null ;
}
}
return null ; return null ;
} }
} , } ,
/ * * / * *
* Update the active DID in the active_identity table * Set the active DID in the active_identity table
* Also maintains legacy settings . activeDid during Phase A transition * Also update slegacy settings . activeDid during Phase A / B transition
* *
* @param did The DID to set as active ( or null to clear ) * @param did The DID to set as active
* @param scope Scope identifier ( default : 'default' )
* @returns Promise < void > * @returns Promise < void >
* / * /
async $setActiveDid ( async $setActiveDid ( did : string | null ) : Promise < void > {
did : string | null ,
scope : string = DEFAULT_SCOPE ,
) : Promise < void > {
try { try {
if ( ! did ) { if ( ! did ) {
throw new Error ( "Cannot set null DID as active ") ; logger . warn ( "[ActiveDid] Attempting to set null activeDid - this may cause issues" ) ;
} }
// Validate that the DID exists in accounts table
logger . debug ( "[ActiveDid] Setting activeDid to:" , did ) ;
const accountExists = await this . $first < Account > (
"SELECT did FROM accounts WHERE did = ? LIMIT 1" ,
[ did ] ,
) ;
if ( ! accountExists ) { // Update/insert into new active_identity table
throw new Error (
` Cannot set activeDid to non-existent account: ${ did } ` ,
) ;
}
await this . $withTransaction ( async ( ) = > {
// Update/insert into active_identity table
const existingRecord = await this . $first < ActiveIdentity > ( const existingRecord = await this . $first < ActiveIdentity > (
"SELECT id FROM active_identity WHERE scope = ? LIMIT 1" , "SELECT id FROM active_identity LIMIT 1" ,
[ scope ] ,
) ; ) ;
if ( existingRecord ) { if ( existingRecord ? . id ) {
// Update existing record
// Update existing record
await this . $dbE xec ( await this . $exec (
` UPDATE active_identity
` UPDATE active_identity
SET active_did = ? , updated_at = strftime ( '%Y-%m-%dT%H:%M:%fZ' , 'now' ) SET active_did = ? , updated_at = strftime ( '%Y-%m-%dT%H:%M:%fZ' , 'now' )
WHERE scope = ? ` ,
WHERE id = ? ` ,
[ did , scope ] , [ did , existingRecord . id ] ,
) ; ) ;
logger . debug ( "[ActiveDid] Updated existing record" ) ;
} else { } else {
// Insert new record
// Insert new record
await this . $dbE xec ( await this . $e xec (
` INSERT INTO active_identity (scope, active_did, updated_at)
` INSERT INTO active_identity (active_did, updated_at)
VALUES ( ? , ? , strftime ( '%Y-%m-%dT%H:%M:%fZ' , 'now' ) ) ` ,
VALUES ( ? , strftime ( '%Y-%m-%dT%H:%M:%fZ' , 'now' ) ) ` ,
[ scope , did ] , [ did ] ,
) ; ) ;
logger . debug ( "[ActiveDid] Inserted new record" ) ;
} }
// Maintain legacy settings.activeDid during Phase A (unless Phase C is complete)
// Legacy fallback - update settings.activeDid during Phase A/B
if ( ! FLAGS . DROP_SETTINGS_ACTIVEDID ) { if ( ! FLAGS . USE_ACTIVE_IDENTITY_ONLY ) {
await this . $dbE xec ( await this . $e xec (
"UPDATE settings SET activeDid = ? WHERE id = ?" , "UPDATE settings SET activeDid = ? WHERE id = ?" ,
[ did , MASTER_SETTINGS_KEY ] , [ did , MASTER_SETTINGS_KEY ] ,
) ; ) ;
logger . debug ( "[ActiveDid] Updated legacy settings.activeDid" ) ;
} }
} ) ;
// Update component cache for change detection
logger . debug ( "[ActiveDid] Successfully set activeDid to:" , did ) ;
await this . $updateActiveDid ( did ) ;
logger . info ( ` [PlatformServiceMixin] Active DID updated to: ${ did } ` ) ;
} catch ( error ) { } catch ( error ) {
logger . error ( "[PlatformServiceMixin ] Error setting activeDid:" , error ) ; logger . error ( "[ActiveDid] Error setting activeDid:" , error ) ;
throw error ; throw error ;
} }
} , } ,
@ -1132,24 +1108,12 @@ export const PlatformServiceMixin = {
} , } ,
/ * * / * *
* Get all available active identity scopes * Get all available identity scopes ( simplified to single scope )
* Useful for multi - profile support in the future * @returns Promise < string [ ] > Array containing only 'default' scope
*
* @returns Promise < string [ ] > Array of scope identifiers
* / * /
async $getActiveIdentityScopes ( ) : Promise < string [ ] > { async $getActiveIdentityScopes ( ) : Promise < string [ ] > {
try { // Simplified to single scope since we removed multi-scope support
const scopes = await this . $query < { scope : string } > ( return [ "default" ] ;
"SELECT DISTINCT scope FROM active_identity ORDER BY scope" ,
) ;
return scopes . map ( ( row ) = > row . scope ) ;
} catch ( error ) {
logger . error (
"[PlatformServiceMixin] Error getting active identity scopes:" ,
error ,
) ;
return [ ] ;
}
} , } ,
// =================================================
// =================================================
@ -1898,8 +1862,8 @@ export interface IPlatformServiceMixin {
$debugMergedSettings ( did : string ) : Promise < void > ; $debugMergedSettings ( did : string ) : Promise < void > ;
// Active Identity façade methods
// Active Identity façade methods
$getActiveDid ( scope? : string ) : Promise < string | null > ; $getActiveDid ( ) : Promise < string | null > ;
$setActiveDid ( did : string | null , scope? : string ) : Promise < void > ; $setActiveDid ( did : string | null ) : Promise < void > ;
$switchActiveIdentity ( did : string ) : Promise < void > ; $switchActiveIdentity ( did : string ) : Promise < void > ;
$getActiveIdentityScopes ( ) : Promise < string [ ] > ; $getActiveIdentityScopes ( ) : Promise < string [ ] > ;
} }
@ -1919,8 +1883,8 @@ declare module "@vue/runtime-core" {
$updateActiveDid ( newDid : string | null ) : Promise < void > ; $updateActiveDid ( newDid : string | null ) : Promise < void > ;
// Active Identity façade methods
// Active Identity façade methods
$getActiveDid ( scope? : string ) : Promise < string | null > ; $getActiveDid ( ) : Promise < string | null > ;
$setActiveDid ( did : string | null , scope? : string ) : Promise < void > ; $setActiveDid ( did : string | null ) : Promise < void > ;
$switchActiveIdentity ( did : string ) : Promise < void > ; $switchActiveIdentity ( did : string ) : Promise < void > ;
$getActiveIdentityScopes ( ) : Promise < string [ ] > ; $getActiveIdentityScopes ( ) : Promise < string [ ] > ;
Matthew Raymer
15 hours ago