switch all fe to camelCase

2026-04-01 21:13:09 +00:00 · 2024-03-22 12:05:41 -06:00
parent a35baca580
commit 7e9d453a2c
120 changed files with 593 additions and 1739 deletions
--- a/web/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.ts
+++ b/web/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.ts
@@ -61,7 +61,7 @@ export class CifsModal {
    const target: CifsBackupTarget = {
      ...this.cifs,
      mountable: true,
-      'embassy-os': diskInfo,
+      startOs: diskInfo,
    }

    const modal = await this.modalController.create({
--- a/web/projects/setup-wizard/src/app/modals/password/password.page.ts
+++ b/web/projects/setup-wizard/src/app/modals/password/password.page.ts
@@ -31,11 +31,11 @@ export class PasswordPage {
  }

  async verifyPw() {
-    if (!this.target || !this.target['embassy-os'])
+    if (!this.target || !this.target.startOs)
      this.pwError = 'No recovery target' // unreachable

    try {
-      const passwordHash = this.target!['embassy-os']?.['password-hash'] || ''
+      const passwordHash = this.target!.startOs?.passwordHash || ''

      argon2.verify(passwordHash, this.password)
      this.modalController.dismiss({ password: this.password }, 'success')
--- a/web/projects/setup-wizard/src/app/pages/loading/loading.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/loading/loading.page.ts
@@ -38,10 +38,7 @@ export class LoadingPage {

      if (!progress) return

-      const {
-        'total-bytes': totalBytes,
-        'bytes-transferred': bytesTransferred,
-      } = progress
+      const { totalBytes, bytesTransferred } = progress

      this.progress$.next({
        totalBytes,
--- a/web/projects/setup-wizard/src/app/pages/recover/recover.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/recover/recover.page.ts
@@ -35,7 +35,7 @@ export class RecoverPage {
  }

  driveClickable(mapped: MappedDisk) {
-    return mapped.drive['embassy-os']?.full
+    return mapped.drive.startOs?.full
  }

  async getDrives() {
@@ -53,10 +53,10 @@ export class RecoverPage {
              label: p.label,
              capacity: p.capacity,
              used: p.used,
-              'embassy-os': p['embassy-os'],
+              startOs: p.startOs,
            }
            this.mappedDrives.push({
-              hasValidBackup: !!p['embassy-os']?.full,
+              hasValidBackup: !!p.startOs?.full,
              drive,
            })
          })
--- a/web/projects/setup-wizard/src/app/pages/success/success.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/success/success.page.ts
@@ -76,9 +76,9 @@ export class SuccessPage {
    try {
      const ret = await this.api.complete()
      if (!this.isKiosk) {
-        this.torAddress = ret['tor-address'].replace(/^https:/, 'http:')
-        this.lanAddress = ret['lan-address'].replace(/^https:/, 'http:')
-        this.cert = ret['root-ca']
+        this.torAddress = ret.torAddress.replace(/^https:/, 'http:')
+        this.lanAddress = ret.lanAddress.replace(/^https:/, 'http:')
+        this.cert = ret.rootCa

        await this.api.exit()
      }
--- a/web/projects/setup-wizard/src/app/services/api/api.service.ts
+++ b/web/projects/setup-wizard/src/app/services/api/api.service.ts
@@ -28,27 +28,27 @@ type Encrypted = {
 }

 export type StatusRes = {
-  'bytes-transferred': number
-  'total-bytes': number | null
+  bytesTransferred: number
+  totalBytes: number | null
  complete: boolean
 } | null

 export type AttachReq = {
  guid: string
-  'embassy-password': Encrypted
+  startOsPassword: Encrypted
 }

 export type ExecuteReq = {
-  'embassy-logicalname': string
-  'embassy-password': Encrypted
-  'recovery-source': RecoverySource | null
-  'recovery-password': Encrypted | null
+  startOsLogicalname: string
+  startOsPassword: Encrypted
+  recoverySource: RecoverySource | null
+  recoveryPassword: Encrypted | null
 }

 export type CompleteRes = {
-  'tor-address': string
-  'lan-address': string
-  'root-ca': string
+  torAddress: string
+  lanAddress: string
+  rootCa: string
 }

 export type DiskBackupTarget = {
@@ -58,7 +58,7 @@ export type DiskBackupTarget = {
  label: string | null
  capacity: number
  used: number | null
-  'embassy-os': StartOSDiskInfo | null
+  startOs: StartOSDiskInfo | null
 }

 export type CifsBackupTarget = {
@@ -66,7 +66,7 @@ export type CifsBackupTarget = {
  path: string
  username: string
  mountable: boolean
-  'embassy-os': StartOSDiskInfo | null
+  startOs: StartOSDiskInfo | null
 }

 export type DiskRecoverySource = {
--- a/web/projects/setup-wizard/src/app/services/api/live-api.service.ts
+++ b/web/projects/setup-wizard/src/app/services/api/live-api.service.ts
@@ -73,11 +73,10 @@ export class LiveApiService extends ApiService {
  }

  async execute(setupInfo: ExecuteReq) {
-    if (setupInfo['recovery-source']?.type === 'backup') {
-      if (isCifsSource(setupInfo['recovery-source'].target)) {
-        setupInfo['recovery-source'].target.path = setupInfo[
-          'recovery-source'
-        ].target.path.replace('/\\/g', '/')
+    if (setupInfo.recoverySource?.type === 'backup') {
+      if (isCifsSource(setupInfo.recoverySource.target)) {
+        setupInfo.recoverySource.target.path =
+          setupInfo.recoverySource.target.path.replace('/\\/g', '/')
      }
    }

@@ -95,7 +94,7 @@ export class LiveApiService extends ApiService {

    return {
      ...res,
-      'root-ca': encodeBase64(res['root-ca']),
+      rootCa: encodeBase64(res.rootCa),
    }
  }

--- a/web/projects/setup-wizard/src/app/services/api/mock-api.service.ts
+++ b/web/projects/setup-wizard/src/app/services/api/mock-api.service.ts
@@ -30,8 +30,8 @@ export class MockApiService extends ApiService {
    const progress = tries > 4 ? (tries - 4) * 268435456 : 0

    return {
-      'bytes-transferred': restoreOrMigrate ? progress : 0,
-      'total-bytes': restoreOrMigrate ? total : null,
+      bytesTransferred: restoreOrMigrate ? progress : 0,
+      totalBytes: restoreOrMigrate ? total : null,
      complete: progress === total,
    }
  }
@@ -65,12 +65,12 @@ export class MockApiService extends ApiService {
            label: null,
            capacity: 1979120929996,
            used: null,
-            'embassy-os': {
+            startOs: {
              version: '0.2.17',
              full: true,
-              'password-hash':
+              passwordHash:
                '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-              'wrapped-key': null,
+              wrappedKey: null,
            },
            guid: null,
          },
@@ -88,12 +88,12 @@ export class MockApiService extends ApiService {
            label: null,
            capacity: 73264762332,
            used: null,
-            'embassy-os': {
+            startOs: {
              version: '0.3.3',
              full: true,
-              'password-hash':
+              passwordHash:
                '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-              'wrapped-key': null,
+              wrappedKey: null,
            },
            guid: null,
          },
@@ -111,12 +111,12 @@ export class MockApiService extends ApiService {
            label: null,
            capacity: 73264762332,
            used: null,
-            'embassy-os': {
+            startOs: {
              version: '0.3.2',
              full: true,
-              'password-hash':
+              passwordHash:
                '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-              'wrapped-key': null,
+              wrappedKey: null,
            },
            guid: 'guid-guid-guid-guid',
          },
@@ -132,9 +132,9 @@ export class MockApiService extends ApiService {
    return {
      version: '0.3.0',
      full: true,
-      'password-hash':
+      passwordHash:
        '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-      'wrapped-key': '',
+      wrappedKey: '',
    }
  }

@@ -149,9 +149,9 @@ export class MockApiService extends ApiService {
  async complete(): Promise<CompleteRes> {
    await pauseFor(1000)
    return {
-      'tor-address': 'https://asdafsadasdasasdasdfasdfasdf.onion',
-      'lan-address': 'https://adjective-noun.local',
-      'root-ca': encodeBase64(rootCA),
+      torAddress: 'https://asdafsadasdasasdasdfasdfasdf.onion',
+      lanAddress: 'https://adjective-noun.local',
+      rootCa: encodeBase64(rootCA),
    }
  }

--- a/web/projects/setup-wizard/src/app/services/state.service.ts
+++ b/web/projects/setup-wizard/src/app/services/state.service.ts
@@ -15,7 +15,7 @@ export class StateService {
  async importDrive(guid: string, password: string): Promise<void> {
    await this.api.attach({
      guid,
-      'embassy-password': await this.api.encrypt(password),
+      startOsPassword: await this.api.encrypt(password),
    })
  }

@@ -24,10 +24,10 @@ export class StateService {
    password: string,
  ): Promise<void> {
    await this.api.execute({
-      'embassy-logicalname': storageLogicalname,
-      'embassy-password': await this.api.encrypt(password),
-      'recovery-source': this.recoverySource || null,
-      'recovery-password': this.recoveryPassword
+      startOsLogicalname: storageLogicalname,
+      startOsPassword: await this.api.encrypt(password),
+      recoverySource: this.recoverySource || null,
+      recoveryPassword: this.recoveryPassword
        ? await this.api.encrypt(this.recoveryPassword)
        : null,
    })