@ -68,9 +68,9 @@
class = "inline-block text-md uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md" class = "inline-block text-md uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md"
@ click = " @ click = "
( ) => ( ) =>
( $refs . userNameDialog as UserNameDialog ) . open ( ( $refs . userNameDialog as UserNameDialog ) . open ( ( name ) => {
( name ) => ( givenName = name ) , if ( name ) givenName = name ;
) } )
" "
> >
Set Your Name Set Your Name
@ -980,7 +980,6 @@ import "leaflet/dist/leaflet.css";
import { AxiosError } from "axios" ; import { AxiosError } from "axios" ;
import { Buffer } from "buffer/" ; import { Buffer } from "buffer/" ;
import Dexie from "dexie" ;
import "dexie-export-import" ; import "dexie-export-import" ;
/ / @ t s - e x p e c t - e r r o r - t h e y a r e n ' t e x p o r t i n g i t b u t i t ' s t h e r e / / @ t s - e x p e c t - e r r o r - t h e y a r e n ' t e x p o r t i n g i t b u t i t ' s t h e r e
import { ImportProgress } from "dexie-export-import" ; import { ImportProgress } from "dexie-export-import" ;
@ -1008,29 +1007,22 @@ import {
DEFAULT_PUSH_SERVER , DEFAULT_PUSH_SERVER ,
IMAGE_TYPE_PROFILE , IMAGE_TYPE_PROFILE ,
NotificationIface , NotificationIface ,
USE_DEXIE_DB ,
} from "../constants/app" ; } from "../constants/app" ;
import {
db ,
logConsoleAndDb ,
retrieveSettingsForActiveAccount ,
updateAccountSettings ,
} from "../db/index" ;
import { Contact } from "../db/tables/contacts" ; import { Contact } from "../db/tables/contacts" ;
import { import { DEFAULT_PASSKEY_EXPIRATION_MINUTES } from "../db/tables/settings" ;
DEFAULT_PASSKEY_EXPIRATION_MINUTES ,
MASTER_SETTINGS_KEY ,
} from "../db/tables/settings" ;
import * as databaseUtil from "../db/databaseUtil" ; import * as databaseUtil from "../db/databaseUtil" ;
import { import {
clearPasskeyToken ,
EndorserRateLimits , EndorserRateLimits ,
ImageRateLimits ,
ErrorResponse , ErrorResponse ,
} from "../interfaces" ;
import {
clearPasskeyToken ,
errorStringForLog , errorStringForLog ,
fetchEndorserRateLimits , fetchEndorserRateLimits ,
fetchImageRateLimits , fetchImageRateLimits ,
getHeaders , getHeaders ,
ImageRateLimits ,
tokenExpiryTimeDescription , tokenExpiryTimeDescription ,
} from "../libs/endorserServer" ; } from "../libs/endorserServer" ;
import { import {
@ -1043,11 +1035,39 @@ import { logger } from "../utils/logger";
const inputImportFileNameRef = ref < Blob > ( ) ; const inputImportFileNameRef = ref < Blob > ( ) ;
/ / T y p e g u a r d f o r A P I e r r o r s
function isApiError ( error : unknown ) : error is {
response ? : { data ? : { error ? : { message ? : string } | string } } ;
} {
return typeof error === "object" && error !== null && "response" in error ;
}
/ / T y p e g u a r d f o r s t a n d a r d e r r o r s
function isError ( error : unknown ) : error is Error {
return error instanceof Error ;
}
/ / H e l p e r f u n c t i o n t o e x t r a c t e r r o r m e s s a g e
function extractErrorMessage ( error : unknown ) : string {
if ( isApiError ( error ) ) {
const apiError = error . response ? . data ? . error ;
if ( typeof apiError === "string" ) {
return apiError ;
}
if ( typeof apiError === "object" && apiError ? . message ) {
return apiError . message ;
}
}
if ( isError ( error ) ) {
return error . message ;
}
return "An unknown error occurred" ;
}
@ Component ( { @ Component ( {
components : { components : {
EntityIcon , EntityIcon ,
ImageMethodDialog , ImageMethodDialog ,
LeafletMouseEvent ,
LMap , LMap ,
LMarker , LMarker ,
LTileLayer , LTileLayer ,
@ -1158,11 +1178,6 @@ export default class AccountViewView extends Vue {
databaseUtil . logConsoleAndDb ( databaseUtil . logConsoleAndDb (
"Error loading profile: " + errorStringForLog ( error ) , "Error loading profile: " + errorStringForLog ( error ) ,
) ; ) ;
if ( USE_DEXIE_DB ) {
logConsoleAndDb (
"Error loading profile: " + errorStringForLog ( error ) ,
) ;
}
this . $notify ( this . $notify (
{ {
group : "alert" , group : "alert" ,
@ -1238,11 +1253,7 @@ export default class AccountViewView extends Vue {
* Initializes component state with values from the database or defaults . * Initializes component state with values from the database or defaults .
* / * /
async initializeState ( ) { async initializeState ( ) {
let settings = await databaseUtil . retrieveSettingsForActiveAccount ( ) ; const settings = await databaseUtil . retrieveSettingsForActiveAccount ( ) ;
if ( USE_DEXIE_DB ) {
await db . open ( ) ;
settings = await retrieveSettingsForActiveAccount ( ) ;
}
this . activeDid = settings . activeDid || "" ; this . activeDid = settings . activeDid || "" ;
this . apiServer = settings . apiServer || "" ; this . apiServer = settings . apiServer || "" ;
@ -1288,12 +1299,6 @@ export default class AccountViewView extends Vue {
await databaseUtil . updateDefaultSettings ( { await databaseUtil . updateDefaultSettings ( {
showContactGivesInline : this . showContactGives , showContactGivesInline : this . showContactGives ,
} ) ; } ) ;
if ( USE_DEXIE_DB ) {
await db . open ( ) ;
await db . settings . update ( MASTER_SETTINGS_KEY , {
showContactGivesInline : this . showContactGives ,
} ) ;
}
} }
async toggleShowGeneralAdvanced ( ) { async toggleShowGeneralAdvanced ( ) {
@ -1301,12 +1306,6 @@ export default class AccountViewView extends Vue {
await databaseUtil . updateDefaultSettings ( { await databaseUtil . updateDefaultSettings ( {
showGeneralAdvanced : this . showGeneralAdvanced , showGeneralAdvanced : this . showGeneralAdvanced ,
} ) ; } ) ;
if ( USE_DEXIE_DB ) {
await db . open ( ) ;
await db . settings . update ( MASTER_SETTINGS_KEY , {
showGeneralAdvanced : this . showGeneralAdvanced ,
} ) ;
}
} }
async toggleProdWarning ( ) { async toggleProdWarning ( ) {
@ -1314,12 +1313,6 @@ export default class AccountViewView extends Vue {
await databaseUtil . updateDefaultSettings ( { await databaseUtil . updateDefaultSettings ( {
warnIfProdServer : this . warnIfProdServer , warnIfProdServer : this . warnIfProdServer ,
} ) ; } ) ;
if ( USE_DEXIE_DB ) {
await db . open ( ) ;
await db . settings . update ( MASTER_SETTINGS_KEY , {
warnIfProdServer : this . warnIfProdServer ,
} ) ;
}
} }
async toggleTestWarning ( ) { async toggleTestWarning ( ) {
@ -1327,12 +1320,6 @@ export default class AccountViewView extends Vue {
await databaseUtil . updateDefaultSettings ( { await databaseUtil . updateDefaultSettings ( {
warnIfTestServer : this . warnIfTestServer , warnIfTestServer : this . warnIfTestServer ,
} ) ; } ) ;
if ( USE_DEXIE_DB ) {
await db . open ( ) ;
await db . settings . update ( MASTER_SETTINGS_KEY , {
warnIfTestServer : this . warnIfTestServer ,
} ) ;
}
} }
async toggleShowShortcutBvc ( ) { async toggleShowShortcutBvc ( ) {
@ -1340,12 +1327,6 @@ export default class AccountViewView extends Vue {
await databaseUtil . updateDefaultSettings ( { await databaseUtil . updateDefaultSettings ( {
showShortcutBvc : this . showShortcutBvc , showShortcutBvc : this . showShortcutBvc ,
} ) ; } ) ;
if ( USE_DEXIE_DB ) {
await db . open ( ) ;
await db . settings . update ( MASTER_SETTINGS_KEY , {
showShortcutBvc : this . showShortcutBvc ,
} ) ;
}
} }
readableDate ( timeStr : string ) { readableDate ( timeStr : string ) {
@ -1404,11 +1385,6 @@ export default class AccountViewView extends Vue {
await databaseUtil . updateDefaultSettings ( { await databaseUtil . updateDefaultSettings ( {
notifyingNewActivityTime : timeText , notifyingNewActivityTime : timeText ,
} ) ; } ) ;
if ( USE_DEXIE_DB ) {
await db . settings . update ( MASTER_SETTINGS_KEY , {
notifyingNewActivityTime : timeText ,
} ) ;
}
this . notifyingNewActivity = true ; this . notifyingNewActivity = true ;
this . notifyingNewActivityTime = timeText ; this . notifyingNewActivityTime = timeText ;
} }
@ -1425,11 +1401,6 @@ export default class AccountViewView extends Vue {
await databaseUtil . updateDefaultSettings ( { await databaseUtil . updateDefaultSettings ( {
notifyingNewActivityTime : "" , notifyingNewActivityTime : "" ,
} ) ; } ) ;
if ( USE_DEXIE_DB ) {
await db . settings . update ( MASTER_SETTINGS_KEY , {
notifyingNewActivityTime : "" ,
} ) ;
}
this . notifyingNewActivity = false ; this . notifyingNewActivity = false ;
this . notifyingNewActivityTime = "" ; this . notifyingNewActivityTime = "" ;
} }
@ -1475,12 +1446,6 @@ export default class AccountViewView extends Vue {
notifyingReminderMessage : message , notifyingReminderMessage : message ,
notifyingReminderTime : timeText , notifyingReminderTime : timeText ,
} ) ; } ) ;
if ( USE_DEXIE_DB ) {
await db . settings . update ( MASTER_SETTINGS_KEY , {
notifyingReminderMessage : message ,
notifyingReminderTime : timeText ,
} ) ;
}
this . notifyingReminder = true ; this . notifyingReminder = true ;
this . notifyingReminderMessage = message || "" ; this . notifyingReminderMessage = message || "" ;
this . notifyingReminderTime = timeText ; this . notifyingReminderTime = timeText ;
@ -1500,12 +1465,6 @@ export default class AccountViewView extends Vue {
notifyingReminderMessage : "" , notifyingReminderMessage : "" ,
notifyingReminderTime : "" , notifyingReminderTime : "" ,
} ) ; } ) ;
if ( USE_DEXIE_DB ) {
await db . settings . update ( MASTER_SETTINGS_KEY , {
notifyingReminderMessage : "" ,
notifyingReminderTime : "" ,
} ) ;
}
this . notifyingReminder = false ; this . notifyingReminder = false ;
this . notifyingReminderMessage = "" ; this . notifyingReminderMessage = "" ;
this . notifyingReminderTime = "" ; this . notifyingReminderTime = "" ;
@ -1522,12 +1481,6 @@ export default class AccountViewView extends Vue {
await databaseUtil . updateDefaultSettings ( { await databaseUtil . updateDefaultSettings ( {
hideRegisterPromptOnNewContact : newSetting , hideRegisterPromptOnNewContact : newSetting ,
} ) ; } ) ;
if ( USE_DEXIE_DB ) {
await db . open ( ) ;
await db . settings . update ( MASTER_SETTINGS_KEY , {
hideRegisterPromptOnNewContact : newSetting ,
} ) ;
}
this . hideRegisterPromptOnNewContact = newSetting ; this . hideRegisterPromptOnNewContact = newSetting ;
} }
@ -1535,12 +1488,6 @@ export default class AccountViewView extends Vue {
await databaseUtil . updateDefaultSettings ( { await databaseUtil . updateDefaultSettings ( {
passkeyExpirationMinutes : this . passkeyExpirationMinutes , passkeyExpirationMinutes : this . passkeyExpirationMinutes ,
} ) ; } ) ;
if ( USE_DEXIE_DB ) {
await db . open ( ) ;
await db . settings . update ( MASTER_SETTINGS_KEY , {
passkeyExpirationMinutes : this . passkeyExpirationMinutes ,
} ) ;
}
clearPasskeyToken ( ) ; clearPasskeyToken ( ) ;
this . passkeyExpirationDescription = tokenExpiryTimeDescription ( ) ; this . passkeyExpirationDescription = tokenExpiryTimeDescription ( ) ;
} }
@ -1552,14 +1499,6 @@ export default class AccountViewView extends Vue {
notifyingReminderMessage : "" , notifyingReminderMessage : "" ,
notifyingReminderTime : "" , notifyingReminderTime : "" ,
} ) ; } ) ;
if ( USE_DEXIE_DB ) {
await db . open ( ) ;
await db . settings . update ( MASTER_SETTINGS_KEY , {
notifyingNewActivityTime : "" ,
notifyingReminderMessage : "" ,
notifyingReminderTime : "" ,
} ) ;
}
this . notifyingNewActivity = false ; this . notifyingNewActivity = false ;
this . notifyingNewActivityTime = "" ; this . notifyingNewActivityTime = "" ;
this . notifyingReminder = false ; this . notifyingReminder = false ;
@ -1599,9 +1538,7 @@ export default class AccountViewView extends Vue {
* @ returns { Promise < Blob > } The generated blob object . * @ returns { Promise < Blob > } The generated blob object .
* / * /
private async generateDatabaseBlob ( ) : Promise < Blob > { private async generateDatabaseBlob ( ) : Promise < Blob > {
if ( USE_DEXIE_DB ) { / / T O D O : I m p l e m e n t t h i s f o r S Q L i t e
return await db . export ( { prettyJson : true } ) ;
}
throw new Error ( "Not implemented" ) ; throw new Error ( "Not implemented" ) ;
} }
@ -1704,30 +1641,7 @@ export default class AccountViewView extends Vue {
* / * /
async submitImportFile ( ) { async submitImportFile ( ) {
if ( inputImportFileNameRef . value != null ) { if ( inputImportFileNameRef . value != null ) {
if ( USE_DEXIE_DB ) { / / T O D O : i m p l e m e n t t h i s f o r S Q L i t e
await db
. delete ( )
. then ( async ( ) => {
/ / B u l k E r r o r : s e t t i n g s . b u l k A d d ( ) : 1 o f 2 1 o p e r a t i o n s f a i l e d . E r r o r s : C o n s t r a i n t E r r o r : K e y a l r e a d y e x i s t s i n t h e o b j e c t s t o r e .
await Dexie . import ( inputImportFileNameRef . value as Blob , {
progressCallback : this . progressCallback ,
} ) ;
} )
. catch ( ( error ) => {
logger . error ( "Error importing file:" , error ) ;
this . $notify (
{
group : "alert" ,
type : "danger" ,
title : "Error Importing" ,
text : "There was an error in the import. Your identities and contacts may have been affected, so you may have to restore your identifier and use the contact import method." ,
} ,
- 1 ,
) ;
} ) ;
} else {
throw new Error ( "Not implemented" ) ;
}
} }
} }
@ -1818,12 +1732,6 @@ export default class AccountViewView extends Vue {
await databaseUtil . updateDidSpecificSettings ( did , { await databaseUtil . updateDidSpecificSettings ( did , {
isRegistered : true , isRegistered : true ,
} ) ; } ) ;
if ( USE_DEXIE_DB ) {
await db . open ( ) ;
await db . settings . update ( MASTER_SETTINGS_KEY , {
isRegistered : true ,
} ) ;
}
this . isRegistered = true ; this . isRegistered = true ;
} catch ( err ) { } catch ( err ) {
logger . error ( "Got an error updating settings:" , err ) ; logger . error ( "Got an error updating settings:" , err ) ;
@ -1886,12 +1794,6 @@ export default class AccountViewView extends Vue {
await databaseUtil . updateDefaultSettings ( { await databaseUtil . updateDefaultSettings ( {
apiServer : this . apiServerInput , apiServer : this . apiServerInput ,
} ) ; } ) ;
if ( USE_DEXIE_DB ) {
await db . open ( ) ;
await db . settings . update ( MASTER_SETTINGS_KEY , {
apiServer : this . apiServerInput ,
} ) ;
}
this . apiServer = this . apiServerInput ; this . apiServer = this . apiServerInput ;
} }
@ -1899,12 +1801,6 @@ export default class AccountViewView extends Vue {
await databaseUtil . updateDefaultSettings ( { await databaseUtil . updateDefaultSettings ( {
partnerApiServer : this . partnerApiServerInput , partnerApiServer : this . partnerApiServerInput ,
} ) ; } ) ;
if ( USE_DEXIE_DB ) {
await db . open ( ) ;
await db . settings . update ( MASTER_SETTINGS_KEY , {
partnerApiServer : this . partnerApiServerInput ,
} ) ;
}
this . partnerApiServer = this . partnerApiServerInput ; this . partnerApiServer = this . partnerApiServerInput ;
} }
@ -1912,12 +1808,6 @@ export default class AccountViewView extends Vue {
await databaseUtil . updateDefaultSettings ( { await databaseUtil . updateDefaultSettings ( {
webPushServer : this . webPushServerInput , webPushServer : this . webPushServerInput ,
} ) ; } ) ;
if ( USE_DEXIE_DB ) {
await db . open ( ) ;
await db . settings . update ( MASTER_SETTINGS_KEY , {
webPushServer : this . webPushServerInput ,
} ) ;
}
this . webPushServer = this . webPushServerInput ; this . webPushServer = this . webPushServerInput ;
this . $notify ( this . $notify (
{ {
@ -1936,12 +1826,6 @@ export default class AccountViewView extends Vue {
await databaseUtil . updateDefaultSettings ( { await databaseUtil . updateDefaultSettings ( {
profileImageUrl : imgUrl , profileImageUrl : imgUrl ,
} ) ; } ) ;
if ( USE_DEXIE_DB ) {
await db . open ( ) ;
await db . settings . update ( MASTER_SETTINGS_KEY , {
profileImageUrl : imgUrl ,
} ) ;
}
this . profileImageUrl = imgUrl ; this . profileImageUrl = imgUrl ;
/ / c o n s o l e . l o g ( " G o t i m a g e U R L : " , i m g U r l ) ; / / c o n s o l e . l o g ( " G o t i m a g e U R L : " , i m g U r l ) ;
} , } ,
@ -2005,12 +1889,6 @@ export default class AccountViewView extends Vue {
await databaseUtil . updateDefaultSettings ( { await databaseUtil . updateDefaultSettings ( {
profileImageUrl : undefined , profileImageUrl : undefined ,
} ) ; } ) ;
if ( USE_DEXIE_DB ) {
await db . open ( ) ;
await db . settings . update ( MASTER_SETTINGS_KEY , {
profileImageUrl : undefined ,
} ) ;
}
this . profileImageUrl = undefined ; this . profileImageUrl = undefined ;
} catch ( error ) { } catch ( error ) {
@ -2022,11 +1900,6 @@ export default class AccountViewView extends Vue {
await databaseUtil . updateDidSpecificSettings ( this . activeDid , { await databaseUtil . updateDidSpecificSettings ( this . activeDid , {
profileImageUrl : undefined , profileImageUrl : undefined ,
} ) ; } ) ;
if ( USE_DEXIE_DB ) {
await updateAccountSettings ( this . activeDid , {
profileImageUrl : undefined ,
} ) ;
}
this . profileImageUrl = undefined ; this . profileImageUrl = undefined ;
@ -2107,14 +1980,8 @@ export default class AccountViewView extends Vue {
databaseUtil . logConsoleAndDb ( databaseUtil . logConsoleAndDb (
"Error saving profile: " + errorStringForLog ( error ) , "Error saving profile: " + errorStringForLog ( error ) ,
) ; ) ;
if ( USE_DEXIE_DB ) {
logConsoleAndDb ( "Error saving profile: " + errorStringForLog ( error ) ) ;
}
const errorMessage : string = const errorMessage : string =
error . response ? . data ? . error ? . message || extractErrorMessage ( error ) || "There was an error saving your profile." ;
error . response ? . data ? . error ||
error . message ||
"There was an error saving your profile." ;
this . $notify ( this . $notify (
{ {
group : "alert" , group : "alert" ,
@ -2202,13 +2069,8 @@ export default class AccountViewView extends Vue {
databaseUtil . logConsoleAndDb ( databaseUtil . logConsoleAndDb (
"Error deleting profile: " + errorStringForLog ( error ) , "Error deleting profile: " + errorStringForLog ( error ) ,
) ; ) ;
if ( USE_DEXIE_DB ) {
logConsoleAndDb ( "Error deleting profile: " + errorStringForLog ( error ) ) ;
}
const errorMessage : string = const errorMessage : string =
error . response ? . data ? . error ? . message || extractErrorMessage ( error ) ||
error . response ? . data ? . error ||
error . message ||
"There was an error deleting your profile." ; "There was an error deleting your profile." ;
this . $notify ( this . $notify (
{ {
Matthew Raymer
2 weeks ago