Merge branch 'master' into kb/add-usage-guide

Co-authored-by: Trent Larson <trent@trentlarson.com>
Reviewed-on: #116
Co-authored-by: trentlarson <trent@trentlarson.com>
Co-committed-by: trentlarson <trent@trentlarson.com>

.env.production

@@ -1,4 +1,4 @@
-# Only the variables that start with VITE_ are seen in the application import.meta.env in Vue.
+# Only the variables that start with VITE_ are seen in the application process.env in Vue.
 VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01GXYPFF7FA03NXKPYY142PY4H
 VITE_DEFAULT_ENDORSER_API_SERVER=https://api.endorser.ch
 VITE_DEFAULT_IMAGE_API_SERVER=https://image-api.timesafari.app

.github/workflows/playwright.yml

@@ -1,27 +0,0 @@
-name: Playwright Tests
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-jobs:
-  test:
-    timeout-minutes: 60
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: lts/*
-    - name: Install dependencies
-      run: npm ci
-    - name: Install Playwright Browsers
-      run: npx playwright install --with-deps
-    - name: Run Playwright tests
-      run: npx playwright test
-    - uses: actions/upload-artifact@v4
-      if: always()
-      with:
-        name: playwright-report
-        path: playwright-report/
-        retention-days: 30

.gitignore

@@ -27,7 +27,3 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
-/test-results/
-/playwright-report/
-/blob-report/
-/playwright/.cache/

CHANGELOG.md

@@ -6,58 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## ?
+## [0.3.14]
-### Added
-- Send list of contacts to someone
-### Changed
-- Moved contact actions from list onto detail page
-
-
-## [0.3.20] - 2024.08.18 - 4064eb75a9743ca268bf00016fa0a5fc5dec4e30
-### Fixed
-- Bad "give" verbiage on offer page
-- Failing offer test
-
-
-## [0.3.19] - 2024.08.18 - ee9c14942ceba993bf21a11249601f205158ec71
-### Added
-- Update of an offer
-- Recipient description in offer list
-### Fixed
-- List of offers wasn't showing.
-- Destination page after sharing photo was wrong.
-
-
-## [0.3.17] - 2024.07.11 - cefa384ff1a2d922848c370640c096c529920fab
-### Added
-- Photos on more screens
-### Fixed
-- Share of a photo, including sharing a photo from webkit/Safari which never worked
-### Changed in DB or environment
-- Nothing (though there's a new temp field in IndexedDB)
-
-
-## [0.3.15] - 2024.08.04 - c8f0f2c2b16b9f0b4b47d40f7bf29058c7baa68e
-### Added
-- Edit gives
-- Page to edit claim JSON before submitting
-- Update of imported contacts
-- Improve messaging on give dialog
-- Section for gives provided by plan
-- Deletion of an identity
-- UI for choosing a passkey creation (not enabled on prod)
-- Cache signatures for reports for passkey-signed requests
-- Refactor: consolidate alternative signing, eg. for passkeys & did:peer
-- Playwright tests
-### Changed
-- Linked projects display below description (instead of at bottom)
-### Fixed
-- Visibility toggle appearance
-### Changed in DB or environment
-- Nothing
-
-
-## [0.3.14] - 2024.06.22 - 1611d22892f683f43856d2503eee7f391b6bbce8
 ### Added
 - Clearer give-confirmation screen
 - BX currency https://thebx.medium.com/

CONTRIBUTING.md

@@ -2,10 +2,5 @@
 
 Welcome! We are happy to have your help with this project.
 
-We expect contributions to include automated tests and pass linting. Run the `test-all` task.
+Note that all contributions will be under our
-Note that some previous features don't have tests and adding more will make you friends quick.
+[license, modeled after SQLite](https://github.com/trentlarson/endorser-ch/blob/master/LICENSE).
-
-Note that all contributions will be under our [license, modeled after SQLite](https://github.com/trentlarson/endorser-ch/blob/master/LICENSE).
-
-If you want to see a code of conduct, we're probably not the people you want to hang with.
-Basically, we'll work together as long as we both enjoy it, and we'll stop when that stops.

README.md

@@ -39,17 +39,15 @@ npm run lint
 
 * Update the ClickUp tasks & CHANGELOG.md & the version in package.json, run `npm install`.
 
-* Commit everything (since the commit hash is used the app).
-
 * Record what version is currently on production.
 
 * Run the correct build:
 
-  * Staging
+  * Test
 ```
 # (Let's replace this with a .env.development or .env.staging file.)
 # The test BVC_MEETUPS_PROJECT_CLAIM_ID does not resolve as a URL because it's only in the test DB and the prod redirect won't redirect there.
-TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HNTZYJJXTGT0EZS3VEJGX7AK VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app VITE_PASSKEYS_ENABLED=yep npm run build
+TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HNTZYJJXTGT0EZS3VEJGX7AK VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app npm run build
 ```
 
   * Production
@@ -58,7 +56,7 @@ TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https:
 npm run build
 ```
 
-* Get on the server and back up the time-safari/dist folder.
+* Get on the server and back up 3 DBs and the time-safari folder.
 
 * `rsync -azvu -e "ssh -i ~/.ssh/..." dist ubuntutest@test.timesafari.app:time-safari`
 
@@ -71,41 +69,6 @@ npm run build
 
 ## Tests
 
-### Automated
-
-Use the locally running Endorser server:
-
-* Clone and set up https://github.com/trentlarson/endorser-ch and run the following in that directory:
-```
-test/test.sh
-NODE_ENV=test-local npm run dev
-```
-
-* Now run the local tests:
-```
-npm run test-all
-```
-
-Note that a test will sometimes fail and rerunning may succeed (and repeat if a different test fails).
-
-
-
-
-It's possible to use the global test Endorser (ledger) server (but currently the tests don't all succeed):
-`npx playwright test`
-
-
-
-
-It's possible to run with a minimal set of data: the following starts with the bare minimum of test data (but currently the tests don't all succeed):
-```
-rm ../endorser-ch-test-local.sqlite3
-NODE_ENV=test-local npm run flyway migrate
-NODE_ENV=test-local npm run test test/controller0
-NODE_ENV=test-local npm run dev
-```
-
-
 ### Register new user on test server
 
 On the test server, User #0 has rights to register others, so you can start

docs/README.md

@@ -7,55 +7,45 @@ This uses Pandoc and BasicTex (LaTeX) Installed through Homebrew.
 ### Set Up
 
 ```bash 
+# See https://daniel.feldroy.com/posts/setting-up-latex-on-mac-os-x
 brew install pandoc
 
 brew install basictex
 
+pandoc keystore-migration.md -o keystore-migration.pdf
+
 # Setting up LaTex packages
 
 # First update tlmgr
 sudo tlmgr update --self
 
 # Then install LaTex packages
-sudo tlmgr install bbding
+sudo tlmgr install titlesec
-sudo tlmgr install enumitem
-sudo tlmgr install environ
-sudo tlmgr install fancyhdr
 sudo tlmgr install framed
-sudo tlmgr install import
+sudo tlmgr install threeparttable
-sudo tlmgr install lastpage  # Enables Page X of Y
+sudo tlmgr install wrapfig
-sudo tlmgr install mdframed
 sudo tlmgr install multirow
-sudo tlmgr install needspace
+sudo tlmgr install enumitem
-sudo tlmgr install ntheorem
+sudo tlmgr install bbding
+sudo tlmgr install titling  # Required for the fancy headers used
 sudo tlmgr install tabu
+sudo tlmgr install mdframed
 sudo tlmgr install tcolorbox
 sudo tlmgr install textpos
-sudo tlmgr install titlesec
+sudo tlmgr install import
-sudo tlmgr install titling  # Required for the fancy headers used
-sudo tlmgr install threeparttable
-sudo tlmgr install trimspaces
-sudo tlmgr install tocloft  # Required for \tableofcontents generation
 sudo tlmgr install varwidth
-sudo tlmgr install wrapfig
+sudo tlmgr install needspace
-
+sudo tlmgr install tocloft  # Required for \tableofcontents generation
-# Install fonts
+sudo tlmgr install ntheorem
-sudo tlmgr install cmbright
+sudo tlmgr install environ
+sudo tlmgr install trimspaces
+sudo tlmgr install lastpage  # Enables Page X of Y
 sudo tlmgr install collection-fontsrecommended # And set up fonts
-sudo tlmgr install fira
-sudo tlmgr install fontaxes
 sudo tlmgr install libertine # The main font the doc uses
-sudo tlmgr install opensans
+
-sudo tlmgr install sourceserifpro
 
 ```
 
-#### References
-
-The following guide was adapted to this project except that we install with Brew and have a few more packages.
-
-Guide: https://daniel.feldroy.com/posts/setting-up-latex-on-mac-os-x
-
 ### Usage
 
 Use the `pandoc` command to generate a PDF.

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "TimeSafari",
-  "version": "0.3.21-beta",
+  "version": "0.3.15-beta",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "TimeSafari",
-      "version": "0.3.21-beta",
+      "version": "0.3.15-beta",
       "dependencies": {
         "@dicebear/collection": "^5.4.1",
         "@dicebear/core": "^5.4.1",
@@ -39,6 +39,7 @@
         "did-jwt": "^7.4.7",
         "ethereum-cryptography": "^2.1.3",
         "ethereumjs-util": "^7.1.5",
+        "ethr-did-resolver": "^8.1.2",
         "jdenticon": "^3.2.0",
         "js-generate-password": "^0.1.9",
         "js-yaml": "^4.1.0",
@@ -68,11 +69,9 @@
         "web-did-resolver": "^2.0.27"
       },
       "devDependencies": {
-        "@playwright/test": "^1.45.2",
         "@types/js-yaml": "^4.0.9",
         "@types/leaflet": "^1.9.8",
         "@types/luxon": "^3.4.2",
-        "@types/node": "^20.14.11",
         "@types/ramda": "^0.29.11",
         "@types/three": "^0.155.1",
         "@types/ua-parser-js": "^0.7.39",
@@ -3208,6 +3207,31 @@
         "node": ">=14"
       }
     },
+    "node_modules/@ethersproject/abi": {
+      "version": "5.7.0",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@ethersproject/address": "^5.7.0",
+        "@ethersproject/bignumber": "^5.7.0",
+        "@ethersproject/bytes": "^5.7.0",
+        "@ethersproject/constants": "^5.7.0",
+        "@ethersproject/hash": "^5.7.0",
+        "@ethersproject/keccak256": "^5.7.0",
+        "@ethersproject/logger": "^5.7.0",
+        "@ethersproject/properties": "^5.7.0",
+        "@ethersproject/strings": "^5.7.0"
+      }
+    },
     "node_modules/@ethersproject/abstract-provider": {
       "version": "5.7.0",
       "funding": [
@@ -3361,6 +3385,32 @@
         "@ethersproject/bignumber": "^5.7.0"
       }
     },
+    "node_modules/@ethersproject/contracts": {
+      "version": "5.7.0",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@ethersproject/abi": "^5.7.0",
+        "@ethersproject/abstract-provider": "^5.7.0",
+        "@ethersproject/abstract-signer": "^5.7.0",
+        "@ethersproject/address": "^5.7.0",
+        "@ethersproject/bignumber": "^5.7.0",
+        "@ethersproject/bytes": "^5.7.0",
+        "@ethersproject/constants": "^5.7.0",
+        "@ethersproject/logger": "^5.7.0",
+        "@ethersproject/properties": "^5.7.0",
+        "@ethersproject/transactions": "^5.7.0"
+      }
+    },
     "node_modules/@ethersproject/hash": {
       "version": "5.7.0",
       "funding": [
@@ -3498,6 +3548,60 @@
         "@ethersproject/logger": "^5.7.0"
       }
     },
+    "node_modules/@ethersproject/providers": {
+      "version": "5.7.2",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@ethersproject/abstract-provider": "^5.7.0",
+        "@ethersproject/abstract-signer": "^5.7.0",
+        "@ethersproject/address": "^5.7.0",
+        "@ethersproject/base64": "^5.7.0",
+        "@ethersproject/basex": "^5.7.0",
+        "@ethersproject/bignumber": "^5.7.0",
+        "@ethersproject/bytes": "^5.7.0",
+        "@ethersproject/constants": "^5.7.0",
+        "@ethersproject/hash": "^5.7.0",
+        "@ethersproject/logger": "^5.7.0",
+        "@ethersproject/networks": "^5.7.0",
+        "@ethersproject/properties": "^5.7.0",
+        "@ethersproject/random": "^5.7.0",
+        "@ethersproject/rlp": "^5.7.0",
+        "@ethersproject/sha2": "^5.7.0",
+        "@ethersproject/strings": "^5.7.0",
+        "@ethersproject/transactions": "^5.7.0",
+        "@ethersproject/web": "^5.7.0",
+        "bech32": "1.1.4",
+        "ws": "7.4.6"
+      }
+    },
+    "node_modules/@ethersproject/random": {
+      "version": "5.7.0",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@ethersproject/bytes": "^5.7.0",
+        "@ethersproject/logger": "^5.7.0"
+      }
+    },
     "node_modules/@ethersproject/rlp": {
       "version": "5.7.0",
       "funding": [
@@ -6087,21 +6191,6 @@
         "url": "https://opencollective.com/unts"
       }
     },
-    "node_modules/@playwright/test": {
-      "version": "1.45.2",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.45.2.tgz",
-      "integrity": "sha512-JxG9eq92ET75EbVi3s+4sYbcG7q72ECeZNbdBlaMkGcNbiDQ4cAi8U2QP5oKkOx+1gpaiL1LDStmzCaEM1Z6fQ==",
-      "dev": true,
-      "dependencies": {
-        "playwright": "1.45.2"
-      },
-      "bin": {
-        "playwright": "cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/@pvermeer/dexie-encrypted-addon": {
       "version": "3.0.0",
       "license": "MIT",
@@ -8678,9 +8767,8 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.14.11",
+      "version": "20.11.30",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.11.tgz",
+      "license": "MIT",
-      "integrity": "sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -10377,6 +10465,10 @@
         "node": ">=14"
       }
     },
+    "node_modules/bech32": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
     "node_modules/better-opn": {
       "version": "3.0.2",
       "license": "MIT",
@@ -12721,6 +12813,24 @@
         "ethr-did-resolver": "10.1.5"
       }
     },
+    "node_modules/ethr-did-resolver": {
+      "version": "8.1.2",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@ethersproject/abi": "^5.6.3",
+        "@ethersproject/abstract-signer": "^5.6.2",
+        "@ethersproject/address": "^5.6.1",
+        "@ethersproject/basex": "^5.6.1",
+        "@ethersproject/bignumber": "^5.6.2",
+        "@ethersproject/bytes": "^5.6.1",
+        "@ethersproject/contracts": "^5.6.2",
+        "@ethersproject/keccak256": "^5.6.1",
+        "@ethersproject/providers": "^5.6.8",
+        "@ethersproject/signing-key": "^5.6.2",
+        "@ethersproject/transactions": "^5.6.2",
+        "did-resolver": "^4.0.1"
+      }
+    },
     "node_modules/ethr-did/node_modules/@noble/ciphers": {
       "version": "0.5.1",
       "license": "MIT",
@@ -17989,50 +18099,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/playwright": {
-      "version": "1.45.2",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.45.2.tgz",
-      "integrity": "sha512-ReywF2t/0teRvNBpfIgh5e4wnrI/8Su8ssdo5XsQKpjxJj+jspm00jSoz9BTg91TT0c9HRjXO7LBNVrgYj9X0g==",
-      "dev": true,
-      "dependencies": {
-        "playwright-core": "1.45.2"
-      },
-      "bin": {
-        "playwright": "cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "optionalDependencies": {
-        "fsevents": "2.3.2"
-      }
-    },
-    "node_modules/playwright-core": {
-      "version": "1.45.2",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.45.2.tgz",
-      "integrity": "sha512-ha175tAWb0dTK0X4orvBIqi3jGEt701SMxMhyujxNrgd8K0Uy5wMSwwcQHtyB4om7INUkfndx02XnQ2p6dvLDw==",
-      "dev": true,
-      "bin": {
-        "playwright-core": "cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/playwright/node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/plist": {
       "version": "3.1.0",
       "license": "MIT",
@@ -22221,8 +22287,6 @@
     "node_modules/ws": {
       "version": "7.4.6",
       "license": "MIT",
-      "optional": true,
-      "peer": true,
       "engines": {
         "node": ">=8.3.0"
       },

package.json

@@ -1,15 +1,13 @@
 {
   "name": "TimeSafari",
-  "version": "0.3.21-beta",
+  "version": "0.3.15-beta",
   "scripts": {
     "dev": "vite",
     "serve": "vite preview",
     "build": "VITE_GIT_HASH=`git log -1 --pretty=format:%h` vite build",
     "lint": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src",
     "lint-fix": "eslint --ext .js,.ts,.vue --ignore-path .gitignore --fix src",
-    "prebuild": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && node sw_combine.js",
+    "prebuild": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && node sw_combine.js"
-    "test-local": "npx playwright test -c playwright.config-local.ts --trace on",
-    "test-all": "npm run build && npx playwright test -c playwright.config-local.ts --trace on"
   },
   "dependencies": {
     "@dicebear/collection": "^5.4.1",
@@ -43,6 +41,7 @@
     "did-jwt": "^7.4.7",
     "ethereum-cryptography": "^2.1.3",
     "ethereumjs-util": "^7.1.5",
+    "ethr-did-resolver": "^8.1.2",
     "jdenticon": "^3.2.0",
     "js-generate-password": "^0.1.9",
     "js-yaml": "^4.1.0",
@@ -72,11 +71,9 @@
     "web-did-resolver": "^2.0.27"
   },
   "devDependencies": {
-    "@playwright/test": "^1.45.2",
     "@types/js-yaml": "^4.0.9",
     "@types/leaflet": "^1.9.8",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^20.14.11",
     "@types/ramda": "^0.29.11",
     "@types/three": "^0.155.1",
     "@types/ua-parser-js": "^0.7.39",

playwright.config-local.ts

@@ -1,98 +0,0 @@
-import { defineConfig, devices } from '@playwright/test';
-
-/**
- * Read environment variables from file.
- * https://github.com/motdotla/dotenv
- */
-// import dotenv from 'dotenv';
-// dotenv.config({ path: path.resolve(__dirname, '.env') });
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-  testDir: './test-playwright',
-  /* Run tests in files in parallel */
-  fullyParallel: true,
-  /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env.CI,
-  /* Retry on CI only */
-  retries: process.env.CI ? 2 : 0,
-  /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 1 : undefined,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: 'html',
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    baseURL: 'http://localhost:8080',
-
-    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: 'on-first-retry',
-  },
-
-  /* Configure projects for major browsers */
-  projects: [
-    {
-      name: 'chromium',
-      use: {
-        ...devices['Desktop Chrome'],
-        permissions: ["clipboard-read"],
-      },
-    },
-
-    {
-      name: 'firefox',
-      use: { ...devices['Desktop Firefox'] },
-    },
-
-    {
-      name: 'webkit',
-      use: { ...devices['Desktop Safari'] },
-    },
-
-    /* Test against mobile viewports. */
-    {
-      name: 'Mobile Chrome',
-      use: { ...devices['Pixel 5'] },
-    },
-    {
-      name: 'Mobile Safari',
-      use: { ...devices['iPhone 12'] },
-    },
-
-    /* Test against branded browsers. */
-    // {
-    //   name: 'Microsoft Edge',
-    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
-    // },
-    {
-      name: 'Google Chrome',
-      use: { ...devices['Desktop Chrome'], channel: 'chrome' },
-    },
-  ],
-
-  /* Configure global timeout; default is 30000 milliseconds */
-  // the image upload will often not succeed at 5 seconds
-  timeout: 20000,
-
-  /* Run your local dev server before starting the tests */
-  /**
-   * This could be an array of servers, meaning we could start the Endorser server as well:
-   *     {
-   *       command: "cd ../endorser-ch; NODE_ENV=test-local npm run dev",
-   *       url: 'http://localhost:3000',
-   *       reuseExistingServer: !process.env.CI,
-   *     },
-   *
-   * But if we do then the testInfo.config.webServer is null and the API-setting test 00 fails.
-   * It is worth considering a change such that Time Safari's default Endorser API server is NOT set
-   * in the user's settings so that it can be blanked out and the default is used.
-   */
-  webServer: {
-    command:
-      "VITE_PASSKEYS_ENABLED=true VITE_DEFAULT_ENDORSER_API_SERVER=http://localhost:3000 npm run dev",
-    url: "http://localhost:8080",
-    reuseExistingServer: !process.env.CI,
-  },
-});

playwright.config.ts

@@ -1,82 +0,0 @@
-import { defineConfig, devices } from '@playwright/test';
-
-/**
- * Read environment variables from file.
- * https://github.com/motdotla/dotenv
- */
-// import dotenv from 'dotenv';
-// dotenv.config({ path: path.resolve(__dirname, '.env') });
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-  testDir: './test-playwright',
-  /* Run tests in files in parallel */
-  fullyParallel: true,
-  /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env.CI,
-  /* Retry on CI only */
-  retries: process.env.CI ? 2 : 0,
-  /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 1 : undefined,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: 'html',
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    baseURL: 'https://test.timesafari.app',
-
-    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: 'on-first-retry',
-  },
-
-  /* Configure projects for major browsers */
-  projects: [
-    {
-      name: 'chromium',
-      use: {
-        ...devices['Desktop Chrome'],
-        permissions: ["clipboard-read"],
-      },
-    },
-
-    {
-      name: 'firefox',
-      use: { ...devices['Desktop Firefox'] },
-    },
-
-    {
-      name: 'webkit',
-      use: { ...devices['Desktop Safari'] },
-    },
-
-    /* Test against mobile viewports. */
-    {
-      name: 'Mobile Chrome',
-      use: { ...devices['Pixel 5'] },
-    },
-    {
-      name: 'Mobile Safari',
-      use: { ...devices['iPhone 12'] },
-    },
-
-    /* Test against branded browsers. */
-    // {
-    //   name: 'Microsoft Edge',
-    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
-    // },
-    // {
-    //   name: 'Google Chrome',
-    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
-    // },
-  ],
-
-  /* Run your local dev server before starting the tests */
-  // webServer: {
-  //   command:
-  //     "VITE_PASSKEYS_ENABLED=true VITE_DEFAULT_ENDORSER_API_SERVER=http://localhost:3000 npm run dev",
-  //   url: "http://localhost:8080",
-  //   reuseExistingServer: !process.env.CI,
-  // },
-});

src/App.vue

@@ -181,7 +181,6 @@
                   class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
                 >
                   Yes
-                  {{ notification.yesText ? ", " + notification.yesText : "" }}
                 </button>
 
                 <button
@@ -193,7 +192,7 @@
                   "
                   class="block w-full text-center text-md font-bold uppercase bg-yellow-600 text-white px-2 py-2 rounded-md mb-2"
                 >
-                  No {{ notification.noText ? ", " + notification.noText : "" }}
+                  No
                 </button>
 
                 <label

src/components/FeedFilters.vue

@@ -133,18 +133,18 @@ export default class FeedFilters extends Vue {
     this.visible = true;
   }
 
-  async toggleHasVisibleDid() {
+  toggleHasVisibleDid() {
     this.settingChanged = true;
     this.hasVisibleDid = !this.hasVisibleDid;
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+    db.settings.update(MASTER_SETTINGS_KEY, {
       filterFeedByVisible: this.hasVisibleDid,
     });
   }
 
-  async toggleNearby() {
+  toggleNearby() {
     this.settingChanged = true;
     this.isNearby = !this.isNearby;
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+    db.settings.update(MASTER_SETTINGS_KEY, {
       filterFeedByNearby: this.isNearby,
     });
   }
@@ -154,7 +154,7 @@ export default class FeedFilters extends Vue {
       this.settingChanged = true;
     }
 
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+    db.settings.update(MASTER_SETTINGS_KEY, {
       filterFeedByNearby: false,
       filterFeedByVisible: false,
     });
@@ -168,7 +168,7 @@ export default class FeedFilters extends Vue {
       this.settingChanged = true;
     }
 
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+    db.settings.update(MASTER_SETTINGS_KEY, {
       filterFeedByNearby: true,
       filterFeedByVisible: true,
     });

src/components/GiftedDialog.vue

@@ -24,7 +24,6 @@
           <fa icon="chevron-left" />
         </div>
         <input
-          id="inputGivenAmount"
           type="number"
           class="border border-r-0 border-slate-400 px-2 py-2 text-center w-20"
           v-model="amountInput"
@@ -55,7 +54,7 @@
             }"
             class="text-blue-500"
           >
-            Photo & more options ...
+            Photo & Details ...
           </router-link>
         </span>
       </div>
@@ -288,12 +287,13 @@ export default class GiftedDialog extends Vue {
     unitCode: string = "HUR",
   ) {
     try {
+      const identity = await libsUtil.getIdentity(this.activeDid);
       const result = await createAndSubmitGive(
         this.axios,
         this.apiServer,
-        this.activeDid,
+        identity,
-        giverDid as string,
+        giverDid,
-        recipientDid as string,
+        this.receiver?.did as string,
         description,
         amount,
         unitCode,

src/components/OfferDialog.vue

@@ -4,7 +4,6 @@
       <h1 class="text-xl font-bold text-center mb-4">Offer Help</h1>
       <input
         type="text"
-        data-testId="inputDescription"
         class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
         placeholder="Description, prerequisites, terms, etc."
         v-model="description"
@@ -24,7 +23,6 @@
           <fa icon="chevron-left" />
         </div>
         <input
-          data-testId="inputOfferAmount"
           type="number"
           class="w-full border border-r-0 border-slate-400 px-2 py-2 text-center"
           v-model="amountInput"
@@ -36,27 +34,18 @@
           <fa icon="chevron-right" />
         </div>
       </div>
-      <div class="mt-4 flex justify-center">
+      <div class="flex flex-row mt-2">
-        <span>
+        <span
-          <router-link
+          class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center px-2 py-2"
-            :to="{
-              name: 'offer-details',
-              query: {
-                amountInput,
-                description,
-                offererDid: activeDid,
-                projectId,
-                projectName,
-                recipientDid,
-                recipientName,
-                unitCode: amountUnitCode,
-              },
-            }"
-            class="text-blue-500"
         >
-            Conditions & more options...
+          Expiration
-          </router-link>
         </span>
+        <input
+          type="text"
+          class="w-full border border-slate-400 px-2 py-2 rounded-r"
+          :placeholder="datePlaceholder()"
+          v-model="expirationDateInput"
+        />
       </div>
       <p class="text-center mt-6 mb-2 italic">
         Sign & Send to publish to the world
@@ -80,6 +69,7 @@
 </template>
 
 <script lang="ts">
+import { DateTime } from "luxon";
 import { Vue, Component, Prop } from "vue-facing-decorator";
 
 import { NotificationIface } from "@/constants/app";
@@ -92,8 +82,7 @@ import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 export default class OfferDialog extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
-  @Prop projectId?;
+  @Prop projectId? = "";
-  @Prop projectName?;
 
   activeDid = "";
   apiServer = "";
@@ -103,15 +92,13 @@ export default class OfferDialog extends Vue {
   description = "";
   expirationDateInput = "";
   recipientDid? = "";
-  recipientName? = "";
   visible = false;
 
   libsUtil = libsUtil;
 
-  async open(recipientDid?: string, recipientName?: string) {
+  async open(recipientDid?: string) {
     try {
       this.recipientDid = recipientDid;
-      this.recipientName = recipientName;
 
       await db.open();
       const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
@@ -157,6 +144,12 @@ export default class OfferDialog extends Vue {
     )}`;
   }
 
+  datePlaceholder() {
+    return (
+      "Date, eg. " + DateTime.now().plus({ month: 1 }).toISO().slice(0, 10)
+    );
+  }
+
   cancel() {
     this.close();
     this.eraseValues();
@@ -230,10 +223,11 @@ export default class OfferDialog extends Vue {
     }
 
     try {
+      const identity = await libsUtil.getIdentity(this.activeDid);
       const result = await createAndSubmitOffer(
         this.axios,
         this.apiServer,
-        this.activeDid,
+        identity,
         description,
         amount,
         unitCode,

src/components/PhotoDialog.vue

@@ -126,6 +126,7 @@ import { Component, Vue } from "vue-facing-decorator";
 import VuePictureCropper, { cropper } from "vue-picture-cropper";
 
 import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "@/constants/app";
+import { getIdentity } from "@/libs/util";
 import { db } from "@/db/index";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
@@ -347,10 +348,10 @@ export default class PhotoDialog extends Vue {
       this.blob = (await cropper?.getBlob()) || undefined;
     }
 
-    const token = await accessToken(this.activeDid);
+    const identifier = await getIdentity(this.activeDid);
+    const token = await accessToken(identifier);
     const headers = {
       Authorization: "Bearer " + token,
-      // axios fills in Content-Type of multipart/form-data
     };
     const formData = new FormData();
     if (!this.blob) {

src/components/TopMessage.vue

@@ -1,15 +1,5 @@
 <template>
-  <div class="absolute right-5 top-3">
+  <div class="text-center text-red-500">{{ message }}</div>
-    <span class="align-center text-red-500 mr-2">{{ message }}</span>
-    <span class="ml-2">
-      <router-link
-        :to="{ name: 'help' }"
-        class="text-xs 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-1.5 py-1 rounded-md ml-1"
-      >
-        Help
-      </router-link>
-    </span>
-  </div>
 </template>
 
 <script lang="ts">

src/components/World/components/objects/landmarks.js

@@ -1,11 +1,12 @@
 import axios from "axios";
+import * as R from "ramda";
 import * as THREE from "three";
 import { GLTFLoader } from "three/addons/loaders/GLTFLoader";
 import * as SkeletonUtils from "three/addons/utils/SkeletonUtils";
 import * as TWEEN from "@tweenjs/tween.js";
-import { db } from "@/db";
+import { accountsDB, db } from "@/db";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import { getHeaders } from "@/libs/endorserServer";
+import { accessToken } from "@/libs/crypto";
 
 const ANIMATION_DURATION_SECS = 10;
 const ENDORSER_ENTITY_PREFIX = "https://endorser.ch/entity/";
@@ -18,7 +19,17 @@ export async function loadLandmarks(vue, world, scene, loop) {
     const settings = await db.settings.get(MASTER_SETTINGS_KEY);
     const activeDid = settings?.activeDid || "";
     const apiServer = settings?.apiServer;
-    const headers = await getHeaders(activeDid);
+    await accountsDB.open();
+    const accounts = await accountsDB.accounts.toArray();
+    const account = R.find((acc) => acc.did === activeDid, accounts);
+    const headers = {
+      "Content-Type": "application/json",
+    };
+    const identity = JSON.parse(account?.identity || "null");
+    if (identity) {
+      const token = await accessToken(identity);
+      headers["Authorization"] = "Bearer " + token;
+    }
 
     const url = apiServer + "/api/v2/report/claims?claimType=GiveAction";
     const resp = await axios.get(url, { headers: headers });

src/constants/app.ts

@@ -4,10 +4,6 @@
  * See also ../libs/veramo/setup.ts
  */
 export enum AppString {
-  // This is used in titles and verbiage inside the app.
-  // There is also an app name without spaces, for packaging in the package.json file used in the manifest.
-  APP_NAME = "Time Safari",
-
   PROD_ENDORSER_API_SERVER = "https://api.endorser.ch",
   TEST_ENDORSER_API_SERVER = "https://test-api.endorser.ch",
   LOCAL_ENDORSER_API_SERVER = "http://localhost:3000",
@@ -36,9 +32,6 @@ export const DEFAULT_PUSH_SERVER =
 
 export const IMAGE_TYPE_PROFILE = "profile";
 
-export const PASSKEYS_ENABLED =
-  !!import.meta.env.VITE_PASSKEYS_ENABLED || false;
-
 /**
  * The possible values for "group" and "type" are in App.vue.
  * From the notiwind package
@@ -48,10 +41,8 @@ export interface NotificationIface {
   type: string; // "toast" | "info" | "success" | "warning" | "danger"
   title: string;
   text?: string;
-  noText?: string;
   onCancel?: (stopAsking: boolean) => Promise<void>;
   onNo?: (stopAsking: boolean) => Promise<void>;
   onYes?: () => Promise<void>;
   promptToStopAsking?: boolean;
-  yesText?: string;
 }

src/db/index.ts

@@ -51,8 +51,8 @@ db.version(2).stores({
 db.version(3).stores(TempSchema);
 
 // Event handler to initialize the non-sensitive database with default settings
-db.on("populate", async () => {
+db.on("populate", () => {
-  await db.settings.add({
+  db.settings.add({
     id: MASTER_SETTINGS_KEY,
     apiServer: DEFAULT_ENDORSER_API_SERVER,
   });

src/db/tables/contacts.ts

@@ -4,8 +4,8 @@ export interface Contact {
   nextPubKeyHashB64?: string; // base64-encoded SHA256 hash of next public key
   profileImageUrl?: string;
   publicKeyBase64?: string;
-  seesMe?: boolean; // cached value of the server setting
+  seesMe?: boolean;
-  registered?: boolean; // cached value of the server setting
+  registered?: boolean;
 }
 
 export const ContactSchema = {

src/db/tables/settings.ts

@@ -26,7 +26,6 @@ export type Settings = {
   lastName?: string; // deprecated - put all names in firstName
   lastNotifiedClaimId?: string;
   lastViewedClaimId?: string;
-  passkeyExpirationMinutes?: number; // passkey access token time-to-live in minutes
   profileImageUrl?: string;
   reminderTime?: number; // Time in milliseconds since UNIX epoch for reminders
   reminderOn?: boolean; // Toggle to enable or disable reminders
@@ -38,7 +37,6 @@ export type Settings = {
   }>;
 
   showContactGivesInline?: boolean; // Display contact inline or not
-  showGeneralAdvanced?: boolean; // Show advanced features which don't have their own flag
   showShortcutBvc?: boolean; // Show shortcut for Bountiful Voluntaryist Community actions
   vapid?: string; // VAPID (Voluntary Application Server Identification) field for web push
   warnIfProdServer?: boolean; // Warn if using a production server
@@ -47,7 +45,7 @@ export type Settings = {
 };
 
 export function isAnyFeedFilterOn(settings: Settings): boolean {
-  return !!(settings?.filterFeedByNearby || settings?.filterFeedByVisible);
+  return !!(settings.filterFeedByNearby || settings.filterFeedByVisible);
 }
 
 /**
@@ -61,5 +59,3 @@ export const SettingsSchema = {
  * Constants.
  */
 export const MASTER_SETTINGS_KEY = 1;
-
-export const DEFAULT_PASSKEY_EXPIRATION_MINUTES = 15;

src/db/tables/temp.ts

@@ -2,8 +2,7 @@
 
 export type Temp = {
   id: string;
-  blob?: Blob; // deprecated because webkit (Safari) does not support Blob
+  blob?: Blob;
-  blobB64?: string; // base64-encoded blob
 };
 
 /**

src/libs/crypto/index.ts

@@ -3,13 +3,11 @@ import { getRandomBytesSync } from "ethereum-cryptography/random";
 import { entropyToMnemonic } from "ethereum-cryptography/bip39";
 import { wordlist } from "ethereum-cryptography/bip39/wordlists/english";
 import { HDNode } from "@ethersproject/hdnode";
+import * as didJwt from "did-jwt";
+import * as u8a from "uint8arrays";
 
-import {
+import { ENDORSER_JWT_URL_LOCATION } from "@/libs/endorserServer";
-  createEndorserJwtForDid,
-  ENDORSER_JWT_URL_LOCATION,
-} from "@/libs/endorserServer";
 import { DEFAULT_DID_PROVIDER_NAME } from "../veramo/setup";
-import { decodeEndorserJwt } from "@/libs/crypto/vc";
 
 export const DEFAULT_ROOT_DERIVATION_PATH = "m/84737769'/0'/0'/0'";
 
@@ -85,21 +83,82 @@ export const generateSeed = (): string => {
 };
 
 /**
- * Retrieve an access token, or "" if no DID is provided.
+ * Retreive an access token
  *
+ * @param {IIdentifier} identifier
  * @return {*}
  */
-export const accessToken = async (did?: string) => {
+export const accessToken = async (identifier: IIdentifier) => {
-  if (did) {
+  const did: string = identifier.did;
+  const privateKeyHex: string = identifier.keys[0].privateKeyHex as string;
+
+  const signer = SimpleSigner(privateKeyHex);
+
   const nowEpoch = Math.floor(Date.now() / 1000);
   const endEpoch = nowEpoch + 60; // add one minute
+
   const tokenPayload = { exp: endEpoch, iat: nowEpoch, iss: did };
-    return createEndorserJwtForDid(did, tokenPayload);
+  const alg = undefined; // defaults to 'ES256K', more standardized but harder to verify vs ES256K-R
-  } else {
+  const jwt: string = await didJwt.createJWT(tokenPayload, {
-    return "";
+    alg,
-  }
+    issuer: did,
+    signer,
+  });
+  return jwt;
 };
 
+export const sign = async (privateKeyHex: string) => {
+  const signer = SimpleSigner(privateKeyHex);
+
+  return signer;
+};
+
+/**
+ *  Copied out of did-jwt since it's deprecated in that library.
+ *
+ *  The SimpleSigner returns a configured function for signing data.
+ *
+ *  @example
+ *  const signer = SimpleSigner(import.meta.env.PRIVATE_KEY)
+ *  signer(data, (err, signature) => {
+ *    ...
+ *  })
+ *
+ *  @param    {String}         hexPrivateKey    a hex encoded private key
+ *  @return   {Function}                     a configured signer function
+ */
+export function SimpleSigner(hexPrivateKey: string): didJwt.Signer {
+  const signer = didJwt.ES256KSigner(didJwt.hexToBytes(hexPrivateKey), true);
+  return async (data) => {
+    const signature = (await signer(data)) as string;
+    return fromJose(signature);
+  };
+}
+
+// from did-jwt/util; see SimpleSigner above
+export function fromJose(signature: string): {
+  r: string;
+  s: string;
+  recoveryParam?: number;
+} {
+  const signatureBytes: Uint8Array = didJwt.base64ToBytes(signature);
+  if (signatureBytes.length < 64 || signatureBytes.length > 65) {
+    throw new TypeError(
+      `Wrong size for signature. Expected 64 or 65 bytes, but got ${signatureBytes.length}`,
+    );
+  }
+  const r = bytesToHex(signatureBytes.slice(0, 32));
+  const s = bytesToHex(signatureBytes.slice(32, 64));
+  const recoveryParam =
+    signatureBytes.length === 65 ? signatureBytes[64] : undefined;
+  return { r, s, recoveryParam };
+}
+
+// from did-jwt/util; see SimpleSigner above
+export function bytesToHex(b: Uint8Array): string {
+  return u8a.toString(b, "base16");
+}
+
 /**
  @return results of uportJwtPayload:
  { iat: number, iss: string (DID), own: { name, publicEncKey (base64-encoded key) } }
@@ -116,7 +175,7 @@ export const getContactPayloadFromJwtUrl = (jwtUrlText: string) => {
   }
 
   // JWT format: { header, payload, signature, data }
-  const jwt = decodeEndorserJwt(jwtText);
+  const jwt = didJwt.decodeJWT(jwtText);
 
   return jwt.payload;
 };

src/libs/crypto/passkeyHelpers.ts

@@ -55,8 +55,8 @@ export function isoUint8ArrayConcat(arrays: Uint8Array[]): Uint8Array {
 }
 
 // from https://github.com/MasterKale/SimpleWebAuthn/blob/master/packages/server/src/helpers/iso/isoCrypto/getWebCrypto.ts
-let webCrypto: { subtle: SubtleCrypto } | undefined = undefined;
+let webCrypto: unknown = undefined;
-export function getWebCrypto(): Promise<{ subtle: SubtleCrypto }> {
+export function getWebCrypto() {
   /**
    * Hello there! If you came here wondering why this method is asynchronous when use of
    * `globalThis.crypto` is not, it's to minimize a bunch of refactor related to making this
@@ -67,8 +67,7 @@ export function getWebCrypto(): Promise<{ subtle: SubtleCrypto }> {
    * TODO: If it's after February 2025 when you read this then consider whether it still makes sense
    * to keep this method asynchronous.
    */
-  const toResolve: Promise<{ subtle: SubtleCrypto }> = new Promise(
+  const toResolve = new Promise((resolve, reject) => {
-    (resolve, reject) => {
     if (webCrypto) {
       return resolve(webCrypto);
     }
@@ -76,19 +75,17 @@ export function getWebCrypto(): Promise<{ subtle: SubtleCrypto }> {
      * Naively attempt to access Crypto as a global object, which popular ESM-centric run-times
      * support (and Node v20+)
      */
-      const _globalThisCrypto =
+    const _globalThisCrypto = _getWebCryptoInternals.stubThisGlobalThisCrypto();
-        _getWebCryptoInternals.stubThisGlobalThisCrypto();
     if (_globalThisCrypto) {
       webCrypto = _globalThisCrypto;
       return resolve(webCrypto);
     }
     // We tried to access it both in Node and globally, so bail out
     return reject(new MissingWebCrypto());
-    },
+  });
-  );
   return toResolve;
 }
-class MissingWebCrypto extends Error {
+export class MissingWebCrypto extends Error {
   constructor() {
     const message = "An instance of the Crypto API could not be located";
     super(message);
@@ -96,10 +93,10 @@ class MissingWebCrypto extends Error {
   }
 }
 // Make it possible to stub return values during testing
-const _getWebCryptoInternals = {
+export const _getWebCryptoInternals = {
   stubThisGlobalThisCrypto: () => globalThis.crypto,
   // Make it possible to reset the `webCrypto` at the top of the file
-  setCachedCrypto: (newCrypto: { subtle: SubtleCrypto }) => {
+  setCachedCrypto: (newCrypto: unknown) => {
     webCrypto = newCrypto;
   },
 };

src/libs/crypto/vc/didPeer.ts

@@ -1,96 +0,0 @@
-import { Buffer } from "buffer/";
-import { decode as cborDecode } from "cbor-x";
-import { bytesToMultibase, multibaseToBytes } from "did-jwt";
-
-import { getWebCrypto } from "@/libs/crypto/vc/passkeyHelpers";
-
-export const PEER_DID_PREFIX = "did:peer:";
-const PEER_DID_MULTIBASE_PREFIX = PEER_DID_PREFIX + "0";
-
-/**
- *
- *
- * similar code is in crowd-funder-for-time-pwa libs/crypto/vc/passkeyDidPeer.ts verifyJwtWebCrypto
- *
- * @returns {Promise<boolean>}
- */
-export async function verifyPeerSignature(
-  payloadBytes: Buffer,
-  issuerDid: string,
-  signatureBytes: Uint8Array,
-): Promise<boolean> {
-  const publicKeyBytes = peerDidToPublicKeyBytes(issuerDid);
-
-  const WebCrypto = await getWebCrypto();
-  const verifyAlgorithm = {
-    name: "ECDSA",
-    hash: { name: "SHA-256" },
-  };
-  const publicKeyJwk = cborToKeys(publicKeyBytes).publicKeyJwk;
-  const keyAlgorithm = {
-    name: "ECDSA",
-    namedCurve: publicKeyJwk.crv,
-  };
-  const publicKeyCryptoKey = await WebCrypto.subtle.importKey(
-    "jwk",
-    publicKeyJwk,
-    keyAlgorithm,
-    false,
-    ["verify"],
-  );
-  const verified = await WebCrypto.subtle.verify(
-    verifyAlgorithm,
-    publicKeyCryptoKey,
-    signatureBytes,
-    payloadBytes,
-  );
-  return verified;
-}
-
-export function cborToKeys(publicKeyBytes: Uint8Array) {
-  const jwkObj = cborDecode(publicKeyBytes);
-  if (
-    jwkObj[1] != 2 || // kty "EC"
-    jwkObj[3] != -7 || // alg "ES256"
-    jwkObj[-1] != 1 || // crv "P-256"
-    jwkObj[-2].length != 32 || // x
-    jwkObj[-3].length != 32 // y
-  ) {
-    throw new Error("Unable to extract key.");
-  }
-  const publicKeyJwk = {
-    alg: "ES256",
-    crv: "P-256",
-    kty: "EC",
-    x: arrayToBase64Url(jwkObj[-2]),
-    y: arrayToBase64Url(jwkObj[-3]),
-  };
-  const publicKeyBuffer = Buffer.concat([
-    Buffer.from(jwkObj[-2]),
-    Buffer.from(jwkObj[-3]),
-  ]);
-  return { publicKeyJwk, publicKeyBuffer };
-}
-
-export function toBase64Url(anythingB64: string) {
-  return anythingB64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
-}
-
-export function arrayToBase64Url(anything: Uint8Array) {
-  return toBase64Url(Buffer.from(anything).toString("base64"));
-}
-
-export function peerDidToPublicKeyBytes(did: string) {
-  return multibaseToBytes(did.substring(PEER_DID_MULTIBASE_PREFIX.length));
-}
-
-export function createPeerDid(publicKeyBytes: Uint8Array) {
-  // https://github.com/decentralized-identity/veramo/blob/next/packages/did-provider-peer/src/peer-did-provider.ts#L67
-  //const provider = new PeerDIDProvider({ defaultKms: LOCAL_KMS_NAME });
-  const methodSpecificId = bytesToMultibase(
-    publicKeyBytes,
-    "base58btc",
-    "p256-pub",
-  );
-  return PEER_DID_MULTIBASE_PREFIX + methodSpecificId;
-}

src/libs/crypto/vc/index.ts

@@ -1,112 +0,0 @@
-/**
- * Verifiable Credential & DID functions, specifically for EndorserSearch.org tools
- *
- * The goal is to make this folder similar across projects, then move it to a library.
- * Other projects: endorser-ch, image-api
- *
- */
-
-import * as didJwt from "did-jwt";
-import { JWTDecoded } from "did-jwt/lib/JWT";
-import { IIdentifier } from "@veramo/core";
-import * as u8a from "uint8arrays";
-
-import { createDidPeerJwt } from "@/libs/crypto/vc/passkeyDidPeer";
-
-export const ETHR_DID_PREFIX = "did:ethr:";
-
-/**
- * Meta info about a key
- */
-export interface KeyMeta {
-  /**
-   * Decentralized ID for the key
-   */
-  did: string;
-  /**
-   * Stringified IIDentifier object from Veramo
-   */
-  identity?: string;
-  /**
-   * The Webauthn credential ID in hex, if this is from a passkey
-   */
-  passkeyCredIdHex?: string;
-}
-
-/**
- * Tell whether a key is from a passkey
- * @param keyMeta contains info about the key, whose passkeyCredIdHex determines if the key is from a passkey
- */
-export function isFromPasskey(keyMeta?: KeyMeta): boolean {
-  return !!keyMeta?.passkeyCredIdHex;
-}
-
-export async function createEndorserJwtForKey(
-  account: KeyMeta,
-  payload: object,
-) {
-  if (account?.identity) {
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const identity: IIdentifier = JSON.parse(account.identity!);
-    const privateKeyHex = identity.keys[0].privateKeyHex;
-    const signer = await SimpleSigner(privateKeyHex as string);
-    return didJwt.createJWT(payload, {
-      issuer: account.did,
-      signer: signer,
-    });
-  } else if (account?.passkeyCredIdHex) {
-    return createDidPeerJwt(account.did, account.passkeyCredIdHex, payload);
-  } else {
-    throw new Error("No identity data found to sign for DID " + account.did);
-  }
-}
-
-/**
- *  Copied out of did-jwt since it's deprecated in that library.
- *
- *  The SimpleSigner returns a configured function for signing data.
- *
- *  @example
- *  const signer = SimpleSigner(privateKeyHexString)
- *  signer(data, (err, signature) => {
- *    ...
- *  })
- *
- *  @param    {String}         hexPrivateKey    a hex encoded private key
- *  @return   {Function}                     a configured signer function
- */
-function SimpleSigner(hexPrivateKey: string): didJwt.Signer {
-  const signer = didJwt.ES256KSigner(didJwt.hexToBytes(hexPrivateKey), true);
-  return async (data) => {
-    const signature = (await signer(data)) as string;
-    return fromJose(signature);
-  };
-}
-
-// from did-jwt/util; see SimpleSigner above
-function fromJose(signature: string): {
-  r: string;
-  s: string;
-  recoveryParam?: number;
-} {
-  const signatureBytes: Uint8Array = didJwt.base64ToBytes(signature);
-  if (signatureBytes.length < 64 || signatureBytes.length > 65) {
-    throw new TypeError(
-      `Wrong size for signature. Expected 64 or 65 bytes, but got ${signatureBytes.length}`,
-    );
-  }
-  const r = bytesToHex(signatureBytes.slice(0, 32));
-  const s = bytesToHex(signatureBytes.slice(32, 64));
-  const recoveryParam =
-    signatureBytes.length === 65 ? signatureBytes[64] : undefined;
-  return { r, s, recoveryParam };
-}
-
-// from did-jwt/util; see SimpleSigner above
-function bytesToHex(b: Uint8Array): string {
-  return u8a.toString(b, "base16");
-}
-
-export function decodeEndorserJwt(jwt: string): JWTDecoded {
-  return didJwt.decodeJWT(jwt);
-}

src/libs/didPeer.ts

@@ -1,5 +1,7 @@
+import asn1 from "asn1-ber";
 import { Buffer } from "buffer/";
-import { JWTPayload } from "did-jwt";
+import { decode as cborDecode } from "cbor-x";
+import { bytesToMultibase, JWTPayload, multibaseToBytes } from "did-jwt";
 import { DIDResolutionResult } from "did-resolver";
 import { sha256 } from "ethereum-cryptography/sha256.js";
 import {
@@ -19,15 +21,10 @@ import {
   PublicKeyCredentialRequestOptionsJSON,
 } from "@simplewebauthn/types";
 
-import { AppString } from "@/constants/app";
+import { getWebCrypto, unwrapEC2Signature } from "@/libs/crypto/passkeyHelpers";
-import { unwrapEC2Signature } from "@/libs/crypto/vc/passkeyHelpers";
-import {
-  arrayToBase64Url,
-  cborToKeys,
-  peerDidToPublicKeyBytes,
-  verifyPeerSignature,
-} from "@/libs/crypto/vc/didPeer";
 
+const PEER_DID_PREFIX = "did:peer:";
+const PEER_DID_MULTIBASE_PREFIX = PEER_DID_PREFIX + "0";
 export interface JWK {
   kty: string;
   crv: string;
@@ -35,12 +32,20 @@ export interface JWK {
   y: string;
 }
 
+function toBase64Url(anythingB64: string) {
+  return anythingB64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
+}
+
+function arrayToBase64Url(anything: Uint8Array) {
+  return toBase64Url(Buffer.from(anything).toString("base64"));
+}
+
 export async function registerCredential(passkeyName?: string) {
   const options: PublicKeyCredentialCreationOptionsJSON =
     await generateRegistrationOptions({
-      rpName: AppString.APP_NAME,
+      rpName: "Time Safari",
       rpID: window.location.hostname,
-      userName: passkeyName || AppString.APP_NAME + " User",
+      userName: passkeyName || "Time Safari User",
       // Don't prompt users for additional information about the authenticator
       // (Recommended for smoother UX)
       attestationType: "none",
@@ -69,7 +74,7 @@ export async function registerCredential(passkeyName?: string) {
 
   const credIdBase64Url = verification.registrationInfo?.credentialID as string;
   if (attResp.rawId !== credIdBase64Url) {
-    console.log("Warning! The raw ID does not match the credential ID.");
+    console.log("Warning! The raw ID does not match the credential ID.")
   }
   const credIdHex = Buffer.from(
     base64URLStringToArrayBuffer(credIdBase64Url),
@@ -87,6 +92,21 @@ export async function registerCredential(passkeyName?: string) {
   };
 }
 
+export function createPeerDid(publicKeyBytes: Uint8Array) {
+  // https://github.com/decentralized-identity/veramo/blob/next/packages/did-provider-peer/src/peer-did-provider.ts#L67
+  //const provider = new PeerDIDProvider({ defaultKms: LOCAL_KMS_NAME });
+  const methodSpecificId = bytesToMultibase(
+    publicKeyBytes,
+    "base58btc",
+    "p256-pub",
+  );
+  return PEER_DID_MULTIBASE_PREFIX + methodSpecificId;
+}
+
+function peerDidToPublicKeyBytes(did: string) {
+  return multibaseToBytes(did.substring(PEER_DID_MULTIBASE_PREFIX.length));
+}
+
 export class PeerSetup {
   public authenticatorData?: ArrayBuffer;
   public challenge?: Uint8Array;
@@ -97,17 +117,13 @@ export class PeerSetup {
     issuerDid: string,
     payload: object,
     credIdHex: string,
-    expMinutes: number = 1,
   ) {
     const credentialId = arrayBufferToBase64URLString(
       Buffer.from(credIdHex, "hex").buffer,
     );
-    const issuedAt = Math.floor(Date.now() / 1000);
-    const expiryTime = Math.floor(Date.now() / 1000) + expMinutes * 60; // some minutes from now
     const fullPayload = {
       ...payload,
-      exp: expiryTime,
+      iat: Math.floor(Date.now() / 1000),
-      iat: issuedAt,
       iss: issuerDid,
     };
     this.challenge = new Uint8Array(Buffer.from(JSON.stringify(fullPayload)));
@@ -143,8 +159,7 @@ export class PeerSetup {
     const dataInJwt = {
       AuthenticationDataB64URL: authenticatorDataBase64Url,
       ClientDataJSONB64URL: this.clientDataJsonBase64Url,
-      exp: expiryTime,
+      iat: Math.floor(Date.now() / 1000),
-      iat: issuedAt,
       iss: issuerDid,
     };
     const dataInJwtString = JSON.stringify(dataInJwt);
@@ -163,14 +178,10 @@ export class PeerSetup {
     issuerDid: string,
     payload: object,
     credIdHex: string,
-    expMinutes: number = 1,
   ) {
-    const issuedAt = Math.floor(Date.now() / 1000);
-    const expiryTime = Math.floor(Date.now() / 1000) + expMinutes * 60; // some minutes from now
     const fullPayload = {
       ...payload,
-      exp: expiryTime,
+      iat: Math.floor(Date.now() / 1000),
-      iat: issuedAt,
       iss: issuerDid,
     };
     const dataToSignString = JSON.stringify(fullPayload);
@@ -184,12 +195,12 @@ export class PeerSetup {
         allowCredentials: [
           {
             id: credentialId,
-            type: "public-key" as const,
+            type: "public-key",
           },
         ],
         challenge: this.challenge.buffer,
         rpID: window.location.hostname,
-        userVerification: "preferred" as const,
+        userVerification: "preferred",
       },
     };
 
@@ -198,7 +209,7 @@ export class PeerSetup {
 
     this.authenticatorData = credential?.response.authenticatorData;
     const authenticatorDataBase64Url = arrayBufferToBase64URLString(
-      this.authenticatorData as ArrayBuffer,
+      this.authenticatorData,
     );
 
     this.clientDataJsonBase64Url = arrayBufferToBase64URLString(
@@ -216,8 +227,7 @@ export class PeerSetup {
     const dataInJwt = {
       AuthenticationDataB64URL: authenticatorDataBase64Url,
       ClientDataJSONB64URL: this.clientDataJsonBase64Url,
-      exp: expiryTime,
+      iat: Math.floor(Date.now() / 1000),
-      iat: issuedAt,
       iss: issuerDid,
     };
     const dataInJwtString = JSON.stringify(dataInJwt);
@@ -227,9 +237,8 @@ export class PeerSetup {
       .replace(/\//g, "_")
       .replace(/=+$/, "");
 
-    const origSignature = Buffer.from(credential?.response.signature).toString(
+    const origSignature = Buffer.from(credential?.response.signature)
-      "base64",
+      .toString("base64")
-    );
     this.signature = origSignature
       .replace(/\+/g, "-")
       .replace(/\//g, "_")
@@ -239,9 +248,6 @@ export class PeerSetup {
     return jwt;
   }
 
-  // To use this, add the asn1-ber library and add this import:
-  // import asn1 from "asn1-ber";
-  //
   // return a low-level signing function, similar to createJWS approach
   // async webAuthnES256KSigner(credentialID: string) {
   //   return async (data: string | Uint8Array) => {
@@ -298,16 +304,6 @@ export class PeerSetup {
   // }
 }
 
-export async function createDidPeerJwt(
-  did: string,
-  credIdHex: string,
-  payload: object,
-): Promise<string> {
-  const peerSetup = new PeerSetup();
-  const jwt = await peerSetup.createJwtNavigator(did, payload, credIdHex);
-  return jwt;
-}
-
 // I'd love to use this but it doesn't verify.
 // Requires:
 // npm install @noble/curves
@@ -380,7 +376,6 @@ export async function verifyJwtSimplewebauthn(
   return verification.verified;
 }
 
-// similar code is in endorser-ch util-crypto.ts verifyPeerSignature
 export async function verifyJwtWebCrypto(
   credId: Base64URLString,
   issuerDid: string,
@@ -399,10 +394,35 @@ export async function verifyJwtWebCrypto(
 
   // Construct the preimage
   const preimage = Buffer.concat([authDataFromBase, hash]);
-  return verifyPeerSignature(preimage, issuerDid, finalSigBuffer);
+
+  const publicKeyBytes = peerDidToPublicKeyBytes(issuerDid);
+
+  const WebCrypto = await getWebCrypto();
+  const verifyAlgorithm = {
+    name: "ECDSA",
+    hash: { name: "SHA-256" },
+  };
+  const publicKeyJwk = cborToKeys(publicKeyBytes).publicKeyJwk;
+  const keyAlgorithm = {
+    name: "ECDSA",
+    namedCurve: publicKeyJwk.crv,
+  };
+  const publicKeyCryptoKey = await WebCrypto.subtle.importKey(
+    "jwk",
+    publicKeyJwk,
+    keyAlgorithm,
+    false,
+    ["verify"],
+  );
+  const verified = await WebCrypto.subtle.verify(
+    verifyAlgorithm,
+    publicKeyCryptoKey,
+    finalSigBuffer,
+    preimage,
+  );
+  return verified;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 async function peerDidToDidDocument(did: string): Promise<DIDResolutionResult> {
   if (!did.startsWith("did:peer:0z")) {
     throw new Error(
@@ -411,21 +431,13 @@ async function peerDidToDidDocument(did: string): Promise<DIDResolutionResult> {
   }
   // this is basically hard-coded from https://www.w3.org/TR/did-core/#example-various-verification-method-types
   // (another reference is the @aviarytech/did-peer resolver)
-
-  /**
-   * Looks like JsonWebKey2020 isn't too difficult:
-   * - change context security/suites link to jws-2020/v1
-   * - change publicKeyMultibase to publicKeyJwk generated with cborToKeys
-   * - change type to JsonWebKey2020
-   */
-
   const id = did.split(":")[2];
   const multibase = id.slice(1);
   const encnumbasis = multibase.slice(1);
   const didDocument = {
     "@context": [
       "https://www.w3.org/ns/did/v1",
-      "https://w3id.org/security/suites/secp256k1-2019/v1",
+      "https://w3id.org/security/suites/jws-2020/v1",
     ],
     assertionMethod: [did + "#" + encnumbasis],
     authentication: [did + "#" + encnumbasis],
@@ -451,15 +463,12 @@ async function peerDidToDidDocument(did: string): Promise<DIDResolutionResult> {
 }
 
 // convert COSE public key to PEM format
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function COSEtoPEM(cose: Buffer) {
   // const alg = cose.get(3); // Algorithm
   const x = cose[-2]; // x-coordinate
   const y = cose[-3]; // y-coordinate
 
   // Ensure the coordinates are in the correct format
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-expect-error because it complains about the type of x and y
   const pubKeyBuffer = Buffer.concat([Buffer.from([0x04]), x, y]);
 
   // Convert to PEM format
@@ -470,7 +479,6 @@ ${pubKeyBuffer.toString("base64")}
   return pem;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function base64urlDecode(input: string) {
   input = input.replace(/-/g, "+").replace(/_/g, "/");
   const pad = input.length % 4 === 0 ? "" : "====".slice(input.length % 4);
@@ -482,14 +490,13 @@ function base64urlDecode(input: string) {
   return bytes.buffer;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function base64urlEncode(buffer: ArrayBuffer) {
   const str = String.fromCharCode(...new Uint8Array(buffer));
   return btoa(str).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
 
 // from @simplewebauthn/browser
-function arrayBufferToBase64URLString(buffer: ArrayBuffer) {
+function arrayBufferToBase64URLString(buffer) {
   const bytes = new Uint8Array(buffer);
   let str = "";
   for (const charCode of bytes) {
@@ -513,7 +520,31 @@ function base64URLStringToArrayBuffer(base64URLString: string) {
   return buffer;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function cborToKeys(publicKeyBytes: Uint8Array) {
+  const jwkObj = cborDecode(publicKeyBytes);
+  if (
+    jwkObj[1] != 2 || // kty "EC"
+    jwkObj[3] != -7 || // alg "ES256"
+    jwkObj[-1] != 1 || // crv "P-256"
+    jwkObj[-2].length != 32 || // x
+    jwkObj[-3].length != 32 // y
+  ) {
+    throw new Error("Unable to extract key.");
+  }
+  const publicKeyJwk = {
+    alg: "ES256",
+    crv: "P-256",
+    kty: "EC",
+    x: arrayToBase64Url(jwkObj[-2]),
+    y: arrayToBase64Url(jwkObj[-3]),
+  };
+  const publicKeyBuffer = Buffer.concat([
+    Buffer.from(jwkObj[-2]),
+    Buffer.from(jwkObj[-3]),
+  ]);
+  return { publicKeyJwk, publicKeyBuffer };
+}
+
 async function pemToCryptoKey(pem: string) {
   const binaryDerString = atob(
     pem

src/libs/endorserServer.ts

@@ -1,13 +1,19 @@
-import { Axios, AxiosRequestConfig, AxiosResponse } from "axios";
+import {
+  Axios,
+  AxiosRequestConfig,
+  AxiosResponse,
+  RawAxiosRequestHeaders,
+} from "axios";
+import * as didJwt from "did-jwt";
 import { LRUCache } from "lru-cache";
 import * as R from "ramda";
+import { IIdentifier } from "@veramo/core";
 
 import { DEFAULT_IMAGE_API_SERVER } from "@/constants/app";
 import { Contact } from "@/db/tables/contacts";
-import { accessToken } from "@/libs/crypto";
+import { accessToken, SimpleSigner } from "@/libs/crypto";
 import { NonsensitiveDexie } from "@/db/index";
-import { getAccount, getPasskeyExpirationSeconds } from "@/libs/util";
+import { getIdentity } from "@/libs/util";
-import { createEndorserJwtForKey, KeyMeta } from "@/libs/crypto/vc";
 
 export const SCHEMA_ORG_CONTEXT = "https://schema.org";
 // the object in RegisterAction claims
@@ -48,32 +54,29 @@ export interface ClaimResult {
 }
 
 export interface GenericVerifiableCredential {
-  "@context"?: string; // optional when embedded, eg. in an Agree
+  "@context": string;
   "@type": string;
   [key: string]: any; // eslint-disable-line @typescript-eslint/no-explicit-any
 }
 
-export interface GenericCredWrapper<T extends GenericVerifiableCredential> {
+export interface GenericCredWrapper extends GenericVerifiableCredential {
-  "@context": string;
-  "@type": string;
-  claim: T;
-  claimType?: string;
   handleId: string;
   id: string;
   issuedAt: string;
   issuer: string;
-  publicUrls?: Record<string, string>; // only for IDs that want to be public
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  claim: Record<string, any>;
+  claimType?: string;
 }
-export const BLANK_GENERIC_SERVER_RECORD: GenericCredWrapper<GenericVerifiableCredential> =
+export const BLANK_GENERIC_SERVER_RECORD: GenericCredWrapper = {
-  {
   "@context": SCHEMA_ORG_CONTEXT,
   "@type": "",
-    claim: { "@type": "" },
+  claim: {},
   handleId: "",
   id: "",
   issuedAt: "",
   issuer: "",
-  };
+};
 
 // a summary record; the VC is found the fullClaim field
 export interface GiveSummaryRecord {
@@ -85,7 +88,6 @@ export interface GiveSummaryRecord {
   fulfillsPlanHandleId: string;
   handleId: string;
   issuedAt: string;
-  issuerDid: string;
   jwtId: string;
   recipientDid: string;
   unit: string;
@@ -99,7 +101,6 @@ export interface OfferSummaryRecord {
   fullClaim: OfferVerifiableCredential;
   fulfillsPlanHandleId: string;
   handleId: string;
-  issuerDid: string;
   jwtId: string;
   nonAmountGivenConfirmed: number;
   objectDescription: string;
@@ -128,7 +129,7 @@ export interface PlanSummaryRecord {
 
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id4
-export interface GiveVerifiableCredential extends GenericVerifiableCredential {
+export interface GiveVerifiableCredential {
   "@context"?: string; // optional when embedded, eg. in an Agree
   "@type": "GiveAction";
   agent?: { identifier: string };
@@ -142,13 +143,13 @@ export interface GiveVerifiableCredential extends GenericVerifiableCredential {
 
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id8
-export interface OfferVerifiableCredential extends GenericVerifiableCredential {
+export interface OfferVerifiableCredential {
-  "@context"?: string; // optional when embedded... though it doesn't make sense to agree to an offer
+  "@context"?: string; // optional when embedded, eg. in an Agree
   "@type": "Offer";
-  description?: string; // conditions for the offer
+  description?: string;
   includesObject?: { amountOfThisGood: number; unitCode: string };
   itemOffered?: {
-    description?: string; // description of the item
+    description?: string;
     isPartOf?: { identifier?: string; lastClaimId?: string; "@type"?: string };
   };
   offeredBy?: { identifier: string };
@@ -158,7 +159,7 @@ export interface OfferVerifiableCredential extends GenericVerifiableCredential {
 
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id7
-export interface PlanVerifiableCredential extends GenericVerifiableCredential {
+export interface PlanVerifiableCredential {
   "@context": "https://schema.org";
   "@type": "PlanAction";
   name: string;
@@ -196,7 +197,7 @@ export interface PlanData {
    */
   issuerDid: string;
   /**
-   * The identifier of the project -- different from jwtId, needs to be fixed
+   * The Identier of the project -- different from jwtId, needs to be fixed
    **/
   rowid?: string;
 }
@@ -270,6 +271,10 @@ export type CreateAndSubmitClaimResult = SuccessResult | ErrorResult;
 // See https://github.com/trentlarson/endorser-ch/blob/0cb626f803028e7d9c67f095858a9fc8542e3dbd/server/api/services/util.js#L6
 const HIDDEN_DID = "did:none:HIDDEN";
 
+const planCache: LRUCache<string, PlanSummaryRecord> = new LRUCache({
+  max: 500,
+});
+
 export function isDid(did: string) {
   return did.startsWith("did:");
 }
@@ -448,79 +453,28 @@ export function didInfo(
   return didInfoForContact(did, activeDid, contact, allMyDids).displayName;
 }
 
-let passkeyAccessToken: string = "";
+async function getHeaders(identity: IIdentifier | null) {
-let passkeyTokenExpirationEpochSeconds: number = 0;
+  const headers: RawAxiosRequestHeaders = {
-
-export function clearPasskeyToken() {
-  passkeyAccessToken = "";
-  passkeyTokenExpirationEpochSeconds = 0;
-}
-
-export function tokenExpiryTimeDescription() {
-  if (
-    !passkeyAccessToken ||
-    passkeyTokenExpirationEpochSeconds < new Date().getTime() / 1000
-  ) {
-    return "Token has expired";
-  } else {
-    return (
-      "Token expires at " +
-      new Date(passkeyTokenExpirationEpochSeconds * 1000).toLocaleString()
-    );
-  }
-}
-
-/**
- * Get the headers for a request, potentially including Authorization
- */
-export async function getHeaders(did?: string) {
-  const headers: { "Content-Type": string; Authorization?: string } = {
     "Content-Type": "application/json",
   };
-  if (did) {
+  if (identity) {
-    let token;
+    const token = await accessToken(identity);
-    const account = await getAccount(did);
-    if (account?.passkeyCredIdHex) {
-      if (
-        passkeyAccessToken &&
-        passkeyTokenExpirationEpochSeconds > Date.now() / 1000
-      ) {
-        // there's an active current passkey token
-        token = passkeyAccessToken;
-      } else {
-        // there's no current passkey token or it's expired
-        token = await accessToken(did);
-
-        passkeyAccessToken = token;
-        const passkeyExpirationSeconds = await getPasskeyExpirationSeconds();
-        passkeyTokenExpirationEpochSeconds =
-          Date.now() / 1000 + passkeyExpirationSeconds;
-      }
-    } else {
-      token = await accessToken(did);
-    }
     headers["Authorization"] = "Bearer " + token;
-  } else {
-    // it's often OK to request without auth; we assume necessary checks are done earlier
   }
   return headers;
 }
 
-const planCache: LRUCache<string, PlanSummaryRecord> = new LRUCache({
-  max: 500,
-});
-
 /**
  * @param handleId nullable, in which case "undefined" will be returned
- * @param requesterDid optional, in which case no private info will be returned
+ * @param identity nullable, in which case no private info will be returned
  * @param axios
  * @param apiServer
  */
 export async function getPlanFromCache(
   handleId: string | null,
+  identity: IIdentifier | null,
   axios: Axios,
   apiServer: string,
-  requesterDid?: string,
 ): Promise<PlanSummaryRecord | undefined> {
   if (!handleId) {
     return undefined;
@@ -531,7 +485,7 @@ export async function getPlanFromCache(
       apiServer +
       "/api/v2/report/plans?handleId=" +
       encodeURIComponent(handleId);
-    const headers = await getHeaders(requesterDid);
+    const headers = await getHeaders(identity);
     try {
       const resp = await axios.get(url, { headers });
       if (resp.status === 200 && resp.data?.data?.length > 0) {
@@ -565,13 +519,19 @@ export async function setPlanInCache(
 }
 
 /**
- * Construct GiveAction VC for submission to server
+ * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
  *
- * @param lastClaimId supplied when editing a previous claim
+ * @param identity
+ * @param fromDid may be null
+ * @param toDid
+ * @param description may be null; should have this or amount
+ * @param amount may be null; should have this or description
  */
-export function hydrateGive(
+export async function createAndSubmitGive(
-  vcClaimOrig?: GiveVerifiableCredential,
+  axios: Axios,
-  fromDid?: string,
+  apiServer: string,
+  identity: IIdentifier,
+  fromDid?: string | null,
   toDid?: string,
   description?: string,
   amount?: number,
@@ -580,279 +540,91 @@ export function hydrateGive(
   fulfillsOfferHandleId?: string,
   isTrade: boolean = false,
   imageUrl?: string,
-  lastClaimId?: string,
+): Promise<CreateAndSubmitClaimResult> {
-): GiveVerifiableCredential {
+  const vcClaim: GiveVerifiableCredential = {
-  // Remember: replace values or erase if it's null
+    "@context": "https://schema.org",
-
-  const vcClaim: GiveVerifiableCredential = vcClaimOrig
-    ? R.clone(vcClaimOrig)
-    : {
-        "@context": SCHEMA_ORG_CONTEXT,
     "@type": "GiveAction",
-      };
+    recipient: toDid ? { identifier: toDid } : undefined,
-
+    agent: fromDid ? { identifier: fromDid } : undefined,
-  if (lastClaimId) {
+    description: description || undefined,
-    // this is an edit
+    object: amount
-    vcClaim.lastClaimId = lastClaimId;
-    delete vcClaim.identifier;
-  }
-
-  vcClaim.agent = fromDid ? { identifier: fromDid } : undefined;
-  vcClaim.recipient = toDid ? { identifier: toDid } : undefined;
-  vcClaim.description = description || undefined;
-  vcClaim.object =
-    amount && !isNaN(amount)
       ? { amountOfThisGood: amount, unitCode: unitCode || "HUR" }
-      : undefined;
+      : undefined,
-
+    fulfills: [{ "@type": isTrade ? "TradeAction" : "DonateAction" }],
-  // ensure fulfills is an array
+  };
-  if (!Array.isArray(vcClaim.fulfills)) {
-    vcClaim.fulfills = vcClaim.fulfills ? [vcClaim.fulfills] : [];
-  }
-  // ... and replace or add each element, ending with Trade or Donate
-  // I realize the following doesn't change any elements that are not PlanAction or Offer or Trade/Action.
-  vcClaim.fulfills = vcClaim.fulfills.filter(
-    (elem) => elem["@type"] !== "PlanAction",
-  );
   if (fulfillsProjectHandleId) {
+    vcClaim.fulfills = vcClaim.fulfills || []; // weird that it won't typecheck without this
     vcClaim.fulfills.push({
       "@type": "PlanAction",
       identifier: fulfillsProjectHandleId,
     });
   }
-  vcClaim.fulfills = vcClaim.fulfills.filter(
-    (elem) => elem["@type"] !== "Offer",
-  );
   if (fulfillsOfferHandleId) {
+    vcClaim.fulfills = vcClaim.fulfills || []; // weird that it won't typecheck without this
     vcClaim.fulfills.push({
       "@type": "Offer",
       identifier: fulfillsOfferHandleId,
     });
   }
-  // do Trade/Donate last because current endorser.ch only looks at the first for plans & offers
+  if (imageUrl) {
-  vcClaim.fulfills = vcClaim.fulfills.filter(
+    vcClaim.image = imageUrl;
-    (elem) =>
+  }
-      elem["@type"] !== "DonateAction" && elem["@type"] !== "TradeAction",
-  );
-  vcClaim.fulfills.push({ "@type": isTrade ? "TradeAction" : "DonateAction" });
-
-  vcClaim.image = imageUrl || undefined;
-
-  return vcClaim;
-}
-
-/**
- *  For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
- *
- * @param fromDid may be null
- * @param toDid
- * @param description may be null
- * @param amount may be null
- */
-export async function createAndSubmitGive(
-  axios: Axios,
-  apiServer: string,
-  issuerDid: string,
-  fromDid?: string,
-  toDid?: string,
-  description?: string,
-  amount?: number,
-  unitCode?: string,
-  fulfillsProjectHandleId?: string,
-  fulfillsOfferHandleId?: string,
-  isTrade: boolean = false,
-  imageUrl?: string,
-): Promise<CreateAndSubmitClaimResult> {
-  const vcClaim = hydrateGive(
-    undefined,
-    fromDid,
-    toDid,
-    description,
-    amount,
-    unitCode,
-    fulfillsProjectHandleId,
-    fulfillsOfferHandleId,
-    isTrade,
-    imageUrl,
-    undefined,
-  );
   return createAndSubmitClaim(
-    vcClaim as GenericVerifiableCredential,
+    vcClaim as GenericCredWrapper,
-    issuerDid,
+    identity,
     apiServer,
     axios,
   );
 }
 
-/**
- * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
- *
- * @param fromDid may be null
- * @param toDid may be null if project is provided
- * @param description may be null
- * @param amount may be null
- */
-export async function editAndSubmitGive(
-  axios: Axios,
-  apiServer: string,
-  fullClaim: GenericCredWrapper<GiveVerifiableCredential>,
-  issuerDid: string,
-  fromDid?: string,
-  toDid?: string,
-  description?: string,
-  amount?: number,
-  unitCode?: string,
-  fulfillsProjectHandleId?: string,
-  fulfillsOfferHandleId?: string,
-  isTrade: boolean = false,
-  imageUrl?: string,
-): Promise<CreateAndSubmitClaimResult> {
-  const vcClaim = hydrateGive(
-    fullClaim.claim,
-    fromDid,
-    toDid,
-    description,
-    amount,
-    unitCode,
-    fulfillsProjectHandleId,
-    fulfillsOfferHandleId,
-    isTrade,
-    imageUrl,
-    fullClaim.id,
-  );
-  return createAndSubmitClaim(
-    vcClaim as GenericVerifiableCredential,
-    issuerDid,
-    apiServer,
-    axios,
-  );
-}
-
-/**
- * Construct Offer VC for submission to server
- *
- * @param lastClaimId supplied when editing a previous claim
- */
-export function hydrateOffer(
-  vcClaimOrig?: OfferVerifiableCredential,
-  fromDid?: string,
-  toDid?: string,
-  itemDescription?: string,
-  amount?: number,
-  unitCode?: string,
-  conditionDescription?: string,
-  fulfillsProjectHandleId?: string,
-  validThrough?: string,
-  lastClaimId?: string,
-): OfferVerifiableCredential {
-  // Remember: replace values or erase if it's null
-
-  const vcClaim: OfferVerifiableCredential = vcClaimOrig
-    ? R.clone(vcClaimOrig)
-    : {
-        "@context": SCHEMA_ORG_CONTEXT,
-        "@type": "Offer",
-      };
-
-  if (lastClaimId) {
-    // this is an edit
-    vcClaim.lastClaimId = lastClaimId;
-    delete vcClaim.identifier;
-  }
-
-  vcClaim.offeredBy = fromDid ? { identifier: fromDid } : undefined;
-  vcClaim.recipient = toDid ? { identifier: toDid } : undefined;
-  vcClaim.description = conditionDescription || undefined;
-
-  vcClaim.includesObject =
-    amount && !isNaN(amount)
-      ? { amountOfThisGood: amount, unitCode: unitCode || "HUR" }
-      : undefined;
-
-  if (itemDescription || fulfillsProjectHandleId) {
-    vcClaim.itemOffered = vcClaim.itemOffered || {};
-    vcClaim.itemOffered.description = itemDescription || undefined;
-    if (fulfillsProjectHandleId) {
-      vcClaim.itemOffered.isPartOf = {
-        "@type": "PlanAction",
-        identifier: fulfillsProjectHandleId,
-      };
-    }
-  }
-  vcClaim.validThrough = validThrough || undefined;
-
-  return vcClaim;
-}
-
 /**
  * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
  *
  * @param identity
- * @param description may be null
+ * @param description may be null; should have this or amount
- * @param amount may be null
+ * @param amount may be null; should have this or description
- * @param validThrough ISO 8601 date string YYYY-MM-DD (may be null)
+ * @param expirationDate ISO 8601 date string YYYY-MM-DD (may be null)
  * @param fulfillsProjectHandleId ID of project to which this contributes (may be null)
  */
 export async function createAndSubmitOffer(
   axios: Axios,
   apiServer: string,
-  issuerDid: string,
+  identity: IIdentifier,
-  itemDescription: string,
+  description?: string,
   amount?: number,
   unitCode?: string,
-  conditionDescription?: string,
+  expirationDate?: string,
-  validThrough?: string,
   recipientDid?: string,
   fulfillsProjectHandleId?: string,
 ): Promise<CreateAndSubmitClaimResult> {
-  const vcClaim = hydrateOffer(
+  const vcClaim: OfferVerifiableCredential = {
-    undefined,
+    "@context": "https://schema.org",
-    issuerDid,
+    "@type": "Offer",
-    recipientDid,
+    offeredBy: { identifier: identity.did },
-    itemDescription,
+    validThrough: expirationDate || undefined,
-    amount,
+  };
-    unitCode,
+  if (amount) {
-    conditionDescription,
+    vcClaim.includesObject = {
-    fulfillsProjectHandleId,
+      amountOfThisGood: amount,
-    validThrough,
+      unitCode: unitCode || "HUR",
-    undefined,
+    };
-  );
+  }
+  if (description) {
+    vcClaim.itemOffered = { description };
+  }
+  if (recipientDid) {
+    vcClaim.recipient = { identifier: recipientDid };
+  }
+  if (fulfillsProjectHandleId) {
+    vcClaim.itemOffered = vcClaim.itemOffered || {};
+    vcClaim.itemOffered.isPartOf = {
+      "@type": "PlanAction",
+      identifier: fulfillsProjectHandleId,
+    };
+  }
   return createAndSubmitClaim(
-    vcClaim as OfferVerifiableCredential,
+    vcClaim as GenericCredWrapper,
-    issuerDid,
+    identity,
-    apiServer,
-    axios,
-  );
-}
-
-export async function editAndSubmitOffer(
-  axios: Axios,
-  apiServer: string,
-  fullClaim: GenericCredWrapper<OfferVerifiableCredential>,
-  issuerDid: string,
-  itemDescription: string,
-  amount?: number,
-  unitCode?: string,
-  conditionDescription?: string,
-  validThrough?: string,
-  recipientDid?: string,
-  fulfillsProjectHandleId?: string,
-): Promise<CreateAndSubmitClaimResult> {
-  const vcClaim = hydrateOffer(
-    fullClaim.claim,
-    issuerDid,
-    recipientDid,
-    itemDescription,
-    amount,
-    unitCode,
-    conditionDescription,
-    fulfillsProjectHandleId,
-    validThrough,
-    fullClaim.id,
-  );
-  return createAndSubmitClaim(
-    vcClaim as OfferVerifiableCredential,
-    issuerDid,
     apiServer,
     axios,
   );
@@ -860,7 +632,7 @@ export async function editAndSubmitOffer(
 
 // similar logic is found in endorser-mobile
 export const createAndSubmitConfirmation = async (
-  issuerDid: string,
+  identifier: IIdentifier,
   claim: GenericVerifiableCredential,
   lastClaimId: string, // used to set the lastClaimId
   handleId: string | undefined,
@@ -873,16 +645,16 @@ export const createAndSubmitConfirmation = async (
     ),
   );
   const confirmationClaim: GenericVerifiableCredential = {
-    "@context": SCHEMA_ORG_CONTEXT,
+    "@context": "https://schema.org",
     "@type": "AgreeAction",
     object: goodClaim,
   };
-  return createAndSubmitClaim(confirmationClaim, issuerDid, apiServer, axios);
+  return createAndSubmitClaim(confirmationClaim, identifier, apiServer, axios);
 };
 
 export async function createAndSubmitClaim(
   vcClaim: GenericVerifiableCredential,
-  issuerDid: string,
+  identity: IIdentifier,
   apiServer: string,
   axios: Axios,
 ): Promise<CreateAndSubmitClaimResult> {
@@ -895,22 +667,41 @@ export async function createAndSubmitClaim(
       },
     };
 
-    const vcJwt: string = await createEndorserJwtForDid(issuerDid, vcPayload);
+    // Create a signature using private key of identity
+    const firstKey = identity.keys[0];
+    const privateKeyHex = firstKey?.privateKeyHex;
+
+    if (!privateKeyHex) {
+      throw {
+        error: "No private key",
+        message: `Your identifier ${identity.did} is not configured correctly. Use a different identifier.`,
+      };
+    }
+
+    const signer = await SimpleSigner(privateKeyHex);
+
+    // Create a JWT for the request
+    const vcJwt: string = await didJwt.createJWT(vcPayload, {
+      issuer: identity.did,
+      signer,
+    });
 
     // Make the xhr request payload
     const payload = JSON.stringify({ jwtEncoded: vcJwt });
     const url = `${apiServer}/api/v2/claim`;
+    const token = await accessToken(identity);
 
     const response = await axios.post(url, payload, {
       headers: {
         "Content-Type": "application/json",
+        Authorization: `Bearer ${token}`,
       },
     });
 
     return { type: "success", response };
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } catch (error: any) {
-    console.error("Error submitting claim:", error);
+    console.error("Error creating claim:", error);
     const errorMessage: string =
       error.response?.data?.error?.message ||
       error.message ||
@@ -925,14 +716,6 @@ export async function createAndSubmitClaim(
   }
 }
 
-export async function createEndorserJwtForDid(
-  issuerDid: string,
-  payload: object,
-) {
-  const account = await getAccount(issuerDid);
-  return createEndorserJwtForKey(account as KeyMeta, payload);
-}
-
 /**
  * An AcceptAction is when someone accepts some contract or pledge.
  *
@@ -979,29 +762,24 @@ export const capitalizeAndInsertSpacesBeforeCaps = (text: string) => {
  similar code is also contained in endorser-mobile
  **/
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const claimSummary = (
+const claimSummary = (claim: Record<string, any>) => {
-  claim: GenericCredWrapper<GenericVerifiableCredential>,
-) => {
   if (!claim) {
     // to differentiate from "something" above
     return "something";
   }
-  let specificClaim:
-    | GenericVerifiableCredential
-    | GenericCredWrapper<GenericVerifiableCredential> = claim;
   if (claim.claim) {
     // probably a Verified Credential
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    specificClaim = claim.claim;
+    claim = claim.claim as Record<string, any>;
   }
-  if (Array.isArray(specificClaim)) {
+  if (Array.isArray(claim)) {
-    if (specificClaim.length === 1) {
+    if (claim.length === 1) {
-      specificClaim = specificClaim[0];
+      claim = claim[0];
     } else {
       return "multiple claims";
     }
   }
-  const type = specificClaim["@type"];
+  const type = claim["@type"];
   if (!type) {
     return "a claim";
   } else {
@@ -1022,7 +800,7 @@ const claimSummary = (
  similar code is also contained in endorser-mobile
  **/
 export const claimSpecialDescription = (
-  record: GenericCredWrapper<GenericVerifiableCredential>,
+  record: GenericCredWrapper,
   activeDid: string,
   identifiers: Array<string>,
   contacts: Array<Contact>,
@@ -1116,11 +894,7 @@ export const claimSpecialDescription = (
       "...]"
     );
   } else {
-    return (
+    return issuer + " declared " + claimSummary(claim as GenericCredWrapper);
-      issuer +
-      " declared " +
-      claimSummary(claim as GenericCredWrapper<GenericVerifiableCredential>)
-    );
   }
 };
 
@@ -1145,31 +919,18 @@ export const bvcMeetingJoinClaim = (did: string, startTime: string) => {
   };
 };
 
-export async function createEndorserJwtVcFromClaim(
-  issuerDid: string,
-  claim: object,
-) {
-  // Make a payload for the claim
-  const vcPayload = {
-    vc: {
-      "@context": ["https://www.w3.org/2018/credentials/v1"],
-      type: ["VerifiableCredential"],
-      credentialSubject: claim,
-    },
-  };
-  return createEndorserJwtForDid(issuerDid, vcPayload);
-}
-
 export async function register(
   activeDid: string,
   apiServer: string,
   axios: Axios,
   contact: Contact,
 ) {
+  const identity = await getIdentity(activeDid);
+
   const vcClaim: RegisterVerifiableCredential = {
-    "@context": SCHEMA_ORG_CONTEXT,
+    "@context": "https://schema.org",
     "@type": "RegisterAction",
-    agent: { identifier: activeDid },
+    agent: { identifier: identity.did },
     object: SERVICE_ID,
     participant: { identifier: contact.did },
   };
@@ -1182,10 +943,26 @@ export async function register(
     },
   };
   // Create a signature using private key of identity
-  const vcJwt = await createEndorserJwtForDid(activeDid, vcPayload);
+  if (identity.keys[0].privateKeyHex == null) {
+    return { error: "Private key not found." };
+  }
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  const privateKeyHex: string = identity.keys[0].privateKeyHex!;
+  const signer = await SimpleSigner(privateKeyHex);
+  const alg = undefined;
+  // Create a JWT for the request
+  const vcJwt: string = await didJwt.createJWT(vcPayload, {
+    alg: alg,
+    issuer: identity.did,
+    signer: signer,
+  });
 
+  // Make the xhr request payload
+  const payload = JSON.stringify({ jwtEncoded: vcJwt });
   const url = apiServer + "/api/v2/claim";
-  const resp = await axios.post(url, { jwtEncoded: vcJwt });
+  const headers = await getHeaders(identity);
+
+  const resp = await axios.post(url, payload, { headers });
   if (resp.data?.success?.handleId) {
     return { success: true };
   } else if (resp.data?.success?.embeddedRecordError) {
@@ -1214,17 +991,15 @@ export async function setVisibilityUtil(
   }
   const url =
     apiServer + "/api/report/" + (visibility ? "canSeeMe" : "cannotSeeMe");
-  const headers = await getHeaders(activeDid);
+  const identity = await getIdentity(activeDid);
+  const headers = await getHeaders(identity);
   const payload = JSON.stringify({ did: contact.did });
 
   try {
     const resp = await axios.post(url, payload, { headers });
     if (resp.status === 200) {
-      const success = resp.data.success;
-      if (success) {
       db.contacts.update(contact.did, { seesMe: visibility });
-      }
+      return { success: true };
-      return { success };
     } else {
       console.error(
         "Got some bad server response when setting visibility: ",
@@ -1246,16 +1021,16 @@ export async function setVisibilityUtil(
  *
  * @param apiServer endorser server URL string
  * @param axios Axios instance
- * @param {string} issuerDid - The DID for which to check rate limits.
+ * @param {IIdentifier} identity - The identity object to check rate limits for.
  * @returns {Promise<AxiosResponse>} The Axios response object.
  */
 export async function fetchEndorserRateLimits(
   apiServer: string,
   axios: Axios,
-  issuerDid: string,
+  identity: IIdentifier,
 ) {
   const url = `${apiServer}/api/report/rateLimits`;
-  const headers = await getHeaders(issuerDid);
+  const headers = await getHeaders(identity);
   return await axios.get(url, { headers } as AxiosRequestConfig);
 }
 
@@ -1264,11 +1039,15 @@ export async function fetchEndorserRateLimits(
  *
  * @param apiServer image server URL string
  * @param axios Axios instance
- * @param {string} issuerDid - The DID for which to check rate limits.
+ * @param {IIdentifier} identity - The identity object to check rate limits for.
  * @returns {Promise<AxiosResponse>} The Axios response object.
  */
-export async function fetchImageRateLimits(axios: Axios, issuerDid: string) {
+export async function fetchImageRateLimits(
+  apiServer: string,
+  axios: Axios,
+  identity: IIdentifier,
+) {
   const url = DEFAULT_IMAGE_API_SERVER + "/image-limits";
-  const headers = await getHeaders(issuerDid);
+  const headers = await getHeaders(identity);
   return await axios.get(url, { headers } as AxiosRequestConfig);
 }

src/libs/util.ts

@@ -1,38 +1,24 @@
 // many of these are also found in endorser-mobile utility.ts
 
 import axios, { AxiosResponse } from "axios";
-import { Buffer } from "buffer";
+import { IIdentifier } from "@veramo/core";
-import * as R from "ramda";
 import { useClipboard } from "@vueuse/core";
 
 import { DEFAULT_PUSH_SERVER } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { Account } from "@/db/tables/accounts";
-import { Contact } from "@/db/tables/contacts";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import {
-  DEFAULT_PASSKEY_EXPIRATION_MINUTES,
-  MASTER_SETTINGS_KEY,
-} from "@/db/tables/settings";
 import { deriveAddress, generateSeed, newIdentifier } from "@/libs/crypto";
-import {
+import { GenericCredWrapper, containsHiddenDid } from "@/libs/endorserServer";
-  containsHiddenDid,
-  GenericCredWrapper,
-  GenericVerifiableCredential,
-  OfferVerifiableCredential,
-} from "@/libs/endorserServer";
 import * as serverUtil from "@/libs/endorserServer";
-import { KeyMeta } from "@/libs/crypto/vc";
-import { createPeerDid } from "@/libs/crypto/vc/didPeer";
-import { registerCredential } from "@/libs/crypto/vc/passkeyDidPeer";
 
 export const PRIVACY_MESSAGE =
-  "The data you send will be visible to the world -- except: your IDs and the IDs of anyone you tag will stay private, only visible to them and others you explicitly allow.";
+  "The data you send be visible to the world -- except: your IDs and the IDs of anyone you tag will stay private, only visible to those you allow.";
-export const SHARED_PHOTO_BASE64_KEY = "shared-photo-base64";
 
 /* eslint-disable prettier/prettier */
 export const UNIT_SHORT: Record<string, string> = {
-  "BTC": "BTC",
   "BX": "BX",
+  "BTC": "BTC",
   "ETH": "ETH",
   "HUR": "Hours",
   "USD": "US $",
@@ -41,8 +27,8 @@ export const UNIT_SHORT: Record<string, string> = {
 
 /* eslint-disable prettier/prettier */
 export const UNIT_LONG: Record<string, string> = {
-  "BTC": "Bitcoin",
   "BX": "Buxbe",
+  "BTC": "Bitcoin",
   "ETH": "Ethereum",
   "HUR": "hours",
   "USD": "dollars",
@@ -86,34 +72,10 @@ export const isGlobalUri = (uri: string) => {
   return uri && uri.match(new RegExp(/^[A-Za-z][A-Za-z0-9+.-]+:/));
 };
 
-export const isGiveAction = (
+export const isGiveAction = (veriClaim: GenericCredWrapper) => {
-  veriClaim: GenericCredWrapper<GenericVerifiableCredential>,
-) => {
   return veriClaim.claimType === "GiveAction";
 };
 
-export const nameForDid = (
-  activeDid: string,
-  contacts: Array<Contact>,
-  did: string,
-): string => {
-  if (did === activeDid) {
-    return "you";
-  }
-  const contact = R.find((con) => con.did == did, contacts);
-  return nameForContact(contact);
-};
-
-export const nameForContact = (
-  contact?: Contact,
-  capitalize?: boolean,
-): string => {
-  return (
-    (contact?.name as string) ||
-    (capitalize ? "This" : "this") + " unnamed user"
-  );
-};
-
 export const doCopyTwoSecRedo = (text: string, fn: () => void) => {
   fn();
   useClipboard()
@@ -126,13 +88,11 @@ export const doCopyTwoSecRedo = (text: string, fn: () => void) => {
  * @param veriClaim is expected to have fields: claim, claimType, and issuer
  */
 export const isGiveRecordTheUserCanConfirm = (
-  isRegistered: boolean,
+  veriClaim: GenericCredWrapper,
-  veriClaim: GenericCredWrapper<GenericVerifiableCredential>,
   activeDid: string,
   confirmerIdList: string[] = [],
 ) => {
   return (
-    isRegistered &&
     isGiveAction(veriClaim) &&
     !confirmerIdList.includes(activeDid) &&
     veriClaim.issuer !== activeDid &&
@@ -140,45 +100,13 @@ export const isGiveRecordTheUserCanConfirm = (
   );
 };
 
-export async function blobToBase64(blob: Blob): Promise<string> {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-    reader.onloadend = () => resolve(reader.result as string); // potential problem if it returns an ArrayBuffer?
-    reader.onerror = reject;
-    reader.readAsDataURL(blob);
-  });
-}
-
-export function base64ToBlob(base64DataUrl: string, sliceSize = 512) {
-  // Extract the content type and the Base64 data
-  const [metadata, base64] = base64DataUrl.split(",");
-  const contentTypeMatch = metadata.match(/data:(.*?);base64/);
-  const contentType = contentTypeMatch ? contentTypeMatch[1] : "";
-
-  const byteCharacters = atob(base64);
-  const byteArrays = [];
-
-  for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {
-    const slice = byteCharacters.slice(offset, offset + sliceSize);
-
-    const byteNumbers = new Array(slice.length);
-    for (let i = 0; i < slice.length; i++) {
-      byteNumbers[i] = slice.charCodeAt(i);
-    }
-
-    const byteArray = new Uint8Array(byteNumbers);
-    byteArrays.push(byteArray);
-  }
-  return new Blob(byteArrays, { type: contentType });
-}
-
 /**
  * @returns the DID of the person who offered, or undefined if hidden
  * @param veriClaim is expected to have fields: claim and issuer
  */
-export const offerGiverDid: (
+export const offerGiverDid: (arg0: GenericCredWrapper) => string | undefined = (
-  arg0: GenericCredWrapper<OfferVerifiableCredential>,
+  veriClaim,
-) => string | undefined = (veriClaim) => {
+) => {
   let giver;
   if (
     veriClaim.claim.offeredBy?.identifier &&
@@ -195,13 +123,8 @@ export const offerGiverDid: (
  * @returns true if the user can fulfill the offer
  * @param veriClaim is expected to have fields: claim, claimType, and issuer
  */
-export const canFulfillOffer = (
+export const canFulfillOffer = (veriClaim: GenericCredWrapper) => {
-  veriClaim: GenericCredWrapper<GenericVerifiableCredential>,
+  return !!(veriClaim.claimType === "Offer" && offerGiverDid(veriClaim));
-) => {
-  return !!(
-    veriClaim.claimType === "Offer" &&
-    offerGiverDid(veriClaim as GenericCredWrapper<OfferVerifiableCredential>)
-  );
 };
 
 // return object with paths and arrays of DIDs for any keys ending in "VisibleToDid"
@@ -270,17 +193,20 @@ export function findAllVisibleToDids(
  *
  **/
 
-export interface AccountKeyInfo extends Account, KeyMeta {}
+export const getIdentity = async (activeDid: string): Promise<IIdentifier> => {
-
-export const getAccount = async (
-  activeDid: string,
-): Promise<AccountKeyInfo | undefined> => {
   await accountsDB.open();
   const account = (await accountsDB.accounts
     .where("did")
     .equals(activeDid)
     .first()) as Account;
-  return account;
+  const identity = JSON.parse(account?.identity || "null");
+
+  if (!identity) {
+    throw new Error(
+      `Attempted to load identity ${activeDid} but no identifier was found`,
+    );
+  }
+  return identity;
 };
 
 /**
@@ -313,47 +239,6 @@ export const generateSaveAndActivateIdentity = async (): Promise<string> => {
   return newId.did;
 };
 
-export const registerAndSavePasskey = async (
-  keyName: string,
-): Promise<Account> => {
-  const cred = await registerCredential(keyName);
-  const publicKeyBytes = cred.publicKeyBytes;
-  const did = createPeerDid(publicKeyBytes as Uint8Array);
-  const passkeyCredIdHex = cred.credIdHex as string;
-
-  const account = {
-    dateCreated: new Date().toISOString(),
-    did,
-    passkeyCredIdHex,
-    publicKeyHex: Buffer.from(publicKeyBytes).toString("hex"),
-  };
-  await accountsDB.open();
-  await accountsDB.accounts.add(account);
-  return account;
-};
-
-export const registerSaveAndActivatePasskey = async (
-  keyName: string,
-): Promise<Account> => {
-  const account = await registerAndSavePasskey(keyName);
-
-  await db.open();
-  await db.settings.update(MASTER_SETTINGS_KEY, {
-    activeDid: account.did,
-  });
-
-  return account;
-};
-
-export const getPasskeyExpirationSeconds = async (): Promise<number> => {
-  await db.open();
-  const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-  const passkeyExpirationSeconds =
-    (settings?.passkeyExpirationMinutes ?? DEFAULT_PASSKEY_EXPIRATION_MINUTES) *
-    60;
-  return passkeyExpirationSeconds;
-};
-
 export const sendTestThroughPushServer = async (
   subscriptionJSON: PushSubscriptionJSON,
   skipFilter: boolean,

src/registerServiceWorker.ts

@@ -2,7 +2,6 @@
 
 import { register } from "register-service-worker";
 
-// NODE_ENV is "production" by default with "vite build". See https://vitejs.dev/guide/env-and-mode
 if (import.meta.env.NODE_ENV === "production") {
   register("/sw_scripts-combined.js", {
     ready() {

src/router/index.ts

@@ -38,11 +38,6 @@ const routes: Array<RouteRecordRaw> = [
     name: "claim",
     component: () => import("../views/ClaimView.vue"),
   },
-  {
-    path: "/claim-add-raw/:id?",
-    name: "claim-add-raw",
-    component: () => import("../views/ClaimAddRawView.vue"),
-  },
   {
     path: "/confirm-contact",
     name: "confirm-contact",
@@ -63,11 +58,6 @@ const routes: Array<RouteRecordRaw> = [
     name: "contact-gift",
     component: () => import("../views/ContactGiftingView.vue"),
   },
-  {
-    path: "/contact-import",
-    name: "contact-import",
-    component: () => import("../views/ContactImportView.vue"),
-  },
   {
     path: "/contact-qr",
     name: "contact-qr",
@@ -91,7 +81,7 @@ const routes: Array<RouteRecordRaw> = [
   {
     path: "/gifted-details",
     name: "gifted-details",
-    component: () => import("@/views/GiftedDetailsView.vue"),
+    component: () => import("../views/GiftedDetails.vue"),
   },
   {
     path: "/help",
@@ -143,11 +133,6 @@ const routes: Array<RouteRecordRaw> = [
     name: "new-identifier",
     component: () => import("../views/NewIdentifierView.vue"),
   },
-  {
-    path: "/offer-details/:id?",
-    name: "offer-details",
-    component: () => import("../views/OfferDetailsView.vue"),
-  },
   {
     path: "/project/:id?",
     name: "project",
@@ -194,9 +179,6 @@ const routes: Array<RouteRecordRaw> = [
     name: "shared-photo",
     component: () => import("@/views/SharedPhotoView.vue"),
   },
-
-  // /share-target is also an endpoint in the service worker
-
   {
     path: "/start",
     name: "start",

src/test/index.ts

@@ -6,9 +6,6 @@ import { SERVICE_ID } from "../libs/endorserServer";
 import { deriveAddress, newIdentifier } from "../libs/crypto";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 
-/**
- * Get User #0 to sign & submit a RegisterAction for the user's activeDid.
- */
 export async function testServerRegisterUser() {
   const testUser0Mnem =
     "seminar accuse mystery assist delay law thing deal image undo guard initial shallow wrestle list fragile borrow velvet tomorrow awake explain test offer control";

src/views/AccountViewView.vue

@@ -22,10 +22,21 @@
       <span />
     </div>
 
+    <div class="flex justify-between py-2">
+      <span />
+      <span>
+        <router-link
+          :to="{ name: 'help' }"
+          class="text-xs 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-1.5 py-1 rounded-md ml-1"
+        >
+          Help
+        </router-link>
+      </span>
+    </div>
+
     <!-- ID notice -->
     <div
       v-if="!activeDid"
-      id="noticeBeforeShare"
       class="bg-amber-200 text-amber-900 border-amber-500 border-dashed border text-center rounded-md overflow-hidden px-4 py-3 mb-4"
     >
       <p class="mb-4">
@@ -41,10 +52,7 @@
     </div>
 
     <!-- Identity Details -->
-    <div
+    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
-      id="sectionIdentityDetails"
-      class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4"
-    >
       <div v-if="givenName">
         <h2 class="text-xl font-semibold mb-2">
           {{ givenName }}
@@ -144,7 +152,7 @@
 
       <div class="text-blue-500 text-sm font-bold">
         <router-link :to="{ path: '/did/' + encodeURIComponent(activeDid) }">
-          Your Activity
+          Activity
         </router-link>
       </div>
     </div>
@@ -153,7 +161,6 @@
     <!-- We won't show any loading indicator because it usually doesn't change anything. We'll just pop the message in only if we discover that they need it. -->
     <div
       v-if="!loadingLimits && !endorserLimits?.nextWeekBeginDateTime"
-      id="noticeBeforeAnnounce"
       class="bg-amber-200 text-amber-900 border-amber-500 border-dashed border text-center rounded-md overflow-hidden px-4 py-3 mb-4"
     >
       <p class="mb-4">
@@ -168,10 +175,7 @@
       </router-link>
     </div>
 
-    <div
+    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8">
-      id="sectionNotifications"
-      class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8"
-    >
       <!-- label -->
       <div class="mb-2 font-bold">Notifications</div>
       <div
@@ -207,15 +211,13 @@
       </router-link>
     </div>
 
-    <div
+    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8">
-      id="sectionSearchLocation"
-      class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8"
-    >
       <!-- label -->
-      <div class="mb-2 font-bold">Location for Searches</div>
+      <div class="mb-2 font-bold">Location</div>
       <router-link
         :to="{ name: 'search-area' }"
-        class="block w-full text-center text-m 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-1.5 py-2 rounded-md mb-2 mt-6"
+        v-if="activeDid"
+        class="block w-full text-center text-m bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-2 mt-6"
       >
         Set Search Area…
         <!-- If already set, change button label to "Change Search Area" -->
@@ -224,7 +226,6 @@
 
     <div
       v-if="activeDid"
-      id="sectionUsageLimits"
       class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8"
     >
       <div class="mb-2 font-bold">Usage Limits</div>
@@ -277,22 +278,19 @@
       </button>
     </div>
 
-    <div
+    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8">
-      id="sectionDataExport"
-      class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8"
-    >
       <div class="mb-2 font-bold">Data Export</div>
       <router-link
         :to="{ name: 'seed-backup' }"
         v-if="activeDid"
-        class="block w-full text-center text-md 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-1.5 py-2 rounded-md mb-2 mt-2"
+        class="block w-full text-center text-md bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-2 mt-2"
       >
         Backup Identifier Seed
       </router-link>
 
       <button
         v-bind:class="computedStartDownloadLinkClassNames()"
-        class="block w-full text-center text-md 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-1.5 py-2 rounded-md"
+        class="block w-full text-center text-md bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
         @click="exportDatabase()"
       >
         Download Settings & Contacts
@@ -306,23 +304,6 @@
       >
         If no download happened yet, click again here to download now.
       </a>
-      <div>
-        <p>
-          After the download, you can save the file in your preferred storage
-          location.
-        </p>
-        <ul>
-          <li class="list-disc list-outside ml-4">
-            On iOS: Choose "More..." and select a place in iCloud, or go "Back"
-            and save to another location.
-          </li>
-          <li class="list-disc list-outside ml-4">
-            On Android: Choose "Open" and then share
-            <fa icon="share-nodes" class="fa-fw" />
-            to your prefered place.
-          </li>
-        </ul>
-      </div>
     </div>
 
     <!-- id used by puppeteer test script -->
@@ -333,7 +314,7 @@
     >
       Advanced
     </h3>
-    <div id="sectionAdvanced" v-if="showAdvanced || showGeneralAdvanced">
+    <div v-if="showAdvanced">
       <p class="text-rose-600 mb-8">
         Beware: the features here can be confusing and even change data in ways
         you do not expect. But we support your freedom!
@@ -343,10 +324,7 @@
       <span class="text-slate-500 text-sm font-bold mb-2">
         Deep Identifier Details
       </span>
-      <div
+      <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
-        id="sectionDeepIdentifier"
-        class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4"
-      >
         <div class="text-slate-500 text-sm font-bold">Public Key (base 64)</div>
         <div
           class="text-sm text-slate-500 flex justify-start items-center mb-1"
@@ -381,7 +359,6 @@
 
         <div class="text-slate-500 text-sm font-bold">Derivation Path</div>
         <div
-          v-if="derivationPath"
           class="text-sm text-slate-500 flex justify-start items-center mb-1"
         >
           <code class="truncate">{{ derivationPath }}</code>
@@ -398,12 +375,6 @@
           </button>
           <span v-show="showDerCopy">Copied</span>
         </div>
-        <div
-          v-else
-          class="text-sm text-slate-500 flex justify-start items-center mb-1"
-        >
-          (none)
-        </div>
       </div>
 
       <!-- id used by puppeteer test script -->
@@ -415,34 +386,6 @@
         Switch Identifier
       </router-link>
 
-      <div id="sectionImportContactsSettings" class="mt-4">
-        <h2 class="text-slate-500 text-sm font-bold">
-          Import Contacts & Settings Database
-        </h2>
-
-        <div class="ml-4 mt-2">
-          <input type="file" @change="uploadImportFile" class="ml-2" />
-          <div v-if="showContactImport()" class="mt-4">
-            <button
-              class="block text-center text-md 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-1.5 py-2 rounded-md mb-6"
-              @click="confirmSubmitImportFile()"
-            >
-              Overwrite Settings & Contacts
-              <br />
-              (which doesn't include Identifier Data)
-            </button>
-            <button
-              class="block text-center text-md 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-1.5 py-2 rounded-md mb-6"
-              @click="checkContactImports()"
-            >
-              Import Contacts
-              <br />
-              after comparing
-            </button>
-          </div>
-        </div>
-      </div>
-
       <label
         for="toggleShowAmounts"
         class="flex items-center justify-between cursor-pointer my-4"
@@ -469,7 +412,7 @@
         </div>
       </label>
 
-      <div id="sectionClaimServer">
+      <div>
         <h2 class="text-slate-500 text-sm font-bold mt-4">Claim Server</h2>
         <div class="px-4 py-4">
           <input
@@ -548,7 +491,7 @@
       <h2 class="text-slate-500 text-sm font-bold mb-2">
         Notification Push Server
       </h2>
-      <div id="sectionNotificationPushServer" class="px-3 py-4">
+      <div class="px-3 py-4">
         <input
           type="text"
           class="block w-full rounded border border-slate-400 px-3 py-2"
@@ -586,7 +529,7 @@
         {{ DEFAULT_PUSH_SERVER }}
       </span>
 
-      <div id="sectionImageServerURL" class="mt-2">
+      <div class="mt-2">
         <span class="text-slate-500 text-sm font-bold">Image Server URL</span>
         &nbsp;
         <span class="text-sm">{{ DEFAULT_IMAGE_API_SERVER }}</span>
@@ -640,6 +583,27 @@
         </div>
       </label>
 
+      <div class="mt-4">
+        <h2 class="text-slate-500 text-sm font-bold">
+          Contacts & Settings Database
+        </h2>
+
+        <div class="ml-4 mt-2">
+          Import
+          <input type="file" @change="uploadImportFile" class="ml-2" />
+          <div v-if="showContactImport()">
+            <button
+              class="block text-center text-md 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-1.5 py-2 rounded-md mb-6"
+              @click="confirmSubmitImportFile()"
+            >
+              Import Settings & Contacts
+              <br />
+              (excluding Identifier Data)
+            </button>
+          </div>
+        </div>
+      </div>
+
       <div class="flex mt-4">
         <button>
           <router-link
@@ -650,70 +614,19 @@
           </router-link>
         </button>
       </div>
-
-      <div id="sectionPasskeyExpiration" class="flex justify-between">
-        <span>
-          <span class="text-slate-500 text-sm font-bold mb-2">
-            Passkey Expiration Minutes
-          </span>
-          <br />
-          <span class="text-sm ml-2">
-            {{ passkeyExpirationDescription }}
-          </span>
-        </span>
-        <div class="relative ml-2">
-          <input
-            type="number"
-            class="border border-slate-400 rounded px-2 py-2 text-center w-20"
-            v-model="passkeyExpirationMinutes"
-            @change="updatePasskeyExpiration"
-          />
-        </div>
-      </div>
-
-      <label
-        for="toggleShowGeneralAdvanced"
-        class="flex items-center justify-between cursor-pointer mt-4"
-        @click="toggleShowGeneralAdvanced"
-      >
-        <!-- label -->
-        <span class="text-slate-500 text-sm font-bold">
-          Show All General Advanced Functions
-        </span>
-        <!-- toggle -->
-        <div class="relative ml-2">
-          <!-- input -->
-          <input
-            type="checkbox"
-            v-model="showGeneralAdvanced"
-            class="sr-only"
-          />
-          <!-- line -->
-          <div class="block bg-slate-500 w-14 h-8 rounded-full" />
-          <!-- dot -->
-          <div
-            class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
-          />
-        </div>
-      </label>
     </div>
   </section>
 </template>
 
 <script lang="ts">
 import { AxiosError } from "axios";
-import { Buffer } from "buffer/";
 import Dexie from "dexie";
 import "dexie-export-import";
 import { ImportProgress } from "dexie-export-import/dist/import";
-import * as R from "ramda";
-import { IIdentifier } from "@veramo/core";
 import { ref } from "vue";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 import { useClipboard } from "@vueuse/core";
 
-import EntityIcon from "@/components/EntityIcon.vue";
 import ImageMethodDialog from "@/components/ImageMethodDialog.vue";
 import QuickNav from "@/components/QuickNav.vue";
 import TopMessage from "@/components/TopMessage.vue";
@@ -725,24 +638,25 @@ import {
   NotificationIface,
 } from "@/constants/app";
 import { db, accountsDB } from "@/db/index";
-import { Account } from "@/db/tables/accounts";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import { Contact } from "@/db/tables/contacts";
+import { accessToken } from "@/libs/crypto";
+import { IIdentifier } from "@veramo/core";
 import {
-  DEFAULT_PASSKEY_EXPIRATION_MINUTES,
-  MASTER_SETTINGS_KEY,
-  Settings,
-} from "@/db/tables/settings";
-import {
-  clearPasskeyToken,
   ErrorResponse,
   EndorserRateLimits,
+  ImageRateLimits,
   fetchEndorserRateLimits,
   fetchImageRateLimits,
-  getHeaders,
-  ImageRateLimits,
-  tokenExpiryTimeDescription,
 } from "@/libs/endorserServer";
-import { getAccount } from "@/libs/util";
+import { Buffer } from "buffer/";
+import EntityIcon from "@/components/EntityIcon.vue";
+
+interface IAccount {
+  did: string;
+  publicKeyHex: string;
+  privateHex?: string;
+  derivationPath: string;
+}
 
 const inputImportFileNameRef = ref<Blob>();
 
@@ -763,35 +677,31 @@ export default class AccountViewView extends Vue {
   downloadUrl = ""; // because DuckDuckGo doesn't download on automated call to "click" on the anchor
   endorserLimits: EndorserRateLimits | null = null;
   givenName = "";
-  hideRegisterPromptOnNewContact = false;
   imageLimits: ImageRateLimits | null = null;
-  imageServer = "";
   isRegistered = false;
   isSubscribed = false;
-  limitsMessage = "";
-  loadingLimits = false;
   notificationMaybeChanged = false;
-  passkeyExpirationDescription = "";
-  passkeyExpirationMinutes = DEFAULT_PASSKEY_EXPIRATION_MINUTES;
-  previousPasskeyExpirationMinutes = DEFAULT_PASSKEY_EXPIRATION_MINUTES;
   profileImageUrl?: string;
   publicHex = "";
   publicBase64 = "";
-  showAdvanced = false;
+  showLargeIdenticonId?: string;
-  showB64Copy = false;
+  showLargeIdenticonUrl?: string;
+  webPushServer = "";
+  webPushServerInput = "";
+
+  limitsMessage = "";
+  loadingLimits = false;
   showContactGives = false;
   showDidCopy = false;
   showDerCopy = false;
-  showGeneralAdvanced = false;
+  showB64Copy = false;
-  showLargeIdenticonId?: string;
-  showLargeIdenticonUrl?: string;
   showPubCopy = false;
+  showAdvanced = false;
+  hideRegisterPromptOnNewContact = false;
   showShortcutBvc = false;
   subscription: PushSubscription | null = null;
   warnIfProdServer = false;
   warnIfTestServer = false;
-  webPushServer = "";
-  webPushServerInput = "";
 
   /**
    * Async function executed when the component is mounted.
@@ -802,42 +712,25 @@ export default class AccountViewView extends Vue {
    */
   async mounted() {
     try {
+      await db.open();
+
+      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+
       // Initialize component state with values from the database or defaults
-      await this.initializeState();
+      this.initializeState(settings);
-      await this.processIdentity();
 
-      this.passkeyExpirationDescription = tokenExpiryTimeDescription();
+      // Get and process the identity
+      const identity = await this.getIdentity(this.activeDid);
+      if (identity) {
+        this.processIdentity(identity);
+      }
 
-      /**
-       * Beware! I've seen where this "ready" never resolves.
-       */
       const registration = await navigator.serviceWorker.ready;
       this.subscription = await registration.pushManager.getSubscription();
       this.isSubscribed = !!this.subscription;
-      console.log("Got to the end of 'mounted' call.");
-      /**
-       * Beware! I've seen where we never get to this point because "ready" never resolves.
-       */
     } catch (error) {
-      // this can happen when running automated tests in dev mode because notifications don't work
+      console.error("Mount error:", error);
-      console.error(
+      this.handleError(error);
-        "Telling user to clear cache at page create because:",
-        error,
-      );
-      // this sometimes gives different information on the error
-      console.error(
-        "Telling user to clear cache at page create because (error added): " +
-          error,
-      );
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error Loading Account",
-          text: "Clear your cache and start over (after data backup).",
-        },
-        -1,
-      );
     }
   }
 
@@ -849,12 +742,9 @@ export default class AccountViewView extends Vue {
 
   /**
    * Initializes component state with values from the database or defaults.
+   * @param {SettingsType} settings - Object containing settings from the database.
    */
-  async initializeState() {
+  initializeState(settings: Settings | undefined) {
-    await db.open();
-    const settings: Settings | undefined =
-      await db.settings.get(MASTER_SETTINGS_KEY);
-
     this.activeDid = (settings?.activeDid as string) || "";
     this.apiServer = (settings?.apiServer as string) || "";
     this.apiServerInput = (settings?.apiServer as string) || "";
@@ -862,16 +752,10 @@ export default class AccountViewView extends Vue {
       (settings?.firstName || "") +
       (settings?.lastName ? ` ${settings.lastName}` : ""); // pre v 0.1.3
     this.isRegistered = !!settings?.isRegistered;
-    this.imageServer = (settings?.imageServer as string) || "";
     this.profileImageUrl = settings?.profileImageUrl as string;
     this.showContactGives = !!settings?.showContactGivesInline;
     this.hideRegisterPromptOnNewContact =
       !!settings?.hideRegisterPromptOnNewContact;
-    this.passkeyExpirationMinutes =
-      (settings?.passkeyExpirationMinutes as number) ??
-      DEFAULT_PASSKEY_EXPIRATION_MINUTES;
-    this.previousPasskeyExpirationMinutes = this.passkeyExpirationMinutes;
-    this.showGeneralAdvanced = !!settings?.showGeneralAdvanced;
     this.showShortcutBvc = !!settings?.showShortcutBvc;
     this.warnIfProdServer = !!settings?.warnIfProdServer;
     this.warnIfTestServer = !!settings?.warnIfTestServer;
@@ -879,6 +763,49 @@ export default class AccountViewView extends Vue {
     this.webPushServerInput = (settings?.webPushServer as string) || "";
   }
 
+  public async getIdentity(activeDid: string): Promise<IIdentifier | null> {
+    try {
+      // Open the accounts database
+      await accountsDB.open();
+
+      // Search for the account with the matching DID (decentralized identifier)
+      const account: { identity?: string } | undefined =
+        await accountsDB.accounts.where("did").equals(activeDid).first();
+
+      // Return parsed identity or null if not found
+      return JSON.parse((account?.identity as string) || "null");
+    } catch (error) {
+      console.error("Failed to find account:", error);
+      return null;
+    }
+  }
+
+  /**
+   * Asynchronously retrieves headers for HTTP requests.
+   *
+   * @param {IIdentifier} identity - The identity object for which to generate the headers.
+   * @returns {Promise<Record<string,string>>} A Promise that resolves to an object containing the headers.
+   *
+   * @throws Will throw an error if unable to generate an access token.
+   */
+  public async getHeaders(
+    identity: IIdentifier,
+  ): Promise<Record<string, string>> {
+    try {
+      const token = await accessToken(identity);
+
+      const headers: Record<string, string> = {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${token}`,
+      };
+
+      return headers;
+    } catch (error) {
+      console.error("Failed to get headers:", error);
+      return Promise.reject(error);
+    }
+  }
+
   // call fn, copy text to the clipboard, then redo fn after 2 seconds
   doCopyTwoSecRedo(text: string, fn: () => void) {
     fn();
@@ -892,11 +819,6 @@ export default class AccountViewView extends Vue {
     this.updateShowContactAmounts();
   }
 
-  toggleShowGeneralAdvanced() {
-    this.showGeneralAdvanced = !this.showGeneralAdvanced;
-    this.updateShowGeneralAdvanced();
-  }
-
   toggleProdWarning() {
     this.warnIfProdServer = !this.warnIfProdServer;
     this.updateWarnIfProdServer(this.warnIfProdServer);
@@ -918,19 +840,25 @@ export default class AccountViewView extends Vue {
 
   /**
    * Processes the identity and updates the component's state.
+   * @param {IdentityType} identity - Object containing identity information.
    */
-  async processIdentity() {
+  processIdentity(identity: IIdentifier) {
-    const account: Account | undefined = await getAccount(this.activeDid);
+    if (
-    if (account?.identity) {
+      identity &&
-      const identity = JSON.parse(account.identity as string) as IIdentifier;
+      identity.keys &&
+      identity.keys.length > 0 &&
+      identity.keys[0].meta
+    ) {
       this.publicHex = identity.keys[0].publicKeyHex;
       this.publicBase64 = Buffer.from(this.publicHex, "hex").toString("base64");
       this.derivationPath = identity.keys[0].meta?.derivationPath as string;
-      await this.checkLimitsFor(this.activeDid);
+
-    } else if (account?.publicKeyHex) {
+      db.settings.update(MASTER_SETTINGS_KEY, {
-      this.publicHex = account.publicKeyHex as string;
+        activeDid: identity.did,
-      this.publicBase64 = Buffer.from(this.publicHex, "hex").toString("base64");
+      });
-      await this.checkLimitsFor(this.activeDid);
+      this.checkLimitsFor(identity);
+    } else {
+      // Handle the case where any of these are null or undefined
     }
   }
 
@@ -959,24 +887,58 @@ export default class AccountViewView extends Vue {
     this.notificationMaybeChanged = true;
   }
 
-  public async updateShowContactAmounts() {
+  /**
-    await db.open();
+   * Handles errors and updates the component's state accordingly.
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+   * @param {Error} err - The error object.
-      showContactGivesInline: this.showContactGives,
+   */
-    });
+  handleError(err: unknown) {
+    if (
+      err instanceof Error &&
+      err.message ===
+        "Attempted to load account records with no identifier available."
+    ) {
+      this.limitsMessage = "No identifier.";
+    } else {
+      console.error("Telling user to clear cache at page create because:", err);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error Loading Account",
+          text: "Clear your cache and start over (after data backup).",
+        },
+        -1,
+      );
+    }
   }
 
-  public async updateShowGeneralAdvanced() {
+  public async updateShowContactAmounts() {
+    try {
       await db.open();
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+      db.settings.update(MASTER_SETTINGS_KEY, {
-      showGeneralAdvanced: this.showGeneralAdvanced,
+        showContactGivesInline: this.showContactGives,
       });
+    } catch (err) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error Updating Contact Setting",
+          text: "The setting may not have saved. Try again, maybe after restarting the app.",
+        },
+        -1,
+      );
+      console.error(
+        "Telling user to try again after contact-amounts setting update because:",
+        err,
+      );
+    }
   }
 
   public async updateWarnIfProdServer(newSetting: boolean) {
     try {
       await db.open();
-      await db.settings.update(MASTER_SETTINGS_KEY, {
+      db.settings.update(MASTER_SETTINGS_KEY, {
         warnIfProdServer: newSetting,
       });
     } catch (err) {
@@ -997,35 +959,71 @@ export default class AccountViewView extends Vue {
   }
 
   public async updateWarnIfTestServer(newSetting: boolean) {
+    try {
       await db.open();
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+      db.settings.update(MASTER_SETTINGS_KEY, {
         warnIfTestServer: newSetting,
       });
+    } catch (err) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error Updating Test Warning",
+          text: "The setting may not have saved. Try again, maybe after restarting the app.",
+        },
+        -1,
+      );
+      console.error(
+        "Telling user to try again after test-server-warning setting update because:",
+        err,
+      );
+    }
   }
 
   public async toggleHideRegisterPromptOnNewContact() {
     const newSetting = !this.hideRegisterPromptOnNewContact;
+    try {
       await db.open();
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+      db.settings.update(MASTER_SETTINGS_KEY, {
         hideRegisterPromptOnNewContact: newSetting,
       });
       this.hideRegisterPromptOnNewContact = newSetting;
+    } catch (err) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error Updating Setting",
+          text: "The setting may not have saved. Try again, maybe after restarting the app.",
+        },
+        -1,
+      );
+      console.error("Telling user to try again because:", err);
     }
-
-  public async updatePasskeyExpiration() {
-    await db.open();
-    await db.settings.update(MASTER_SETTINGS_KEY, {
-      passkeyExpirationMinutes: this.passkeyExpirationMinutes,
-    });
-    clearPasskeyToken();
-    this.passkeyExpirationDescription = tokenExpiryTimeDescription();
   }
 
   public async updateShowShortcutBvc(newSetting: boolean) {
+    try {
       await db.open();
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+      db.settings.update(MASTER_SETTINGS_KEY, {
         showShortcutBvc: newSetting,
       });
+    } catch (err) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error Updating BVC Shortcut Setting",
+          text: "The setting may not have saved. Try again, maybe after restarting the app.",
+        },
+        -1,
+      );
+      console.error(
+        "Telling user to try again after BVC-shortcut setting update because:",
+        err,
+      );
+    }
   }
 
   /**
@@ -1131,7 +1129,7 @@ export default class AccountViewView extends Vue {
   }
 
   async uploadImportFile(event: Event) {
-    inputImportFileNameRef.value = (event.target as EventTarget).files[0];
+    inputImportFileNameRef.value = event.target.files[0];
   }
 
   showContactImport() {
@@ -1169,40 +1167,6 @@ export default class AccountViewView extends Vue {
     }
   }
 
-  async checkContactImports() {
-    const reader = new FileReader();
-    reader.onload = (event) => {
-      const fileContent: string = (event.target?.result as string) || "{}";
-      try {
-        const contents = JSON.parse(fileContent);
-        const contactTableRows: Array<Contact> = (
-          contents.data?.data as [{ tableName: string; rows: Array<Contact> }]
-        )?.find((table) => table.tableName === "contacts")
-          ?.rows as Array<Contact>;
-        const contactRows = contactTableRows.map(
-          // @ts-expect-error for omitting this field that is found in the Dexie format
-          (contact) => R.omit(["$types"], contact) as Contact,
-        );
-        (this.$router as Router).push({
-          name: "contact-import",
-          query: { contacts: JSON.stringify(contactRows) },
-        });
-      } catch (error) {
-        console.error("Error checking contact imports:", error);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error Importing",
-            text: "There was an error reading that Dexie file.",
-          },
-          3000,
-        );
-      }
-    };
-    reader.readAsText(inputImportFileNameRef.value as Blob);
-  }
-
   private progressCallback(progress: ImportProgress) {
     console.log(
       `Import progress: ${progress.completedRows} of ${progress.totalRows} rows completed.`,
@@ -1223,8 +1187,9 @@ export default class AccountViewView extends Vue {
   }
 
   async checkLimits() {
-    if (this.activeDid) {
+    const identity = await this.getIdentity(this.activeDid);
-      this.checkLimitsFor(this.activeDid);
+    if (identity) {
+      this.checkLimitsFor(identity);
     } else {
       this.limitsMessage =
         "You have no identifier, or your data has been corrupted.";
@@ -1236,7 +1201,7 @@ export default class AccountViewView extends Vue {
    *
    * Updates component state variables `limits`, `limitsMessage`, and `loadingLimits`.
    */
-  public async checkLimitsFor(did: string) {
+  public async checkLimitsFor(identity: IIdentifier) {
     this.loadingLimits = true;
     this.limitsMessage = "";
 
@@ -1244,7 +1209,7 @@ export default class AccountViewView extends Vue {
       const resp = await fetchEndorserRateLimits(
         this.apiServer,
         this.axios,
-        did,
+        identity,
       );
       if (resp.status === 200) {
         this.endorserLimits = resp.data;
@@ -1252,7 +1217,7 @@ export default class AccountViewView extends Vue {
           // the user was not known to be registered, but now they are (because we got no error) so let's record it
           try {
             await db.open();
-            await db.settings.update(MASTER_SETTINGS_KEY, {
+            db.settings.update(MASTER_SETTINGS_KEY, {
               isRegistered: true,
             });
             this.isRegistered = true;
@@ -1269,13 +1234,28 @@ export default class AccountViewView extends Vue {
             );
           }
         }
-        const imageResp = await fetchImageRateLimits(this.axios, did);
+        const imageResp = await fetchImageRateLimits(
+          this.apiServer,
+          this.axios,
+          identity,
+        );
         if (imageResp.status === 200) {
           this.imageLimits = imageResp.data;
         }
       }
     } catch (error) {
       this.handleRateLimitsError(error);
+
+      try {
+        await db.open();
+        db.settings.update(MASTER_SETTINGS_KEY, {
+          isRegistered: false,
+        });
+        this.isRegistered = false;
+      } catch (err) {
+        console.error("Got an error marking user not registered:", err);
+        // already set an error notification for the user
+      }
     }
 
     this.loadingLimits = false;
@@ -1293,8 +1273,8 @@ export default class AccountViewView extends Vue {
         (data?.error?.message as string) || "Bad server response.";
       console.error(
         "Got bad response retrieving limits, which usually means user isn't registered.",
-        error,
       );
+      //console.error(error);
     } else {
       this.limitsMessage = "Got an error retrieving limits.";
       console.error("Got some error retrieving limits:", error);
@@ -1355,9 +1335,9 @@ export default class AccountViewView extends Vue {
    *
    * @param {AccountType} account - The account object.
    */
-  private updateActiveAccountProperties(account: Account) {
+  private updateActiveAccountProperties(account: IAccount) {
     this.activeDid = account.did;
-    this.derivationPath = account.derivationPath || "";
+    this.derivationPath = account.derivationPath;
     this.publicHex = account.publicKeyHex;
     this.publicBase64 = Buffer.from(this.publicHex, "hex").toString("base64");
   }
@@ -1371,7 +1351,7 @@ export default class AccountViewView extends Vue {
 
   async onClickSaveApiServer() {
     await db.open();
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+    db.settings.update(MASTER_SETTINGS_KEY, {
       apiServer: this.apiServerInput,
     });
     this.apiServer = this.apiServerInput;
@@ -1379,7 +1359,7 @@ export default class AccountViewView extends Vue {
 
   async onClickSavePushServer() {
     await db.open();
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+    db.settings.update(MASTER_SETTINGS_KEY, {
       webPushServer: this.webPushServerInput,
     });
     this.webPushServer = this.webPushServerInput;
@@ -1398,7 +1378,7 @@ export default class AccountViewView extends Vue {
     (this.$refs.imageMethodDialog as ImageMethodDialog).open(
       async (imgUrl) => {
         await db.open();
-        await db.settings.update(MASTER_SETTINGS_KEY, {
+        db.settings.update(MASTER_SETTINGS_KEY, {
           profileImageUrl: imgUrl,
         });
         this.profileImageUrl = imgUrl;
@@ -1428,13 +1408,20 @@ export default class AccountViewView extends Vue {
       return;
     }
     try {
-      const headers = await getHeaders(this.activeDid);
+      const identity = await this.getIdentity(this.activeDid);
-      this.passkeyExpirationDescription = tokenExpiryTimeDescription();
+      if (!identity) {
+        throw Error("No identity found.");
+      }
+      const token = await accessToken(identity);
       const response = await this.axios.delete(
         DEFAULT_IMAGE_API_SERVER +
           "/image/" +
           encodeURIComponent(this.profileImageUrl),
-        { headers },
+        {
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        },
       );
       if (response.status === 204) {
         // don't bother with a notification
@@ -1454,7 +1441,7 @@ export default class AccountViewView extends Vue {
       }
 
       await db.open();
-      await db.settings.update(MASTER_SETTINGS_KEY, {
+      db.settings.update(MASTER_SETTINGS_KEY, {
         profileImageUrl: undefined,
       });
 
@@ -1466,7 +1453,7 @@ export default class AccountViewView extends Vue {
         console.error("The image was already deleted:", error);
 
         await db.open();
-        await db.settings.update(MASTER_SETTINGS_KEY, {
+        db.settings.update(MASTER_SETTINGS_KEY, {
           profileImageUrl: undefined,
         });
 

src/views/ClaimAddRawView.vue

@@ -1,99 +0,0 @@
-<template>
-  <QuickNav />
-  <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
-    <!-- Breadcrumb -->
-    <div id="ViewBreadcrumb" class="mb-8">
-      <h1 class="text-lg text-center font-light relative px-7">
-        <!-- Back -->
-        <button
-          @click="$router.go(-1)"
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-        >
-          <fa icon="chevron-left" class="fa-fw" />
-        </button>
-        Raw Claim
-      </h1>
-    </div>
-
-    <div class="flex">
-      <textarea rows="20" class="border-2 w-full" v-model="claimStr"></textarea>
-    </div>
-    <button
-      class="block w-full text-center text-lg font-bold 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-2 py-3 rounded-md"
-      @click="submitClaim()"
-    >
-      Sign &amp; Send
-    </button>
-  </section>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
-import { NotificationIface } from "@/constants/app";
-import { db } from "@/db/index";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import * as serverUtil from "@/libs/endorserServer";
-import QuickNav from "@/components/QuickNav.vue";
-
-@Component({
-  components: { QuickNav },
-})
-export default class ClaimAddRawView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  accountIdentityStr: string = "null";
-  activeDid = "";
-  apiServer = "";
-  claimStr = "";
-
-  async mounted() {
-    await db.open();
-    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
-    this.activeDid = settings?.activeDid || "";
-    this.apiServer = settings?.apiServer || "";
-
-    this.claimStr = (this.$route as Router).query["claim"];
-    try {
-      this.veriClaim = JSON.parse(this.claimStr);
-      this.claimStr = JSON.stringify(this.veriClaim, null, 2);
-    } catch (e) {
-      // ignore a parse
-    }
-  }
-
-  async submitClaim() {
-    const fullClaim = JSON.parse(this.claimStr);
-    const result = await serverUtil.createAndSubmitClaim(
-      fullClaim,
-      this.activeDid,
-      this.apiServer,
-      this.axios,
-    );
-    if (result.type === "success") {
-      this.$notify(
-        {
-          group: "alert",
-          type: "success",
-          title: "Success",
-          text: "Claim submitted.",
-        },
-        5000,
-      );
-    } else {
-      console.error("Got error submitting the claim:", result);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "There was a problem submitting the claim. See logs for more info.",
-        },
-        -1,
-      );
-    }
-  }
-}
-</script>

src/views/ClaimView.vue

@@ -22,18 +22,6 @@
         <div class="overflow-hidden">
           <h2 class="text-md font-bold">
             {{ capitalizeAndInsertSpacesBeforeCaps(veriClaim.claimType) }}
-            <button
-              v-if="
-                ['GiveAction', 'Offer'].includes(
-                  veriClaim.claimType as string,
-                ) && veriClaim.issuer === activeDid
-              "
-              @click="onClickEditClaim"
-              title="Edit"
-              data-testId="editClaimButton"
-            >
-              <fa icon="pen" class="text-sm text-blue-500 ml-2 mb-1" />
-            </button>
           </h2>
           <div class="text-sm">
             <div>
@@ -51,12 +39,9 @@
               </button>
               <span v-show="showIdCopy">Copied ID</span>
             </div>
-            <div data-testId="description">
+            <div>
               <fa icon="message" class="fa-fw text-slate-400" />
-              {{
+              {{ veriClaim.claim?.description }}
-                veriClaim.claim?.itemOffered?.description ||
-                veriClaim.claim?.description
-              }}
             </div>
             <div>
               <fa icon="user" class="fa-fw text-slate-400" />
@@ -80,11 +65,6 @@
               <fa icon="calendar" class="fa-fw text-slate-400" />
               {{ veriClaim.issuedAt?.replace(/T/, " ").replace(/Z/, " UTC") }}
             </div>
-            <div v-if="veriClaim.claim.image" class="flex justify-center">
-              <a :href="veriClaim.claim.image" target="_blank">
-                <img :src="veriClaim.claim.image" class="h-24 rounded-xl" />
-              </a>
-            </div>
 
             <!-- Fullfills Links -->
 
@@ -141,24 +121,11 @@
       </div>
     </div>
 
-    <div class="mt-8">
-      <button
-        v-if="libsUtil.canFulfillOffer(veriClaim)"
-        @click="openFulfillGiftDialog()"
-        class="col-span-1 block w-fit text-center text-md 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-1.5 py-2 rounded-md"
-      >
-        Affirm Delivery
-        <fa icon="hand-holding-heart" class="ml-2 text-white cursor-pointer" />
-      </button>
-    </div>
-
-    <div v-if="libsUtil.isGiveAction(veriClaim)">
     <div class="flex columns-3">
       <button
-          class="col-span-1 bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mt-2 px-4 py-2 rounded-md"
+        class="col-span-1 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"
         v-if="
           libsUtil.isGiveRecordTheUserCanConfirm(
-              isRegistered,
             veriClaim,
             activeDid,
             confirmerIdList,
@@ -169,21 +136,31 @@
         Confirm
         <fa icon="circle-check" class="ml-2 text-white cursor-pointer" />
       </button>
-        <h2 v-else class="font-bold uppercase text-xl mt-2">Confirmations</h2>
 
-        <span class="mt-0.5 px-4 py-2">
+      <span class="px-4 py-2">
         <router-link
           v-if="libsUtil.isGiveAction(veriClaim)"
           :to="'/confirm-gift/' + encodeURIComponent(veriClaim.id)"
           class="col-span-1 text-blue-500"
-            data-testId="confirmGiftLink"
         >
-            Details...
+          Confirmation Details...
         </router-link>
       </span>
+
+      <button
+        v-if="libsUtil.canFulfillOffer(veriClaim)"
+        @click="openFulfillGiftDialog()"
+        class="col-span-1 block w-fit text-center text-md 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-1.5 py-2 rounded-md"
+      >
+        Affirm Delivery
+        <fa icon="hand-holding-heart" class="ml-2 text-white cursor-pointer" />
+      </button>
     </div>
     <GiftedDialog ref="customGiveDialog" />
 
+    <div v-if="libsUtil.isGiveAction(veriClaim)">
+      <h2 class="font-bold uppercase text-xl mt-8 mb-2">Confirmations</h2>
+
       <span v-if="totalConfirmers() === 0">Nobody has confirmed this.</span>
       <span v-else-if="totalConfirmers() === 1">
         One person has confirmed this.
@@ -312,15 +289,13 @@
           <a @click="onClickShareClaim()" class="text-blue-500"
             >click to send them this info</a
           >
-          and see if they are willing to make an introduction. They are surely
+          and see if they are willing to make an introduction.
-          connected to someone; if you don't know who to ask, you might try the
-          person who registered you.
         </span>
         <span v-else>
           If you'd like to ask any of your contacts to take a look and see if
           their contacts can see more details,
           <a
-            @click="copyToClipboard('This page location', windowLocation)"
+            @click="copyToClipboard('Location', windowLocation)"
             class="text-blue-500"
             >share this page with them</a
           >
@@ -393,19 +368,9 @@
           </div>
         </div>
       </div>
-      <span v-if="isEditedGlobalId" class="mt-2">
-        This record is an edited version. The latest version is here.
-      </span>
-      <br />
-      <button @click="showVeriClaimDump = !showVeriClaimDump" class="ml-2">
-        Details
-        <fa v-if="showVeriClaimDump" icon="chevron-up" class="text-blue-400" />
-        <fa v-else icon="chevron-down" class="text-blue-400" />
-      </button>
       <!-- Keep the dump contents directly between > and < to avoid weird spacing. -->
       <pre
-        v-if="showVeriClaimDump"
+        class="text-sm overflow-x-scroll px-4 py-3 bg-slate-100 rounded-md"
-        class="text-sm overflow-x-scroll bg-slate-100 px-4 py-3 rounded-md"
         >{{ veriClaimDump }}</pre
       >
     </div>
@@ -428,10 +393,7 @@
       </button>
     </div>
     <div v-else>
-      <pre
+      <pre>{{ fullClaimDump }}</pre>
-        class="text-sm overflow-x-scroll bg-slate-100 px-4 py-3 rounded-md"
-        >{{ fullClaimDump }}</pre
-      >
     </div>
 
     <a
@@ -445,11 +407,11 @@
 </template>
 
 <script lang="ts">
-import { AxiosError } from "axios";
+import { AxiosError, RawAxiosRequestHeaders } from "axios";
 import * as yaml from "js-yaml";
 import * as R from "ramda";
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 import { useClipboard } from "@vueuse/core";
 
 import GiftedDialog from "@/components/GiftedDialog.vue";
@@ -457,15 +419,12 @@ import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 import * as serverUtil from "@/libs/endorserServer";
 import * as libsUtil from "@/libs/util";
 import QuickNav from "@/components/QuickNav.vue";
 import { Account } from "@/db/tables/accounts";
-import {
+import { GiverReceiverInputInfo } from "@/libs/endorserServer";
-  GenericCredWrapper,
-  GiverReceiverInputInfo,
-  OfferVerifiableCredential,
-} from "@/libs/endorserServer";
 
 @Component({
   components: { GiftedDialog, QuickNav },
@@ -473,6 +432,7 @@ import {
 export default class ClaimView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
+  accountIdentityStr: string = "null";
   activeDid = "";
   allMyDids: Array<string> = [];
   allContacts: Array<Contact> = [];
@@ -487,12 +447,9 @@ export default class ClaimView extends Vue {
   fullClaim = null;
   fullClaimDump = "";
   fullClaimMessage = "";
-  isEditedGlobalId = false;
-  isRegistered = false;
   numConfsNotVisible = 0; // number of hidden DIDs in the confirmerIdList, minus the issuer if they aren't visible
   showDidCopy = false;
   showIdCopy = false;
-  showVeriClaimDump = false;
   veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
   veriClaimDump = "";
   veriClaimDidsVisible = {};
@@ -512,8 +469,6 @@ export default class ClaimView extends Vue {
     this.fullClaim = null;
     this.fullClaimDump = "";
     this.fullClaimMessage = "";
-    this.isEditedGlobalId = false;
-    this.isRegistered = false;
     this.numConfsNotVisible = 0;
     this.veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
     this.veriClaimDump = "";
@@ -525,18 +480,20 @@ export default class ClaimView extends Vue {
     this.activeDid = settings?.activeDid || "";
     this.apiServer = settings?.apiServer || "";
     this.allContacts = await db.contacts.toArray();
-    this.isRegistered = settings?.isRegistered || false;
 
     await accountsDB.open();
     const accounts = accountsDB.accounts;
     const accountsArr: Array<Account> = await accounts?.toArray();
     this.allMyDids = accountsArr.map((acc) => acc.did);
+    const account = accountsArr.find((acc) => acc.did === this.activeDid);
+    this.accountIdentityStr = (account?.identity as string) || "null";
+    const identity = JSON.parse(this.accountIdentityStr);
 
     const pathParam = window.location.pathname.substring("/claim/".length);
     let claimId;
     if (pathParam) {
       claimId = decodeURIComponent(pathParam);
-      await this.loadClaim(claimId, this.activeDid);
+      await this.loadClaim(claimId, identity);
     } else {
       this.$notify(
         {
@@ -570,6 +527,33 @@ export default class ClaimView extends Vue {
     );
   }
 
+  public async getIdentity(activeDid: string): Promise<IIdentifier> {
+    await accountsDB.open();
+    const account = (await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first()) as Account;
+    const identity = JSON.parse(account?.identity || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load project records with no identifier available.",
+      );
+    }
+    return identity;
+  }
+
+  public async getHeaders(identity: IIdentifier) {
+    const headers: RawAxiosRequestHeaders = {
+      "Content-Type": "application/json",
+    };
+    if (identity) {
+      const token = await accessToken(identity);
+      headers["Authorization"] = "Bearer " + token;
+    }
+    return headers;
+  }
+
   // Isn't there a better way to make this available to the template?
   didInfo(did: string) {
     return serverUtil.didInfo(
@@ -580,12 +564,12 @@ export default class ClaimView extends Vue {
     );
   }
 
-  async loadClaim(claimId: string, userDid: string) {
+  async loadClaim(claimId: string, identity: IIdentifier) {
     const urlPath = libsUtil.isGlobalUri(claimId)
       ? "/api/claim/byHandle/"
       : "/api/claim/";
     const url = this.apiServer + urlPath + encodeURIComponent(claimId);
-    const headers = await serverUtil.getHeaders(userDid);
+    const headers = await this.getHeaders(identity);
 
     try {
       const resp = await this.axios.get(url, { headers });
@@ -611,15 +595,13 @@ export default class ClaimView extends Vue {
         return;
       }
 
-      this.isEditedGlobalId = !this.veriClaim.handleId.endsWith(claimId);
-
       // retrieve more details on Give, Offer, or Plan
       if (this.veriClaim.claimType === "GiveAction") {
         const giveUrl =
           this.apiServer +
           "/api/v2/report/gives?handleId=" +
           encodeURIComponent(this.veriClaim.handleId as string);
-        const giveHeaders = await serverUtil.getHeaders(userDid);
+        const giveHeaders = await this.getHeaders(identity);
         const giveResp = await this.axios.get(giveUrl, {
           headers: giveHeaders,
         });
@@ -633,7 +615,7 @@ export default class ClaimView extends Vue {
           this.apiServer +
           "/api/v2/report/offers?handleId=" +
           encodeURIComponent(this.veriClaim.handleId as string);
-        const offerHeaders = await serverUtil.getHeaders(userDid);
+        const offerHeaders = await this.getHeaders(identity);
         const offerResp = await this.axios.get(offerUrl, {
           headers: offerHeaders,
         });
@@ -649,14 +631,12 @@ export default class ClaimView extends Vue {
         this.apiServer +
         "/api/report/issuersWhoClaimedOrConfirmed?claimId=" +
         encodeURIComponent(serverUtil.stripEndorserPrefix(claimId));
-      const confirmHeaders = await serverUtil.getHeaders(userDid);
+      const confirmHeaders = await this.getHeaders(identity);
       const response = await this.axios.get(confirmUrl, {
         headers: confirmHeaders,
       });
       if (response.status === 200) {
         const resultList1 = response.data.result || [];
-        //const publicUrls = resultList.publicUrls || [];
-        delete resultList1.publicUrls;
         const resultList2 = R.reject(serverUtil.isHiddenDid, resultList1);
         const resultList3 = R.reject(
           (did: string) => did === this.veriClaim.issuer,
@@ -691,9 +671,15 @@ export default class ClaimView extends Vue {
   }
 
   async showFullClaim(claimId: string) {
+    await accountsDB.open();
+    const accounts = accountsDB.accounts;
+    const accountsArr: Account[] = await accounts?.toArray();
+    const account = accountsArr.find((acc) => acc.did === this.activeDid);
+    const identity = JSON.parse((account?.identity as string) || "null");
+
     const url =
       this.apiServer + "/api/claim/full/" + encodeURIComponent(claimId);
-    const headers = await serverUtil.getHeaders(this.activeDid);
+    const headers = await this.getHeaders(identity);
 
     try {
       const resp = await this.axios.get(url, { headers });
@@ -772,7 +758,7 @@ export default class ClaimView extends Vue {
     };
     const result = await serverUtil.createAndSubmitClaim(
       confirmationClaim,
-      this.activeDid,
+      await this.getIdentity(this.activeDid),
       this.apiServer,
       this.axios,
     );
@@ -804,17 +790,15 @@ export default class ClaimView extends Vue {
     const route = {
       path: "/claim/" + encodeURIComponent(claimId),
     };
-    (this.$router as Router).push(route).then(async () => {
+    this.$router.push(route).then(async () => {
       this.resetThisValues();
-      await this.loadClaim(claimId, this.activeDid);
+      await this.loadClaim(claimId, JSON.parse(this.accountIdentityStr));
     });
   }
 
   openFulfillGiftDialog() {
     const giver: GiverReceiverInputInfo = {
-      did: libsUtil.offerGiverDid(
+      did: libsUtil.offerGiverDid(this.veriClaim),
-        this.veriClaim as GenericCredWrapper<OfferVerifiableCredential>,
-      ),
     };
     (this.$refs.customGiveDialog as GiftedDialog).open(
       giver,
@@ -847,43 +831,5 @@ export default class ClaimView extends Vue {
       url: this.windowLocation,
     });
   }
-
-  onClickEditClaim() {
-    if (this.veriClaim.claimType === "GiveAction") {
-      const route = {
-        name: "gifted-details",
-        query: {
-          prevCredToEdit: JSON.stringify(this.veriClaim),
-          destinationPathAfter:
-            "/claim/" + encodeURIComponent(this.veriClaim.handleId),
-        },
-      };
-      (this.$router as Router).push(route);
-    } else if (this.veriClaim.claimType === "Offer") {
-      const route = {
-        name: "offer-details",
-        query: {
-          prevCredToEdit: JSON.stringify(this.veriClaim),
-          destinationPathAfter:
-            "/claim/" + encodeURIComponent(this.veriClaim.handleId),
-        },
-      };
-      (this.$router as Router).push(route);
-    } else {
-      console.error(
-        "Unrecognized claim type for edit:",
-        this.veriClaim.claimType,
-      );
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "This is an unrecognized claim type.",
-        },
-        3000,
-      );
-    }
-  }
 }
 </script>

src/views/ConfirmGiftView.vue

@@ -1,6 +1,5 @@
 <template>
   <QuickNav />
-  <TopMessage />
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
     <!-- Breadcrumb -->
@@ -16,7 +15,6 @@
         <span
           v-if="
             libsUtil.isGiveRecordTheUserCanConfirm(
-              isRegistered,
               veriClaim,
               activeDid,
               confirmerIdList,
@@ -29,13 +27,12 @@
       </h1>
     </div>
 
-    <div v-if="giveDetails && !isLoading">
+    <div v-if="giveDetails">
       <div class="flex justify-center">
         <button
           class="col-span-1 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"
           v-if="
             libsUtil.isGiveRecordTheUserCanConfirm(
-              isRegistered,
               veriClaim,
               activeDid,
               confirmerIdList,
@@ -55,7 +52,6 @@
           <fa icon="circle-check" class="ml-2 text-white cursor-pointer" />
         </button>
         <a
-          v-if="isRegistered"
           class="col-span-1 bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white ml-2 px-4 py-2 rounded-md"
           :href="urlForNewGive"
         >
@@ -149,9 +145,11 @@
 
         <span v-if="totalConfirmers() === 0">Nobody has confirmed this.</span>
         <span v-else-if="totalConfirmers() === 1">
-          One person confirmed this.
+          One person has confirmed this.
+        </span>
+        <span v-else>
+          {{ totalConfirmers() }} people have confirmed this.
         </span>
-        <span v-else> {{ totalConfirmers() }} people confirmed this. </span>
 
         <div v-if="totalConfirmers() > 0">
           <div
@@ -169,10 +167,10 @@
             "
           >
             <!-- Only show if this person has links to confirmers (below). -->
-            Nobody that you know issued or confirmed this claim.
+            Nobody that you know has issued or confirmed this claim.
           </div>
           <div v-if="confirmerIdList.length > 0">
-            The following people issued or confirmed this claim.
+            The following people have issued or confirmed this claim.
             <ul class="ml-4">
               <li
                 v-for="confirmerId in confirmerIdList"
@@ -204,7 +202,7 @@
 
           <!--
            Never need to show this message:
-           "Nobody that you know can see someone who confirmed this claim."
+           "Nobody that you know can see someone who has confirmed this claim."
 
            If there is nobody in the confirmerIdList then we'll show the combined "nobody" message.
            If there is somebody in the confirmerIdList then that's all they need to show.
@@ -212,7 +210,7 @@
 
           <!-- Now show anyone linked to confirmers. -->
           <div v-if="confsVisibleToIdList.length > 0">
-            The following people can connect you with people who issued or
+            The following people can connect you with people who have issued or
             confirmed this claim.
             <ul class="ml-4">
               <li
@@ -248,11 +246,10 @@
 
         <!-- explain if user cannot confirm -->
         <!-- Note that these conditions are mirrored in userCanConfirm(). -->
-        <div v-if="!isRegistered">
+        <div v-if="confirmerIdList.includes(activeDid)">
-          You cannot confirm this because you are not registered. Find someone
+          You have confirmed this claim.
-          to register you, maybe on the Help page.
         </div>
-        <div v-else-if="giveDetails.issuerDid == activeDid">
+        <div v-else-if="giveDetails.agentDid == activeDid">
           You cannot confirm this because you issued this claim, so you already
           count as confirming it.
         </div>
@@ -374,9 +371,9 @@
         >
       </div>
     </div>
-    <div v-else-if="!isLoading">This does not have details to confirm.</div>
+    <div v-else>This does not have details to confirm.</div>
 
-    <div class="mt-4" v-if="!isLoading">
+    <div class="mt-4">
       <a
         @click="showClaimPage(veriClaim.id)"
         class="text-blue-500 cursor-pointer"
@@ -385,43 +382,38 @@
         All Generic Info
       </a>
     </div>
-
-    <div
-      class="fixed left-6 bottom-24 text-center text-4xl leading-none bg-slate-400 text-white w-14 py-2.5 rounded-full"
-      v-if="isLoading"
-    >
-      <fa icon="spinner" class="fa-spin-pulse"></fa>
-    </div>
   </section>
 </template>
 
 <script lang="ts">
-import { AxiosError } from "axios";
+import { AxiosError, RawAxiosRequestHeaders } from "axios";
 import * as yaml from "js-yaml";
 import * as R from "ramda";
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
 import { useClipboard } from "@vueuse/core";
-import { Router } from "vue-router";
 
+import GiftedDialog from "@/components/GiftedDialog.vue";
 import QuickNav from "@/components/QuickNav.vue";
 import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 import * as serverUtil from "@/libs/endorserServer";
-import { displayAmount, GiveSummaryRecord } from "@/libs/endorserServer";
+import { displayAmount, GiverReceiverInputInfo } from "@/libs/endorserServer";
 import * as libsUtil from "@/libs/util";
 import { isGiveAction } from "@/libs/util";
-import TopMessage from "@/components/TopMessage.vue";
 
 @Component({
   methods: { displayAmount },
-  components: { TopMessage, QuickNav },
+  components: { GiftedDialog, QuickNav },
 })
 export default class ClaimView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
+  accountIdentityStr: string = "null";
   activeDid = "";
   allMyDids: Array<string> = [];
   allContacts: Array<Contact> = [];
@@ -431,11 +423,9 @@ export default class ClaimView extends Vue {
   confirmerIdList: string[] = []; // list of DIDs that have confirmed this claim excluding the issuer
   confsVisibleErrorMessage = "";
   confsVisibleToIdList: string[] = []; // list of DIDs that can see any confirmer
-  giveDetails?: GiveSummaryRecord;
+  giveDetails = null;
   giverName = "";
   issuerName = "";
-  isLoading = false;
-  isRegistered = false;
   numConfsNotVisible = 0; // number of hidden DIDs in the confirmerIdList, minus the issuer if they aren't visible
   recipientName = "";
   showDetails = false;
@@ -454,8 +444,7 @@ export default class ClaimView extends Vue {
     this.confirmerIdList = [];
     this.confsVisibleErrorMessage = "";
     this.confsVisibleToIdList = [];
-    this.giveDetails = undefined;
+    this.giveDetails = null;
-    this.isRegistered = false;
     this.numConfsNotVisible = 0;
     this.urlForNewGive = "";
     this.veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
@@ -463,18 +452,19 @@ export default class ClaimView extends Vue {
   }
 
   async mounted() {
-    this.isLoading = true;
     await db.open();
     const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
     this.activeDid = settings?.activeDid || "";
     this.apiServer = settings?.apiServer || "";
     this.allContacts = await db.contacts.toArray();
-    this.isRegistered = settings?.isRegistered || false;
 
     await accountsDB.open();
     const accounts = accountsDB.accounts;
     const accountsArr: Array<Account> = await accounts?.toArray();
     this.allMyDids = accountsArr.map((acc) => acc.did);
+    const account = accountsArr.find((acc) => acc.did === this.activeDid);
+    this.accountIdentityStr = (account?.identity as string) || "null";
+    const identity = JSON.parse(this.accountIdentityStr);
 
     const pathParam = window.location.pathname.substring(
       "/confirm-gift/".length,
@@ -482,7 +472,7 @@ export default class ClaimView extends Vue {
     let claimId;
     if (pathParam) {
       claimId = decodeURIComponent(pathParam);
-      await this.loadClaim(claimId, this.activeDid);
+      await this.loadClaim(claimId, identity);
     } else {
       this.$notify(
         {
@@ -498,8 +488,6 @@ export default class ClaimView extends Vue {
     // When Chrome compatibility is fixed https://developer.mozilla.org/en-US/docs/Web/API/Web_Share_API#api.navigator.canshare
     // then use this truer check: navigator.canShare && navigator.canShare()
     this.canShare = !!navigator.share;
-
-    this.isLoading = false;
   }
 
   // insert a space before any capital letters except the initial letter
@@ -531,6 +519,33 @@ export default class ClaimView extends Vue {
     );
   }
 
+  public async getIdentity(activeDid: string): Promise<IIdentifier> {
+    await accountsDB.open();
+    const account = (await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first()) as Account;
+    const identity = JSON.parse(account?.identity || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load project records with no identifier available.",
+      );
+    }
+    return identity;
+  }
+
+  public async getHeaders(identity: IIdentifier) {
+    const headers: RawAxiosRequestHeaders = {
+      "Content-Type": "application/json",
+    };
+    if (identity) {
+      const token = await accessToken(identity);
+      headers["Authorization"] = "Bearer " + token;
+    }
+    return headers;
+  }
+
   // Isn't there a better way to make this available to the template?
   didInfo(did: string | undefined) {
     return serverUtil.didInfo(
@@ -541,14 +556,14 @@ export default class ClaimView extends Vue {
     );
   }
 
-  async loadClaim(claimId: string, userDid: string) {
+  async loadClaim(claimId: string, identity: IIdentifier) {
     const urlPath = libsUtil.isGlobalUri(claimId)
       ? "/api/claim/byHandle/"
       : "/api/claim/";
     const url = this.apiServer + urlPath + encodeURIComponent(claimId);
 
     try {
-      const headers = await serverUtil.getHeaders(userDid);
+      const headers = await this.getHeaders(identity);
       const resp = await this.axios.get(url, { headers });
       // resp.data is:
       // - a Jwt from https://api.endorser.ch/api-docs/
@@ -588,7 +603,7 @@ export default class ClaimView extends Vue {
         this.apiServer +
         "/api/v2/report/gives?handleId=" +
         encodeURIComponent(this.veriClaim.handleId as string);
-      const giveHeaders = await serverUtil.getHeaders(userDid);
+      const giveHeaders = await this.getHeaders(identity);
       const giveResp = await this.axios.get(giveUrl, {
         headers: giveHeaders,
       });
@@ -606,12 +621,6 @@ export default class ClaimView extends Vue {
           },
           3000,
         );
-        return;
-      }
-
-      // the logic already stops earlier if the claim doesn't exist but this helps with typechecking
-      if (!this.giveDetails) {
-        return;
       }
 
       this.urlForNewGive = "/gifted-details?";
@@ -652,8 +661,7 @@ export default class ClaimView extends Vue {
         this.giveDetails.fulfillsHandleId
       ) {
         this.urlForNewGive +=
-          "&offerId=" +
+          "&offerId=" + encodeURIComponent(this.giveDetails.fulfillsHandleId);
-          encodeURIComponent(this.giveDetails?.fulfillsHandleId as string);
       }
       if (this.giveDetails.fulfillsPlanHandleId) {
         this.urlForNewGive +=
@@ -666,19 +674,15 @@ export default class ClaimView extends Vue {
         this.apiServer +
         "/api/report/issuersWhoClaimedOrConfirmed?claimId=" +
         encodeURIComponent(serverUtil.stripEndorserPrefix(claimId));
-      const confirmHeaders = await serverUtil.getHeaders(userDid);
+      const confirmHeaders = await this.getHeaders(identity);
       const response = await this.axios.get(confirmUrl, {
         headers: confirmHeaders,
       });
       if (response.status === 200) {
         const resultList1 = response.data.result || [];
-        //const publicUrls = resultList.publicUrls || [];
-        delete resultList1.publicUrls;
-        // remove any hidden DIDs
         const resultList2 = R.reject(serverUtil.isHiddenDid, resultList1);
-        // remove confirmations by this user
         const resultList3 = R.reject(
-          (did: string) => did === this.giveDetails?.issuerDid,
+          (did: string) => did === this.giveDetails.agentDid,
           resultList2,
         );
         this.confirmerIdList = resultList3;
@@ -743,7 +747,7 @@ export default class ClaimView extends Vue {
     };
     const result = await serverUtil.createAndSubmitClaim(
       confirmationClaim,
-      this.activeDid,
+      await this.getIdentity(this.activeDid),
       this.apiServer,
       this.axios,
     );
@@ -775,12 +779,24 @@ export default class ClaimView extends Vue {
     const route = {
       path: "/claim/" + encodeURIComponent(claimId),
     };
-    (this.$router as Router).push(route).then(async () => {
+    this.$router.push(route).then(async () => {
       this.resetThisValues();
-      await this.loadClaim(claimId, this.activeDid);
+      await this.loadClaim(claimId, JSON.parse(this.accountIdentityStr));
     });
   }
 
+  openFulfillGiftDialog() {
+    const giver: GiverReceiverInputInfo = {
+      did: libsUtil.offerGiverDid(this.veriClaim),
+    };
+    (this.$refs.customGiveDialog as GiftedDialog).open(
+      giver,
+      undefined,
+      this.giveDetails.handleId,
+      "Offer fulfilled by " + (giver?.name || "someone not named"),
+    );
+  }
+
   copyToClipboard(name: string, text: string) {
     useClipboard()
       .copy(text)
@@ -798,17 +814,7 @@ export default class ClaimView extends Vue {
   }
 
   notifyWhyCannotConfirm() {
-    if (!this.isRegistered) {
+    if (!isGiveAction(this.veriClaim)) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "info",
-          title: "Not Registered",
-          text: "Someone needs to register you before you can contribute.",
-        },
-        3000,
-      );
-    } else if (!isGiveAction(this.veriClaim)) {
       this.$notify(
         {
           group: "alert",
@@ -824,11 +830,11 @@ export default class ClaimView extends Vue {
           group: "alert",
           type: "info",
           title: "Already Confirmed",
-          text: "You already confirmed this claim.",
+          text: "You have already confirmed this claim.",
         },
         3000,
       );
-    } else if (this.giveDetails?.issuerDid == this.activeDid) {
+    } else if (this.giveDetails.agentDid == this.activeDid) {
       this.$notify(
         {
           group: "alert",
@@ -838,7 +844,7 @@ export default class ClaimView extends Vue {
         },
         3000,
       );
-    } else if (serverUtil.containsHiddenDid(this.giveDetails?.fullClaim)) {
+    } else if (serverUtil.containsHiddenDid(this.giveDetails.fullClaim)) {
       this.$notify(
         {
           group: "alert",

src/views/ContactAmountsView.vue

@@ -55,7 +55,7 @@
             {{ new Date(record.issuedAt).toLocaleString() }}
           </td>
           <td class="p-1">
-            <span v-if="record.agentDid == contact?.did">
+            <span v-if="record.agentDid == contact.did">
               <div class="font-bold">
                 {{ displayAmount(record.unit, record.amount) }}
                 <span v-if="record.amountConfirmed" title="Confirmed">
@@ -71,7 +71,7 @@
             </span>
           </td>
           <td class="p-1">
-            <span v-if="record.agentDid == contact?.did">
+            <span v-if="record.agentDid == contact.did">
               <fa icon="arrow-left" class="text-slate-400 fa-fw" />
             </span>
             <span v-else>
@@ -79,7 +79,7 @@
             </span>
           </td>
           <td class="p-1">
-            <span v-if="record.agentDid != contact?.did">
+            <span v-if="record.agentDid != contact.did">
               <div class="font-bold">
                 {{ displayAmount(record.unit, record.amount) }}
                 <span v-if="record.amountConfirmed" title="Confirmed">
@@ -105,21 +105,21 @@
 </template>
 
 <script lang="ts">
-import { AxiosError, AxiosRequestHeaders } from "axios";
+import { AxiosError } from "axios";
+import * as didJwt from "did-jwt";
 import * as R from "ramda";
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import QuickNav from "@/components/QuickNav.vue";
 import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { accessToken, SimpleSigner } from "@/libs/crypto";
 import {
   AgreeVerifiableCredential,
-  createEndorserJwtVcFromClaim,
   displayAmount,
-  getHeaders,
   GiveSummaryRecord,
   GiveVerifiableCredential,
   SCHEMA_ORG_CONTEXT,
@@ -142,15 +142,40 @@ export default class ContactAmountssView extends Vue {
     this.numAccounts = await accountsDB.accounts.count();
   }
 
+  public async getIdentity(activeDid: string) {
+    await accountsDB.open();
+    const account = await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first();
+    const identity = JSON.parse(account?.identity || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load Give records with no identifier available.",
+      );
+    }
+    return identity;
+  }
+
+  public async getHeaders(identity: IIdentifier) {
+    const token = await accessToken(identity);
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token,
+    };
+    return headers;
+  }
+
   async created() {
     try {
       await db.open();
-      const contactDid = (this.$route as Router).query["contactDid"] as string;
+      const contactDid = this.$route.query.contactDid as string;
       this.contact = (await db.contacts.get(contactDid)) || null;
 
       const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-      this.activeDid = (settings?.activeDid as string) || "";
+      this.activeDid = settings?.activeDid || "";
-      this.apiServer = (settings?.apiServer as string) || "";
+      this.apiServer = settings?.apiServer || "";
 
       if (this.activeDid && this.contact) {
         this.loadGives(this.activeDid, this.contact);
@@ -174,14 +199,15 @@ export default class ContactAmountssView extends Vue {
 
   async loadGives(activeDid: string, contact: Contact) {
     try {
+      const identity = await this.getIdentity(this.activeDid);
       let result: Array<GiveSummaryRecord> = [];
       const url =
         this.apiServer +
         "/api/v2/report/gives?agentDid=" +
-        encodeURIComponent(this.activeDid) +
+        encodeURIComponent(identity.did) +
         "&recipientDid=" +
         encodeURIComponent(contact.did);
-      const headers = await getHeaders(activeDid);
+      const headers = await this.getHeaders(identity);
       const resp = await this.axios.get(url, { headers });
       if (resp.status === 200) {
         result = resp.data.data;
@@ -207,8 +233,8 @@ export default class ContactAmountssView extends Vue {
         "/api/v2/report/gives?agentDid=" +
         encodeURIComponent(contact.did) +
         "&recipientDid=" +
-        encodeURIComponent(this.activeDid);
+        encodeURIComponent(identity.did);
-      const headers2 = await getHeaders(activeDid);
+      const headers2 = await this.getHeaders(identity);
       const resp2 = await this.axios.get(url2, { headers: headers2 });
       if (resp2.status === 200) {
         result = R.concat(result, resp2.data.data);
@@ -263,21 +289,42 @@ export default class ContactAmountssView extends Vue {
       object: origClaim,
     };
 
-    const vcJwt: string = await createEndorserJwtVcFromClaim(
+    // Make a payload for the claim
-      this.activeDid,
+    const vcPayload = {
-      vcClaim,
+      vc: {
-    );
+        "@context": ["https://www.w3.org/2018/credentials/v1"],
+        type: ["VerifiableCredential"],
+        credentialSubject: vcClaim,
+      },
+    };
+
+    // Create a signature using private key of identity
+    const identity = await this.getIdentity(this.activeDid);
+    if (identity.keys[0].privateKeyHex !== null) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const privateKeyHex: string = identity.keys[0].privateKeyHex!;
+      const signer = await SimpleSigner(privateKeyHex);
+      const alg = undefined;
+      // Create a JWT for the request
+      const vcJwt: string = await didJwt.createJWT(vcPayload, {
+        alg: alg,
+        issuer: identity.did,
+        signer: signer,
+      });
 
       // Make the xhr request payload
       const payload = JSON.stringify({ jwtEncoded: vcJwt });
       const url = this.apiServer + "/api/v2/claim";
-    const headers = (await getHeaders(this.activeDid)) as AxiosRequestHeaders;
+      const token = await accessToken(identity);
+      const headers = {
+        "Content-Type": "application/json",
+        Authorization: "Bearer " + token,
+      };
 
       try {
         const resp = await this.axios.post(url, payload, { headers });
         if (resp.data?.success) {
-        record.amountConfirmed =
+          record.amountConfirmed = origClaim.object?.amountOfThisGood || 1;
-          (origClaim.object?.amountOfThisGood as number) || 1;
         }
       } catch (error) {
         let userMessage = "There was an error. See logs for more info.";
@@ -303,6 +350,7 @@ export default class ContactAmountssView extends Vue {
         );
       }
     }
+  }
 
   cannotConfirmMessage() {
     this.$notify(

src/views/ContactGiftingView.vue

@@ -72,14 +72,17 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
+import { IIdentifier } from "@veramo/core";
 
 import GiftedDialog from "@/components/GiftedDialog.vue";
 import QuickNav from "@/components/QuickNav.vue";
 import EntityIcon from "@/components/EntityIcon.vue";
 import { NotificationIface } from "@/constants/app";
-import { db } from "@/db/index";
+import { db, accountsDB } from "@/db/index";
+import { Account, AccountsSchema } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 import { GiverReceiverInputInfo } from "@/libs/endorserServer";
 
 @Component({
@@ -91,8 +94,13 @@ export default class ContactGiftingView extends Vue {
   activeDid = "";
   allContacts: Array<Contact> = [];
   apiServer = "";
+  accounts: typeof AccountsSchema;
   projectId = localStorage.getItem("projectId") || "";
 
+  async beforeCreate() {
+    accountsDB.open();
+  }
+
   async created() {
     try {
       await db.open();
@@ -126,7 +134,32 @@ export default class ContactGiftingView extends Vue {
     }
   }
 
-  openDialog(giver?: GiverReceiverInputInfo) {
+  public async getIdentity(activeDid: string) {
+    await accountsDB.open();
+    const account = (await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first()) as Account;
+    const identity = JSON.parse(account?.identity || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load Give records with no identifier available.",
+      );
+    }
+    return identity;
+  }
+
+  public async getHeaders(identity: IIdentifier) {
+    const token = await accessToken(identity);
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token,
+    };
+    return headers;
+  }
+
+  openDialog(giver: GiverReceiverInputInfo) {
     const recipient = this.projectId
       ? undefined
       : { did: this.activeDid, name: "you" };

src/views/ContactImportView.vue

@@ -1,194 +0,0 @@
-<template>
-  <QuickNav selected="Contacts"></QuickNav>
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
-    <!-- Back -->
-    <div class="text-lg text-center font-light relative px-7">
-      <h1
-        class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-        @click="$router.back()"
-      >
-        <fa icon="chevron-left" class="fa-fw"></fa>
-      </h1>
-    </div>
-
-    <!-- Heading -->
-    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-      Contact Import
-    </h1>
-
-    <span>
-      Note that you will have to make them visible one-by-one in the list of
-      Contacts.
-    </span>
-    <div v-if="sameCount > 0">
-      <span v-if="sameCount == 1"
-        >One contact is the same as an existing contact</span
-      >
-      <span v-else
-        >{{ sameCount }} contacts are the same as existing contacts</span
-      >
-    </div>
-
-    <!-- Results List -->
-    <ul v-if="contactsImporting.length > 0" class="border-t border-slate-300">
-      <li v-for="(contact, index) in contactsImporting" :key="contact.did">
-        <div
-          v-if="
-            !contactsExisting[contact.did] ||
-            !R.isEmpty(contactDifferences[contact.did])
-          "
-          class="grow overflow-hidden border-b border-slate-300 pt-2.5 pb-4"
-        >
-          <h2 class="text-base font-semibold">
-            <input type="checkbox" v-model="contactsSelected[index]" />
-            {{ contact.name || AppString.NO_CONTACT_NAME }}
-            -
-            <span v-if="contactsExisting[contact.did]" class="text-orange-500"
-              >Existing</span
-            >
-            <span v-else class="text-green-500">New</span>
-          </h2>
-          <div class="text-sm truncate">
-            {{ contact.did }}
-          </div>
-          <div v-if="contactDifferences[contact.did]">
-            <div>
-              <div class="grid grid-cols-3 gap-2">
-                <div class="font-bold">Field</div>
-                <div class="font-bold">Old Value</div>
-                <div class="font-bold">New Value</div>
-              </div>
-              <div
-                v-for="(value, contactField) in contactDifferences[contact.did]"
-                :key="contactField"
-                class="grid grid-cols-3 border"
-              >
-                <div class="border p-1">{{ contactField }}</div>
-                <div class="border p-1">{{ value.old }}</div>
-                <div class="border p-1">{{ value.new }}</div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </li>
-      <fa icon="spinner" v-if="importing" class="animate-spin" />
-      <button
-        v-else
-        class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-sm text-white mt-2 px-2 py-1.5 rounded"
-        @click="importContacts"
-      >
-        Import Selected Contacts
-      </button>
-    </ul>
-    <p v-else>There are no contacts to import.</p>
-  </section>
-</template>
-
-<script lang="ts">
-import * as R from "ramda";
-import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
-import { AppString, NotificationIface } from "@/constants/app";
-import { db } from "@/db/index";
-import { Contact } from "@/db/tables/contacts";
-import * as libsUtil from "@/libs/util";
-import QuickNav from "@/components/QuickNav.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-import OfferDialog from "@/components/OfferDialog.vue";
-
-@Component({
-  components: { EntityIcon, OfferDialog, QuickNav },
-})
-export default class ContactImportView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  AppString = AppString;
-  libsUtil = libsUtil;
-  R = R;
-
-  contactsExisting: Record<string, Contact> = {}; // user's contacts already in the system, keyed by DID
-  contactsImporting: Array<Contact> = []; // contacts from the import
-  contactsSelected: Array<boolean> = []; // whether each contact in contactsImporting is selected
-  contactDifferences: Record<
-    string,
-    Record<string, { new: string; old: string }>
-  > = {}; // for existing contacts, it shows the difference between imported and existing contacts for each key
-  importing = false;
-  sameCount = 0;
-
-  async created() {
-    // Retrieve the imported contacts from the query parameter
-    const importedContacts =
-      ((this.$route as Router).query["contacts"] as string) || "[]";
-    this.contactsImporting = JSON.parse(importedContacts);
-    this.contactsSelected = new Array(this.contactsImporting.length).fill(
-      false,
-    );
-
-    await db.open();
-    const baseContacts = await db.contacts.toArray();
-    // set the existing contacts, keyed by DID, if they exist in contactsImporting
-    for (let i = 0; i < this.contactsImporting.length; i++) {
-      const contactIn = this.contactsImporting[i];
-      const existingContact = baseContacts.find(
-        (contact) => contact.did === contactIn.did,
-      );
-      if (existingContact) {
-        this.contactsExisting[contactIn.did] = existingContact;
-
-        const differences: Record<string, { new: string; old: string }> = {};
-        Object.keys(contactIn).forEach((key) => {
-          if (contactIn[key] !== existingContact[key]) {
-            differences[key] = {
-              old: existingContact[key],
-              new: contactIn[key],
-            };
-          }
-        });
-        this.contactDifferences[contactIn.did] = differences;
-        if (R.isEmpty(differences)) {
-          this.sameCount++;
-        }
-      } else {
-        // automatically import new data
-        this.contactsSelected[i] = true;
-      }
-    }
-  }
-
-  async importContacts() {
-    this.importing = true;
-    let importedCount = 0,
-      updatedCount = 0;
-    for (let i = 0; i < this.contactsImporting.length; i++) {
-      if (this.contactsSelected[i]) {
-        const contact = this.contactsImporting[i];
-        const existingContact = this.contactsExisting[contact.did];
-        if (existingContact) {
-          await db.contacts.update(contact.did, contact);
-          updatedCount++;
-        } else {
-          // without explicit clone on the Proxy, we get: DataCloneError: Failed to execute 'add' on 'IDBObjectStore': #<Object> could not be cloned.
-          await db.contacts.add(R.clone(contact));
-          importedCount++;
-        }
-      }
-    }
-    this.importing = false;
-
-    this.$notify(
-      {
-        group: "alert",
-        type: "success",
-        title: "Import Success",
-        text:
-          `${importedCount} contact${importedCount == 1 ? "" : "s"} imported.` +
-          (updatedCount ? ` ${updatedCount} updated.` : ""),
-      },
-      3000,
-    );
-    (this.$router as Router).push({ name: "contacts" });
-  }
-}
-</script>

src/views/ContactQRScanShowView.vue

@@ -24,7 +24,6 @@
       >
         <span class="text-red">Beware!</span>
         You aren't sharing your name, so quickly
-        <br />
         <router-link
           :to="{ name: 'new-edit-account' }"
           class="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-1.5 py-1 rounded-md"
@@ -34,11 +33,7 @@
       </p>
     </div>
 
-    <div
+    <div @click="onCopyToClipboard()" v-if="activeDid" class="text-center">
-      @click="onCopyUrlToClipboard()"
-      v-if="activeDid && activeDid.startsWith(ETHR_DID_PREFIX)"
-      class="text-center"
-    >
       <!--
         Play with display options: https://qr-code-styling.com/
         See docs: https://www.npmjs.com/package/qr-code-generator-vue3
@@ -49,18 +44,8 @@
         :dotsOptions="{ type: 'square' }"
         class="flex justify-center"
       />
-      <span>
+      <span> Click that QR to copy your contact URL to your clipboard. </span>
-        Click this or QR code to copy your contact URL to your clipboard.
+      <div>Not scanning? Show it in pieces.</div>
-      </span>
-    </div>
-    <div v-else-if="activeDid" class="text-center">
-      <!-- Not an ETHR DID so force them to paste it. (Passkey Peer DIDs are too big.) -->
-      <span @click="onCopyDidToClipboard()" class="text-blue-500">
-        Click here to copy your DID to your clipboard.
-      </span>
-      <span>
-        Then give it to them so they can paste it in their list of People.
-      </span>
     </div>
     <div class="text-center" v-else>
       You have no identitifiers yet, so
@@ -87,7 +72,7 @@
 
 <script lang="ts">
 import { AxiosError } from "axios";
-import { Buffer } from "buffer/";
+import * as didJwt from "did-jwt";
 import { sha256 } from "ethereum-cryptography/sha256.js";
 import QRCodeVue3 from "qr-code-generator-vue3";
 import * as R from "ramda";
@@ -98,22 +83,24 @@ import { useClipboard } from "@vueuse/core";
 import QuickNav from "@/components/QuickNav.vue";
 import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
+import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import {
   deriveAddress,
   getContactPayloadFromJwtUrl,
   nextDerivationPath,
+  SimpleSigner,
 } from "@/libs/crypto";
 import {
   CONTACT_URL_PREFIX,
-  createEndorserJwtForDid,
   ENDORSER_JWT_URL_LOCATION,
   isDid,
   register,
   setVisibilityUtil,
 } from "@/libs/endorserServer";
-import { ETHR_DID_PREFIX } from "@/libs/crypto/vc";
+
+import { Buffer } from "buffer/";
 
 @Component({
   components: {
@@ -132,8 +119,6 @@ export default class ContactQRScanShow extends Vue {
   isRegistered = false;
   qrValue = "";
 
-  ETHR_DID_PREFIX = ETHR_DID_PREFIX;
-
   async created() {
     await db.open();
     const settings = await db.settings.get(MASTER_SETTINGS_KEY);
@@ -148,9 +133,17 @@ export default class ContactQRScanShow extends Vue {
     const accounts = await accountsDB.accounts.toArray();
     const account = R.find((acc) => acc.did === this.activeDid, accounts);
     if (account) {
-      const publicKeyHex = account.publicKeyHex;
+      const identity = await this.getIdentity(this.activeDid);
+      const publicKeyHex = identity.keys[0].publicKeyHex;
       const publicEncKey = Buffer.from(publicKeyHex, "hex").toString("base64");
 
+      const newDerivPath = nextDerivationPath(account.derivationPath);
+      const nextPublicHex = deriveAddress(account.mnemonic, newDerivPath)[2];
+      const nextPublicEncKey = Buffer.from(nextPublicHex, "hex");
+      const nextPublicEncKeyHash = sha256(nextPublicEncKey);
+      const nextPublicEncKeyHashBase64 =
+        Buffer.from(nextPublicEncKeyHash).toString("base64");
+
       const contactInfo = {
         iat: Date.now(),
         iss: this.activeDid,
@@ -159,28 +152,21 @@ export default class ContactQRScanShow extends Vue {
             (settings?.firstName || "") +
             (settings?.lastName ? ` ${settings.lastName}` : ""), // deprecated, pre v 0.1.3
           publicEncKey,
+          nextPublicEncKeyHash: nextPublicEncKeyHashBase64,
           profileImageUrl: settings?.profileImageUrl,
           registered: settings?.isRegistered,
         },
       };
 
-      if (account?.mnemonic && account?.derivationPath) {
+      const alg = undefined;
-        const newDerivPath = nextDerivationPath(
+      const privateKeyHex: string = identity.keys[0].privateKeyHex;
-          account.derivationPath as string,
+      const signer = await SimpleSigner(privateKeyHex);
-        );
+      // create a JWT for the request
-        const nextPublicHex = deriveAddress(
+      const vcJwt: string = await didJwt.createJWT(contactInfo, {
-          account.mnemonic as string,
+        alg: alg,
-          newDerivPath,
+        issuer: identity.did,
-        )[2];
+        signer: signer,
-        const nextPublicEncKey = Buffer.from(nextPublicHex, "hex");
+      });
-        const nextPublicEncKeyHash = sha256(nextPublicEncKey);
-        const nextPublicEncKeyHashBase64 =
-          Buffer.from(nextPublicEncKeyHash).toString("base64");
-        contactInfo.own.nextPublicEncKeyHash = nextPublicEncKeyHashBase64;
-      }
-
-      const vcJwt = await createEndorserJwtForDid(this.activeDid, contactInfo);
-
       const viewPrefix = CONTACT_URL_PREFIX + ENDORSER_JWT_URL_LOCATION;
       this.qrValue = viewPrefix + vcJwt;
     }
@@ -198,6 +184,23 @@ export default class ContactQRScanShow extends Vue {
     );
   }
 
+  public async getIdentity(activeDid: string) {
+    await accountsDB.open();
+    const accounts = await accountsDB.accounts.toArray();
+    const account: Account | undefined = R.find(
+      (acc) => acc.did === activeDid,
+      accounts,
+    );
+    const identity = JSON.parse((account?.identity as string) || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to show contact info with no identifier available.",
+      );
+    }
+    return identity;
+  }
+
   /**
    *
    * @param content is the result of a QR scan, an array with one item with a rawValue property
@@ -278,7 +281,7 @@ export default class ContactQRScanShow extends Vue {
                   text: "Do you want to register them?",
                   onCancel: async (stopAsking: boolean) => {
                     if (stopAsking) {
-                      await db.settings.update(MASTER_SETTINGS_KEY, {
+                      db.settings.update(MASTER_SETTINGS_KEY, {
                         hideRegisterPromptOnNewContact: stopAsking,
                       });
                       this.hideRegisterPromptOnNewContact = stopAsking;
@@ -286,7 +289,7 @@ export default class ContactQRScanShow extends Vue {
                   },
                   onNo: async (stopAsking: boolean) => {
                     if (stopAsking) {
-                      await db.settings.update(MASTER_SETTINGS_KEY, {
+                      db.settings.update(MASTER_SETTINGS_KEY, {
                         hideRegisterPromptOnNewContact: stopAsking,
                       });
                       this.hideRegisterPromptOnNewContact = stopAsking;
@@ -430,7 +433,7 @@ export default class ContactQRScanShow extends Vue {
     );
   }
 
-  onCopyUrlToClipboard() {
+  onCopyToClipboard() {
     //this.onScanDetect([{ rawValue: this.qrValue }]); // good for testing
     useClipboard()
       .copy(this.qrValue)
@@ -447,22 +450,5 @@ export default class ContactQRScanShow extends Vue {
         );
       });
   }
-
-  onCopyDidToClipboard() {
-    //this.onScanDetect([{ rawValue: this.qrValue }]); // good for testing
-    useClipboard()
-      .copy(this.activeDid)
-      .then(() => {
-        this.$notify(
-          {
-            group: "alert",
-            type: "info",
-            title: "Copied",
-            text: "Your DID was copied to the clipboard. Have them paste it in the box on their 'People' screen to add you.",
-          },
-          5000,
-        );
-      });
-  }
 }
 </script>

src/views/ContactsView.vue

@@ -1,7 +1,5 @@
 <template>
-  <QuickNav selected="Contacts" />
+  <QuickNav selected="Contacts"></QuickNav>
-  <TopMessage />
-
   <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
     <!-- Heading -->
     <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
@@ -22,7 +20,7 @@
     </div>
 
     <!-- New Contact -->
-    <div id="formAddNewContact" class="mt-4 mb-4 flex items-stretch">
+    <div class="mt-4 mb-4 flex items-stretch">
       <router-link
         :to="{ name: 'contact-qr' }"
         class="flex items-center bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-1 mr-1 rounded-md"
@@ -39,37 +37,7 @@
         class="px-4 rounded-r bg-slate-200 border border-l-0 border-slate-400"
         @click="onClickNewContact()"
       >
-        <fa icon="plus" class="fa-fw" />
+        <fa icon="plus" class="fa-fw"></fa>
-      </button>
-    </div>
-
-    <div class="flex justify-between" v-if="contacts.length > 0">
-      <div class="w-full text-left">
-        <input
-          type="checkbox"
-          v-if="!showGiveNumbers"
-          :checked="contactsSelected.length === contacts.length"
-          @click="
-            contactsSelected.length === contacts.length
-              ? (contactsSelected = [])
-              : (contactsSelected = contacts.map((contact) => contact.did))
-          "
-          class="align-middle ml-2 h-6 w-6"
-          data-testId="contactCheckAllTop"
-        />
-        <button
-          href=""
-          class="text-md bg-gradient-to-b shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white ml-2 px-1 py-1 rounded-md"
-          :style="
-            contactsSelected.length > 0
-              ? 'background-image: linear-gradient(to bottom, #3b82f6, #1e40af);'
-              : 'background-image: linear-gradient(to bottom, #94a3b8, #374151);'
-          "
-          @click="copySelectedContacts()"
-          v-if="!showGiveNumbers"
-          data-testId="copySelectedContactsButtonTop"
-        >
-          Copy Selections
       </button>
     </div>
 
@@ -82,7 +50,6 @@
         {{ showGiveNumbers ? "Hide Given Hours" : "Show Given Hours" }}
       </button>
     </div>
-    </div>
     <div class="flex justify-between mt-1" v-if="showGiveNumbers">
       <div class="w-full text-right">
         In the following, only the most recent hours are included. To see more,
@@ -112,56 +79,111 @@
     </div>
 
     <!-- Results List -->
-    <ul
+    <ul v-if="contacts.length > 0" class="border-t border-slate-300">
-      id="listContacts"
-      v-if="contacts.length > 0"
-      class="border-t border-slate-300 mt-1"
-    >
       <li
-        class="border-b border-slate-300 pt-1 pb-1"
+        class="border-b border-slate-300 pt-2.5 pb-4"
-        v-for="contact in filteredContacts()"
+        v-for="contact in contacts"
         :key="contact.did"
-        data-testId="contactListItem"
       >
         <div class="grow overflow-hidden">
-          <div class="flex items-center">
+          <h2 class="text-base font-semibold">
             <EntityIcon
               :contact="contact"
               :iconSize="24"
               class="inline-block align-text-bottom border border-slate-300 rounded cursor-pointer"
               @click="showLargeIdenticon = contact"
             />
-
-            <input
-              type="checkbox"
-              v-if="!showGiveNumbers"
-              :checked="contactsSelected.includes(contact.did)"
-              @click="
-                contactsSelected.includes(contact.did)
-                  ? contactsSelected.splice(
-                      contactsSelected.indexOf(contact.did),
-                      1,
-                    )
-                  : contactsSelected.push(contact.did)
-              "
-              class="ml-2 h-6 w-6"
-              data-testId="contactCheckOne"
-            />
-
-            <h2 class="text-base font-semibold ml-2">
             {{ contact.name || AppString.NO_CONTACT_NAME }}
-            </h2>
+            <button
-
+              @click="
+                contactEdit = contact;
+                contactNewName = contact.name || '';
+              "
+              title="Edit"
+            >
+              <fa icon="pen" class="text-sm text-blue-500 ml-2 mb-1"></fa>
+            </button>
             <router-link
               :to="{
                 path: '/did/' + encodeURIComponent(contact.did),
               }"
-              title="See more about this person"
+              title="See more about this DID"
             >
               <fa icon="circle-info" class="text-blue-500 ml-4" />
             </router-link>
+          </h2>
+          <div class="text-sm truncate">
+            {{ contact.did }}
+            <button
+              @click="
+                libsUtil.doCopyTwoSecRedo(
+                  contact.did,
+                  () => (showDidCopy = !showDidCopy),
+                )
+              "
+              class="ml-2 mr-2"
+            >
+              <fa icon="copy" class="text-slate-400 fa-fw"></fa>
+            </button>
+            <span v-show="showDidCopy">Copied DID</span>
           </div>
+          <div class="text-sm truncate" v-if="contact.publicKeyBase64">
+            Public Key (base 64): {{ contact.publicKeyBase64 }}
+          </div>
+          <div class="text-sm truncate" v-if="contact.nextPubKeyHashB64">
+            Next Public Key Hash (base 64):
+            {{ contact.nextPubKeyHashB64 }}
+          </div>
+
           <div id="ContactActions" class="flex gap-1.5 mt-2">
+            <div v-if="activeDid">
+              <button
+                v-if="contact.seesMe"
+                class="text-sm uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
+                @click="confirmSetVisibility(contact, false)"
+                title="They can see you"
+              >
+                <fa icon="eye" class="fa-fw" />
+              </button>
+              <button
+                v-else
+                class="text-sm uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
+                @click="confirmSetVisibility(contact, true)"
+                title="They cannot see you"
+              >
+                <fa icon="eye-slash" class="fa-fw" />
+              </button>
+              <button
+                class="text-sm uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
+                @click="checkVisibility(contact)"
+                title="Check Visibility"
+                v-if="activeDid"
+              >
+                <fa icon="rotate" class="fa-fw" />
+              </button>
+              <button
+                @click="confirmRegister(contact)"
+                class="text-sm uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white ml-6 px-2 py-1.5 rounded-md"
+                v-if="activeDid"
+                title="Registration"
+              >
+                <fa
+                  v-if="contact.registered"
+                  icon="person-circle-check"
+                  class="fa-fw"
+                />
+                <fa v-else icon="person-circle-question" class="fa-fw" />
+              </button>
+            </div>
+
+            <button
+              @click="confirmDeleteContact(contact)"
+              class="text-sm uppercase bg-gradient-to-b from-rose-500 to-rose-800 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white ml-6 px-2 py-1.5 rounded-md"
+              title="Delete"
+            >
+              <fa icon="trash-can" class="fa-fw" />
+            </button>
+
             <div
               v-if="showGiveNumbers && contact.did != activeDid"
               class="ml-auto flex gap-1.5"
@@ -210,7 +232,7 @@
 
               <button
                 class="text-sm 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-2 py-1.5 rounded-md border border-blue-400"
-                @click="openOfferDialog(contact.did, contact.name)"
+                @click="openOfferDialog(contact.did)"
               >
                 Offer
               </button>
@@ -232,34 +254,6 @@
     </ul>
     <p v-else>There are no contacts.</p>
 
-    <div class="mt-2 w-full text-left" v-if="contacts.length > 0">
-      <input
-        type="checkbox"
-        v-if="!showGiveNumbers"
-        :checked="contactsSelected.length === contacts.length"
-        @click="
-          contactsSelected.length === contacts.length
-            ? (contactsSelected = [])
-            : (contactsSelected = contacts.map((contact) => contact.did))
-        "
-        class="align-middle ml-2 h-6 w-6"
-        data-testId="contactCheckAllBottom"
-      />
-      <button
-        href=""
-        class="text-md bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white ml-2 px-1 py-1 rounded-md"
-        :style="
-          contactsSelected.length > 0
-            ? 'background-image: linear-gradient(to bottom, #3b82f6, #1e40af);'
-            : 'background-image: linear-gradient(to bottom, #94a3b8, #374151);'
-        "
-        @click="copySelectedContacts()"
-        v-if="!showGiveNumbers"
-      >
-        Copy Selections
-      </button>
-    </div>
-
     <GiftedDialog ref="customGivenDialog" />
     <OfferDialog ref="customOfferDialog" />
 
@@ -275,29 +269,54 @@
         />
       </div>
     </div>
+
+    <div v-if="contactEdit !== null" class="dialog-overlay">
+      <div class="dialog">
+        <h1 class="text-xl font-bold text-center mb-4">Edit Name</h1>
+        <input
+          type="text"
+          class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
+          placeholder="Name"
+          v-model="contactNewName"
+        />
+        <div class="flex justify-between">
+          <button
+            class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded -ml-1.5 border-l border-blue-400"
+            @click="onClickSaveName(contactEdit, contactNewName)"
+          >
+            <fa icon="save" />
+          </button>
+          <span class="inline-block w-2" />
+          <button
+            class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded -ml-1.5 border-l border-blue-400"
+            @click="onClickCancelName()"
+          >
+            <fa icon="ban" />
+          </button>
+        </div>
+      </div>
+    </div>
   </section>
 </template>
 
 <script lang="ts">
 import { AxiosError } from "axios";
-import { Buffer } from "buffer/";
 import { IndexableType } from "dexie";
 import * as R from "ramda";
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
 import { Router } from "vue-router";
-import { useClipboard } from "@vueuse/core";
 
 import { AppString, NotificationIface } from "@/constants/app";
-import { db } from "@/db/index";
+import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import { getContactPayloadFromJwtUrl } from "@/libs/crypto";
+import { accessToken, getContactPayloadFromJwtUrl } from "@/libs/crypto";
 import {
   CONTACT_CSV_HEADER,
   CONTACT_URL_PREFIX,
   GiverReceiverInputInfo,
   GiveSummaryRecord,
-  getHeaders,
   isDid,
   register,
   setVisibilityUtil,
@@ -307,10 +326,12 @@ import QuickNav from "@/components/QuickNav.vue";
 import EntityIcon from "@/components/EntityIcon.vue";
 import GiftedDialog from "@/components/GiftedDialog.vue";
 import OfferDialog from "@/components/OfferDialog.vue";
-import TopMessage from "@/components/TopMessage.vue";
+import { Account } from "@/db/tables/accounts";
+
+import { Buffer } from "buffer/";
 
 @Component({
-  components: { TopMessage, GiftedDialog, EntityIcon, OfferDialog, QuickNav },
+  components: { GiftedDialog, EntityIcon, OfferDialog, QuickNav },
 })
 export default class ContactsView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
@@ -321,7 +342,6 @@ export default class ContactsView extends Vue {
   contactInput = "";
   contactEdit: Contact | null = null;
   contactNewName = "";
-  contactsSelected: Array<string> = [];
   // { "did:...": concatenated-descriptions } entry for each contact
   givenByMeDescriptions: Record<string, string> = {};
   // { "did:...": amount } entry for each contact
@@ -337,8 +357,6 @@ export default class ContactsView extends Vue {
   hideRegisterPromptOnNewContact = false;
   isRegistered = false;
   showDidCopy = false;
-  showPubKeyCopy = false;
-  showPubKeyHashCopy = false;
   showGiveNumbers = false;
   showGiveTotals = true;
   showGiveConfirmed = true;
@@ -347,7 +365,7 @@ export default class ContactsView extends Vue {
   AppString = AppString;
   libsUtil = libsUtil;
 
-  public async created() {
+  async created() {
     await db.open();
     const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
     this.activeDid = settings?.activeDid || "";
@@ -370,7 +388,7 @@ export default class ContactsView extends Vue {
     );
   }
 
-  private danger(message: string, title: string = "Error", timeout = 5000) {
+  danger(message: string, title: string = "Error", timeout = 5000) {
     this.$notify(
       {
         group: "alert",
@@ -382,17 +400,37 @@ export default class ContactsView extends Vue {
     );
   }
 
-  private filteredContacts() {
+  public async getIdentity(activeDid: string): Promise<IIdentifier> {
-    return this.showGiveNumbers
+    await accountsDB.open();
-      ? this.contactsSelected.length === 0
+    const accounts = await accountsDB.accounts.toArray();
-        ? this.contacts
+    const account = R.find((acc) => acc.did === activeDid, accounts) as Account;
-        : this.contacts.filter((contact) =>
+    const identity = JSON.parse(account?.identity || "null");
-            this.contactsSelected.includes(contact.did),
+
-          )
+    if (!identity) {
-      : this.contacts;
+      throw new Error(
+        "Attempted to load Give records with no identifier available.",
+      );
+    }
+    return identity;
   }
 
-  private async loadGives() {
+  public async getHeaders(identity: IIdentifier) {
+    const token = await accessToken(identity);
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token,
+    };
+    return headers;
+  }
+
+  public async getHeadersAndIdentity(activeDid: string) {
+    const identity = await this.getIdentity(activeDid);
+    const headers = await this.getHeaders(identity);
+
+    return { headers, identity };
+  }
+
+  async loadGives() {
     if (!this.activeDid) {
       return;
     }
@@ -443,7 +481,7 @@ export default class ContactsView extends Vue {
     };
 
     try {
-      const headers = await getHeaders(this.activeDid);
+      const { headers } = await this.getHeadersAndIdentity(this.activeDid);
       const givenByUrl =
         this.apiServer +
         "/api/v2/report/gives?agentDid=" +
@@ -499,20 +537,19 @@ export default class ContactsView extends Vue {
     }
   }
 
-  private async onClickNewContact(): Promise<void> {
+  async onClickNewContact(): Promise<void> {
-    const contactInput = this.contactInput.trim();
+    if (!this.contactInput) {
-    if (!contactInput) {
       this.danger("There was no contact info to add.", "No Contact");
       return;
     }
 
-    if (contactInput.startsWith(CONTACT_URL_PREFIX)) {
+    if (this.contactInput.startsWith(CONTACT_URL_PREFIX)) {
-      await this.addContactFromScan(contactInput);
+      await this.addContactFromScan(this.contactInput);
       return;
     }
 
-    if (contactInput.startsWith(CONTACT_CSV_HEADER)) {
+    if (this.contactInput.startsWith(CONTACT_CSV_HEADER)) {
-      const lines = contactInput.split(/\n/);
+      const lines = this.contactInput.split(/\n/);
       const lineAdded = [];
       for (const line of lines) {
         if (!line.trim() || line.startsWith(CONTACT_CSV_HEADER)) {
@@ -544,21 +581,20 @@ export default class ContactsView extends Vue {
       return;
     }
 
-    if (contactInput.startsWith("did:")) {
+    let did = this.contactInput;
-      let did = contactInput;
     let name, publicKeyInput, nextPublicKeyHashInput;
-      const commaPos1 = contactInput.indexOf(",");
+    const commaPos1 = this.contactInput.indexOf(",");
     if (commaPos1 > -1) {
-        did = contactInput.substring(0, commaPos1).trim();
+      did = this.contactInput.substring(0, commaPos1).trim();
-        name = contactInput.substring(commaPos1 + 1).trim();
+      name = this.contactInput.substring(commaPos1 + 1).trim();
-        const commaPos2 = contactInput.indexOf(",", commaPos1 + 1);
+      const commaPos2 = this.contactInput.indexOf(",", commaPos1 + 1);
       if (commaPos2 > -1) {
-          name = contactInput.substring(commaPos1 + 1, commaPos2).trim();
+        name = this.contactInput.substring(commaPos1 + 1, commaPos2).trim();
-          publicKeyInput = contactInput.substring(commaPos2 + 1).trim();
+        publicKeyInput = this.contactInput.substring(commaPos2 + 1).trim();
-          const commaPos3 = contactInput.indexOf(",", commaPos2 + 1);
+        const commaPos3 = this.contactInput.indexOf(",", commaPos2 + 1);
         if (commaPos3 > -1) {
-            publicKeyInput = contactInput.substring(commaPos2 + 1, commaPos3).trim(); // eslint-disable-line prettier/prettier
+          publicKeyInput = this.contactInput.substring(commaPos2 + 1, commaPos3).trim(); // eslint-disable-line prettier/prettier
-            nextPublicKeyHashInput = contactInput.substring(commaPos3 + 1).trim(); // eslint-disable-line prettier/prettier
+          nextPublicKeyHashInput = this.contactInput.substring(commaPos3 + 1).trim(); // eslint-disable-line prettier/prettier
         }
       }
     }
@@ -566,9 +602,7 @@ export default class ContactsView extends Vue {
     let publicKeyBase64 = publicKeyInput;
     if (publicKeyBase64 && /^[0-9A-Fa-f]{66}$/i.test(publicKeyBase64)) {
       // it must be all hex (compressed public key), so convert
-        publicKeyBase64 = Buffer.from(publicKeyBase64, "hex").toString(
+      publicKeyBase64 = Buffer.from(publicKeyBase64, "hex").toString("base64");
-          "base64",
-        );
     }
     let nextPubKeyHashB64 = nextPublicKeyHashInput;
     if (nextPubKeyHashB64 && /^[0-9A-Fa-f]{66}$/i.test(nextPubKeyHashB64)) {
@@ -582,33 +616,9 @@ export default class ContactsView extends Vue {
       nextPubKeyHashB64: nextPubKeyHashB64,
     };
     await this.addContact(newContact);
-      return;
   }
 
-    if (contactInput.includes("[")) {
+  async addContactFromEndorserMobileLine(line: string): Promise<IndexableType> {
-      // assume there's a JSON array of contacts in the input
-      const jsonContactInput = contactInput.substring(
-        contactInput.indexOf("["),
-        contactInput.lastIndexOf("]") + 1,
-      );
-      try {
-        const contacts = JSON.parse(jsonContactInput);
-        (this.$router as Router).push({
-          name: "contact-import",
-          query: { contacts: JSON.stringify(contacts) },
-        });
-      } catch (e) {
-        this.danger("The input could not be parsed.", "Invalid Contact List");
-      }
-      return;
-    }
-
-    this.danger("No contact info was found in that input.", "No Contact Info");
-  }
-
-  private async addContactFromEndorserMobileLine(
-    line: string,
-  ): Promise<IndexableType> {
     // Note that Endorser Mobile puts name first, then did, etc.
     let name = line;
     let did = "";
@@ -649,7 +659,7 @@ export default class ContactsView extends Vue {
     return db.contacts.add(newContact);
   }
 
-  private async addContactFromScan(url: string): Promise<void> {
+  async addContactFromScan(url: string): Promise<void> {
     const payload = getContactPayloadFromJwtUrl(url);
     if (!payload) {
       this.$notify(
@@ -674,7 +684,7 @@ export default class ContactsView extends Vue {
     }
   }
 
-  private async addContact(newContact: Contact) {
+  async addContact(newContact: Contact) {
     if (!newContact.did) {
       this.danger("Cannot add a contact without a DID.", "Incomplete Contact");
       return;
@@ -712,7 +722,7 @@ export default class ContactsView extends Vue {
                   text: "Do you want to register them?",
                   onCancel: async (stopAsking: boolean) => {
                     if (stopAsking) {
-                      await db.settings.update(MASTER_SETTINGS_KEY, {
+                      db.settings.update(MASTER_SETTINGS_KEY, {
                         hideRegisterPromptOnNewContact: stopAsking,
                       });
                       this.hideRegisterPromptOnNewContact = stopAsking;
@@ -720,7 +730,7 @@ export default class ContactsView extends Vue {
                   },
                   onNo: async (stopAsking: boolean) => {
                     if (stopAsking) {
-                      await db.settings.update(MASTER_SETTINGS_KEY, {
+                      db.settings.update(MASTER_SETTINGS_KEY, {
                         hideRegisterPromptOnNewContact: stopAsking,
                       });
                       this.hideRegisterPromptOnNewContact = stopAsking;
@@ -763,30 +773,56 @@ export default class ContactsView extends Vue {
       });
   }
 
-  // note that this is also in DIDView.vue
+  // prompt with confirmation if they want to delete a contact
-  private async confirmSetVisibility(contact: Contact, visibility: boolean) {
+  confirmDeleteContact(contact: Contact) {
-    const visibilityPrompt = visibility
-      ? "Are you sure you want to make your activity visible to them?"
-      : "Are you sure you want to hide all your activity from them?";
     this.$notify(
       {
         group: "modal",
         type: "confirm",
-        title: "Set Visibility",
+        title: "Delete",
-        text: visibilityPrompt,
+        text:
+          "Are you sure you want to remove " +
+          this.nameForDid(this.contacts, contact.did) +
+          " with DID " +
+          contact.did +
+          " from your contact list?",
         onYes: async () => {
-          const success = await this.setVisibility(contact, visibility, true);
+          await this.deleteContact(contact);
-          if (success) {
-            contact.seesMe = visibility; // didn't work inside setVisibility
-          }
         },
       },
       -1,
     );
   }
 
-  // note that this is also in DIDView.vue
+  async deleteContact(contact: Contact) {
-  private async register(contact: Contact) {
+    await db.open();
+    await db.contacts.delete(contact.did);
+    this.contacts = R.without([contact], this.contacts);
+  }
+
+  // confirm to register a new contact
+  async confirmRegister(contact: Contact) {
+    this.$notify(
+      {
+        group: "modal",
+        type: "confirm",
+        title: "Register",
+        text:
+          "Are you sure you want to register " +
+          this.nameForDid(this.contacts, contact.did) +
+          (contact.registered
+            ? " -- especially since they are already marked as registered"
+            : "") +
+          "?",
+        onYes: async () => {
+          await this.register(contact);
+        },
+      },
+      -1,
+    );
+  }
+
+  async register(contact: Contact) {
     this.$notify({ group: "alert", type: "toast", title: "Sent..." }, 1000);
 
     try {
@@ -798,7 +834,7 @@ export default class ContactsView extends Vue {
       );
       if (regResult.success) {
         contact.registered = true;
-        await db.contacts.update(contact.did, { registered: true });
+        db.contacts.update(contact.did, { registered: true });
 
         this.$notify(
           {
@@ -851,8 +887,25 @@ export default class ContactsView extends Vue {
     }
   }
 
-  // note that this is also in DIDView.vue
+  async confirmSetVisibility(contact: Contact, visibility: boolean) {
-  private async setVisibility(
+    const visibilityPrompt = visibility
+      ? "Are you sure you want to make your activity visible to them?"
+      : "Are you sure you want to hide all your activity from them?";
+    this.$notify(
+      {
+        group: "modal",
+        type: "confirm",
+        title: "Set Visibility",
+        text: visibilityPrompt,
+        onYes: async () => {
+          await this.setVisibility(contact, visibility, true);
+        },
+      },
+      -1,
+    );
+  }
+
+  async setVisibility(
     contact: Contact,
     visibility: boolean,
     showSuccessAlert: boolean,
@@ -866,8 +919,6 @@ export default class ContactsView extends Vue {
       visibility,
     );
     if (result.success) {
-      //contact.seesMe = visibility; // why doesn't it affect the UI from here?
-      //console.log("Set result & seesMe", result, contact.seesMe, contact.did);
       if (showSuccessAlert) {
         this.$notify(
           {
@@ -883,51 +934,42 @@ export default class ContactsView extends Vue {
           3000,
         );
       }
-      return true;
+    } else if (result.error) {
-    } else {
-      console.error("Got strange result from setting visibility:", result);
-      const message =
-        (result.error as string) || "Could not set visibility on the server.";
       this.$notify(
         {
           group: "alert",
           type: "danger",
           title: "Error Setting Visibility",
-          text: message,
+          text: result.error as string,
         },
         5000,
       );
-      return false;
+    } else {
+      console.error("Got strange result from setting visibility:", result);
     }
   }
 
-  // note that this is also in DIDView.vue
+  async checkVisibility(contact: Contact) {
-  private async checkVisibility(contact: Contact) {
     const url =
       this.apiServer +
       "/api/report/canDidExplicitlySeeMe?did=" +
       encodeURIComponent(contact.did);
-    const headers = await getHeaders(this.activeDid);
+    const identity = await this.getIdentity(this.activeDid);
-    if (!headers["Authorization"]) {
+    const headers = await this.getHeaders(identity);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "No Identity",
-          text: "There is no identity to use to check visibility.",
-        },
-        3000,
-      );
-      return;
-    }
 
     try {
       const resp = await this.axios.get(url, { headers });
       if (resp.status === 200) {
         const visibility = resp.data;
         contact.seesMe = visibility;
-        //console.log("Visi check:", visibility, contact.seesMe, contact.did);
+        console.log(
-        await db.contacts.update(contact.did, { seesMe: visibility });
+          "Visibility checked:",
+          visibility,
+          contact.did,
+          contact.name,
+        ); // eslint-disable-line no-console
+        console.log(this.contacts); // eslint-disable-line no-console
+        db.contacts.update(contact.did, { seesMe: visibility });
 
         this.$notify(
           {
@@ -935,7 +977,7 @@ export default class ContactsView extends Vue {
             type: "info",
             title: "Visibility Refreshed",
             text:
-              libsUtil.nameForContact(contact, true) +
+              this.nameForContact(contact, true) +
               " can " +
               (visibility ? "" : "not ") +
               "see your activity.",
@@ -969,7 +1011,22 @@ export default class ContactsView extends Vue {
     }
   }
 
-  private confirmShowGiftedDialog(giverDid: string, recipientDid: string) {
+  private nameForDid(contacts: Array<Contact>, did: string): string {
+    if (did === this.activeDid) {
+      return "you";
+    }
+    const contact = R.find((con) => con.did == did, contacts);
+    return this.nameForContact(contact);
+  }
+
+  private nameForContact(contact?: Contact, capitalize?: boolean): string {
+    return (
+      (contact?.name as string) ||
+      (capitalize ? "This" : "this") + " unnamed user"
+    );
+  }
+
+  confirmShowGiftedDialog(giverDid: string, recipientDid: string) {
     // if they have unconfirmed amounts, ask to confirm those
     if (
       recipientDid === this.activeDid &&
@@ -1014,13 +1071,13 @@ export default class ContactsView extends Vue {
     if (giverDid) {
       giver = {
         did: giverDid,
-        name: libsUtil.nameForDid(this.activeDid, this.contacts, giverDid),
+        name: this.nameForDid(this.contacts, giverDid),
       };
     }
     if (recipientDid) {
       receiver = {
         did: recipientDid,
-        name: libsUtil.nameForDid(this.activeDid, this.contacts, recipientDid),
+        name: this.nameForDid(this.contacts, recipientDid),
       };
     }
 
@@ -1052,18 +1109,27 @@ export default class ContactsView extends Vue {
     );
   }
 
-  openOfferDialog(recipientDid: string, recipientName?: string) {
+  openOfferDialog(recipientDid: string) {
-    (this.$refs.customOfferDialog as OfferDialog).open(
+    (this.$refs.customOfferDialog as OfferDialog).open(recipientDid);
-      recipientDid,
-      recipientName,
-    );
   }
 
-  private async toggleShowContactAmounts() {
+  private async onClickCancelName() {
+    this.contactEdit = null;
+    this.contactNewName = "";
+  }
+
+  private async onClickSaveName(contact: Contact, newName: string) {
+    contact.name = newName;
+    return db.contacts
+      .update(contact.did, { name: newName })
+      .then(() => (this.contactEdit = null));
+  }
+
+  public async toggleShowContactAmounts() {
     const newShowValue = !this.showGiveNumbers;
     try {
       await db.open();
-      await db.settings.update(MASTER_SETTINGS_KEY, {
+      db.settings.update(MASTER_SETTINGS_KEY, {
         showContactGivesInline: newShowValue,
       });
     } catch (err) {
@@ -1095,7 +1161,7 @@ export default class ContactsView extends Vue {
       this.loadGives();
     }
   }
-  private toggleShowGiveTotals() {
+  public toggleShowGiveTotals() {
     if (this.showGiveTotals) {
       this.showGiveTotals = false;
       this.showGiveConfirmed = true;
@@ -1108,7 +1174,7 @@ export default class ContactsView extends Vue {
     }
   }
 
-  private showGiveAmountsClassNames() {
+  public showGiveAmountsClassNames() {
     return {
       "from-slate-400": this.showGiveTotals,
       "to-slate-700": this.showGiveTotals,
@@ -1118,31 +1184,76 @@ export default class ContactsView extends Vue {
       "to-yellow-700": !this.showGiveTotals && !this.showGiveConfirmed,
     };
   }
-
-  private copySelectedContacts() {
-    if (this.contactsSelected.length === 0) {
-      this.danger("You must select contacts to copy.");
-      return;
-    }
-    const selectedContacts = this.contacts.filter((c) =>
-      this.contactsSelected.includes(c.did),
-    );
-    const message =
-      "To add contacts, paste this into the box on the 'People' screen.\n\n" +
-      JSON.stringify(selectedContacts, null, 2);
-    useClipboard()
-      .copy(message)
-      .then(() => {
-        this.$notify(
-          {
-            group: "alert",
-            type: "info",
-            title: "Copied",
-            text: "Those contacts were copied to the clipboard. Have them paste it in the box on their 'People' screen.",
-          },
-          5000,
-        );
-      });
-  }
 }
 </script>
+
+<style>
+.dialog-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 1.5rem;
+}
+.dialog {
+  background-color: white;
+  padding: 1rem;
+  border-radius: 0.5rem;
+  width: 100%;
+  max-width: 500px;
+}
+
+/*
+  Tooltip, generated on "title" attributes on "fa" icons
+  Kudos to https://www.w3schools.com/css/css_tooltip.asp
+*/
+/* Tooltip container */
+.tooltip {
+  position: relative;
+  display: inline-block;
+  border-bottom: 1px dotted black; /* If you want dots under the hoverable text */
+}
+/* Tooltip text */
+.tooltip .tooltiptext {
+  visibility: hidden;
+  width: 200px;
+  background-color: black;
+  color: #fff;
+  text-align: center;
+  padding: 5px 0;
+  border-radius: 6px;
+
+  position: absolute;
+  z-index: 1;
+}
+/* How do we share with the above so code isn't duplicated? */
+.tooltip .tooltiptext-left {
+  visibility: hidden;
+  width: 200px;
+  background-color: black;
+  color: #fff;
+  text-align: center;
+  padding: 5px 0;
+  border-radius: 6px;
+
+  position: absolute;
+  z-index: 1;
+
+  bottom: 0%;
+  right: 105%;
+  margin-left: -60px;
+}
+
+/* Show the tooltip text when you mouse over the tooltip container */
+.tooltip:hover .tooltiptext {
+  visibility: visible;
+}
+.tooltip:hover .tooltiptext-left {
+  visibility: visible;
+}
+</style>

src/views/DIDView.vue

@@ -22,31 +22,14 @@
     <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
       <div>
         <h2 class="text-xl font-semibold">
-          {{ contact?.name || "(no name)" }}
+          {{
-          <button
+            didInfoForContact(viewingDid, activeDid, contact, allMyDids)
-            @click="
+              .displayName
-              contactEdit = true;
+          }}
-              contactNewName = contact.name || '';
-            "
-            title="Edit"
-          >
-            <fa icon="pen" class="text-sm text-blue-500 ml-2 mb-1" />
-          </button>
         </h2>
-        <button
+        <span class="mt-2 text-xl font-semibold break-words">
-          @click="showDidDetails = !showDidDetails"
+          {{ viewingDid }}
-          class="ml-2 mr-2 mt-4"
+        </span>
-        >
-          Details
-          <fa v-if="showDidDetails" icon="chevron-up" class="text-blue-400" />
-          <fa v-else icon="chevron-down" class="text-blue-400" />
-        </button>
-        <!-- Keep the dump contents directly between > and < to avoid weird spacing. -->
-        <pre
-          v-if="showDidDetails"
-          class="text-sm overflow-x-scroll px-4 py-3 bg-slate-100 rounded-md"
-          >{{ contactYaml }}</pre
-        >
       </div>
       <div class="flex justify-center mt-4">
         <span v-if="contact?.profileImageUrl" class="flex justify-between">
@@ -58,68 +41,8 @@
           />
         </span>
       </div>
-      <div class="flex justify-between mt-4">
+      <div class="mt-4">
-        <div class="flex items-center">
+        <div class="flex justify-center">Auto-Generated Icon:</div>
-          <div v-if="activeDid" class="flex justify-between">
-            <div>
-              <button
-                v-if="contact?.seesMe && contact.did !== activeDid"
-                class="text-sm uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
-                @click="confirmSetVisibility(contact, false)"
-                title="They can see you"
-              >
-                <fa icon="eye" class="fa-fw" />
-              </button>
-              <button
-                v-else-if="!contact?.seesMe && contact?.did !== activeDid"
-                class="text-sm uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
-                @click="confirmSetVisibility(contact, true)"
-                title="They cannot see you"
-              >
-                <fa icon="eye-slash" class="fa-fw" />
-              </button>
-              <!-- otherwise it's this user so hide it -->
-              <fa v-else icon="eye" class="text-white mx-2.5" />
-
-              <button
-                class="text-sm uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
-                @click="checkVisibility(contact)"
-                title="Check Visibility"
-                v-if="contact?.did !== activeDid"
-              >
-                <fa icon="rotate" class="fa-fw" />
-              </button>
-              <!-- otherwise it's this user so hide it -->
-              <fa v-else icon="rotate" class="text-white mx-2.5" />
-            </div>
-
-            <button
-              @click="confirmRegister(contact)"
-              class="text-sm uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white ml-6 mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
-              v-if="contact?.did !== activeDid"
-              title="Registration"
-            >
-              <fa
-                v-if="contact?.registered"
-                icon="person-circle-check"
-                class="fa-fw"
-              />
-              <fa v-else icon="person-circle-question" class="fa-fw" />
-            </button>
-            <!-- otherwise it's this user so hide it -->
-            <fa v-else icon="rotate" class="text-white ml-6 px-2.5" />
-          </div>
-
-          <button
-            @click="confirmDeleteContact(contact)"
-            class="text-sm uppercase bg-gradient-to-b from-rose-500 to-rose-800 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white ml-6 mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
-            title="Delete"
-          >
-            <fa icon="trash-can" class="fa-fw" />
-          </button>
-        </div>
-        <div v-if="!contact?.profileImageUrl">
-          <div>Auto-Generated Icon</div>
         <div class="flex justify-center">
           <EntityIcon
             :entityId="viewingDid"
@@ -129,7 +52,6 @@
           />
         </div>
       </div>
-      </div>
       <div
         v-if="showLargeIdenticonId || showLargeIdenticonUrl"
         class="fixed z-[100] top-0 inset-x-0 w-full"
@@ -150,32 +72,6 @@
         </div>
       </div>
     </div>
-    <div v-if="contactEdit" class="dialog-overlay">
-      <div class="dialog">
-        <h1 class="text-xl font-bold text-center mb-4">Edit Name</h1>
-        <input
-          type="text"
-          class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
-          placeholder="Name"
-          v-model="contactNewName"
-        />
-        <div class="flex justify-between">
-          <button
-            class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded -ml-1.5 border-l border-blue-400"
-            @click="onClickSaveName(contactNewName)"
-          >
-            <fa icon="save" />
-          </button>
-          <span class="inline-block w-2" />
-          <button
-            class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded -ml-1.5 border-l border-blue-400"
-            @click="onClickCancelName()"
-          >
-            <fa icon="ban" />
-          </button>
-        </div>
-      </div>
-    </div>
 
     <!-- Loading Animation -->
     <div
@@ -209,7 +105,10 @@
               {{ claimDescription(claim) }}
             </span>
             <span class="col-span-1">
-              <a @click="onClickLoadClaim(claim.id)" class="cursor-pointer">
+              <a
+                @click="onClickLoadClaim(claim.handleId)"
+                class="cursor-pointer"
+              >
                 <fa icon="file-lines" class="pl-2 pt-1 text-blue-500" />
               </a>
             </span>
@@ -222,16 +121,13 @@
       v-if="!isLoading && claims.length === 0"
       class="flex justify-center mt-4"
     >
-      <span>They are in no claims visible to you.</span>
+      <span>They Are in No Claims Visible to You</span>
     </div>
   </section>
 </template>
 
 <script lang="ts">
-import { AxiosError } from "axios";
-import * as yaml from "js-yaml";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import QuickNav from "@/components/QuickNav.vue";
 import InfiniteScroll from "@/components/InfiniteScroll.vue";
@@ -240,19 +136,16 @@ import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
 import { BoundingBox, MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 import {
   capitalizeAndInsertSpacesBeforeCaps,
   didInfoForContact,
   displayAmount,
-  getHeaders,
   GenericCredWrapper,
   GenericVerifiableCredential,
   GiveVerifiableCredential,
   OfferVerifiableCredential,
-  register,
-  setVisibilityUtil,
 } from "@/libs/endorserServer";
-import * as libsUtil from "@/libs/util";
 import EntityIcon from "@/components/EntityIcon.vue";
 
 @Component({
@@ -266,21 +159,14 @@ import EntityIcon from "@/components/EntityIcon.vue";
 export default class DIDView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
-  libsUtil = libsUtil;
-  yaml = yaml;
-
   activeDid = "";
   allMyDids: Array<string> = [];
   apiServer = "";
-  claims: Array<GenericCredWrapper<GenericVerifiableCredential>> = [];
+  claims: Array<GenericCredWrapper> = [];
-  contact: Contact;
+  contact?: Contact;
-  contactEdit = false;
-  contactNewName?: string;
-  contactYaml = "";
   hitEnd = false;
   isLoading = false;
   searchBox: { name: string; bbox: BoundingBox } | null = null;
-  showDidDetails = false;
   showLargeIdenticonId?: string;
   showLargeIdenticonUrl?: string;
   viewingDid?: string;
@@ -296,34 +182,51 @@ export default class DIDView extends Vue {
     this.apiServer = (settings?.apiServer as string) || "";
 
     const pathParam = window.location.pathname.substring("/did/".length);
-    let theContact: Contact | undefined;
     if (pathParam) {
       this.viewingDid = decodeURIComponent(pathParam);
-      theContact = await db.contacts.get(this.viewingDid);
+      this.contact = await db.contacts.get(this.viewingDid);
-    }
+      await this.loadClaimsAbout();
-    if (theContact) {
-      this.contact = theContact;
     } else {
       this.$notify(
         {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: "No valid claim ID was provided.",
+          text: "No claim ID was provided.",
         },
         -1,
       );
-      return;
     }
 
-    this.contactYaml = yaml.dump(this.contact);
-    await this.loadClaimsAbout();
-
     await accountsDB.open();
     const allAccounts = await accountsDB.accounts.toArray();
     this.allMyDids = allAccounts.map((acc) => acc.did);
   }
 
+  public async buildHeaders(): Promise<HeadersInit> {
+    const headers: HeadersInit = {
+      "Content-Type": "application/json",
+    };
+
+    if (this.activeDid) {
+      await accountsDB.open();
+      const allAccounts = await accountsDB.accounts.toArray();
+      const account = allAccounts.find((acc) => acc.did === this.activeDid);
+      const identity = JSON.parse((account?.identity as string) || "null");
+
+      if (!identity) {
+        throw new Error(
+          "An ID is chosen but there are no keys for it so it cannot be used to talk with the service. Switch your ID.",
+        );
+      }
+
+      headers["Authorization"] = "Bearer " + (await accessToken(identity));
+    } else {
+      // it's OK without auth... we just won't get any identifiers
+    }
+    return headers;
+  }
+
   /**
    * Data loader used by infinite scroller
    * @param payload is the flag from the InfiniteScroll indicating if it should load
@@ -334,128 +237,6 @@ export default class DIDView extends Vue {
     }
   }
 
-  // prompt with confirmation if they want to delete a contact
-  confirmDeleteContact(contact: Contact) {
-    this.$notify(
-      {
-        group: "modal",
-        type: "confirm",
-        title: "Delete",
-        text:
-          "Are you sure you want to remove " +
-          libsUtil.nameForContact(contact, false) +
-          " from your contact list?",
-        onYes: async () => {
-          await this.deleteContact(contact);
-        },
-      },
-      -1,
-    );
-  }
-
-  async deleteContact(contact: Contact) {
-    await db.open();
-    await db.contacts.delete(contact.did);
-    this.$notify(
-      {
-        group: "alert",
-        type: "success",
-        title: "Deleted",
-        text: "Contact has been removed.",
-      },
-      3000,
-    );
-    (this.$router as Router).push({ name: "contacts" });
-  }
-
-  // confirm to register a new contact
-  async confirmRegister(contact: Contact) {
-    this.$notify(
-      {
-        group: "modal",
-        type: "confirm",
-        title: "Register",
-        text:
-          "Are you sure you want to register " +
-          libsUtil.nameForContact(this.contact, false) +
-          (contact.registered
-            ? " -- especially since they are already marked as registered"
-            : "") +
-          "?",
-        onYes: async () => {
-          await this.register(contact);
-        },
-      },
-      -1,
-    );
-  }
-
-  // note that this is also in ContactView.vue
-  async register(contact: Contact) {
-    this.$notify({ group: "alert", type: "toast", title: "Sent..." }, 1000);
-
-    try {
-      const regResult = await register(
-        this.activeDid,
-        this.apiServer,
-        this.axios,
-        contact,
-      );
-      if (regResult.success) {
-        contact.registered = true;
-        await db.contacts.update(contact.did, { registered: true });
-
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Registration Success",
-            text:
-              (contact.name || "That unnamed person") + " has been registered.",
-          },
-          5000,
-        );
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Registration Error",
-            text:
-              (regResult.error as string) ||
-              "Something went wrong during registration.",
-          },
-          5000,
-        );
-      }
-    } catch (error) {
-      console.error("Error when registering:", error);
-      let userMessage = "There was an error. See logs for more info.";
-      const serverError = error as AxiosError;
-      if (serverError) {
-        if (serverError.response?.data?.error?.message) {
-          userMessage = serverError.response.data.error.message;
-        } else if (serverError.message) {
-          userMessage = serverError.message; // Info for the user
-        } else {
-          userMessage = JSON.stringify(serverError.toJSON());
-        }
-      } else {
-        userMessage = error as string;
-      }
-      // Now set that error for the user to see.
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Registration Error",
-          text: userMessage,
-        },
-        5000,
-      );
-    }
-  }
-
   public async loadClaimsAbout() {
     if (!this.viewingDid) {
       console.error("This should never be called without a DID.");
@@ -474,7 +255,7 @@ export default class DIDView extends Vue {
         this.apiServer + "/api/v2/report/claims?" + queryParams + postfix,
         {
           method: "GET",
-          headers: await getHeaders(this.activeDid),
+          headers: await this.buildHeaders(),
         },
       );
 
@@ -518,7 +299,7 @@ export default class DIDView extends Vue {
     const route = {
       path: "/claim/" + encodeURIComponent(jwtId),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   public claimAmount(claim: GenericVerifiableCredential) {
@@ -552,178 +333,5 @@ export default class DIDView extends Vue {
   claimDescription(claim: GenericVerifiableCredential) {
     return claim.claim.name || claim.claim.description || "";
   }
-
-  private async onClickCancelName() {
-    this.contactEdit = false;
-  }
-
-  private async onClickSaveName(newName: string) {
-    this.contact.name = newName;
-    return db.contacts
-      .update(this.contact.did, { name: newName })
-      .then(() => (this.contactEdit = false));
-  }
-
-  // note that this is also in ContactView.vue
-  async confirmSetVisibility(contact: Contact, visibility: boolean) {
-    const visibilityPrompt = visibility
-      ? "Are you sure you want to make your activity visible to them?"
-      : "Are you sure you want to hide all your activity from them?";
-    this.$notify(
-      {
-        group: "modal",
-        type: "confirm",
-        title: "Set Visibility",
-        text: visibilityPrompt,
-        onYes: async () => {
-          const success = await this.setVisibility(contact, visibility, true);
-          if (success) {
-            contact.seesMe = visibility; // didn't work inside setVisibility
-          }
-        },
-      },
-      -1,
-    );
-  }
-
-  // note that this is also in ContactView.vue
-  async setVisibility(
-    contact: Contact,
-    visibility: boolean,
-    showSuccessAlert: boolean,
-  ) {
-    const result = await setVisibilityUtil(
-      this.activeDid,
-      this.apiServer,
-      this.axios,
-      db,
-      contact,
-      visibility,
-    );
-    if (result.success) {
-      //contact.seesMe = visibility; // why doesn't it affect the UI from here?
-      //console.log("Set result & seesMe", result, contact.seesMe, contact.did);
-      if (showSuccessAlert) {
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Visibility Set",
-            text:
-              (contact.name || "That user") +
-              " can " +
-              (visibility ? "" : "not ") +
-              "see your activity.",
-          },
-          3000,
-        );
-      }
-      return true;
-    } else {
-      console.error("Got strange result from setting visibility:", result);
-      const message =
-        (result.error as string) || "Could not set visibility on the server.";
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error Setting Visibility",
-          text: message,
-        },
-        5000,
-      );
-      return false;
-    }
-  }
-
-  // note that this is also in ContactView.vue
-  async checkVisibility(contact: Contact) {
-    const url =
-      this.apiServer +
-      "/api/report/canDidExplicitlySeeMe?did=" +
-      encodeURIComponent(contact.did);
-    const headers = await getHeaders(this.activeDid);
-    if (!headers["Authorization"]) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "No Identity",
-          text: "There is no identity to use to check visibility.",
-        },
-        3000,
-      );
-      return;
-    }
-
-    try {
-      const resp = await this.axios.get(url, { headers });
-      if (resp.status === 200) {
-        const visibility = resp.data;
-        contact.seesMe = visibility;
-        //console.log("Visi check:", visibility, contact.seesMe, contact.did);
-        await db.contacts.update(contact.did, { seesMe: visibility });
-
-        this.$notify(
-          {
-            group: "alert",
-            type: "info",
-            title: "Visibility Refreshed",
-            text:
-              libsUtil.nameForContact(contact, true) +
-              " can " +
-              (visibility ? "" : "not ") +
-              "see your activity.",
-          },
-          3000,
-        );
-      } else {
-        console.error("Got bad server response checking visibility:", resp);
-        const message = resp.data.error?.message || "Got bad server response.";
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error Checking Visibility",
-            text: message,
-          },
-          5000,
-        );
-      }
-    } catch (err) {
-      console.error("Caught error from request to check visibility:", err);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error Checking Visibility",
-          text: "Check connectivity and try again.",
-        },
-        3000,
-      );
-    }
-  }
 }
 </script>
-
-<style>
-.dialog-overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: 1.5rem;
-}
-.dialog {
-  background-color: white;
-  padding: 1rem;
-  border-radius: 0.5rem;
-  width: 100%;
-  max-width: 500px;
-}
-</style>

src/views/DiscoverView.vue

@@ -92,7 +92,7 @@
 
     <!-- Results List -->
     <InfiniteScroll @reached-bottom="loadMoreData">
-      <ul id="listDiscoverResults">
+      <ul>
         <li
           class="border-b border-slate-300"
           v-for="project in projects"
@@ -129,7 +129,6 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import QuickNav from "@/components/QuickNav.vue";
 import InfiniteScroll from "@/components/InfiniteScroll.vue";
@@ -139,7 +138,8 @@ import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
 import { BoundingBox, MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import { didInfo, getHeaders, PlanData } from "@/libs/endorserServer";
+import { accessToken } from "@/libs/crypto";
+import { didInfo, PlanData } from "@/libs/endorserServer";
 
 @Component({
   components: {
@@ -203,6 +203,30 @@ export default class DiscoverView extends Vue {
     }
   }
 
+  public async buildHeaders(): Promise<HeadersInit> {
+    const headers: HeadersInit = {
+      "Content-Type": "application/json",
+    };
+
+    if (this.activeDid) {
+      await accountsDB.open();
+      const allAccounts = await accountsDB.accounts.toArray();
+      const account = allAccounts.find((acc) => acc.did === this.activeDid);
+      const identity = JSON.parse(account?.identity || "null");
+
+      if (!identity) {
+        throw new Error(
+          "An ID is chosen but there are no keys for it so it cannot be used to talk with the service. Switch your ID.",
+        );
+      }
+
+      headers["Authorization"] = "Bearer " + (await accessToken(identity));
+    } else {
+      // it's OK without auth... we just won't get any identifiers
+    }
+    return headers;
+  }
+
   public async searchAll(beforeId?: string) {
     this.resetCounts();
 
@@ -223,7 +247,7 @@ export default class DiscoverView extends Vue {
         this.apiServer + "/api/v2/report/plans?" + queryParams,
         {
           method: "GET",
-          headers: await getHeaders(this.activeDid),
+          headers: await this.buildHeaders(),
         },
       );
 
@@ -265,8 +289,6 @@ export default class DiscoverView extends Vue {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (e: any) {
       console.error("Error with feed load:", e);
-      // this sometimes gives different information
-      console.error("Error with feed load (error added): " + e);
       this.$notify(
         {
           group: "alert",
@@ -315,7 +337,7 @@ export default class DiscoverView extends Vue {
         this.apiServer + "/api/v2/report/plansByLocation?" + queryParams,
         {
           method: "GET",
-          headers: await getHeaders(this.activeDid),
+          headers: await this.buildHeaders(),
         },
       );
 
@@ -397,7 +419,7 @@ export default class DiscoverView extends Vue {
     const route = {
       path: "/project/" + encodeURIComponent(id),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   public computedLocalTabStyleClassNames() {

src/views/GiftedDetails.vue

@@ -21,17 +21,8 @@
     <h1 class="text-4xl text-center font-light px-4 mb-4">What Was Given</h1>
 
     <h1 class="text-xl font-bold text-center mb-4">
-      <span>From {{ giverName }}</span>
+      <span>From {{ giverName || "somebody not named" }}</span>
-      <span>
+      <span> to {{ recipientName || "somebody not named" }}</span>
-        to
-        {{
-          givenToProject
-            ? projectName
-            : givenToRecipient
-              ? recipientName
-              : "someone unidentified"
-        }}</span
-      >
     </h1>
     <textarea
       class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
@@ -64,9 +55,9 @@
       </div>
     </div>
 
-    <div class="flex justify-center mt-4" data-testid="imagery">
+    <div class="flex justify-center mt-4">
       <span v-if="imageUrl" class="flex justify-between">
-        <a :href="imageUrl" target="_blank">
+        <a :href="imageUrl" target="_blank" class="text-blue-500 ml-4">
           <img :src="imageUrl" class="h-24 rounded-xl" />
         </a>
         <fa
@@ -87,7 +78,7 @@
 
     <div class="h-7 mt-4 flex">
       <input
-        v-if="projectId && !givenToRecipient"
+        v-if="projectId && !givenToUser"
         type="checkbox"
         class="h-6 w-6 mr-2"
         v-model="givenToProject"
@@ -109,24 +100,20 @@
 
     <div class="h-7 mt-4 flex">
       <input
-        v-if="recipientDid && !givenToProject"
+        v-if="!givenToProject"
         type="checkbox"
         class="h-6 w-6 mr-2"
-        v-model="givenToRecipient"
+        v-model="givenToUser"
       />
       <fa
         v-else
         icon="square"
         class="bg-slate-500 text-slate-500 h-5 w-5 px-0.5 py-0.5 mr-2 rounded"
-        @click="notifyUserOfRecipient()"
+        @click="
+          notifyUser('You cannot assign this both a project and also to you.')
+        "
       />
-      <label class="text-sm mt-1">
+      <label class="text-sm mt-1">This was given to you</label>
-        {{
-          recipientDid
-            ? "This was given to " + recipientName
-            : "No recipient was chosen."
-        }}
-      </label>
     </div>
 
     <div class="mt-4 flex">
@@ -134,20 +121,6 @@
       <label class="text-sm mt-1">This was a trade (not a gift)</label>
     </div>
 
-    <div class="mt-4 flex">
-      <router-link
-        :to="{
-          name: 'claim-add-raw',
-          query: {
-            claim: constructGiveParam(),
-          },
-        }"
-        class="text-blue-500"
-      >
-        Edit & Submit Raw
-      </router-link>
-    </div>
-
     <p class="text-center mb-2 mt-6 italic">
       Sign & Send to publish to the world
       <fa
@@ -175,26 +148,16 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import ImageMethodDialog from "@/components/ImageMethodDialog.vue";
 import QuickNav from "@/components/QuickNav.vue";
 import TopMessage from "@/components/TopMessage.vue";
 import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "@/constants/app";
-import { accountsDB, db } from "@/db/index";
+import { db } from "@/db/index";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import {
+import { createAndSubmitGive, getPlanFromCache } from "@/libs/endorserServer";
-  createAndSubmitGive,
-  didInfo,
-  editAndSubmitGive,
-  GenericCredWrapper,
-  getHeaders,
-  getPlanFromCache,
-  GiveVerifiableCredential,
-  hydrateGive,
-} from "@/libs/endorserServer";
 import * as libsUtil from "@/libs/util";
-import { Contact } from "@/db/tables/contacts";
+import { accessToken } from "@/libs/crypto";
 
 @Component({
   components: {
@@ -211,9 +174,9 @@ export default class GiftedDetails extends Vue {
 
   amountInput = "0";
   description = "";
-  destinationPathAfter = "";
+  destinationNameAfter = "";
   givenToProject = false;
-  givenToRecipient = false;
+  givenToUser = false;
   giverDid: string | undefined;
   giverName = "";
   hideBackButton = false;
@@ -221,101 +184,48 @@ export default class GiftedDetails extends Vue {
   isTrade = false;
   message = "";
   offerId = "";
-  prevCredToEdit?: GenericCredWrapper<GiveVerifiableCredential>;
   projectId = "";
   projectName = "a project";
   recipientDid = "";
   recipientName = "";
+  showGivenToUser = false;
   unitCode = "HUR";
 
   libsUtil = libsUtil;
 
   async mounted() {
-    try {
-      this.prevCredToEdit = (this.$route as Router).query["prevCredToEdit"]
-        ? (JSON.parse(
-            (this.$route as Router).query["prevCredToEdit"],
-          ) as GenericCredWrapper<GiveVerifiableCredential>)
-        : undefined;
-    } catch (error) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Retrieval Error",
-          text: "The previous record isn't available for editing. If you submit, you'll create a new record.",
-        },
-        6000,
-      );
-    }
-
-    const prevAmount = this.prevCredToEdit?.claim?.object?.amountOfThisGood;
     this.amountInput =
-      (this.$route as Router).query["amountInput"] ||
+      (this.$route.query.amountInput as string) || this.amountInput;
-      (prevAmount ? String(prevAmount) : "") ||
+    this.description = (this.$route.query.description as string) || "";
-      this.amountInput;
+    this.destinationNameAfter = this.$route.query
-    this.description =
+      .destinationNameAfter as string;
-      (this.$route as Router).query["description"] ||
+    this.giverDid = this.$route.query.giverDid as string;
-      this.prevCredToEdit?.claim?.description ||
+    this.giverName = (this.$route.query.giverName as string) || "";
-      this.description;
+    this.hideBackButton = this.$route.query.hideBackButton === "true";
-    this.destinationPathAfter = (this.$route as Router).query[
+    this.message = (this.$route.query.message as string) || "";
-      "destinationPathAfter"
+    this.offerId = this.$route.query.offerId as string;
-    ];
+    this.projectId = this.$route.query.projectId as string;
-    this.giverDid = ((this.$route as Router).query["giverDid"] ||
+    this.recipientDid = this.$route.query.recipientDid as string;
-      this.prevCredToEdit?.claim?.agent?.identifier ||
+    this.recipientName = (this.$route.query.recipientName as string) || "";
-      this.giverDid) as string;
+    this.unitCode = (this.$route.query.unitCode as string) || this.unitCode;
-    this.giverName =
-      ((this.$route as Router).query["giverName"] as string) || "";
-    this.hideBackButton =
-      (this.$route as Router).query["hideBackButton"] === "true";
-    this.message = ((this.$route as Router).query["message"] as string) || "";
-
-    // find any offer ID
-    const fulfills = this.prevCredToEdit?.claim?.fulfills;
-    const fulfillsArray = Array.isArray(fulfills)
-      ? fulfills
-      : fulfills
-        ? [fulfills]
-        : [];
-    const offer = fulfillsArray.find((rec) => rec["@type"] === "Offer");
-    this.offerId = ((this.$route as Router).query["offerId"] ||
-      offer?.identifier ||
-      this.offerId) as string;
-
-    // find any project ID
-    const project = fulfillsArray.find((rec) => rec["@type"] === "PlanAction");
-    this.projectId = ((this.$route as Router).query["projectId"] ||
-      project?.identifier ||
-      this.projectId) as string;
-
-    this.recipientDid = ((this.$route as Router).query["recipientDid"] ||
-      this.prevCredToEdit?.claim?.recipient?.identifier) as string;
-    this.recipientName =
-      ((this.$route as Router).query["recipientName"] as string) || "";
-    this.unitCode = ((this.$route as Router).query["unitCode"] ||
-      this.prevCredToEdit?.claim?.object?.unitCode ||
-      this.unitCode) as string;
 
     this.imageUrl =
-      ((this.$route as Router).query["imageUrl"] as string) ||
+      (this.$route.query.imageUrl as string) ||
-      this.prevCredToEdit?.claim?.image ||
       localStorage.getItem("imageUrl") ||
-      this.imageUrl;
+      "";
 
     // this is an endpoint for sharing project info to highlight something given
     // https://developer.mozilla.org/en-US/docs/Web/Manifest/share_target
-    if ((this.$route as Router).query["shareTitle"]) {
+    if (this.$route.query.shareTitle) {
-      this.description =
+      this.description = this.$route.query.shareTitle as string;
-        ((this.$route as Router).query["shareTitle"] as string) +
-        (this.description ? "\n" + this.description : "");
     }
-    if ((this.$route as Router).query["shareText"]) {
+    if (this.$route.query.shareText) {
       this.description =
-        (this.description ? this.description + "\n" : "") +
+        (this.description ? this.description + " " : "") +
-        ((this.$route as Router).query["shareText"] as string);
+        (this.$route.query.shareText as string);
     }
-    if ((this.$route as Router).query["shareUrl"]) {
+    if (this.$route.query.shareUrl) {
-      this.imageUrl = (this.$route as Router).query["shareUrl"] as string;
+      this.imageUrl = this.$route.query.shareUrl as string;
     }
 
     try {
@@ -324,37 +234,18 @@ export default class GiftedDetails extends Vue {
       this.apiServer = settings?.apiServer || "";
       this.activeDid = settings?.activeDid || "";
 
-      let allContacts: Contact[] = [];
-      let allMyDids: string[] = [];
-      if (
-        (this.giverDid && !this.giverName) ||
-        (this.recipientDid && !this.recipientName)
-      ) {
-        allContacts = await db.contacts.toArray();
-
-        await accountsDB.open();
-        const allAccounts = await accountsDB.accounts.toArray();
-        allMyDids = allAccounts.map((acc) => acc.did);
       if (this.giverDid && !this.giverName) {
-          this.giverName = didInfo(
+        this.giverName =
-            this.giverDid,
+          this.giverDid === this.activeDid ? "you" : "someone not named";
-            this.activeDid,
-            allMyDids,
-            allContacts,
-          );
       }
+      this.givenToUser = this.recipientDid === this.activeDid;
       if (this.recipientDid && !this.recipientName) {
-          this.recipientName = didInfo(
+        this.recipientName =
-            this.recipientDid,
+          this.recipientDid === this.activeDid ? "you" : "someone not named";
-            this.activeDid,
-            allMyDids,
-            allContacts,
-          );
       }
-      }
-      // these should be functions but something's wrong with the syntax in the <> conditional
       this.givenToProject = !!this.projectId;
-      this.givenToRecipient = !this.givenToProject && !!this.recipientDid;
+      this.givenToUser =
+        !this.projectId && this.recipientDid === this.activeDid;
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
@@ -372,12 +263,14 @@ export default class GiftedDetails extends Vue {
 
     if (this.projectId) {
       // console.log("Getting project name from cache", this.projectId);
+      const identity = await libsUtil.getIdentity(this.activeDid);
       const project = await getPlanFromCache(
         this.projectId,
+        identity,
         this.axios,
         this.apiServer,
-        this.activeDid,
       );
+      console.log("Got project name from cache", project);
       this.projectName = project?.name
         ? "the project: " + project.name
         : "a project";
@@ -403,16 +296,16 @@ export default class GiftedDetails extends Vue {
 
   cancel() {
     this.deleteImage(); // not awaiting, so they'll go back immediately
-    if (this.destinationPathAfter) {
+    if (this.destinationNameAfter) {
-      (this.$router as Router).push({ path: this.destinationPathAfter });
+      this.$router.push({ name: this.destinationNameAfter });
     } else {
-      (this.$router as Router).back();
+      this.$router.back();
     }
   }
 
   cancelBack() {
     this.deleteImage(); // not awaiting, so they'll go back immediately
-    (this.$router as Router).back();
+    this.$router.back();
   }
 
   openImageDialog() {
@@ -439,12 +332,17 @@ export default class GiftedDetails extends Vue {
       return;
     }
     try {
-      const headers = await getHeaders(this.activeDid);
+      const identity = await libsUtil.getIdentity(this.activeDid);
+      const token = await accessToken(identity);
       const response = await this.axios.delete(
         DEFAULT_IMAGE_API_SERVER +
           "/image/" +
           encodeURIComponent(this.imageUrl),
-        { headers },
+        {
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        },
       );
       if (response.status === 204) {
         // don't bother with a notification
@@ -544,6 +442,18 @@ export default class GiftedDetails extends Vue {
     await this.recordGive();
   }
 
+  notifyUser(message: string) {
+    this.$notify(
+      {
+        group: "alert",
+        type: "warning",
+        title: "Error",
+        text: message,
+      },
+      3000,
+    );
+  }
+
   notifyUserOfProject() {
     if (!this.projectId) {
       this.$notify(
@@ -551,43 +461,18 @@ export default class GiftedDetails extends Vue {
           group: "alert",
           type: "warning",
           title: "Error",
-          text: "To assign to a project, you must open this page through a project.",
+          text: "To assign to a project, you must open this dialog through a project.",
         },
         3000,
       );
     } else {
-      // must be because givenToRecipient is true
+      // must be because givenToUser is true
       this.$notify(
         {
           group: "alert",
           type: "warning",
           title: "Error",
-          text: "You cannot assign both to a project and to a recipient.",
+          text: "You cannot assign both to a project and to yourself.",
-        },
-        3000,
-      );
-    }
-  }
-
-  notifyUserOfRecipient() {
-    if (!this.recipientDid) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Error",
-          text: "To assign to a recipient, you must open this page from a contact.",
-        },
-        3000,
-      );
-    } else {
-      // must be because givenToProject is true
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Error",
-          text: "You cannot assign both to a recipient and to a project.",
         },
         3000,
       );
@@ -603,18 +488,18 @@ export default class GiftedDetails extends Vue {
    */
   public async recordGive() {
     try {
-      const recipientDid = this.givenToRecipient
+      const identity = await libsUtil.getIdentity(this.activeDid);
-        ? this.recipientDid
+      const recipientDid =
-        : undefined;
+        this.recipientDid === this.activeDid
+          ? this.givenToUser
+            ? this.activeDid
+            : undefined
+          : this.recipientDid;
       const projectId = this.givenToProject ? this.projectId : undefined;
-      let result;
+      const result = await createAndSubmitGive(
-      if (this.prevCredToEdit) {
-        // don't create from a blank one in case some properties were set from a different interface
-        result = await editAndSubmitGive(
         this.axios,
         this.apiServer,
-          this.prevCredToEdit,
+        identity,
-          this.activeDid,
         this.giverDid,
         recipientDid,
         this.description,
@@ -625,22 +510,6 @@ export default class GiftedDetails extends Vue {
         this.isTrade,
         this.imageUrl,
       );
-      } else {
-        result = await createAndSubmitGive(
-          this.axios,
-          this.apiServer,
-          this.activeDid,
-          this.giverDid,
-          recipientDid,
-          this.description,
-          parseFloat(this.amountInput),
-          this.unitCode,
-          projectId,
-          this.offerId,
-          this.isTrade,
-          this.imageUrl,
-        );
-      }
 
       if (
         result.type === "error" ||
@@ -668,10 +537,10 @@ export default class GiftedDetails extends Vue {
           5000,
         );
         localStorage.removeItem("imageUrl");
-        if (this.destinationPathAfter) {
+        if (this.destinationNameAfter) {
-          (this.$router as Router).push({ path: this.destinationPathAfter });
+          this.$router.push({ name: this.destinationNameAfter });
         } else {
-          (this.$router as Router).back();
+          this.$router.back();
         }
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -693,26 +562,6 @@ export default class GiftedDetails extends Vue {
     }
   }
 
-  constructGiveParam() {
-    const recipientDid = this.givenToRecipient ? this.recipientDid : undefined;
-    const projectId = this.givenToProject ? this.projectId : undefined;
-    const giveClaim = hydrateGive(
-      this.prevCredToEdit?.claim as GiveVerifiableCredential,
-      this.giverDid,
-      recipientDid,
-      this.description,
-      parseFloat(this.amountInput),
-      this.unitCode,
-      projectId,
-      this.offerId,
-      this.isTrade,
-      this.imageUrl,
-      this.prevCredToEdit?.id as string,
-    );
-    const claimStr = JSON.stringify(giveClaim);
-    return claimStr;
-  }
-
   // Helper functions for readability
 
   /**

src/views/HelpView.vue

@@ -24,22 +24,23 @@
     <!-- eslint-disable prettier/prettier -->
     <div>
       <p>
-        This app focuses on gifts & gratitude, using them to build cool things with your network.
+        This app is a window into data that you and your friends own, focused on
+        gifts and collaboration.
       </p>
 
       <h2 class="text-xl font-semibold">What is the idea here?</h2>
       <p>
         We are building networks of people who want to grow a giving society.
-        First of all, let's build gratitude: see what people have given, and recognize
+        First of all, you can see what people have given, and also recognize
-        gifts you've seen. This is done in a way that leaves a permanent record -- one that
+        gifts you've seen, in a way that leaves a permanent record -- one that
-        came from you, and one that the recipient can prove it was for them. This is
+        came from you, and the recipient can prove it was for them. This is
         personally gratifying, but it extends to broader work: volunteers get
         confirmation of activity, and selectively show off their contributions
         and network.
       </p>
       <p>
-        With this, you highlight giving and also offer help --
+        You highlight giving and also offer help to ideas -- which could be
-        which could be conditional on others' willingness to help, too.
+        conditional on others' willingness to help, too.
         You can record your own ideas and invite others to collaborate.
       </p>
       <p>
@@ -54,33 +55,18 @@
       <h2 class="text-xl font-semibold">How do I get started?</h2>
       <p>
         You need someone to register you, like the person who told you
-        about this app, on the Contacts <fa icon="users" class="fa-fw" /> page.
+        about this app, on the Contacts
-        If you heard about this from our outreach, feel free to contact us (below) for a chat.
+        <fa icon="users" class="fa-fw" /> page. After they register you, you can
-        After someone registers you, you can
         select any contact on the home page (or "anonymous") and record your
         appreciation for... whatever. The main goal is to record what people
-        have given you, to grow giving economies. You can also record your own
+        have given you, to grow giving economies. Each claim is recorded on a
-        ideas for projects. Each claim is recorded on a
         custom ledger. The day after being registered, you'll be able to able to
-        register others, too.
+        register others; later, you can create projects, too.
       </p>
       <p>
-        Note that there are limits to how many others you can register.
+        Note that there are rate limits to how many others you can register,
-        Take your time to bring people on... make it an opportunity to get to
+        so it may take some time to register everyone you want. Take your time...
-        know their projects, and to show your own.
+        make it an opportunity to get to know their projects, and show your own.
-      </p>
-
-      <h2 class="text-xl font-semibold">How do I add someone else?</h2>
-      <p>
-        <a href="/help-onboarding" target="_blank" class="text-blue-500">
-          Use these instructions.
-        </a>
-        To start scanning, go to the
-        <router-link class="text-blue-500" to="/contact-qr">contact-scanning page.</router-link>
-      </p>
-      <p>
-        If they are not nearby to scan QR codes, you each can tap on the QR code
-        and paste it into the text box on the Contacts <fa icon="users" class="fa-fw" /> page.
       </p>
 
       <h2 class="text-xl font-semibold">
@@ -90,13 +76,29 @@
       <p>
         Go
         <router-link class="text-blue-500" to="/import-account">import your identifier</router-link>.
+        If you don't want the old one, click "Advanced" and check the box to erase it.
+        (The erase option only shows if you have exactly one identifier.
+         For more in-depth surgery, you'll have to erase data from the browser or reinstall.)
+      </p>
+
+      <h2 class="text-xl font-semibold">How do I add someone else?</h2>
+      <p>
+        <a href="/help-onboarding" target="_blank" class="text-blue-500">
+          Use these instructions.
+        </a>
+        To start scanning, go
+        <router-link class="text-blue-500" to="/contact-qr">here.</router-link>
+      </p>
+      <p>
+        If they are not nearby to scan QR codes, you each can tap on the QR code
+        and paste it into the text box on the Contacts <fa icon="users" class="fa-fw" /> page.
       </p>
 
       <h2 class="text-xl font-semibold">How do I backup all my data?</h2>
       <p>
-        There are four sets of data to backup: the identifier secrets;
+        There are three sets of data to backup: the identifier secrets;
-        the private text data that isn't quite as secret such as settings and contacts;
+        the non-public textual data that isn't quite a secret such as settings and contacts;
-        the private image for yourself; and the data that you have sent to the public.
+        the non-public image for yourself; and the data that you have sent to the public.
       </p>
 
       <div class="px-4">
@@ -117,7 +119,7 @@
         </ul>
 
         <h2 class="text-xl font-semibold">
-          How do I backup my other private text data like settings & contacts?
+          How do I backup my non-secret, non-public text data?
         </h2>
         <ul class="list-disc list-outside ml-4">
           <li>
@@ -131,7 +133,7 @@
         </ul>
 
         <h2 class="text-xl font-semibold">
-          How do I backup my profile image?
+          How do I backup my non-secret, non-public image?
         </h2>
         <ul class="list-disc list-outside ml-4">
           <li>
@@ -141,7 +143,7 @@
         </ul>
 
         <h2 class="text-xl font-semibold">
-          How do I backup other data I've posted?
+          How do I backup my public data?
         </h2>
         <ul class="list-disc list-outside ml-4">
           <li>
@@ -178,7 +180,6 @@
           <li>
             Go to Your Identity <fa icon="circle-user" class="fa-fw" /> page,
             click Advanced, and follow the instructions for the Contacts & Settings Database "Import".
-            Beware that this will erase your existing contact & settings.
           </li>
         </ul>
       </div>
@@ -201,9 +202,6 @@
         <li class="list-disc list-outside ml-4">
           Mobile
           <ul>
-            <li class="list-disc list-outside ml-4">
-              Home Screen: hold down on the icon, and choose to delete it
-            </li>
             <li class="list-disc list-outside ml-4">
               Chrome: Settings -> Privacy and Security -> Clear Browsing Data
             </li>
@@ -342,7 +340,7 @@
 
       <h2 class="text-xl font-semibold">What are the terms & conditions and the privacy policy?</h2>
       <p style="display:inline; align-items: center">
-        This work is public domain. If you like rules, reference
+        This work is public domain, governed by
         <a href="http://creativecommons.org/publicdomain/zero/1.0?ref=chooser-v1" target="_blank" rel="license noopener noreferrer">
           <span class="text-blue-500 mr-1">CC0 1.0</span>
           <img
@@ -368,26 +366,6 @@
         </a>
       </p>
 
-      <h2 class="text-xl font-semibold">How can I contribute?</h2>
-      <p>
-        If you have skills, contact us below.
-        If you have Bitcoin, donate to
-        <button
-          @click="
-            doCopyTwoSecRedo(
-              'bc1q90v4ted6cpt63tjfh2lvd5xzfc67sd4g9w8xma',
-              () => (showDidCopy = !showDidCopy)
-            )
-          "
-          class="text-blue-500 ml-2"
-        >
-          bc1q90v4ted6cpt63tjfh2lvd5xzfc67sd4g9w8xma
-          <fa v-show="!showDidCopy" icon="copy" class="text-slate-400 fa-fw" />
-        </button>
-        <span v-show="showDidCopy" class="ml-2 text-sm text-green-500">Copied</span>
-        For other donations, contact us.
-      </p>
-
       <h2 class="text-xl font-semibold">Where can I read more?</h2>
       <p>
         This is part of the
@@ -401,7 +379,7 @@
       <p>{{ package.version }} ({{ commitHash }})</p>
 
       <h2 class="text-xl font-semibold">
-        For any other questions, like getting a new account or removing all your data from the public ledger:
+        For any other questions, including removing all your data from the public ledger:
       </h2>
       <p>
         Contact us at
@@ -416,7 +394,6 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { useClipboard } from "@vueuse/core";
 
 import * as Package from "../../package.json";
 import QuickNav from "@/components/QuickNav.vue";
@@ -428,14 +405,5 @@ export default class Help extends Vue {
 
   package = Package;
   commitHash = import.meta.env.VITE_GIT_HASH;
-  showDidCopy = false;
-
-  // call fn, copy text to the clipboard, then redo fn after 2 seconds
-  doCopyTwoSecRedo(text: string, fn: () => void) {
-    fn();
-    useClipboard()
-      .copy(text)
-      .then(() => setTimeout(fn, 2000));
-  }
 }
 </script>

src/views/HomeView.vue

@@ -5,7 +5,7 @@
   <!-- CONTENT -->
   <section id="Content" class="p-2 pb-24 max-w-3xl mx-auto">
     <h1 id="ViewHeading" class="text-4xl text-center font-light px-4 mb-8">
-      {{ AppString.APP_NAME }}
+      Time Safari
     </h1>
 
     <!-- prompt to install notifications -->
@@ -77,33 +77,38 @@
 
       <div v-else>
         <!-- !isCreatingIdentifier -->
-        <!-- They should have an identifier, even if it's an auto-generated one that they'll never use. -->
-        <div class="mb-4">
         <div
-            v-if="!isRegistered"
+          v-if="!activeDid"
-            id="noticeSomeoneMustRegisterYou"
+          class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
+        >
+          <p class="text-lg mb-3">
+            Want to connect with your contacts, or share contributions or
+            projects?
+          </p>
+          <router-link
+            :to="{ name: 'start' }"
+            class="block text-center text-md font-bold bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mt-2 px-2 py-3 rounded-md"
+          >
+            Create An Identifier
+          </router-link>
+        </div>
+
+        <div
+          v-else-if="!isRegistered"
           class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
         >
           <!-- activeDid && !isRegistered -->
-            To share, someone must register you.
+          Someone must register you before you can give kudos or make offers or
+          create projects... basically before doing anything.
           <router-link
             :to="{ name: 'contact-qr' }"
             class="block text-center text-md font-bold bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mt-2 px-2 py-3 rounded-md"
           >
-              Show Them {{ PASSKEYS_ENABLED ? "Default" : "Your" }} Identifier
+            Show Them Your Identifier Info
-              Info
           </router-link>
-            <div v-if="PASSKEYS_ENABLED" class="flex justify-end w-full">
-              <router-link
-                :to="{ name: 'start' }"
-                class="block text-right text-md font-bold bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mt-2 px-2 py-3 rounded-md"
-              >
-                See all your options first
-              </router-link>
-            </div>
         </div>
 
-          <div v-else id="sectionRecordSomethingGiven">
+        <div v-else>
           <!-- activeDid && isRegistered -->
 
           <!-- show the actions for recognizing a give -->
@@ -161,7 +166,6 @@
         </div>
       </div>
     </div>
-    </div>
 
     <GiftedDialog ref="customDialog" />
     <GiftedPrompts ref="giftedPrompts" />
@@ -189,7 +193,7 @@
         </button>
       </div>
       <InfiniteScroll @reached-bottom="loadMoreGives">
-        <ul id="listLatestActivity" class="border-t border-slate-300">
+        <ul class="border-t border-slate-300">
           <li
             class="border-b border-slate-300 py-2"
             v-for="record in feedData"
@@ -301,10 +305,10 @@
 
 <script lang="ts">
 import { UAParser } from "ua-parser-js";
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
 import { Router } from "vue-router";
 
-import App from "../App.vue";
 import EntityIcon from "@/components/EntityIcon.vue";
 import GiftedDialog from "@/components/GiftedDialog.vue";
 import GiftedPrompts from "@/components/GiftedPrompts.vue";
@@ -312,12 +316,9 @@ import FeedFilters from "@/components/FeedFilters.vue";
 import InfiniteScroll from "@/components/InfiniteScroll.vue";
 import QuickNav from "@/components/QuickNav.vue";
 import TopMessage from "@/components/TopMessage.vue";
-import {
+import { NotificationIface } from "@/constants/app";
-  AppString,
-  NotificationIface,
-  PASSKEYS_ENABLED,
-} from "@/constants/app";
 import { db, accountsDB } from "@/db/index";
+import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import {
   BoundingBox,
@@ -325,20 +326,17 @@ import {
   MASTER_SETTINGS_KEY,
   Settings,
 } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 import {
   contactForDid,
   containsNonHiddenDid,
   didInfoForContact,
   fetchEndorserRateLimits,
-  getHeaders,
   getPlanFromCache,
   GiverReceiverInputInfo,
   GiveSummaryRecord,
 } from "@/libs/endorserServer";
-import {
+import { generateSaveAndActivateIdentity } from "@/libs/util";
-  generateSaveAndActivateIdentity,
-  registerSaveAndActivatePasskey,
-} from "@/libs/util";
 
 interface GiveRecordWithContactInfo extends GiveSummaryRecord {
   giver: {
@@ -356,11 +354,6 @@ interface GiveRecordWithContactInfo extends GiveSummaryRecord {
 }
 
 @Component({
-  computed: {
-    App() {
-      return App;
-    },
-  },
   components: {
     GiftedDialog,
     GiftedPrompts,
@@ -374,9 +367,6 @@ interface GiveRecordWithContactInfo extends GiveSummaryRecord {
 export default class HomeView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
-  AppString = AppString;
-  PASSKEYS_ENABLED = PASSKEYS_ENABLED;
-
   activeDid = "";
   allContacts: Array<Contact> = [];
   allMyDids: Array<string> = [];
@@ -384,7 +374,6 @@ export default class HomeView extends Vue {
   feedData: GiveRecordWithContactInfo[] = [];
   feedPreviousOldestId?: string;
   feedLastViewedClaimId?: string;
-  givenName = "";
   isAnyFeedFilterOn: boolean;
   isCreatingIdentifier = false;
   isFeedFilteredByVisible = false;
@@ -398,18 +387,30 @@ export default class HomeView extends Vue {
   showShortcutBvc = false;
   userAgentInfo = new UAParser(); // see https://docs.uaparser.js.org/v2/api/ua-parser-js/get-os.html
 
+  public async getIdentity(activeDid: string): Promise<IIdentifier | null> {
+    await accountsDB.open();
+    const account = (await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first()) as Account;
+    const identity = JSON.parse(account?.identity || "null");
+    return identity; // may be null
+  }
+
+  public async getHeaders(identity: IIdentifier) {
+    const token = await accessToken(identity);
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token,
+    };
+    return headers;
+  }
+
   async mounted() {
     try {
       await accountsDB.open();
       const allAccounts = await accountsDB.accounts.toArray();
-      if (allAccounts.length > 0) {
       this.allMyDids = allAccounts.map((acc) => acc.did);
-      } else {
-        this.isCreatingIdentifier = true;
-        const newDid = await generateSaveAndActivateIdentity();
-        this.isCreatingIdentifier = false;
-        this.allMyDids = [newDid];
-      }
 
       await db.open();
       const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
@@ -417,7 +418,6 @@ export default class HomeView extends Vue {
       this.activeDid = settings?.activeDid || "";
       this.allContacts = await db.contacts.toArray();
       this.feedLastViewedClaimId = settings?.lastViewedClaimId;
-      this.givenName = settings?.firstName || "";
       this.isFeedFilteredByVisible = !!settings?.filterFeedByVisible;
       this.isFeedFilteredByNearby = !!settings?.filterFeedByNearby;
       this.isRegistered = !!settings?.isRegistered;
@@ -426,18 +426,26 @@ export default class HomeView extends Vue {
 
       this.isAnyFeedFilterOn = isAnyFeedFilterOn(settings);
 
-      // someone may have have registered after sharing contact info, so recheck
+      if (this.allMyDids.length === 0) {
+        this.isCreatingIdentifier = true;
+        this.activeDid = await generateSaveAndActivateIdentity();
+        this.allMyDids = [this.activeDid];
+        this.isCreatingIdentifier = false;
+      }
+
+      // someone may have have registered after sharing contact info
       if (!this.isRegistered && this.activeDid) {
+        const identity = await this.getIdentity(this.activeDid);
         try {
           const resp = await fetchEndorserRateLimits(
             this.apiServer,
             this.axios,
-            this.activeDid,
+            identity as IIdentifier,
           );
           if (resp.status === 200) {
             // we just needed to know that they're registered
             await db.open();
-            await db.settings.update(MASTER_SETTINGS_KEY, {
+            db.settings.update(MASTER_SETTINGS_KEY, {
               isRegistered: true,
             });
             this.isRegistered = true;
@@ -467,15 +475,6 @@ export default class HomeView extends Vue {
     }
   }
 
-  async generatePasskeyIdentifier() {
-    this.isCreatingIdentifier = true;
-    const account = await registerSaveAndActivatePasskey(
-      AppString.APP_NAME + (this.givenName ? " - " + this.givenName : ""),
-    );
-    this.activeDid = account.did;
-    this.allMyDids = this.allMyDids.concat(this.activeDid);
-    this.isCreatingIdentifier = false;
-  }
   resultsAreFiltered() {
     return this.isFeedFilteredByVisible || this.isFeedFilteredByNearby;
   }
@@ -484,6 +483,26 @@ export default class HomeView extends Vue {
     return "Notification" in window;
   }
 
+  public async buildHeaders() {
+    const headers: HeadersInit = {
+      "Content-Type": "application/json",
+    };
+
+    const identity = await this.getIdentity(this.activeDid);
+    if (this.activeDid) {
+      if (identity) {
+        headers["Authorization"] = "Bearer " + (await accessToken(identity));
+      } else {
+        throw new Error(
+          "An ID is chosen but there are no keys for it so it cannot be used to talk with the service. Switch your ID.",
+        );
+      }
+    } else {
+      // it's OK without auth... we just won't get any identifiers
+    }
+    return headers;
+  }
+
   // only called when a setting was changed
   async reloadFeedOnChange() {
     await db.open();
@@ -501,7 +520,7 @@ export default class HomeView extends Vue {
    * Data loader used by infinite scroller
    * @param payload is the flag from the InfiniteScroll indicating if it should load
    **/
-  async loadMoreGives(payload: boolean) {
+  public async loadMoreGives(payload: boolean) {
     // Since feed now loads projects along the way, it takes longer
     // and the InfiniteScroll component triggers a load before finished.
     // One alternative is to totally separate the project link loading.
@@ -523,7 +542,7 @@ export default class HomeView extends Vue {
     }
   }
 
-  async updateAllFeed() {
+  public async updateAllFeed() {
     this.isFeedLoading = true;
     let endOfResults = true;
     await this.retrieveGives(this.apiServer, this.feedPreviousOldestId)
@@ -531,6 +550,7 @@ export default class HomeView extends Vue {
         if (results.data.length > 0) {
           endOfResults = false;
           // include the descriptions of the giver and receiver
+          const identity = await this.getIdentity(this.activeDid);
           for (const record: GiveSummaryRecord of results.data) {
             // similar code is in endorser-mobile utility.ts
             // claim.claim happen for some claims wrapped in a Verifiable Credential
@@ -547,9 +567,9 @@ export default class HomeView extends Vue {
             // We should display it immediately and then get the plan later.
             const plan = await getPlanFromCache(
               record.fulfillsPlanHandleId,
+              identity,
               this.axios,
               this.apiServer,
-              this.activeDid,
             );
 
             // check if the record should be filtered out
@@ -599,7 +619,7 @@ export default class HomeView extends Vue {
             this.feedLastViewedClaimId < results.data[0].jwtId
           ) {
             await db.open();
-            await db.settings.update(MASTER_SETTINGS_KEY, {
+            db.settings.update(MASTER_SETTINGS_KEY, {
               lastViewedClaimId: results.data[0].jwtId,
             });
           }
@@ -630,7 +650,7 @@ export default class HomeView extends Vue {
    * @param beforeId the earliest ID (of previous searches) to search earlier
    * @return claims in reverse chronological order
    */
-  async retrieveGives(endorserApiServer: string, beforeId?: string) {
+  public async retrieveGives(endorserApiServer: string, beforeId?: string) {
     const beforeQuery = beforeId == null ? "" : "&beforeId=" + beforeId;
     const response = await fetch(
       endorserApiServer +
@@ -638,7 +658,7 @@ export default class HomeView extends Vue {
         beforeQuery,
       {
         method: "GET",
-        headers: await getHeaders(this.activeDid),
+        headers: await this.buildHeaders(),
       },
     );
 

src/views/IdentitySwitcherView.vue

@@ -39,10 +39,10 @@
 
     <!-- Other Identity/ies -->
     <ul class="mb-4">
-      <li v-for="ident in otherIdentities" :key="ident.did">
+      <li
-        <div class="flex items-center justify-between mb-2">
+        class="block bg-slate-100 rounded-md flex items-center px-4 py-3 mb-2"
-          <div
+        v-for="ident in otherIdentities"
-            class="flex flex-grow items-center bg-slate-100 rounded-md px-4 py-3 mb-2 truncate cursor-pointer"
+        :key="ident.did"
         @click="switchAccount(ident.did)"
       >
         <fa
@@ -50,32 +50,13 @@
           icon="circle-check"
           class="fa-fw text-blue-600 text-xl mr-3"
         />
-            <fa
+        <fa v-else icon="circle" class="fa-fw text-slate-400 text-xl mr-3" />
-              v-else
+        <span class="overflow-hidden">
-              icon="circle"
+          <h2 class="text-xl font-semibold mb-0"></h2>
-              class="fa-fw text-slate-400 text-xl mr-3"
-            />
-            <span class="flex-grow overflow-hidden">
           <div class="text-sm text-slate-500 truncate">
             <b>ID:</b> <code>{{ ident.did }}</code>
           </div>
         </span>
-          </div>
-          <div>
-            <fa
-              v-if="ident.did === activeDid"
-              icon="trash-can"
-              class="text-slate-400 text-xl ml-2 mr-2 cursor-pointer"
-              @click="notifyCannotDelete()"
-            />
-            <fa
-              v-else
-              icon="trash-can"
-              class="text-red-600 text-xl ml-2 mr-2 cursor-pointer"
-              @click="deleteAccount(ident.id)"
-            />
-          </div>
-        </div>
       </li>
     </ul>
 
@@ -99,10 +80,10 @@
 </template>
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
-import { NotificationIface } from "@/constants/app";
+import { AppString, NotificationIface } from "@/constants/app";
 import { db, accountsDB } from "@/db/index";
+import { AccountsSchema } from "@/db/tables/accounts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import QuickNav from "@/components/QuickNav.vue";
 
@@ -110,11 +91,14 @@ import QuickNav from "@/components/QuickNav.vue";
 export default class IdentitySwitcherView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
+  Constants = AppString;
+  public accounts: typeof AccountsSchema;
   public activeDid = "";
   public activeDidInIdentities = false;
   public apiServer = "";
   public apiServerInput = "";
-  public otherIdentities: Array<{ id: string; did: string }> = [];
+  public otherIdentities: Array<{ did: string }> = [];
+  public showContactGives = false;
 
   async created() {
     try {
@@ -123,15 +107,21 @@ export default class IdentitySwitcherView extends Vue {
       this.activeDid = settings?.activeDid || "";
       this.apiServer = settings?.apiServer || "";
       this.apiServerInput = settings?.apiServer || "";
+      this.showContactGives = !!settings?.showContactGivesInline;
 
       await accountsDB.open();
       const accounts = await accountsDB.accounts.toArray();
       for (let n = 0; n < accounts.length; n++) {
-        const acct = accounts[n];
+        try {
-        this.otherIdentities.push({ id: acct.id as string, did: acct.did });
+          const did = accounts[n]["did"];
-        if (acct.did && this.activeDid === acct.did) {
+          this.otherIdentities.push({ did: did });
+          if (did && this.activeDid === did) {
             this.activeDidInIdentities = true;
           }
+        } catch (err) {
+          console.error("Error parsing identity:", err);
+          continue;
+        }
       }
     } catch (err) {
       this.$notify(
@@ -156,38 +146,7 @@ export default class IdentitySwitcherView extends Vue {
     await db.settings.update(MASTER_SETTINGS_KEY, {
       activeDid: did,
     });
-    (this.$router as Router).push({ name: "account" });
+    this.$router.push({ name: "account" });
-  }
-
-  async deleteAccount(id: string) {
-    this.$notify(
-      {
-        group: "modal",
-        type: "confirm",
-        title: "Delete Identity?",
-        text: "Are you sure you want to erase this identity? (There is no undo. You may want to select it and back it up just in case.)",
-        onYes: async () => {
-          await accountsDB.open();
-          await accountsDB.accounts.delete(id);
-          this.otherIdentities = this.otherIdentities.filter(
-            (ident) => ident.id !== id,
-          );
-        },
-      },
-      -1,
-    );
-  }
-
-  notifyCannotDelete() {
-    this.$notify(
-      {
-        group: "alert",
-        type: "warning",
-        title: "Cannot Delete",
-        text: "You cannot delete the active identity.",
-      },
-      3000,
-    );
   }
 }
 </script>

src/views/ImportAccountView.vue

@@ -77,7 +77,6 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
@@ -111,7 +110,7 @@ export default class ImportAccountView extends Vue {
   }
 
   public onCancelClick() {
-    (this.$router as Router).back();
+    this.$router.back();
   }
 
   public async fromMnemonic() {
@@ -144,10 +143,10 @@ export default class ImportAccountView extends Vue {
 
       // record that as the active DID
       await db.open();
-      await db.settings.update(MASTER_SETTINGS_KEY, {
+      db.settings.update(MASTER_SETTINGS_KEY, {
         activeDid: newId.did,
       });
-      (this.$router as Router).push({ name: "account" });
+      this.$router.push({ name: "account" });
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
       console.error("Error saving mnemonic & updating settings:", err);

src/views/ImportDerivedAccountView.vue

@@ -17,7 +17,7 @@
 
     <div>
       <p class="text-center text-xl mb-4 font-light">
-        Will increment the maximum known derivation path from the existing seed.
+        Will increment the maximum derivation path from the existing seed.
       </p>
 
       <p v-if="didArrays.length > 1">
@@ -70,14 +70,12 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
 import {
   DEFAULT_ROOT_DERIVATION_PATH,
   deriveAddress,
   newIdentifier,
   nextDerivationPath,
-} from "@/libs/crypto";
+} from "../libs/crypto";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 
@@ -102,7 +100,7 @@ export default class ImportAccountView extends Vue {
   }
 
   public onCancelClick() {
-    (this.$router as Router).back();
+    this.$router.back();
   }
 
   public switchAccount(did: string) {
@@ -126,11 +124,9 @@ export default class ImportAccountView extends Vue {
       }
     });
     // increment the last number in that max derivation path
-    const newDerivPath = nextDerivationPath(
+    const newDerivPath = nextDerivationPath(accountWithMaxDeriv.derivationPath);
-      accountWithMaxDeriv.derivationPath as string,
-    );
 
-    const mne: string = accountWithMaxDeriv.mnemonic as string;
+    const mne: string = accountWithMaxDeriv.mnemonic;
 
     const [address, privateHex, publicHex] = deriveAddress(mne, newDerivPath);
 
@@ -148,10 +144,10 @@ export default class ImportAccountView extends Vue {
 
       // record that as the active DID
       await db.open();
-      await db.settings.update(MASTER_SETTINGS_KEY, {
+      db.settings.update(MASTER_SETTINGS_KEY, {
         activeDid: newId.did,
       });
-      (this.$router as Router).push({ name: "account" });
+      this.$router.push({ name: "account" });
     } catch (err) {
       console.error("Error saving mnemonic & updating settings:", err);
     }

src/views/NewEditAccountView.vue

@@ -45,8 +45,6 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
 import { db } from "@/db/index";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 
@@ -65,16 +63,18 @@ export default class NewEditAccountView extends Vue {
       (settings?.lastName ? ` ${settings.lastName}` : ""); // deprecated, pre v 0.1.3
   }
 
-  async onClickSaveChanges() {
+  onClickSaveChanges() {
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+    db.settings.update(MASTER_SETTINGS_KEY, {
       firstName: this.givenName,
       lastName: "", // deprecated, pre v 0.1.3
     });
-    (this.$router as Router).back();
+    localStorage.setItem("firstName", this.givenName as string);
+    localStorage.setItem("lastName", ""); // deprecated, pre v 0.1.3
+    this.$router.back();
   }
 
   onClickCancel() {
-    (this.$router as Router).back();
+    this.$router.back();
   }
 }
 </script>

src/views/NewEditProjectView.vue

@@ -74,9 +74,6 @@
       v-model="fullClaim.description"
       maxlength="5000"
     ></textarea>
-    <div class="text-xs text-slate-500 italic -mt-3 mb-4">
-      If you want to be contacted, be sure to include your contact information.
-    </div>
     <div class="text-xs text-slate-500 italic -mt-3 mb-4">
       {{ fullClaim.description?.length }}/5000 max. characters
     </div>
@@ -97,8 +94,8 @@
       />
       <input
         :disabled="!startDateInput"
-        placeholder="Start Time"
         v-model="startTimeInput"
+        placeholder="Start Time"
         type="time"
         class="col-span-1 w-full rounded border border-slate-400 ml-2 px-3 py-2"
       />
@@ -176,23 +173,22 @@
 
 <script lang="ts">
 import "leaflet/dist/leaflet.css";
-import { AxiosError, AxiosRequestHeaders } from "axios";
+import { AxiosError } from "axios";
+import * as didJwt from "did-jwt";
 import { DateTime } from "luxon";
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
 import { LMap, LMarker, LTileLayer } from "@vue-leaflet/vue-leaflet";
-import { Router } from "vue-router";
 
-import ImageMethodDialog from "@/components/ImageMethodDialog.vue";
 import QuickNav from "@/components/QuickNav.vue";
 import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import {
+import { accessToken, SimpleSigner } from "@/libs/crypto";
-  createEndorserJwtVcFromClaim,
+import * as libsUtil from "@/libs/util";
-  getHeaders,
-  PlanVerifiableCredential,
-} from "@/libs/endorserServer";
 import { useAppStore } from "@/store/app";
+import { PlanVerifiableCredential } from "@/libs/endorserServer";
+import ImageMethodDialog from "@/components/ImageMethodDialog.vue";
 
 @Component({
   components: { ImageMethodDialog, LMap, LMarker, LTileLayer, QuickNav },
@@ -231,6 +227,33 @@ export default class NewEditProjectView extends Vue {
   zoneName = DateTime.local().zoneName;
   zoom = 2;
 
+  libsUtil = libsUtil;
+
+  public async getIdentity(activeDid: string) {
+    await accountsDB.open();
+    const account = await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first();
+    const identity = JSON.parse((account?.identity as string) || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load project records with no identifier available.",
+      );
+    }
+    return identity;
+  }
+
+  public async getHeaders(identity: IIdentifier) {
+    const token = await accessToken(identity);
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token,
+    };
+    return headers;
+  }
+
   async mounted() {
     await accountsDB.open();
     this.numAccounts = await accountsDB.accounts.count();
@@ -244,17 +267,27 @@ export default class NewEditProjectView extends Vue {
       if (this.numAccounts === 0) {
         this.errNote("There was a problem loading your account info.");
       } else {
-        this.loadProject(this.activeDid);
+        const identity = await this.getIdentity(this.activeDid);
+        if (!identity) {
+          throw new Error(
+            "An ID is chosen but there are no keys for it so it cannot be used to talk with the service. Switch your ID.",
+          );
+        }
+        this.loadProject(identity);
       }
     }
   }
 
-  async loadProject(userDid: string) {
+  async loadProject(identity: IIdentifier) {
     const url =
       this.apiServer +
       "/api/claim/byHandle/" +
       encodeURIComponent(this.projectId);
-    const headers = await getHeaders(userDid);
+    const token = await accessToken(identity);
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token,
+    };
 
     try {
       const resp = await this.axios.get(url, { headers });
@@ -309,12 +342,17 @@ export default class NewEditProjectView extends Vue {
       return;
     }
     try {
-      const headers = (await getHeaders(this.activeDid)) as AxiosRequestHeaders;
+      const identity = await libsUtil.getIdentity(this.activeDid);
+      const token = await accessToken(identity);
       const response = await this.axios.delete(
         DEFAULT_IMAGE_API_SERVER +
           "/image/" +
           encodeURIComponent(this.imageUrl),
-        { headers },
+        {
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        },
       );
       if (response.status === 204) {
         // don't bother with a notification
@@ -357,7 +395,7 @@ export default class NewEditProjectView extends Vue {
     }
   }
 
-  private async saveProject(issuerDid: string) {
+  private async saveProject(identity: IIdentifier) {
     // Make a claim
     const vcClaim: PlanVerifiableCredential = this.fullClaim;
     if (this.projectId) {
@@ -408,13 +446,35 @@ export default class NewEditProjectView extends Vue {
     } else {
       delete vcClaim.startTime;
     }
-    const vcJwt = await createEndorserJwtVcFromClaim(issuerDid, vcClaim);
+    // Make a payload for the claim
+    const vcPayload = {
+      vc: {
+        "@context": ["https://www.w3.org/2018/credentials/v1"],
+        type: ["VerifiableCredential"],
+        credentialSubject: vcClaim,
+      },
+    };
+    // create a signature using private key of identity
+    if (identity.keys[0].privateKeyHex != null) {
+      const privateKeyHex: string = identity.keys[0].privateKeyHex;
+      const signer = await SimpleSigner(privateKeyHex);
+      const alg = undefined;
+      // create a JWT for the request
+      const vcJwt: string = await didJwt.createJWT(vcPayload, {
+        alg: alg,
+        issuer: identity.did,
+        signer: signer,
+      });
 
       // Make the xhr request payload
 
       const payload = JSON.stringify({ jwtEncoded: vcJwt });
       const url = this.apiServer + "/api/v2/claim";
-    const headers = await getHeaders(issuerDid);
+      const token = await accessToken(identity);
+      const headers = {
+        "Content-Type": "application/json",
+        Authorization: "Bearer " + token,
+      };
 
       try {
         const resp = await this.axios.post(url, payload, { headers });
@@ -424,7 +484,7 @@ export default class NewEditProjectView extends Vue {
           useAppStore()
             .setProjectId(resp.data.success.handleId)
             .then(() => {
-            (this.$router as Router).push({ name: "project" });
+              this.$router.push({ name: "project" });
             });
         } else {
           console.error(
@@ -473,7 +533,10 @@ export default class NewEditProjectView extends Vue {
             );
           }
         } else {
-        console.error("Here's the full error trying to save the claim:", error);
+          console.error(
+            "Here's the full error trying to save the claim:",
+            error,
+          );
           this.$notify(
             {
               group: "alert",
@@ -488,6 +551,7 @@ export default class NewEditProjectView extends Vue {
         this.errorMessage = userMessage;
       }
     }
+  }
 
   public async onSaveProjectClick() {
     this.isHiddenSave = true;
@@ -496,7 +560,8 @@ export default class NewEditProjectView extends Vue {
     if (this.numAccounts === 0) {
       console.error("Error: there is no account.");
     } else {
-      this.saveProject(this.activeDid);
+      const identity = await this.getIdentity(this.activeDid);
+      this.saveProject(identity);
     }
   }
 
@@ -522,7 +587,7 @@ export default class NewEditProjectView extends Vue {
   }
 
   public onCancelClick() {
-    (this.$router as Router).back();
+    this.$router.back();
   }
 }
 </script>

src/views/NewIdentifierView.vue

@@ -54,8 +54,6 @@
 <script lang="ts">
 import "dexie-export-import";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
 import { generateSaveAndActivateIdentity } from "@/libs/util";
 import QuickNav from "@/components/QuickNav.vue";
 
@@ -67,7 +65,7 @@ export default class NewIdentifierView extends Vue {
     await generateSaveAndActivateIdentity();
     this.loading = false;
     setTimeout(() => {
-      (this.$router as Router).push({ name: "home" });
+      this.$router.push({ name: "home" });
     }, 1000);
   }
 }

src/views/OfferDetailsView.vue

@@ -1,633 +0,0 @@
-<template>
-  <QuickNav />
-  <TopMessage />
-
-  <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
-    <!-- Back -->
-    <div
-      v-if="!hideBackButton"
-      class="text-lg text-center font-light relative px-7"
-    >
-      <h1
-        class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-        @click="cancelBack()"
-      >
-        <fa icon="chevron-left" class="fa-fw"></fa>
-      </h1>
-    </div>
-
-    <!-- Heading -->
-    <h1 class="text-4xl text-center font-light px-4 mb-4">What Is Offered</h1>
-
-    <h1 class="text-xl font-bold text-center mb-4">
-      <span>
-        Offer to
-        {{
-          offeredToProject
-            ? projectName
-            : offeredToRecipient
-              ? recipientName
-              : "someone unidentified"
-        }}</span
-      >
-    </h1>
-    <textarea
-      class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
-      placeholder="What is offered"
-      v-model="itemDescription"
-      data-testId="itemDescription"
-    />
-    <div class="flex flex-row justify-center">
-      <span
-        class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center text-blue-500 px-2 py-2 w-20"
-        @click="changeUnitCode()"
-      >
-        {{ libsUtil.UNIT_SHORT[unitCode] || unitCode }}
-      </span>
-      <div
-        class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
-        @click="amountInput === '0' ? null : decrement()"
-      >
-        <fa icon="chevron-left" />
-      </div>
-      <input
-        type="number"
-        class="border border-r-0 border-slate-400 px-2 py-2 text-center w-20"
-        v-model="amountInput"
-        data-testId="inputOfferAmount"
-      />
-      <div
-        class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2"
-        @click="increment()"
-      >
-        <fa icon="chevron-right" />
-      </div>
-    </div>
-
-    <div class="flex flex-row mt-2">
-      <span
-        class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center px-2 py-2"
-      >
-        Conditions
-      </span>
-      <textarea
-        class="w-full border border-slate-400 px-3 py-2 rounded-r"
-        placeholder="Prerequisites, other people to include, etc."
-        v-model="conditionDescription"
-      />
-    </div>
-
-    <div class="flex flex-row mt-2">
-      <span
-        class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center px-2 py-2"
-      >
-        {{ validThroughDateInput ? "" : "No" }}&nbsp;Expiration
-      </span>
-      <input
-        v-model="validThroughDateInput"
-        type="date"
-        class="w-full rounded border border-slate-400 px-3 py-2 rounded-r"
-      />
-    </div>
-
-    <div class="h-7 mt-4 flex">
-      <input
-        v-if="projectId && !offeredToRecipient"
-        type="checkbox"
-        class="h-6 w-6 mr-2"
-        v-model="offeredToProject"
-      />
-      <fa
-        v-else
-        icon="square"
-        class="bg-slate-500 text-slate-500 h-5 w-5 px-0.5 py-0.5 mr-2 rounded"
-        @click="notifyUserOfProject()"
-      />
-      <label class="text-sm mt-1">
-        {{
-          projectId
-            ? "This is offered to " + projectName
-            : "No project was chosen"
-        }}
-      </label>
-    </div>
-
-    <div class="h-7 mt-4 flex">
-      <input
-        v-if="recipientDid && !offeredToProject"
-        type="checkbox"
-        class="h-6 w-6 mr-2"
-        v-model="offeredToRecipient"
-      />
-      <fa
-        v-else
-        icon="square"
-        class="bg-slate-500 text-slate-500 h-5 w-5 px-0.5 py-0.5 mr-2 rounded"
-        @click="notifyUserOfRecipient()"
-      />
-      <label class="text-sm mt-1">
-        {{
-          recipientDid
-            ? "This is offered to " + recipientName
-            : "No recipient was chosen."
-        }}
-      </label>
-    </div>
-
-    <div class="mt-4 flex">
-      <router-link
-        :to="{
-          name: 'claim-add-raw',
-          query: {
-            claim: constructOfferParam(),
-          },
-        }"
-        class="text-blue-500"
-      >
-        Edit & Submit Raw
-      </router-link>
-    </div>
-
-    <p class="text-center mb-2 mt-6 italic">
-      Sign & Send to publish to the world
-      <fa
-        icon="circle-info"
-        class="pl-2 text-blue-500 cursor-pointer"
-        @click="explainData()"
-      />
-    </p>
-    <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
-      <button
-        class="block w-full text-center text-lg font-bold 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-2 py-3 rounded-md"
-        @click="confirm"
-      >
-        Sign &amp; Send
-      </button>
-      <button
-        class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
-        @click="cancel"
-      >
-        Cancel
-      </button>
-    </div>
-  </section>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
-import QuickNav from "@/components/QuickNav.vue";
-import TopMessage from "@/components/TopMessage.vue";
-import { NotificationIface } from "@/constants/app";
-import { accountsDB, db } from "@/db/index";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import {
-  createAndSubmitOffer,
-  didInfo,
-  editAndSubmitOffer,
-  GenericCredWrapper,
-  getPlanFromCache,
-  hydrateOffer,
-  OfferVerifiableCredential,
-} from "@/libs/endorserServer";
-import * as libsUtil from "@/libs/util";
-import { Contact } from "@/db/tables/contacts";
-
-@Component({
-  components: {
-    QuickNav,
-    TopMessage,
-  },
-})
-export default class OfferDetailsView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  activeDid = "";
-  apiServer = "";
-
-  amountInput = "0";
-  conditionDescription = "";
-  itemDescription = "";
-  destinationPathAfter = "";
-  offeredToProject = false;
-  offeredToRecipient = false;
-  offererDid: string | undefined;
-  hideBackButton = false;
-  message = "";
-  offerId = "";
-  prevCredToEdit?: GenericCredWrapper<OfferVerifiableCredential>;
-  projectId = "";
-  projectName = "a project";
-  recipientDid = "";
-  recipientName = "";
-  unitCode = "HUR";
-  validThroughDateInput = "";
-
-  libsUtil = libsUtil;
-
-  async mounted() {
-    try {
-      this.prevCredToEdit = (this.$route as Router).query["prevCredToEdit"]
-        ? (JSON.parse(
-            (this.$route as Router).query["prevCredToEdit"],
-          ) as GenericCredWrapper<OfferVerifiableCredential>)
-        : undefined;
-    } catch (error) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Retrieval Error",
-          text: "The previous record isn't available for editing. If you submit, you'll create a new record.",
-        },
-        6000,
-      );
-    }
-
-    const prevAmount =
-      this.prevCredToEdit?.claim?.includesObject?.amountOfThisGood;
-    this.amountInput =
-      (this.$route as Router).query["amountInput"] ||
-      (prevAmount ? String(prevAmount) : "") ||
-      this.amountInput;
-    this.unitCode = ((this.$route as Router).query["unitCode"] ||
-      this.prevCredToEdit?.claim?.includesObject?.unitCode ||
-      this.unitCode) as string;
-
-    this.conditionDescription =
-      this.prevCredToEdit?.claim?.description || this.conditionDescription;
-    this.itemDescription =
-      (this.$route as Router).query["description"] ||
-      this.prevCredToEdit?.claim?.itemOffered?.description ||
-      this.itemDescription;
-    this.destinationPathAfter = (this.$route as Router).query[
-      "destinationPathAfter"
-    ];
-    this.offererDid = ((this.$route as Router).query["offererDid"] ||
-      this.prevCredToEdit?.claim?.agent?.identifier ||
-      this.offererDid) as string;
-    this.hideBackButton =
-      (this.$route as Router).query["hideBackButton"] === "true";
-    this.message = ((this.$route as Router).query["message"] as string) || "";
-
-    // find any project ID
-    let project;
-    if (
-      this.prevCredToEdit?.claim?.itemOffered?.isPartOf?.["@type"] ===
-      "PlanAction"
-    ) {
-      project = this.prevCredToEdit?.claim?.itemOffered?.isPartOf;
-    }
-    this.projectId = ((this.$route as Router).query["projectId"] ||
-      project?.identifier ||
-      this.projectId) as string;
-    this.projectName = ((this.$route as Router).query["projectName"] ||
-      project?.name ||
-      this.projectName) as string;
-
-    this.recipientDid = ((this.$route as Router).query["recipientDid"] ||
-      this.prevCredToEdit?.claim?.recipient?.identifier) as string;
-    this.recipientName =
-      ((this.$route as Router).query["recipientName"] as string) || "";
-
-    this.validThroughDateInput =
-      this.prevCredToEdit?.claim?.validThrough || this.validThroughDateInput;
-
-    try {
-      await db.open();
-      const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
-      this.apiServer = settings?.apiServer || "";
-      this.activeDid = settings?.activeDid || "";
-
-      let allContacts: Contact[] = [];
-      let allMyDids: string[] = [];
-      if (this.recipientDid && !this.recipientName) {
-        allContacts = await db.contacts.toArray();
-
-        await accountsDB.open();
-        const allAccounts = await accountsDB.accounts.toArray();
-        allMyDids = allAccounts.map((acc) => acc.did);
-        this.recipientName = didInfo(
-          this.recipientDid,
-          this.activeDid,
-          allMyDids,
-          allContacts,
-        );
-      }
-      // these should be functions but something's wrong with the syntax in the <> conditional
-      this.offeredToProject = !!this.projectId;
-      this.offeredToRecipient = !this.offeredToProject && !!this.recipientDid;
-
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (err: any) {
-      console.error("Error retrieving settings from database:", err);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: err.message || "There was an error retrieving your settings.",
-        },
-        -1,
-      );
-    }
-
-    if (this.projectId && !this.projectName) {
-      // console.log("Getting project name from cache", this.projectId);
-      const project = await getPlanFromCache(
-        this.projectId,
-        this.axios,
-        this.apiServer,
-        this.activeDid,
-      );
-      this.projectName = project?.name
-        ? "the project: " + project.name
-        : "a project";
-    }
-  }
-
-  changeUnitCode() {
-    const units = Object.keys(this.libsUtil.UNIT_SHORT);
-    const index = units.indexOf(this.unitCode);
-    this.unitCode = units[(index + 1) % units.length];
-  }
-
-  increment() {
-    this.amountInput = `${(parseFloat(this.amountInput) || 0) + 1}`;
-  }
-
-  decrement() {
-    this.amountInput = `${Math.max(
-      0,
-      (parseFloat(this.amountInput) || 1) - 1,
-    )}`;
-  }
-
-  cancel() {
-    if (this.destinationPathAfter) {
-      (this.$router as Router).push({ path: this.destinationPathAfter });
-    } else {
-      (this.$router as Router).back();
-    }
-  }
-
-  cancelBack() {
-    (this.$router as Router).back();
-  }
-
-  async confirm() {
-    if (!this.activeDid) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "You must select an identifier before you can record a offer.",
-        },
-        2000,
-      );
-      return;
-    }
-    if (parseFloat(this.amountInput) < 0) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          text: "You may not send a negative number.",
-          title: "",
-        },
-        2000,
-      );
-      return;
-    }
-    if (!this.itemDescription && !parseFloat(this.amountInput)) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: `You must enter a description or some number of ${
-            this.libsUtil.UNIT_LONG[this.unitCode]
-          }.`,
-        },
-        2000,
-      );
-      return;
-    }
-
-    this.$notify(
-      {
-        group: "alert",
-        type: "toast",
-        text: "Recording the offer...",
-        title: "",
-      },
-      1000,
-    );
-
-    // this is asynchronous, but we don't need to wait for it to complete
-    await this.recordOffer();
-  }
-
-  notifyUserOfProject() {
-    if (!this.projectId) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Error",
-          text: "To assign to a project, you must open this page through a project.",
-        },
-        3000,
-      );
-    } else {
-      // must be because offeredToRecipient is true
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Error",
-          text: "You cannot assign both to a project and to a recipient.",
-        },
-        3000,
-      );
-    }
-  }
-
-  notifyUserOfRecipient() {
-    if (!this.recipientDid) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Error",
-          text: "To assign to a recipient, you must open this page from a contact.",
-        },
-        3000,
-      );
-    } else {
-      // must be because offeredToProject is true
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Error",
-          text: "You cannot assign both to a recipient and to a project.",
-        },
-        3000,
-      );
-    }
-  }
-
-  /**
-   *
-   * @param offererDid may be null
-   * @param description may be an empty string
-   * @param amountInput may be 0
-   * @param unitCode may be omitted, defaults to "HUR"
-   */
-  public async recordOffer() {
-    try {
-      const recipientDid = this.offeredToRecipient
-        ? this.recipientDid
-        : undefined;
-      const projectId = this.offeredToProject ? this.projectId : undefined;
-      let result;
-      if (this.prevCredToEdit) {
-        // don't create from a blank one in case some properties were set from a different interface
-        result = await editAndSubmitOffer(
-          this.axios,
-          this.apiServer,
-          this.prevCredToEdit,
-          this.activeDid,
-          this.itemDescription,
-          parseFloat(this.amountInput),
-          this.unitCode,
-          this.conditionDescription,
-          this.validThroughDateInput,
-          recipientDid,
-          projectId,
-        );
-      } else {
-        result = await createAndSubmitOffer(
-          this.axios,
-          this.apiServer,
-          this.activeDid,
-          this.itemDescription,
-          parseFloat(this.amountInput),
-          this.unitCode,
-          this.conditionDescription,
-          this.validThroughDateInput,
-          recipientDid,
-          projectId,
-        );
-      }
-
-      if (result.type === "error" || this.isCreationError(result.response)) {
-        const errorMessage = this.getCreationErrorMessage(result);
-        console.error("Error with offer creation result:", result);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: errorMessage || "There was an error creating the offer.",
-          },
-          -1,
-        );
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Success",
-            text: `That offer was recorded.`,
-          },
-          5000,
-        );
-        localStorage.removeItem("imageUrl");
-        if (this.destinationPathAfter) {
-          (this.$router as Router).push({ path: this.destinationPathAfter });
-        } else {
-          (this.$router as Router).back();
-        }
-      }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (error: any) {
-      console.error("Error with offer recordation caught:", error);
-      const errorMessage =
-        error.userMessage ||
-        error.response?.data?.error?.message ||
-        "There was an error recording the offer.";
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: errorMessage,
-        },
-        -1,
-      );
-    }
-  }
-
-  constructOfferParam() {
-    const recipientDid = this.offeredToRecipient
-      ? this.recipientDid
-      : undefined;
-    const projectId = this.offeredToProject ? this.projectId : undefined;
-    const offerClaim = hydrateOffer(
-      this.prevCredToEdit?.claim as OfferVerifiableCredential,
-      this.activeDid,
-      recipientDid,
-      this.itemDescription,
-      parseFloat(this.amountInput),
-      this.unitCode,
-      this.conditionDescription,
-      projectId,
-      this.validThroughDateInput,
-      this.prevCredToEdit?.id as string,
-    );
-    const claimStr = JSON.stringify(offerClaim);
-    return claimStr;
-  }
-
-  // Helper functions for readability
-
-  /**
-   * @param result response "data" from the server
-   * @returns true if the result indicates an error
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  isCreationError(result: any) {
-    return result.status !== 201 || result.data?.error;
-  }
-
-  /**
-   * @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
-   * @returns best guess at an error message
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  getCreationErrorMessage(result: any) {
-    return (
-      result.error?.userMessage ||
-      result.error?.error ||
-      result.response?.data?.error?.message
-    );
-  }
-
-  explainData() {
-    this.$notify(
-      {
-        group: "alert",
-        type: "success",
-        title: "Data Sharing",
-        text: libsUtil.PRIVACY_MESSAGE,
-      },
-      -1,
-    );
-  }
-}
-</script>

src/views/ProjectViewView.vue

@@ -115,54 +115,9 @@
       </button>
     </div>
 
-    <div class="grid items-start grid-cols-1 sm:grid-cols-2 gap-4 mt-4">
+    <div v-if="activeDid" class="mt-4">
-      <div>
-        <div
-          v-if="fulfillersToThis.length > 0"
-          class="bg-slate-100 px-4 py-3 rounded-md"
-        >
-          <h3 class="text-sm uppercase font-semibold mt-3">
-            Projects That Contribute To This
-          </h3>
-          <!-- centering because long, wrapped project names didn't left align with blank or "text-left" -->
-          <div class="text-center">
-            <div v-for="plan in fulfillersToThis" :key="plan.handleId">
-              <button
-                @click="onClickLoadProject(plan.handleId)"
-                class="text-blue-500"
-              >
-                {{ plan.name }}
-              </button>
-            </div>
-            <div v-if="fulfillersToHitLimit" class="text-center">
-              <button @click="loadPlanFulfillersTo()">Load More</button>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div>
-        <div v-if="fulfilledByThis" class="bg-slate-100 px-4 py-3 rounded-md">
-          <h3 class="text-sm uppercase font-semibold mb-3">
-            Projects Getting Contributions From This
-          </h3>
-          <!-- centering because long, wrapped project names didn't left align with blank or "text-left" -->
       <div class="text-center">
         <button
-              @click="onClickLoadProject(fulfilledByThis.handleId)"
-              class="text-blue-500"
-            >
-              {{ fulfilledByThis.name }}
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div v-if="activeDid && isRegistered" class="mt-4">
-      <div class="text-center">
-        <button
-          data-testId="offerButton"
           @click="openOfferDialog()"
           class="block w-full text-lg font-bold 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-2 py-3 rounded-md"
         >
@@ -170,13 +125,9 @@
         </button>
       </div>
     </div>
-    <OfferDialog
+    <OfferDialog ref="customOfferDialog" :projectId="this.projectId" />
-      ref="customOfferDialog"
-      :projectId="this.projectId"
-      :projectName="this.name"
-    />
 
-    <div v-if="activeDid && isRegistered">
+    <div v-if="activeDid">
       <div class="text-center">
         <p class="mt-2 mt-4 text-center">Record a contribution from:</p>
       </div>
@@ -305,7 +256,6 @@
           contact above.)
         </div>
 
-        <!-- similar to gift display below -->
         <ul v-else class="text-sm border-t border-slate-300">
           <li
             v-for="give in givesToThis"
@@ -313,8 +263,8 @@
             class="py-1.5 border-b border-slate-300"
           >
             <div class="flex justify-between gap-4">
-              <span>
+              <span
-                <fa icon="user" class="fa-fw text-slate-400" />
+                ><fa icon="user" class="fa-fw text-slate-400"></fa>
                 {{
                   serverUtil.didInfo(
                     give.agentDid,
@@ -350,11 +300,6 @@
                 <fa icon="circle-check" class="text-blue-500 cursor-pointer" />
               </a>
             </div>
-            <div v-if="give.fullClaim.image" class="flex justify-center">
-              <a :href="give.fullClaim.image" target="_blank">
-                <img :src="give.fullClaim.image" class="h-24 mt-2 rounded-xl" />
-              </a>
-            </div>
           </li>
         </ul>
         <div v-if="givesHitLimit" class="text-center text-blue-500">
@@ -364,54 +309,38 @@
 
       <div class="grid items-start grid-cols-1 gap-4">
         <div
-          v-if="givesProvidedByThis.length > 0"
+          v-if="fulfillersToThis.length > 0"
           class="bg-slate-100 px-4 py-3 rounded-md"
         >
-          <div>
+          <h3 class="text-sm uppercase font-semibold mb-3">
-            <h3 class="text-sm font-semibold border-b">
+            Contributions To This Idea
-              Individuals Getting Contributions From This
           </h3>
-            <!-- similar to gift display above -->
+          <!-- centering because long, wrapped project names didn't left align with blank or "text-left" -->
-            <ul class="text-sm border-t border-slate-300">
+          <div class="text-center">
-              <li
+            <div v-for="plan in fulfillersToThis" :key="plan.handleId">
-                v-for="give in givesProvidedByThis"
+              <button
-                :key="give.id"
+                @click="onClickLoadProject(plan.handleId)"
-                class="py-1.5 border-b border-slate-300"
+                class="text-blue-500"
               >
-                <div class="flex justify-between gap-4">
+                {{ plan.name }}
-                  <span>
+              </button>
-                    {{
-                      serverUtil.didInfo(
-                        give.agentDid,
-                        activeDid,
-                        allMyDids,
-                        allContacts,
-                      )
-                    }}
-                  </span>
-                  <span v-if="give.amount" class="whitespace-nowrap">
-                    <fa
-                      :icon="libsUtil.iconForUnitCode(give.unit)"
-                      class="fa-fw text-slate-400"
-                    />{{ give.amount }}
-                  </span>
             </div>
-                <div class="text-slate-500">
+            <div v-if="fulfillersToHitLimit" class="text-center">Load More</div>
-                  <fa icon="calendar" class="fa-fw text-slate-400" />
-                  {{ give.issuedAt?.substring(0, 10) }}
           </div>
-                <div v-if="give.description" class="text-slate-500">
-                  <fa icon="comment" class="fa-fw text-slate-400" />
-                  {{ give.description }}
-                </div>
-                <a @click="onClickLoadClaim(give.jwtId)">
-                  <fa icon="file-lines" class="text-blue-500 cursor-pointer" />
-                </a>
-              </li>
-            </ul>
-            <div v-if="givesProvidedByHitLimit" class="text-center">
-              <button @click="loadGivesProvidedBy()">Load More</button>
         </div>
+
+        <div v-if="fulfilledByThis" class="bg-slate-100 px-4 py-3 rounded-md">
+          <h3 class="text-sm uppercase font-semibold mb-3">
+            Contributions From This Idea
+          </h3>
+          <!-- centering because long, wrapped project names didn't left align with blank or "text-left" -->
+          <div class="text-center">
+            <button
+              @click="onClickLoadProject(fulfilledByThis.handleId)"
+              class="text-blue-500"
+            >
+              {{ fulfilledByThis.name }}
+            </button>
           </div>
         </div>
       </div>
@@ -420,9 +349,9 @@
 </template>
 
 <script lang="ts">
-import { AxiosError } from "axios";
+import { AxiosError, RawAxiosRequestHeaders } from "axios";
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import GiftedDialog from "@/components/GiftedDialog.vue";
 import OfferDialog from "@/components/OfferDialog.vue";
@@ -435,16 +364,14 @@ import { accountsDB, db } from "@/db/index";
 import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 import * as libsUtil from "@/libs/util";
 import {
   BLANK_GENERIC_SERVER_RECORD,
   GenericCredWrapper,
-  getHeaders,
   GiverReceiverInputInfo,
   GiveSummaryRecord,
-  GiveVerifiableCredential,
   OfferSummaryRecord,
-  OfferVerifiableCredential,
   PlanSummaryRecord,
 } from "@/libs/endorserServer";
 import * as serverUtil from "@/libs/endorserServer";
@@ -474,10 +401,7 @@ export default class ProjectViewView extends Vue {
   fulfillersToHitLimit = false;
   givesToThis: Array<GiveSummaryRecord> = [];
   givesHitLimit = false;
-  givesProvidedByThis: Array<GiveSummaryRecord> = [];
-  givesProvidedByHitLimit = false;
   imageUrl = "";
-  isRegistered = false;
   issuer = "";
   latitude = 0;
   longitude = 0;
@@ -500,18 +424,29 @@ export default class ProjectViewView extends Vue {
     this.activeDid = settings?.activeDid || "";
     this.apiServer = settings?.apiServer || "";
     this.allContacts = await db.contacts.toArray();
-    this.isRegistered = !!settings?.isRegistered;
 
     await accountsDB.open();
     const accounts = accountsDB.accounts;
     const accountsArr: Account[] = await accounts?.toArray();
     this.allMyDids = accountsArr.map((acc) => acc.did);
+    const account = accountsArr.find((acc) => acc.did === this.activeDid);
+    const identity = JSON.parse((account?.identity as string) || "null");
 
     const pathParam = window.location.pathname.substring("/project/".length);
     if (pathParam) {
       this.projectId = decodeURIComponent(pathParam);
     }
-    this.loadProject(this.projectId, this.activeDid);
+    this.loadProject(this.projectId, identity);
+  }
+
+  public async getIdentity(activeDid: string) {
+    await accountsDB.open();
+    const account = (await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first()) as Account;
+    const identity = JSON.parse(account?.identity || "null");
+    return identity;
   }
 
   onEditClick() {
@@ -519,7 +454,7 @@ export default class ProjectViewView extends Vue {
     const route = {
       name: "new-edit-project",
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   // Isn't there a better way to make this available to the template?
@@ -531,12 +466,18 @@ export default class ProjectViewView extends Vue {
     this.expanded = false;
   }
 
-  async loadProject(projectId: string, userDid: string) {
+  async loadProject(projectId: string, identity: IIdentifier) {
     this.projectId = projectId;
 
     const url =
       this.apiServer + "/api/claim/byHandle/" + encodeURIComponent(projectId);
-    const headers = await getHeaders(userDid);
+    const headers: RawAxiosRequestHeaders = {
+      "Content-Type": "application/json",
+    };
+    if (identity) {
+      const token = await accessToken(identity);
+      headers["Authorization"] = "Bearer " + token;
+    }
 
     try {
       const resp = await this.axios.get(url, { headers });
@@ -599,12 +540,15 @@ export default class ProjectViewView extends Vue {
 
     this.loadGives();
 
-    this.loadGivesProvidedBy();
-
     this.loadOffers();
 
-    this.loadPlanFulfillersTo();
+    this.loadFulfillersTo();
 
+    // now load fulfilled-by, a single project
+    if (identity) {
+      const token = await accessToken(identity);
+      headers["Authorization"] = "Bearer " + token;
+    }
     const fulfilledByUrl =
       this.apiServer +
       "/api/v2/report/planFulfilledByPlan?planHandleId=" +
@@ -654,7 +598,15 @@ export default class ProjectViewView extends Vue {
     }
     const givesInUrl = givesUrl + postfix;
 
-    const headers = await getHeaders(this.activeDid);
+    const headers: RawAxiosRequestHeaders = {
+      "Content-Type": "application/json",
+    };
+    const identity = await this.getIdentity(this.activeDid);
+    if (identity) {
+      const token = await accessToken(identity);
+      headers["Authorization"] = "Bearer " + token;
+    }
+
     try {
       const resp = await this.axios.get(givesInUrl, { headers });
       if (resp.status === 200 && resp.data.data) {
@@ -701,7 +653,15 @@ export default class ProjectViewView extends Vue {
     }
     const offersInUrl = offersUrl + postfix;
 
-    const headers = await getHeaders(this.activeDid);
+    const headers: RawAxiosRequestHeaders = {
+      "Content-Type": "application/json",
+    };
+    const identity = await this.getIdentity(this.activeDid);
+    if (identity) {
+      const token = await accessToken(identity);
+      headers["Authorization"] = "Bearer " + token;
+    }
+
     try {
       const resp = await this.axios.get(offersInUrl, { headers });
       if (resp.status === 200 && resp.data.data) {
@@ -736,7 +696,7 @@ export default class ProjectViewView extends Vue {
     }
   }
 
-  async loadPlanFulfillersTo() {
+  async loadFulfillersTo() {
     const fulfillsUrl =
       this.apiServer +
       "/api/v2/report/planFulfillersToPlan?planHandleId=" +
@@ -749,7 +709,15 @@ export default class ProjectViewView extends Vue {
     }
     const fulfillsInUrl = fulfillsUrl + postfix;
 
-    const headers = await getHeaders(this.activeDid);
+    const headers: RawAxiosRequestHeaders = {
+      "Content-Type": "application/json",
+    };
+    const identity = await this.getIdentity(this.activeDid);
+    if (identity) {
+      const token = await accessToken(identity);
+      headers["Authorization"] = "Bearer " + token;
+    }
+
     try {
       const resp = await this.axios.get(fulfillsInUrl, { headers });
       if (resp.status === 200) {
@@ -784,56 +752,6 @@ export default class ProjectViewView extends Vue {
     }
   }
 
-  async loadGivesProvidedBy() {
-    const providedByUrl =
-      this.apiServer +
-      "/api/v2/report/givesProvidedBy?providerId=" +
-      encodeURIComponent(this.projectId);
-    let postfix = "";
-    if (this.givesProvidedByThis.length > 0) {
-      postfix =
-        "&beforeId=" +
-        this.givesProvidedByThis[this.givesProvidedByThis.length - 1].jwtId;
-    }
-    const providedByFullUrl = providedByUrl + postfix;
-
-    const headers = await getHeaders(this.activeDid);
-    try {
-      const resp = await this.axios.get(providedByFullUrl, { headers });
-      if (resp.status === 200) {
-        this.givesProvidedByThis = this.givesProvidedByThis.concat(
-          resp.data.data,
-        );
-        this.givesProvidedByHitLimit = resp.data.hitLimit;
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "Failed to retrieve gives that were provided by this project.",
-          },
-          5000,
-        );
-      }
-    } catch (error: unknown) {
-      const serverError = error as AxiosError;
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "Something went wrong retrieving gives that were provided by this project.",
-        },
-        5000,
-      );
-      console.error(
-        "Something went wrong retrieving gives that were provided by this project:",
-        serverError.message,
-      );
-    }
-  }
-
   /**
    * Handle clicking on a project entry found in the list
    * @param id of the project
@@ -843,8 +761,8 @@ export default class ProjectViewView extends Vue {
     const route = {
       path: "/project/" + encodeURIComponent(projectId),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
-    this.loadProject(projectId, this.activeDid);
+    this.loadProject(projectId, await this.getIdentity(this.activeDid));
   }
 
   getOpenStreetMapUrl() {
@@ -879,18 +797,18 @@ export default class ProjectViewView extends Vue {
     const route = {
       name: "contact-gift",
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   onClickLoadClaim(jwtId: string) {
     const route = {
       path: "/claim/" + encodeURIComponent(jwtId),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   checkIsFulfillable(offer: OfferSummaryRecord) {
-    const offerRecord: GenericCredWrapper<OfferVerifiableCredential> = {
+    const offerRecord: GenericCredWrapper = {
       ...BLANK_GENERIC_SERVER_RECORD,
       claim: offer.fullClaim,
       claimType: "Offer",
@@ -900,7 +818,7 @@ export default class ProjectViewView extends Vue {
   }
 
   onClickFulfillGiveToOffer(offer: OfferSummaryRecord) {
-    const offerRecord: GenericCredWrapper<OfferVerifiableCredential> = {
+    const offerRecord: GenericCredWrapper = {
       ...BLANK_GENERIC_SERVER_RECORD,
       claim: offer.fullClaim,
       issuer: offer.offeredByDid,
@@ -945,17 +863,13 @@ export default class ProjectViewView extends Vue {
   }
 
   checkIsConfirmable(give: GiveSummaryRecord) {
-    const giveDetails: GenericCredWrapper<GiveVerifiableCredential> = {
+    const giveDetails: GenericCredWrapper = {
       ...BLANK_GENERIC_SERVER_RECORD,
       claim: give.fullClaim,
       claimType: "GiveAction",
       issuer: give.agentDid,
     };
-    return libsUtil.isGiveRecordTheUserCanConfirm(
+    return libsUtil.isGiveRecordTheUserCanConfirm(giveDetails, this.activeDid);
-      this.isRegistered,
-      giveDetails,
-      this.activeDid,
-    );
   }
 
   confirmConfirmClaim(give: GiveSummaryRecord) {
@@ -992,7 +906,7 @@ export default class ProjectViewView extends Vue {
     };
     const result = await serverUtil.createAndSubmitClaim(
       confirmationClaim,
-      this.activeDid,
+      await this.getIdentity(this.activeDid),
       this.apiServer,
       this.axios,
     );

src/views/ProjectsView.vue

@@ -86,7 +86,7 @@
           Look for projects worth some of your time.
         </router-link>
       </div>
-      <ul id="listOffers" class="border-t border-slate-300">
+      <ul class="border-t border-slate-300">
         <li
           class="border-b border-slate-300"
           v-for="offer in offers"
@@ -109,19 +109,6 @@
             </div>
 
             <div>
-              <div>
-                To
-                {{
-                  offer.fulfillsPlanHandleId
-                    ? projectNameFromHandleId[offer.fulfillsPlanHandleId]
-                    : didInfo(
-                        offer.recipientDid,
-                        activeDid,
-                        allMyDids,
-                        allContacts,
-                      )
-                }}
-              </div>
               <div>
                 {{ offer.objectDescription }}
               </div>
@@ -202,16 +189,12 @@
     <InfiniteScroll v-if="showProjects" @reached-bottom="loadMoreProjectData">
       <div v-if="projects.length === 0" class="text-center py-4">
         You have not announced any projects.
-        <div v-if="isRegistered">
+        <br />
         Hit the big
-          <fa
+        <fa icon="plus" class="bg-blue-600 text-white px-1 py-1 rounded-full" />
-            icon="plus"
-            class="bg-blue-600 text-white px-1 py-1 rounded-full"
-          />
         button. You'll never know until you try.
       </div>
-      </div>
+      <ul class="border-t border-slate-300">
-      <ul id="listProjects" class="border-t border-slate-300">
         <li
           class="border-b border-slate-300"
           v-for="project in projects"
@@ -246,25 +229,19 @@
 <script lang="ts">
 import { AxiosRequestConfig } from "axios";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 import * as libsUtil from "@/libs/util";
+import { IIdentifier } from "@veramo/core";
 import InfiniteScroll from "@/components/InfiniteScroll.vue";
 import QuickNav from "@/components/QuickNav.vue";
 import ProjectIcon from "@/components/ProjectIcon.vue";
 import TopMessage from "@/components/TopMessage.vue";
-import {
+import { OfferSummaryRecord, PlanData } from "@/libs/endorserServer";
-  didInfo,
-  getHeaders,
-  getPlanFromCache,
-  OfferSummaryRecord,
-  PlanData,
-} from "@/libs/endorserServer";
 import EntityIcon from "@/components/EntityIcon.vue";
-import { Contact } from "@/db/tables/contacts";
 
 @Component({
   components: { EntityIcon, InfiniteScroll, QuickNav, ProjectIcon, TopMessage },
@@ -278,39 +255,33 @@ export default class ProjectsView extends Vue {
     );
   }
 
-  activeDid = "";
-  allContacts: Array<Contact> = [];
-  allMyDids: Array<string> = [];
   apiServer = "";
   projects: PlanData[] = [];
+  currentIid: IIdentifier;
   isLoading = false;
   isRegistered = false;
+  numAccounts = 0;
   offers: OfferSummaryRecord[] = [];
-  projectNameFromHandleId: Record<string, string> = {}; // mapping from handleId to description
   showOffers = true;
   showProjects = false;
 
   libsUtil = libsUtil;
-  didInfo = didInfo;
 
   async mounted() {
     try {
       await db.open();
       const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-      this.activeDid = (settings?.activeDid as string) || "";
+      const activeDid: string = (settings?.activeDid as string) || "";
       this.apiServer = (settings?.apiServer as string) || "";
       this.isRegistered = !!settings?.isRegistered;
 
-      this.allContacts = await db.contacts.toArray();
-
       await accountsDB.open();
-      const allAccounts = await accountsDB.accounts.toArray();
+      this.numAccounts = await accountsDB.accounts.count();
-      this.allMyDids = allAccounts.map((acc) => acc.did);
+      if (this.numAccounts === 0) {
-
-      if (allAccounts.length === 0) {
         console.error("No accounts found.");
         this.errNote("You need an identifier to load your projects.");
       } else {
+        this.currentIid = await this.getIdentity(activeDid);
         await this.loadOffers();
       }
     } catch (err) {
@@ -324,9 +295,13 @@ export default class ProjectsView extends Vue {
    * @param url the url used to fetch the data
    * @param token Authorization token
    **/
-  async projectDataLoader(url: string) {
+  async projectDataLoader(url: string, token: string) {
+    const headers: { [key: string]: string } = {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${token}`,
+    };
+
     try {
-      const headers = await getHeaders(this.activeDid);
       this.isLoading = true;
       const resp = await this.axios.get(url, { headers } as AxiosRequestConfig);
       if (resp.status === 200 && resp.data.data) {
@@ -366,18 +341,39 @@ export default class ProjectsView extends Vue {
   async loadMoreProjectData(payload: boolean) {
     if (this.projects.length > 0 && payload) {
       const latestProject = this.projects[this.projects.length - 1];
-      await this.loadProjects(`beforeId=${latestProject.rowid}`);
+      await this.loadProjects(
+        this.currentIid,
+        `beforeId=${latestProject.rowid}`,
+      );
     }
   }
 
   /**
    * Load projects initially
-   * @param issuerDid of the user
+   * @param identifier of the user
    * @param urlExtra additional url parameters in a string
    **/
-  async loadProjects(urlExtra: string = "") {
+  async loadProjects(identifier?: IIdentifier, urlExtra: string = "") {
+    const identity = identifier || this.currentIid;
     const url = `${this.apiServer}/api/v2/report/plansByIssuer?${urlExtra}`;
-    await this.projectDataLoader(url);
+    const token: string = await accessToken(identity);
+    await this.projectDataLoader(url, token);
+  }
+
+  public async getIdentity(activeDid: string): Promise<IIdentifier> {
+    await accountsDB.open();
+    const account = await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first();
+    const identity = JSON.parse((account?.identity as string) || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load project records with no identifier available.",
+      );
+    }
+    return identity;
   }
 
   /**
@@ -389,7 +385,7 @@ export default class ProjectsView extends Vue {
     const route = {
       path: "/project/" + encodeURIComponent(id),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   /**
@@ -400,14 +396,14 @@ export default class ProjectsView extends Vue {
     const route = {
       name: "new-edit-project",
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   onClickLoadClaim(jwtId: string) {
     const route = {
       path: "/claim/" + encodeURIComponent(jwtId),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   /**
@@ -415,38 +411,17 @@ export default class ProjectsView extends Vue {
    * @param url the url used to fetch the data
    * @param token Authorization token
    **/
-  async offerDataLoader(url: string) {
+  async offerDataLoader(url: string, token: string) {
-    const headers = await getHeaders(this.activeDid);
+    const headers: { [key: string]: string } = {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${token}`,
+    };
 
     try {
       this.isLoading = true;
       const resp = await this.axios.get(url, { headers } as AxiosRequestConfig);
       if (resp.status === 200 && resp.data.data) {
-        // add one-by-one as they retrieve project names, potentially from the server
+        this.offers = this.offers.concat(resp.data.data);
-        for (const offer of resp.data.data) {
-          if (offer.fulfillsPlanHandleId) {
-            const project = await getPlanFromCache(
-              offer.fulfillsPlanHandleId,
-              this.axios,
-              this.apiServer,
-              this.activeDid,
-            );
-            const projectName = project?.name as string;
-            console.log(
-              "now have name for",
-              offer.fulfillsPlanHandleId,
-              projectName,
-            );
-            this.projectNameFromHandleId[offer.fulfillsPlanHandleId] =
-              projectName;
-            console.log(
-              "now have a real name for",
-              offer.fulfillsPlanHandleId,
-              this.projectNameFromHandleId[offer.fulfillsPlanHandleId],
-            );
-          }
-          this.offers = this.offers.concat([offer]);
-        }
       } else {
         console.error(
           "Bad server response & data for offers:",
@@ -487,18 +462,20 @@ export default class ProjectsView extends Vue {
   async loadMoreOfferData(payload: boolean) {
     if (this.offers.length > 0 && payload) {
       const latestOffer = this.offers[this.offers.length - 1];
-      await this.loadOffers(`&beforeId=${latestOffer.jwtId}`);
+      await this.loadOffers(this.currentIid, `&beforeId=${latestOffer.jwtId}`);
     }
   }
 
   /**
    * Load offers initially
-   * @param issuerDid of the user
+   * @param identifier of the user
    * @param urlExtra additional url parameters in a string
    **/
-  async loadOffers(urlExtra: string = "") {
+  async loadOffers(identifier?: IIdentifier, urlExtra: string = "") {
-    const url = `${this.apiServer}/api/v2/report/offers?offeredByDid=${this.activeDid}${urlExtra}`;
+    const identity = identifier || this.currentIid;
-    await this.offerDataLoader(url);
+    const url = `${this.apiServer}/api/v2/report/offers?offeredByDid=${identity.did}${urlExtra}`;
+    const token: string = await accessToken(identity);
+    await this.offerDataLoader(url, token);
   }
 
   public computedOfferTabClassNames() {

src/views/QuickActionBvcBeginView.vue

@@ -124,6 +124,7 @@ export default class QuickActionBvcBeginView extends Vue {
 
     try {
       const hoursNum = libsUtil.numberOrZero(this.hoursStr);
+      const identity = await libsUtil.getIdentity(activeDid);
 
       this.$notify({ group: "alert", type: "toast", title: "Sent..." }, 1000);
 
@@ -133,7 +134,7 @@ export default class QuickActionBvcBeginView extends Vue {
         const timeResult = await createAndSubmitGive(
           axios,
           apiServer,
-          activeDid,
+          identity,
           activeDid,
           undefined,
           undefined,
@@ -164,7 +165,7 @@ export default class QuickActionBvcBeginView extends Vue {
       if (this.attended) {
         const attendResult = await createAndSubmitClaim(
           bvcMeetingJoinClaim(activeDid, this.todayOrPreviousStartDate),
-          activeDid,
+          identity,
           apiServer,
           axios,
         );

src/views/QuickActionBvcEndView.vue

@@ -138,26 +138,28 @@
 import axios from "axios";
 import { DateTime } from "luxon";
 import * as R from "ramda";
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import QuickNav from "@/components/QuickNav.vue";
 import TopMessage from "@/components/TopMessage.vue";
 import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
+import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 import {
   BVC_MEETUPS_PROJECT_CLAIM_ID,
   claimSpecialDescription,
   containsHiddenDid,
   createAndSubmitConfirmation,
   createAndSubmitGive,
+  ErrorResult,
   GenericCredWrapper,
   GenericVerifiableCredential,
-  getHeaders,
-  ErrorResult,
 } from "@/libs/endorserServer";
+import * as libsUtil from "@/libs/util";
 
 @Component({
   methods: { claimSpecialDescription },
@@ -175,7 +177,7 @@ export default class QuickActionBvcBeginView extends Vue {
   apiServer = "";
   claimCountByUser = 0;
   claimCountWithHidden = 0;
-  claimsToConfirm: GenericCredWrapper<GenericVerifiableCredential>[] = [];
+  claimsToConfirm: GenericCredWrapper[] = [];
   claimsToConfirmSelected: string[] = [];
   description = "breakfast";
   loadingConfirms = true;
@@ -211,7 +213,16 @@ export default class QuickActionBvcBeginView extends Vue {
     await accountsDB.open();
     const allAccounts = await accountsDB.accounts.toArray();
     this.allMyDids = allAccounts.map((acc) => acc.did);
-    const headers = await getHeaders(this.activeDid);
+    const account: Account | undefined = await accountsDB.accounts
+      .where("did")
+      .equals(this.activeDid)
+      .first();
+    const identity: IIdentifier = JSON.parse(
+      (account?.identity as string) || "null",
+    );
+    const headers = {
+      Authorization: "Bearer " + (await accessToken(identity)),
+    };
     try {
       const response = await fetch(
         this.apiServer +
@@ -228,8 +239,7 @@ export default class QuickActionBvcBeginView extends Vue {
       }
       await response.json().then((data) => {
         const dataByOthers = R.reject(
-          (claim: GenericCredWrapper<GenericVerifiableCredential>) =>
+          (claim: GenericCredWrapper) => claim.issuer === this.activeDid,
-            claim.issuer === this.activeDid,
           data,
         );
         const dataByOthersWithoutHidden = R.reject(
@@ -260,11 +270,13 @@ export default class QuickActionBvcBeginView extends Vue {
     const route = {
       path: "/claim/" + encodeURIComponent(jwtId),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   async record() {
     try {
+      const identity = await libsUtil.getIdentity(this.activeDid);
+
       this.$notify({ group: "alert", type: "toast", title: "Sent..." }, 1000);
 
       // in parallel, make a confirmation for each selected claim and send them all to the server
@@ -276,8 +288,9 @@ export default class QuickActionBvcBeginView extends Vue {
           if (!record) {
             return { type: "error", error: "Record not found." };
           }
+          const identity = await libsUtil.getIdentity(this.activeDid);
           return createAndSubmitConfirmation(
-            this.activeDid,
+            identity,
             record.claim as GenericVerifiableCredential,
             record.id,
             record.handleId,
@@ -311,7 +324,7 @@ export default class QuickActionBvcBeginView extends Vue {
         const giveResult = await createAndSubmitGive(
           axios,
           this.apiServer,
-          this.activeDid,
+          identity,
           undefined,
           this.activeDid,
           this.description,

src/views/SearchAreaView.vue

@@ -105,7 +105,6 @@ import {
   LRectangle,
   LTileLayer,
 } from "@vue-leaflet/vue-leaflet";
-import { Router } from "vue-router";
 
 import QuickNav from "@/components/QuickNav.vue";
 import { NotificationIface } from "@/constants/app";
@@ -199,7 +198,7 @@ export default class DiscoverView extends Vue {
           },
         };
         await db.open();
-        await db.settings.update(MASTER_SETTINGS_KEY, {
+        db.settings.update(MASTER_SETTINGS_KEY, {
           searchBoxes: [newSearchBox],
         });
         this.searchBox = newSearchBox;
@@ -214,7 +213,7 @@ export default class DiscoverView extends Vue {
           },
           7000,
         );
-        (this.$router as Router).back();
+        this.$router.back();
       } catch (err) {
         this.$notify(
           {
@@ -246,7 +245,7 @@ export default class DiscoverView extends Vue {
   public async forgetSearchBox() {
     try {
       await db.open();
-      await db.settings.update(MASTER_SETTINGS_KEY, {
+      db.settings.update(MASTER_SETTINGS_KEY, {
         searchBoxes: [],
         filterFeedByNearby: false,
       });

src/views/SeedBackupView.vue

@@ -33,65 +33,30 @@
       <p class="text-center mb-4">
         <b class="text-red-600">BEWARE!</b> Anyone who has this seed phrase will
         be able impersonate you and take over any digital holdings based on it.
-        Reveal it when you are somewhere private, when only you can see your
+        Reveal it when you are somewhere only you can see your screen, and
-        screen, and record it somewhere only you have access. A password manager
+        record it somewhere only you have access.
-        is a good idea, and so is a piece of paper in a vault.
+        <i>Don't take a screenshot or send it to any online service.</i>
-        <i
-          >We recommend you do NOT take a screenshot or send it to any online
-          service.</i
-        >
       </p>
 
       <p v-if="numAccounts > 1">
         <b class="text-orange-600">Note:</b> You have more than one identifier
         stored in this browser. If they are all based on the same seed as the
-        current identifier, this one backup is sufficient, as long as you also
+        current identifier, this one backup is sufficient; however, if you have
-        record the derivation path. However, if you have different seeds for
+        different seeds for other identifiers, you will have to back them up
-        other identifiers, you will have to back them up separately.
+        separately.
       </p>
 
       <div class="bg-slate-100 rounded-md overflow-hidden p-4 mb-4">
-        <p v-if="showSeed" class="text-center text-slate-700 mt-2">
-          {{ activeAccount.mnemonic }}
         <button
-            v-show="!showCopiedSeed"
-            @click="
-              doCopyTwoSecRedo(
-                activeAccount.mnemonic as string,
-                () => (showCopiedSeed = !showCopiedSeed),
-              )
-            "
-          >
-            <fa icon="copy" class="text-slate-400 fa-fw"></fa>
-          </button>
-          <span v-show="showCopiedSeed" class="text-sm text-green-500">
-            Copied
-          </span>
-          <br />
-          <br />
-          Derivation Path: {{ activeAccount.derivationPath }}
-          <button
-            v-show="!showCopiedDeri"
-            @click="
-              doCopyTwoSecRedo(
-                activeAccount.derivationPath as string,
-                () => (showCopiedDeri = !showCopiedDeri),
-              )
-            "
-          >
-            <fa icon="copy" class="text-slate-400 fa-fw"></fa>
-          </button>
-          <span v-show="showCopiedDeri" class="text-sm text-green-500"
-            >Copied</span
-          >
-        </p>
-        <button
-          v-else
           class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
-          @click="showSeed = true"
+          @click="showSeedPhrase"
         >
           Reveal my Seed Phrase
         </button>
+
+        <p v-if="showSeed" class="text-center text-slate-700 mt-2">
+          {{ activeAccount.mnemonic }}
+        </p>
       </div>
     </div>
     <div v-else>You do not have an active identifier.</div>
@@ -99,9 +64,8 @@
 </template>
 
 <script lang="ts">
-import * as R from "ramda";
 import { Component, Vue } from "vue-facing-decorator";
-import { useClipboard } from "@vueuse/core";
+import * as R from "ramda";
 
 import QuickNav from "@/components/QuickNav.vue";
 import { NotificationIface } from "@/constants/app";
@@ -115,8 +79,6 @@ export default class SeedBackupView extends Vue {
 
   activeAccount: Account | null | undefined = null;
   numAccounts = 0;
-  showCopiedDeri = false;
-  showCopiedSeed = false;
   showSeed = false;
 
   // 'created' hook runs when the Vue instance is first created
@@ -144,12 +106,8 @@ export default class SeedBackupView extends Vue {
     }
   }
 
-  // call fn, copy text to the clipboard, then redo fn after 2 seconds
+  showSeedPhrase() {
-  doCopyTwoSecRedo(text: string, fn: () => void) {
+    this.showSeed = true;
-    fn();
-    useClipboard()
-      .copy(text)
-      .then(() => setTimeout(fn, 2000));
   }
 }
 </script>

src/views/SharedPhotoView.vue

@@ -48,17 +48,6 @@
     </div>
     <div v-else class="text-center mb-4">
       <p>No image found.</p>
-      <p class="mt-4">
-        If you shared an image, the cause is usually that you do not have the
-        recent version of this app, or that the app has not refreshed the
-        service code underneath. To fix this, first make sure you have latest
-        version by comparing your version at the bottom of "Help" with the
-        version at the bottom of https://timesafari.app/help in a browser. After
-        that, it may eventually work, but you can speed up the process by
-        clearing your data cache (in the browser on mobile, even if you
-        installed it) and/or reinstalling the app (after backing up all your
-        data, of course).
-      </p>
     </div>
   </section>
 </template>
@@ -66,7 +55,6 @@
 <script lang="ts">
 import axios from "axios";
 import { Component, Vue } from "vue-facing-decorator";
-import { RouteLocationRaw, Router } from "vue-router";
 
 import PhotoDialog from "@/components/PhotoDialog.vue";
 import QuickNav from "@/components/QuickNav.vue";
@@ -77,8 +65,8 @@ import {
 } from "@/constants/app";
 import { db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { getIdentity } from "@/libs/util";
 import { accessToken } from "@/libs/crypto";
-import { base64ToBlob, SHARED_PHOTO_BASE64_KEY } from "@/libs/util";
 
 @Component({ components: { PhotoDialog, QuickNav } })
 export default class SharedPhotoView extends Vue {
@@ -98,19 +86,14 @@ export default class SharedPhotoView extends Vue {
       const settings = await db.settings.get(MASTER_SETTINGS_KEY);
       this.activeDid = settings?.activeDid as string;
 
-      const temp = await db.temp.get(SHARED_PHOTO_BASE64_KEY);
+      const temp = await db.temp.get("shared-photo");
-      const imageB64 = temp?.blobB64 as string;
       if (temp) {
-        this.imageBlob = base64ToBlob(imageB64);
+        this.imageBlob = temp.blob;
 
         // clear the temp image
-        db.temp.delete(SHARED_PHOTO_BASE64_KEY);
+        db.temp.delete("shared-photo");
 
-        this.imageFileName = (this.$route as Router).query[
+        this.imageFileName = this.$route.query.fileName as string;
-          "fileName"
-        ] as string;
-      } else {
-        console.error("No appropriate image found in temp storage.", temp);
       }
     } catch (err: unknown) {
       console.error("Got an error loading an identifier:", err);
@@ -129,17 +112,15 @@ export default class SharedPhotoView extends Vue {
   async recordGift() {
     await this.sendToImageServer("GiveAction").then((url) => {
       if (url) {
-        const route = {
+        this.$router.push({
           name: "gifted-details",
-          // this might be wrong since "name" goes with params, but it works so test well when you change it
           query: {
-            destinationPathAfter: "/",
+            destinationNameAfter: "home",
             hideBackButton: true,
             imageUrl: url,
             recipientDid: this.activeDid,
           },
-        } as RouteLocationRaw;
+        });
-        (this.$router as Router).push(route);
       }
     });
   }
@@ -147,10 +128,10 @@ export default class SharedPhotoView extends Vue {
   recordProfile() {
     (this.$refs.photoDialog as PhotoDialog).open(
       async (imgUrl) => {
-        await db.settings.update(MASTER_SETTINGS_KEY, {
+        db.settings.update(MASTER_SETTINGS_KEY, {
           profileImageUrl: imgUrl,
         });
-        (this.$router as Router).push({ name: "account" });
+        this.$router.push({ name: "account" });
       },
       IMAGE_TYPE_PROFILE,
       true,
@@ -162,7 +143,7 @@ export default class SharedPhotoView extends Vue {
   async cancel() {
     this.imageBlob = undefined;
     this.imageFileName = undefined;
-    (this.$router as Router).push({ name: "home" });
+    this.$router.push({ name: "home" });
   }
 
   async sendToImageServer(imageType: string) {
@@ -171,10 +152,10 @@ export default class SharedPhotoView extends Vue {
     let result;
     try {
       // send the image to the server
-      const token = await accessToken(this.activeDid);
+      const identifier = await getIdentity(this.activeDid as string);
+      const token = await accessToken(identifier);
       const headers = {
         Authorization: "Bearer " + token,
-        // axios fills in Content-Type of multipart/form-data
       };
       const formData = new FormData();
       formData.append(

src/views/StartView.vue

@@ -17,7 +17,7 @@
 
       <!-- Heading -->
       <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-        Generate an Identity
+        Start Here
       </h1>
     </div>
 
@@ -25,58 +25,33 @@
     <div id="start-question" class="mt-8">
       <div class="max-w-3xl mx-auto">
         <p class="text-center text-xl font-light">
-          How do you want to create this identifier?
+          Do you want a new identifier of your own?
         </p>
-        <p v-if="PASSKEYS_ENABLED" class="text-center font-light mt-6">
+        <p class="text-center font-light">
-          A <strong>passkey</strong> is easy to manage, though it is less
+          If you haven't used this before, click "Yes" to generate a new
-          interoperable with other systems for advanced uses.
+          identifier.
-          <a
-            href="https://www.perplexity.ai/search/what-are-passkeys-v2SHV3yLQlyA2CYH6.Nvhg"
-            target="_blank"
-          >
-            <fa icon="info-circle" class="fa-fw text-blue-500" />
-          </a>
         </p>
-        <p class="text-center font-light mt-4">
+        <p class="text-center mb-4 font-light">
-          A <strong>new seed</strong> allows you full control over the keys,
+          Only click "No" if you have a seed of 12 or 24 words generated
-          though you are responsible for backups.
+          elsewhere.
-          <a
-            href="https://www.perplexity.ai/search/what-is-a-seed-phrase-OqiP9foVRXidr_2le5OFKA"
-            target="_blank"
-          >
-            <fa icon="info-circle" class="fa-fw text-blue-500" />
-          </a>
         </p>
-        <div class="grid grid-cols-1 sm:grid-cols-2 gap-2 mt-4">
         <a
-            v-if="PASSKEYS_ENABLED"
+          @click="onClickYes()"
-            @click="onClickNewPasskey()"
+          class="block w-full text-center text-lg 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-2 py-3 rounded-md mb-2"
-            class="block w-full text-center text-lg 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-2 py-3 rounded-md mb-2 cursor-pointer"
         >
-            Generate one with a passkey
+          Yes, generate one
         </a>
-          <a
+        <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
-            @click="onClickNewSeed()"
-            class="block w-full text-center text-lg 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-2 py-3 rounded-md mb-2 cursor-pointer"
-          >
-            Generate one with a new seed
-          </a>
-        </div>
-        <p class="text-center font-light mt-4">
-          You can also import an existing seed or derive a new address from an
-          existing seed.
-        </p>
-        <div class="grid grid-cols-1 sm:grid-cols-2 gap-2 mt-2">
           <a
             @click="onClickNo()"
-            class="block w-full text-center 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-1.5 py-2 rounded-md cursor-pointer"
+            class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
           >
-            You have a seed
+            No, I have a seed
           </a>
           <a
             v-if="numAccounts > 0"
             @click="onClickDerive()"
-            class="block w-full text-center 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-1.5 py-2 rounded-md cursor-pointer"
+            class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
           >
             Derive new address from existing seed
           </a>
@@ -88,48 +63,30 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
-import { AppString, PASSKEYS_ENABLED } from "@/constants/app";
+import { accountsDB } from "@/db/index";
-import { accountsDB, db } from "@/db/index";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import { registerSaveAndActivatePasskey } from "@/libs/util";
 
 @Component({
   components: {},
 })
 export default class StartView extends Vue {
-  PASSKEYS_ENABLED = PASSKEYS_ENABLED;
-
-  givenName = "";
   numAccounts = 0;
 
   async mounted() {
-    await db.open();
-    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
-    this.givenName = settings?.firstName || "";
-
     await accountsDB.open();
     this.numAccounts = await accountsDB.accounts.count();
   }
 
-  public onClickNewSeed() {
+  public onClickYes() {
-    (this.$router as Router).push({ name: "new-identifier" });
+    this.$router.push({ name: "new-identifier" });
-  }
-
-  public async onClickNewPasskey() {
-    const keyName =
-      AppString.APP_NAME + (this.givenName ? " - " + this.givenName : "");
-    await registerSaveAndActivatePasskey(keyName);
-    (this.$router as Router).push({ name: "account" });
   }
 
   public onClickNo() {
-    (this.$router as Router).push({ name: "import-account" });
+    this.$router.push({ name: "import-account" });
   }
 
   public onClickDerive() {
-    (this.$router as Router).push({ name: "import-derive" });
+    this.$router.push({ name: "import-derive" });
   }
 }
 </script>

src/views/TestView.vue

@@ -157,7 +157,7 @@
     <div class="mt-8">
       <h2 class="text-xl font-bold mb-4">Image Sharing</h2>
       Populates the "shared-photo" view as if they used "share_target".
-      <input type="file" data-testid="fileInput" @change="uploadFile" />
+      <input type="file" @change="uploadFile" />
       <router-link
         v-if="showFileNextStep()"
         :to="{
@@ -165,7 +165,6 @@
           query: { fileName },
         }"
         class="block w-full text-center text-md bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-2 mt-2"
-        data-testid="fileUploadButton"
       >
         Go to Shared Page
       </router-link>
@@ -174,65 +173,59 @@
     <div class="mt-8">
       <h2 class="text-xl font-bold mb-4">Passkeys</h2>
       See console for results.
-      <br />
+      <br/>
-      See existing passkeys in Chrome at: chrome://settings/passkeys
+      Active DID: {{ activeDid }}
-      <br />
+      {{ credIdHex ? "has passkey ID" : "has no passkey ID" }}
-      Active DID: {{ activeDid || "nothing, which" }}
-      {{ credIdHex ? "has a passkey ID" : "has no passkey ID" }}
-
       <div>
-        Register Passkey
+        Register
         <button
           @click="register()"
-          class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
+          class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
         >
           Simplewebauthn
         </button>
       </div>
-
       <div>
-        Create JWT
+        Create
         <button
           @click="createJwtSimplewebauthn()"
-          class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
+          class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
         >
           Simplewebauthn
         </button>
         <button
           @click="createJwtNavigator()"
-          class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
+          class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
         >
           Navigator
         </button>
       </div>
-
       <div v-if="jwt">
-        Verify New JWT
+        Verify
         <button
           @click="verifySimplewebauthn()"
-          class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
+          class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
         >
           Simplewebauthn
         </button>
         <button
           @click="verifyWebCrypto()"
-          class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
+          class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
         >
           WebCrypto
         </button>
         <button
           @click="verifyP256()"
-          class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
+          class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
         >
           p256 - broken
         </button>
       </div>
-      <div v-else>Verify New JWT -- requires creation first</div>
       <button
         @click="verifyMyJwt()"
-        class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
+        class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
       >
-        Verify Hard-Coded JWT
+        Verify Mine
       </button>
     </div>
   </section>
@@ -243,26 +236,18 @@ import { Buffer } from "buffer/";
 import { Base64URLString } from "@simplewebauthn/types";
 import { ref } from "vue";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import QuickNav from "@/components/QuickNav.vue";
-import { AppString, NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
-import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import * as vcLib from "@/libs/crypto/vc";
 import {
+  createPeerDid,
   PeerSetup,
+  registerCredential,
   verifyJwtP256,
   verifyJwtSimplewebauthn,
   verifyJwtWebCrypto,
-} from "@/libs/crypto/vc/passkeyDidPeer";
+} from "@/libs/didPeer";
-import {
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-  AccountKeyInfo,
-  blobToBase64,
-  getAccount,
-  registerAndSavePasskey,
-  SHARED_PHOTO_BASE64_KEY,
-} from "@/libs/util";
 
 const inputFileNameRef = ref<Blob>();
 
@@ -278,8 +263,6 @@ const TEST_PAYLOAD = {
 
 @Component({ components: { QuickNav } })
 export default class Help extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
   // for file import
   fileName?: string;
 
@@ -311,7 +294,7 @@ export default class Help extends Vue {
   }
 
   async uploadFile(event: Event) {
-    inputFileNameRef.value = event.target?.["files"][0];
+    inputFileNameRef.value = event.target.files[0];
     // https://developer.mozilla.org/en-US/docs/Web/API/File
     // ... plus it has a `type` property from my testing
     const file = inputFileNameRef.value;
@@ -323,13 +306,12 @@ export default class Help extends Vue {
           const blob = new Blob([new Uint8Array(data)], {
             type: file.type,
           });
-          const blobB64 = await blobToBase64(blob);
           this.fileName = file.name as string;
-          const temp = await db.temp.get(SHARED_PHOTO_BASE64_KEY);
+          const temp = await db.temp.get("shared-photo");
           if (temp) {
-            await db.temp.update(SHARED_PHOTO_BASE64_KEY, { blobB64 });
+            await db.temp.update("shared-photo", { blob });
           } else {
-            await db.temp.add({ id: SHARED_PHOTO_BASE64_KEY, blobB64 });
+            await db.temp.add({ id: "shared-photo", blob });
           }
         }
       };
@@ -342,41 +324,21 @@ export default class Help extends Vue {
   }
 
   public async register() {
-    const DEFAULT_USERNAME = AppString.APP_NAME + " Tester";
+    const cred = await registerCredential(this.userName);
-    if (!this.userName) {
+    const publicKeyBytes = cred.publicKeyBytes;
-      this.$notify(
+    this.activeDid = createPeerDid(publicKeyBytes as Uint8Array);
-        {
+    this.credIdHex = cred.credIdHex as string;
-          group: "modal",
+
-          type: "confirm",
+    await accountsDB.open();
-          title: "No Name",
+    await accountsDB.accounts.add({
-          text: "You should have a name to attach to this passkey. Would you like to enter your own name first?",
+      dateCreated: new Date().toISOString(),
-          onNo: async () => {
+      did: this.activeDid,
-            this.userName = DEFAULT_USERNAME;
+      passkeyCredIdHex: this.credIdHex,
-          },
+      publicKeyHex: Buffer.from(publicKeyBytes).toString("hex"),
-          onYes: async () => {
+    });``
-            (this.$router as Router).push({ name: "new-edit-account" });
-          },
-          noText: "try again and use " + DEFAULT_USERNAME,
-        },
-        -1,
-      );
-      return;
-    }
-    const account = await registerAndSavePasskey(
-      AppString.APP_NAME + " - " + this.userName,
-    );
-    this.activeDid = account.did;
-    this.credIdHex = account.passkeyCredIdHex;
   }
 
   public async createJwtSimplewebauthn() {
-    const account: AccountKeyInfo | undefined = await getAccount(
-      this.activeDid || "",
-    );
-    if (!vcLib.isFromPasskey(account)) {
-      alert(`The DID ${this.activeDid} is not passkey-enabled.`);
-      return;
-    }
     this.peerSetup = new PeerSetup();
     this.jwt = await this.peerSetup.createJwtSimplewebauthn(
       this.activeDid as string,
@@ -387,13 +349,6 @@ export default class Help extends Vue {
   }
 
   public async createJwtNavigator() {
-    const account: AccountKeyInfo | undefined = await getAccount(
-      this.activeDid || "",
-    );
-    if (!vcLib.isFromPasskey(account)) {
-      alert(`The DID ${this.activeDid} is not passkey-enabled.`);
-      return;
-    }
     this.peerSetup = new PeerSetup();
     this.jwt = await this.peerSetup.createJwtNavigator(
       this.activeDid as string,
@@ -405,46 +360,44 @@ export default class Help extends Vue {
 
   public async verifyP256() {
     const decoded = await verifyJwtP256(
-      this.credIdHex as string,
+      this.credIdHex as Base64URLString,
       this.activeDid as string,
-      this.peerSetup?.authenticatorData as ArrayBuffer,
+      this.peerSetup.authenticatorData as ArrayBuffer,
-      this.peerSetup?.challenge as Uint8Array,
+      this.peerSetup.challenge as Uint8Array,
-      this.peerSetup?.clientDataJsonBase64Url as Base64URLString,
+      this.peerSetup.clientDataJsonBase64Url as Base64URLString,
-      this.peerSetup?.signature as Base64URLString,
+      this.peerSetup.signature as Base64URLString,
     );
     console.log("decoded", decoded);
   }
 
   public async verifySimplewebauthn() {
     const decoded = await verifyJwtSimplewebauthn(
-      this.credIdHex as string,
+      this.credIdHex as Base64URLString,
       this.activeDid as string,
-      this.peerSetup?.authenticatorData as ArrayBuffer,
+      this.peerSetup.authenticatorData as ArrayBuffer,
-      this.peerSetup?.challenge as Uint8Array,
+      this.peerSetup.challenge as Uint8Array,
-      this.peerSetup?.clientDataJsonBase64Url as Base64URLString,
+      this.peerSetup.clientDataJsonBase64Url as Base64URLString,
-      this.peerSetup?.signature as Base64URLString,
+      this.peerSetup.signature as Base64URLString,
     );
     console.log("decoded", decoded);
   }
 
   public async verifyWebCrypto() {
     const decoded = await verifyJwtWebCrypto(
-      this.credIdHex as string,
+      this.credIdHex as Base64URLString,
       this.activeDid as string,
-      this.peerSetup?.authenticatorData as ArrayBuffer,
+      this.peerSetup.authenticatorData as ArrayBuffer,
-      this.peerSetup?.challenge as Uint8Array,
+      this.peerSetup.challenge as Uint8Array,
-      this.peerSetup?.clientDataJsonBase64Url as Base64URLString,
+      this.peerSetup.clientDataJsonBase64Url as Base64URLString,
-      this.peerSetup?.signature as Base64URLString,
+      this.peerSetup.signature as Base64URLString,
     );
     console.log("decoded", decoded);
   }
-
   public async verifyMyJwt() {
-    const did =
-      "did:peer:0zKMFjvUgYrM1hXwDciYHiA9MxXtJPXnRLJvqoMNAKoDLX9pKMWLb3VDsgua1p2zW1xXRsjZSTNsfvMnNyMS7dB4k7NAhFwL3pXBrBXgyYJ9ri";
     const jwt =
       "eyJ0eXAiOiJKV0FOVCIsImFsZyI6IkVTMjU2In0.eyJBdXRoZW50aWNhdGlvbkRhdGFCNjRVUkwiOiJTWllONVlnT2pHaDBOQmNQWkhaZ1c0X2tycm1paGpMSG1Wenp1b01kbDJNRkFBQUFBQSIsIkNsaWVudERhdGFKU09OQjY0VVJMIjoiZXlKMGVYQmxJam9pZDJWaVlYVjBhRzR1WjJWMElpd2lZMmhoYkd4bGJtZGxJam9pWlhsS01sbDVTVFpsZVVwcVkyMVdhMXBYTlRCaFYwWnpWVE5XYVdGdFZtcGtRMGsyWlhsS1FWa3lPWFZrUjFZMFpFTkpOa2x0YURCa1NFSjZUMms0ZG1NeVRtOWFWekZvVEcwNWVWcDVTWE5KYTBJd1pWaENiRWxxYjJsU01td3lXbFZHYW1SSGJIWmlhVWx6U1cxU2JHTXlUbmxoV0VJd1lWYzVkVWxxYjJsalIydzJaVzFGYVdaWU1ITkpiV3hvWkVOSk5rMVVZM2hQUkZVMFRtcHJOVTFEZDJsaFdFNTZTV3B2YVZwSGJHdFBia0pzV2xoSk5rMUljRXhVVlZweFpHeFdibGRZU2s1TlYyaFpaREJTYW1GV2JFbGhWVVUxVkZob1dXUkZjRkZYUnpWVFZFVndNbU5YT1U1VWEwWk1ZakJTVFZkRWJIZFRNREZZVkVkSmVsWnJVbnBhTTFab1RWaEJlV1ZzWTNobFJtaFRZekp3WVZVeFVrOWpNbG95VkZjMVQyVlZNVlJPTWxKRFRrZHpNMVJyUm05U2JtUk5UVE5DV1ZGdVNrTlhSMlExVjFWdk5XTnRhMmxtVVNJc0ltOXlhV2RwYmlJNkltaDBkSEE2THk5c2IyTmhiR2h2YzNRNk9EQTRNQ0lzSW1OeWIzTnpUM0pwWjJsdUlqcG1ZV3h6WlgwIiwiaWF0IjoxNzE4NTg2OTkyLCJpc3MiOiJkaWQ6cGVlcjowektNRmp2VWdZck0xaFh3RGNpWUhpQTlNeFh0SlBYblJMSnZxb01OQUtvRExYOXBLTVdMYjNWRHNndWExcDJ6VzF4WFJzalpTVE5zZnZNbk55TVM3ZEI0azdOQWhGd0wzcFhCckJYZ3lZSjlyaSJ9.MEUCIQDJyCTbMPIFnuBoW3FYnlgtDEIHZ2OrkCEvqVnHU7kJDQIgVxjBjfW1TwQfcSOYwK8Z7AdCWGJlyxtLEsrnPif7caE";
     const pieces = jwt.split(".");
+    console.log("pieces", typeof pieces[1], pieces);
     const payload = JSON.parse(Buffer.from(pieces[1], "base64").toString());
     const authData = Buffer.from(payload["AuthenticationDataB64URL"], "base64");
     const clientJSON = Buffer.from(
@@ -455,8 +408,8 @@ export default class Help extends Vue {
     const challenge = clientData.challenge;
     const signatureB64URL = pieces[2];
     const decoded = await verifyJwtWebCrypto(
-      this.credIdHex as string,
+      this.credIdHex as Base64URLString,
-      did,
+      this.activeDid as string,
       authData,
       challenge,
       payload["ClientDataJSONB64URL"],

src/vite-env.d.ts

@@ -1,10 +0,0 @@
-/// <reference types="vite/client" />
-
-interface ImportMetaEnv {
-  readonly VITE_APP_TITLE: string;
-  // more env variables...
-}
-
-interface ImportMeta {
-  readonly env: ImportMetaEnv;
-}

sw_scripts/safari-notifications.js

@@ -566,27 +566,14 @@ async function getNotificationCount() {
   return result;
 }
 
-async function blobToBase64String(blob) {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-    reader.onloadend = () => resolve(reader.result); // potential problem if it returns an ArrayBuffer?
-    reader.onerror = reject;
-    reader.readAsDataURL(blob);
-  });
-}
-
 // Store the image blob and go immediate to a page to upload it.
 // @param photo - image Blob to store for later retrieval after redirect
 async function savePhoto(photo) {
   try {
-    const photoBase64 = await blobToBase64String(photo);
     const db = await openIndexedDB("TimeSafari");
     const transaction = db.transaction("temp", "readwrite");
     const store = transaction.objectStore("temp");
-    await updateRecord(store, {
+    await updateRecord(store, { id: "shared-photo", blob: photo });
-      id: "shared-photo-base64",
-      blobB64: photoBase64,
-    });
     transaction.oncomplete = () => db.close();
   } catch (error) {
     console.error("safari-notifications logMessage IndexedDB error", error);

test-playwright/.eslintrc.js

@@ -1,16 +0,0 @@
-module.exports = {
-  root: true,
-  parserOptions: {
-    ecmaVersion: 12,
-    sourceType: 'module',
-    requireConfigFile: false,
-  },
-  plugins: [],
-  rules: {
-    quotes: [
-      'error',
-      'single',
-      { avoidEscape: true, allowTemplateLiterals: true },
-    ],
-  },
-};

test-playwright/00-noid-tests.spec.ts

@@ -1,81 +0,0 @@
-import { test, expect } from '@playwright/test';
-
-test('Confirm usage of test API (may fail if you are running your own Time Safari)', async ({ page }, testInfo) => {
-  // Load account view
-  await page.goto('./account');
-  await page.getByRole('heading', { name: 'Advanced' }).click();
-
-  // look into the config file: if it starts Time Safari, it might say which server it should set by default
-  const webServer = testInfo.config.webServer;
-  const endorserWords = webServer?.command.split(' ');
-  const ENDORSER_ENV_NAME = 'VITE_DEFAULT_ENDORSER_API_SERVER';
-  const endorserTerm = endorserWords?.find(word => word.startsWith(ENDORSER_ENV_NAME + '='));
-  const endorserTermInConfig = endorserTerm?.substring(ENDORSER_ENV_NAME.length + 1);
-
-  const endorserServer = endorserTermInConfig || 'https://test-api.endorser.ch';
-  await expect(page.getByRole('textbox').nth(1)).toHaveValue(endorserServer);
-});
-
-test('Check activity feed', async ({ page }) => {
-  // Load app homepage
-  await page.goto('./');
-
-  // Check that initial 10 activities have been loaded
-  await page.locator('ul#listLatestActivity li:nth-child(10)');
-
-  // Scroll down a bit to trigger loading additional activities
-  await page.locator('ul#listLatestActivity li:nth-child(50)').scrollIntoViewIfNeeded();
-});
-
-test('Check discover results', async ({ page }) => {
-  // Load Discover view
-  await page.goto('./discover');
-
-  // Check that initial 10 projects have been loaded
-  await page.locator('ul#listDiscoverResults li.border-b:nth-child(10)');
-
-  // Scroll down a bit to trigger loading additional projects
-  await page.locator('ul#listDiscoverResults li.border-b:nth-child(20)').scrollIntoViewIfNeeded();
-});
-
-test('Check no-ID messaging in homepage', async ({ page }) => {
-  // Load app homepage
-  await page.goto('./');
-
-  // Check 'someone must register you' notice
-  await expect(page.getByText('To share, someone must register you.')).toBeVisible();
-});
-
-test('Check no-ID messaging in account', async ({ page }) => {
-  // Load account view
-  await page.goto('./account');
-
-  // Check 'someone must register you' notice
-  await expect(page.locator('#noticeBeforeShare')).toBeVisible();
-
-  // Check 'a friend needs to register you' notice
-  await expect(page.locator('#noticeBeforeAnnounce')).toBeVisible();
-
-  // Check that there is no ID
-  await expect(page.locator('#sectionIdentityDetails code.truncate')).toBeEmpty();
-});
-
-test('Check ID generation', async ({ page }) => {
-  // Load Account view
-  await page.goto('./account');
-
-  // Check that ID is empty
-  await expect(page.locator('#sectionIdentityDetails code.truncate')).toBeEmpty();
-
-  // Load homepage to trigger ID generation (?)
-  await page.goto('./');
-
-  // Wait for activity feed to start loading, as a delay
-  await expect(page.locator('ul#listLatestActivity li:nth-child(10)')).toBeVisible();
-
-  // Go back to Account view
-  await page.goto('./account');
-
-  // Check that ID is now generated
-  await expect(page.locator('#sectionIdentityDetails code.truncate')).toContainText('did:ethr:');
-});

test-playwright/05-install-pwa.spec.ts

@@ -1,27 +0,0 @@
-const { test, expect } = require('@playwright/test');
-
-test('Install PWA', async ({ page, context }) => {
-  await page.goto('./');
-
-  // Wait for the service worker to register
-  await page.waitForSelector('service-worker-registered-indicator', {
-    timeout: 10000, // Adjust timeout according to your needs
-  });
-
-  // Trigger the install prompt manually
-  const [installPrompt] = await Promise.all([
-    page.waitForEvent('beforeinstallprompt'),
-    page.evaluate(() => {
-      window.dispatchEvent(new Event('beforeinstallprompt'));
-    }),
-  ]);
-
-  // Accept the install prompt
-  await installPrompt.prompt();
-
-  // Check if the PWA was installed successfully
-  const result = await installPrompt.userChoice;
-  expect(result.outcome).toBe('accepted');
-  
-  // Additional checks go here
-});

test-playwright/10-check-usage-limits.spec.ts

@@ -1,18 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { importUser } from './testUtils';
-
-test('Check usage limits', async ({ page }) => {
-  // Check without ID first
-  await page.goto('./account');
-  await expect(page.locator('div.bg-slate-100.rounded-md').filter({ hasText: 'Usage Limits' })).toBeHidden();
-
-  // Import user 01
-  await importUser(page, '01');
-
-  // Verify that "Usage Limits" section is visible
-  await expect(page.locator('#sectionUsageLimits')).toBeVisible();
-  await expect(page.getByText('Your claims counter resets')).toBeVisible();
-  await expect(page.getByText('Your registration counter resets')).toBeVisible();
-  await expect(page.getByText('Your image counter resets')).toBeVisible();
-  await expect(page.getByRole('button', { name: 'Recheck Limits' })).toBeVisible();
-});

test-playwright/20-create-project.spec.ts

@@ -1,53 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { importUser } from './testUtils';
-
-test('Create new project, then search for it', async ({ page }) => {
-  // Generate a random string of 16 characters
-  let randomString = Math.random().toString(36).substring(2, 18);
-
-  // In case the string is shorter than 16 characters, generate more characters until it is 16 characters long
-  while (randomString.length < 16) {
-    randomString += Math.random().toString(36).substring(2, 18);
-  }
-  const finalRandomString = randomString.substring(0, 16);
-
-  // Standard texts
-  const standardTitle = 'Idea ';
-  const standardDescription = 'Description of Idea ';
-
-  // Combine texts with the random string
-  const finalTitle = standardTitle + finalRandomString;
-  const finalDescription = standardDescription + finalRandomString;
-
-  // Import user 00
-  await importUser(page, '00');
-
-  // Pause for 5 seconds
-  await page.waitForTimeout(5000); // I have to wait, otherwise the (+) button to add a new project doesn't appear
-
-  // Create new project
-  await page.goto('./projects');
-  await page.getByRole('link', { name: 'Projects', exact: true }).click();
-  await page.getByRole('button').click();
-  await page.getByPlaceholder('Idea Name').fill(finalTitle); // Add random suffix
-  await page.getByPlaceholder('Description').fill(finalDescription);
-  await page.getByPlaceholder('Website').fill('https://example.com');
-  await page.getByPlaceholder('Start Date').fill('2025-12-01');
-  await page.getByPlaceholder('Start Time').fill('12:00');
-  await page.getByRole('button', { name: 'Save Project' }).click();
-
-  // Check texts
-  await expect(page.locator('h2')).toContainText(finalTitle);
-  await expect(page.locator('#Content')).toContainText(finalDescription);
-
-  // Search for newly-created project in /projects
-  await page.goto('./projects');
-  await page.getByRole('link', { name: 'Projects', exact: true }).click();
-  await expect(page.locator('ul#listProjects li.border-b:nth-child(1)')).toContainText(finalRandomString); // Assumes newest project always appears first in the Projects tab list
-
-  // Search for newly-created project in /discover
-  await page.goto('./discover');
-  await page.getByPlaceholder('Search…').fill(finalRandomString);
-  await page.locator('#QuickSearch button').click();
-  await expect(page.locator('ul#listDiscoverResults li.border-b:nth-child(1)')).toContainText(finalRandomString);
-});

test-playwright/25-create-project-x10.spec.ts

@@ -1,68 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { importUser } from './testUtils';
-
-// Function to generate a random string of specified length
-function generateRandomString(length) {
-  return Math.random().toString(36).substring(2, 2 + length);
-}
-
-// Function to create an array of unique strings
-function createUniqueStringsArray(count) {
-  const stringsArray = [];
-  const stringLength = 16;
-
-  for (let i = 0; i < count; i++) {
-    let randomString = generateRandomString(stringLength);
-    stringsArray.push(randomString);
-  }
-
-  return stringsArray;
-}
-
-test('Create 10 new projects', async ({ page }) => {
-  test.slow(); // Extend the test timeout
-  const projectCount = 10;
-
-  // Standard texts
-  const standardTitle = "Idea ";
-  const standardDescription = "Description of Idea ";
-
-  // Title and description arrays
-  const finalTitles = [];
-  const finalDescriptions = [];
-
-  // Create an array of unique strings
-  const uniqueStrings = createUniqueStringsArray(projectCount);
-
-  // Populate arrays with titles and descriptions
-  for (let i = 0; i < projectCount; i++) {
-    let loopTitle = standardTitle + uniqueStrings[i];
-    finalTitles.push(loopTitle);
-    let loopDescription = standardDescription + uniqueStrings[i];
-    finalDescriptions.push(loopDescription);
-  }
-
-  // Import user 00
-  await importUser(page, '00');
-
-  // Pause a bit
-  await page.waitForTimeout(3000); // I have to wait, otherwise the (+) button to add a new project doesn't appear
-
-  // Create new projects
-  for (let i = 0; i < projectCount; i++) {
-    await page.goto('./projects');
-    await page.getByRole('link', { name: 'Projects', exact: true }).click();
-    await page.getByRole('button').click();
-    await page.getByPlaceholder('Idea Name').fill(finalTitles[i]); // Add random suffix
-    await page.getByPlaceholder('Description').fill(finalDescriptions[i]);
-    await page.getByPlaceholder('Website').fill('https://example.com');
-    await page.getByPlaceholder('Start Date').fill('2025-12-01');
-    await page.getByPlaceholder('Start Time').fill('12:00');
-    await page.getByRole('button', { name: 'Save Project' }).click();
-    await page.waitForTimeout(1000); // Compensate for delay in loading Idea Name heading
-
-    // Check texts
-    await expect(page.locator('h2')).toContainText(finalTitles[i]);
-    await expect(page.locator('#Content')).toContainText(finalDescriptions[i]);
-  }
-});

test-playwright/30-record-gift.spec.ts

@@ -1,36 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { importUser } from './testUtils';
-
-test('Record something given', async ({ page }) => {
-  // Generate a random string of a few characters
-  const randomString = Math.random().toString(36).substring(2, 6);
-
-  // Generate a random non-zero single-digit number
-  const randomNonZeroNumber = Math.floor(Math.random() * 99) + 1;
-
-  // Standard title prefix
-  const standardTitle = 'Gift ';
-
-  // Combine title prefix with the random string
-  const finalTitle = standardTitle + randomString;
-
-  // Import user 00
-  await importUser(page, '00');
-
-  // Record something given
-  await page.goto('./');
-  await page.getByRole('heading', { name: 'Unnamed/Unknown' }).click();
-  await page.getByPlaceholder('What was given').fill(finalTitle);
-  await page.getByRole('spinbutton').fill(randomNonZeroNumber.toString());
-  await page.getByRole('button', { name: 'Sign & Send' }).click();
-  await expect(page.getByText('That gift was recorded.')).toBeVisible();
-
-  // Refresh home view and check gift
-  await page.goto('./');
-  await page.locator('li').filter({ hasText: finalTitle }).locator('a').click();
-  await expect(page.getByRole('heading', { name: 'Verifiable Claim Details' })).toBeVisible();
-  await expect(page.getByText(finalTitle, { exact: true })).toBeVisible();
-  const page1Promise = page.waitForEvent('popup');
-  await page.getByRole('link', { name: 'View on the Public Server' }).click();
-  const page1 = await page1Promise;
-});

test-playwright/33-record-gift-x10.spec.ts

@@ -1,77 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { importUser } from './testUtils';
-
-// Function to generate a random string of specified length
-function generateRandomString(length) {
-  return Math.random().toString(36).substring(2, 2 + length);
-}
-
-// Function to create an array of unique strings
-function createUniqueStringsArray(count) {
-  const stringsArray = [];
-  const stringLength = 16;
-
-  for (let i = 0; i < count; i++) {
-    let randomString = generateRandomString(stringLength);
-    stringsArray.push(randomString);
-  }
-
-  return stringsArray;
-}
-
-// Function to create an array of two-digit non-zero numbers
-function createRandomNumbersArray(count) {
-  const numbersArray = [];
-
-  for (let i = 0; i < count; i++) {
-    let randomNumber = Math.floor(Math.random() * 99) + 1;
-    numbersArray.push(randomNumber);
-  }
-
-  return numbersArray;
-}
-
-test('Record 10 new gifts', async ({ page }) => {
-  test.slow(); // Extend the test timeout
-  const giftCount = 10;
-
-  // Standard text
-  const standardTitle = "Gift ";
-
-  // Field value arrays
-  const finalTitles = [];
-  const finalNumbers = [];
-
-  // Create arrays for field input
-  const uniqueStrings = createUniqueStringsArray(giftCount);
-  const randomNumbers = createRandomNumbersArray(giftCount);
-
-  // Populate array with titles
-  for (let i = 0; i < giftCount; i++) {
-    let loopTitle = standardTitle + uniqueStrings[i];
-    finalTitles.push(loopTitle);
-    let loopNumber = randomNumbers[i];
-    finalNumbers.push(loopNumber);
-  }
-
-  // Import user 00
-  await importUser(page, '00');
-
-  // Pause a bit
-  await page.waitForTimeout(3000); // I have to wait, otherwise the (+) button to add a new project doesn't appear
-
-  // Record new gifts
-  for (let i = 0; i < giftCount; i++) {
-    // Record something given
-    await page.goto('./');
-    await page.getByRole('heading', { name: 'Unnamed/Unknown' }).click();
-    await page.getByPlaceholder('What was given').fill(finalTitles[i]);
-    await page.getByRole('spinbutton').fill(finalNumbers[i].toString());
-    await page.getByRole('button', { name: 'Sign & Send' }).click();
-    await expect(page.getByText('That gift was recorded.')).toBeVisible();
-
-    // Refresh home view and check gift
-    await page.goto('./');
-    await expect(page.locator('li').filter({ hasText: finalTitles[i] })).toBeVisible();
-  }
-});

test-playwright/35-record-gift-from-image-share.spec.ts

@@ -1,69 +0,0 @@
-import path from 'path';
-import { test, expect } from '@playwright/test';
-import { importUser } from './testUtils';
-
-test('Record item given from image-share', async ({ page }) => {
-
-  let randomString = Math.random().toString(36).substring(2, 8);
-
-  // Combine title prefix with the random string
-  const finalTitle = `Gift ${randomString} from image-share`;
-
-  await importUser(page, '00');
-
-  // Record something given
-  await page.goto('./test');
-
-  const fileChooserPromise = page.waitForEvent('filechooser');
-  await page.getByTestId('fileInput').click();
-  const fileChooser = await fileChooserPromise;
-  await fileChooser.setFiles(path.join(__dirname, '..', 'public', 'img', 'icons', 'android-chrome-192x192.png'));
-  await page.getByTestId('fileUploadButton').click();
-
-  // on shared photo page, choose the gift option
-  await page.getByRole('button').filter({ hasText: /gift/i }).click();
-
-  await page.getByTestId('imagery').getByRole('img').isVisible();
-  await page.getByPlaceholder('What was received').fill(finalTitle);
-  await page.getByRole('spinbutton').fill('2');
-  await page.getByRole('button', { name: 'Sign & Send' }).click();
-  await expect(page.getByText('That gift was recorded.')).toBeVisible();
-
-
-  // Refresh home view and check gift
-  await page.goto('./');
-  const item1 = page.locator('li').filter({ hasText: finalTitle });
-  await expect(item1.getByRole('img')).toBeVisible();
-});
-
-// // I believe there's a way to test this service worker feature.
-// // The following is what I got from ChatGPT. I wonder if it doesn't work because it's not registering the service worker correctly.
-//
-// test('Trigger a photo-sharing fetch event in service worker with POST to /share-target', async ({ page }) => {
-//   await importUser(page, '00');
-//
-//   // Create a FormData object with a photo
-//   const photoPath = path.join(__dirname, '..', 'public', 'img', 'icons', 'android-chrome-192x192.png');
-//   const photoContent = await fs.readFileSync(photoPath);
-//   const [response] = await Promise.all([
-//     page.waitForResponse(response => response.url().includes('/share-target')), // also check for response.status() === 303 ?
-//     page.evaluate(async (photoContent) => {
-//       const formData = new FormData();
-//       formData.append('photo', new Blob([photoContent], { type: 'image/png' }), 'test-photo.jpg');
-//
-//       const response = await fetch('/share-target', {
-//         method: 'POST',
-//         body: formData,
-//       });
-//
-//       return response;
-//     }, photoContent)
-//   ]);
-//
-//   // Verify the response redirected to /shared-photo
-//   //expect(response.status).toBe(303);
-//   console.log('response headers', response.headers());
-//   console.log('response status', response.status());
-//   console.log('response url', response.url());
-//   expect(response.url()).toContain('/shared-photo');
-// });

test-playwright/40-add-contact.spec.ts

@@ -1,147 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { importUser } from './testUtils';
-
-test('Add contact, record gift, confirm gift', async ({ page }) => {
-  // Generate a random string of 16 characters
-  let randomString = Math.random().toString(36).substring(2, 18);
-
-  // In case the string is shorter than 16 characters, generate more characters until it is 16 characters long
-  while (randomString.length < 16) {
-    randomString += Math.random().toString(36).substring(2, 18);
-  }
-  const finalRandomString = randomString.substring(0, 16);
-
-  // Generate a random non-zero single-digit number
-  const randomNonZeroNumber = Math.floor(Math.random() * 99) + 1;
-
-  // Standard title prefix
-  const standardTitle = 'Gift ';
-
-  // Combine title prefix with the random string
-  const finalTitle = standardTitle + finalRandomString;
-
-  // Contact name
-  const contactName = 'Contact #111';
-
-  // Import user 01
-  await importUser(page, '01');
-
-  // Add new contact
-  await page.goto('./contacts');
-  await page.getByPlaceholder('URL or DID, Name, Public Key').fill('did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F, User #000');
-  await page.locator('button > svg.fa-plus').click();
-  await expect(page.locator('div[role="alert"]')).toBeVisible();
-  
-  await page.locator('div[role="alert"] button:has-text("Yes")').click();
-
-  // Verify added contact
-  await expect(page.locator('li.border-b')).toContainText('User #000');
-
-  // Rename contact
-  await page.locator('li.border-b div div > a[title="See more about this person"]').click();
-  await page.locator('h2 > button > svg.fa-pen').click();
-  await expect(page.locator('div.dialog-overlay > div.dialog').filter({ hasText: 'Edit Name' })).toBeVisible();
-  await page.getByPlaceholder('Name', { exact: true }).fill(contactName);
-  await page.locator('.dialog > .flex > button').first().click();
-
-  // Confirm that home shows contact in "Record Something…"
-  await page.goto('./');
-  await expect(page.locator('#sectionRecordSomethingGiven ul li').filter({ hasText: contactName }).nth(0)).toBeVisible();
-
-  // Record something given by new contact
-  await page.getByRole('heading', { name: contactName }).click();
-  await page.getByPlaceholder('What was given').fill(finalTitle);
-  await page.getByRole('spinbutton').fill(randomNonZeroNumber.toString());
-  await page.getByRole('button', { name: 'Sign & Send' }).click();
-  await expect(page.getByText('That gift was recorded.')).toBeVisible();
-
-  // Refresh home view and check gift
-  await page.goto('./');
-  await page.locator('li').filter({ hasText: finalTitle }).locator('a').click();
-  await expect(page.getByRole('heading', { name: 'Verifiable Claim Details' })).toBeVisible();
-  await expect(page.getByText(finalTitle, { exact: true })).toBeVisible();
-
-  // Switch to user 00
-  await page.goto('./account');
-  await page.getByRole('heading', { name: 'Advanced' }).click();
-  await page.getByRole('link', { name: 'Switch Identifier' }).click();
-  await page.getByRole('link', { name: 'Add Another Identity…' }).click();
-  await page.getByText('You have a seed').click();
-  await page.getByPlaceholder('Seed Phrase').fill('rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage');
-  await page.getByRole('button', { name: 'Import' }).click();
-
-  // Go to home view and look for gift
-  await page.goto('./');
-  await page.locator('li').filter({ hasText: finalTitle }).locator('a').click();
-
-  // Confirm gift as user 00
-  await page.getByTestId('confirmGiftLink').click();
-  await page.getByRole('button', { name: 'Confirm' }).click();
-  await page.getByRole('button', { name: 'Yes' }).click();
-  await expect(page.getByText('Confirmation submitted.')).toBeVisible();
-
-  // Refresh claim page, Confirm button should throw an alert because they already confirmed
-  await page.reload();
-  await page.getByRole('button', { name: 'Confirm' }).click();
-  await expect(page.locator('div[role="alert"]')).toBeVisible();
-});
-
-test('Add contact, copy details, delete, and import various ways', async ({ page, context }) => {
-  await importUser(page, '00');
-
-  // Add new contact
-  await page.goto('./contacts');
-  await page.getByPlaceholder('URL or DID, Name, Public Key').fill('did:ethr:0x111d15564f824D56C7a07b913aA7aDd03382aA39, User #111');
-  await page.locator('button > svg.fa-plus').click();
-  await expect(page.locator('div[role="alert"]')).toBeVisible();
-  await page.locator('div[role="alert"] button:has-text("No")').click();
-  await page.locator('div[role="alert"] button > svg.fa-xmark').click();
-  // wait for the alert to disappear
-  await expect(page.locator('div[role="alert"]')).toBeHidden();
-
-  // Add another new contact
-  await page.getByPlaceholder('URL or DID, Name, Public Key').fill('did:ethr:0x222BB77E6Ff3774d34c751f3c1260866357B677b, User #222, asdf1234');
-  await page.locator('button > svg.fa-plus').click();
-  await expect(page.locator('div[role="alert"]')).toBeVisible();
-  await page.locator('div[role="alert"] button:has-text("No")').click();
-  await page.locator('div[role="alert"] button > svg.fa-xmark').click();
-  await expect(page.locator('div[role="alert"]')).toBeHidden();
-
-  await expect(page.getByTestId('contactListItem')).toHaveCount(2);
-
-  //// Copy contact details, export them, remove them, and paste to add them
-
-  // Copy contact details
-  await page.getByTestId('contactCheckAllTop').click();
-  await page.getByTestId('copySelectedContactsButtonTop').click();
-  await page.locator('div[role="alert"] button > svg.fa-xmark').click(); // dismiss alert
-  // I would prefer to copy from the clipboard, but the recommended approaches don't work.
-  // this seems to fail in non-chromium browsers
-  //await context.grantPermissions(['clipboard-read', 'clipboard-write']);
-  // this seems to fail in chromium (at least) where clipboard is undefined
-  //const contactData = await navigator.clipboard.readText();
-
-  // see contact details on the second contact
-  await page.getByTestId('contactListItem').nth(1).locator('a').click();
-  // remove contact
-  await page.locator('button > svg.fa-trash-can').click();
-  await page.locator('div[role="alert"] button:has-text("Yes")').click();
-  // for some reason, .isHidden() (without expect) doesn't work
-  await expect(page.locator('div[role="alert"] button:has-text("Yes")')).toBeHidden();
-  await page.locator('div[role="alert"] button > svg.fa-xmark').click(); // dismiss alert
-
-  // go to the contacts page and paste the copied contact details
-  await page.goto('./contacts');
-  // check that there are fewer contacts
-  await expect(page.getByTestId('contactListItem')).toHaveCount(1);
-
-  const contactData = 'Paste this: [{ "did": "did:ethr:0x111d15564f824D56C7a07b913aA7aDd03382aA39", "name": "User #111" }, { "did": "did:ethr:0x222BB77E6Ff3774d34c751f3c1260866357B677b", "name": "User #222", "publicKeyBase64": "asdf1234"}] '
-  await page.getByPlaceholder('URL or DID, Name, Public Key').fill(contactData);
-  await page.locator('button > svg.fa-plus').click();
-  // we're on the contact-import page
-  await expect(page.locator('li', { hasText: 'New' })).toHaveCount(1);
-  await expect(page.locator('span').filter({ hasText: 'the same as' })).toBeVisible();
-  await page.locator('button', { hasText: 'Import' }).click();
-  // check that there are more contacts
-  await expect(page.getByTestId('contactListItem')).toHaveCount(2);
-});

test-playwright/50-record-offer.spec.ts

@@ -1,63 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { importUser } from './testUtils';
-
-test('Record an offer', async ({ page }) => {
-  // Generate a random string of 3 characters, skipping the "0." at the beginning
-  const randomString = Math.random().toString(36).substring(2, 5);
-  // Standard title prefix
-  const description = `Offering of ${randomString}`;
-  const updatedDescription = `Updated ${description}`;
-  const randomNonZeroNumber = Math.floor(Math.random() * 998) + 1;
-
-  // Create new ID for default user
-  await importUser(page);
-
-  // Select a project
-  await page.goto('./discover');
-  await page.locator('ul#listDiscoverResults li:nth-child(1)').click();
-
-  // Record an offer
-  await page.getByTestId('offerButton').click();
-  await page.getByTestId('inputDescription').fill(description);
-  await page.getByTestId('inputOfferAmount').fill(randomNonZeroNumber.toString());
-  await page.getByRole('button', { name: 'Sign & Send' }).click();
-  await expect(page.getByText('That offer was recorded.')).toBeVisible();
-
-  // go to the offer and check the values
-  await page.goto('./projects');
-  await page.locator('li').filter({ hasText: description }).locator('a').first().click();
-  await expect(page.getByRole('heading', { name: 'Verifiable Claim Details' })).toBeVisible();
-  await expect(page.getByText(description, { exact: true })).toBeVisible();
-  const serverPagePromise = page.waitForEvent('popup');
-  await page.getByRole('link', { name: 'View on the Public Server' }).click();
-  const serverPage = await serverPagePromise;
-  await serverPage.getByText(description);
-  await serverPage.getByText('did:none:HIDDEN');
-
-  // Now update that offer
-
-  // find the edit page and check the old values again
-  await page.goto('./projects');
-  await page.locator('li').filter({ hasText: description }).locator('a').first().click();
-  await page.getByTestId('editClaimButton').click();
-  await page.locator('heading', { hasText: 'What is offered' }).isVisible();
-  const itemDesc = await page.getByTestId('itemDescription');
-  await expect(itemDesc).toHaveValue(description);
-  const amount = await page.getByTestId('inputOfferAmount');
-  await expect(amount).toHaveValue(randomNonZeroNumber.toString());
-  // update the values
-  await itemDesc.fill(updatedDescription);
-  await amount.fill(String(randomNonZeroNumber + 1));
-  await page.getByRole('button', { name: 'Sign & Send' }).click();
-
-  // go to the offer claim again and check the updated values
-  await page.goto('./projects');
-  await page.locator('li').filter({ hasText: description }).locator('a').first().click();
-  const newItemDesc = await page.getByTestId('description');
-  await expect(newItemDesc).toHaveText(updatedDescription);
-
-  // go to edit page
-  await page.getByTestId('editClaimButton').click();
-  const newAmount = await page.getByTestId('inputOfferAmount');
-  await expect(newAmount).toHaveValue((randomNonZeroNumber + 1).toString());
-});

test-playwright/testUtils.ts

@@ -1,34 +0,0 @@
-import { expect, Page } from '@playwright/test';
-
-export async function importUser(page: Page, id?: string): Promise<void> {
-  let seedPhrase, userName, did;
-
-  // Set seed phrase and DID based on user ID
-  switch(id) {
-    case '01':
-      seedPhrase = 'island fever beef wine urban aim vacant quit afford total poem flame service calm better adult neither color gaze forum month sister imitate excite';
-      userName = 'User One';
-      did = 'did:ethr:0x111d15564f824D56C7a07b913aA7aDd03382aA39';
-      break;
-    default: // to user 00
-      seedPhrase = 'rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage';
-      userName = 'User Zero';
-      did = 'did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F';
-  }
-
-  // Import ID
-  await page.goto('./start');
-  await page.getByText('You have a seed').click();
-  await page.getByPlaceholder('Seed Phrase').fill(seedPhrase);
-  await page.getByRole('button', { name: 'Import' }).click();
-  await expect(page.locator('#sectionUsageLimits')).toContainText('You have done');
-  await expect(page.locator('#sectionUsageLimits')).toContainText('You have uploaded');
-
-  // Set name
-  await page.getByRole('link', { name: 'Set Your Name' }).click();
-  await page.getByPlaceholder('Name').fill(userName);
-  await page.getByRole('button', { name: 'Save Changes' }).click();
-
-  // Check DID
-  await expect(page.getByRole('code')).toContainText(did);
-}

tsconfig.json

@@ -26,8 +26,8 @@
 		"src/**/*.ts",
 		"src/**/*.tsx",
 		"src/**/*.vue",
-		"test-playwright/**/*.ts",
+		"tests/**/*.ts",
-		"test-playwright/**/*.tsx"
+		"tests/**/*.tsx"
 	],
 	"exclude": [
 		"node_modules"

vite.config.mjs

@@ -16,8 +16,6 @@ export default defineConfig({
       srcDir: '.',
       filename: 'sw_scripts-combined.js',
       manifest: {
-        // This is used for the app name. It doesn't include a space, because iOS complains if I recall correctly.
-        // There is a name with spaces in the constants/app.js file for use internally.
         name: process.env.TIME_SAFARI_APP_TITLE || require('./package.json').name,
         short_name: process.env.TIME_SAFARI_APP_TITLE || require('./package.json').name,
         // 192x192 and 512x512 are important for Chrome to show that it's installable