Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-26 18:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'update/camelCase' of github.com:Start9Labs/start-os into rebase/feat/domains

Browse Source
This commit is contained in:
Matt Hill
2024-03-22 13:09:11 -06:00
parent a4338b0d03 7e9d453a2c
commit 22cd2e3337
30 changed files with 406 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
web/projects/setup-wizard/src/app/services/api.service.ts
View File

@@ -43,20 +43,20 @@ type Encrypted = {
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 = {
@@ -66,7 +66,7 @@ export type DiskBackupTarget = {
label: string | null
capacity: number
used: number | null
'embassy-os': StartOSDiskInfo | null
startOs: StartOSDiskInfo | null
}
export type CifsBackupTarget = {
@@ -74,7 +74,7 @@ export type CifsBackupTarget = {
path: string
username: string
mountable: boolean
'embassy-os': StartOSDiskInfo | null
startOs: StartOSDiskInfo | null
}
export type DiskRecoverySource = {

11
web/projects/setup-wizard/src/app/services/live-api.service.ts
View File

@@ -76,11 +76,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', '/')
}
}
@@ -106,7 +105,7 @@ export class LiveApiService extends ApiService {
return {
...res,
'root-ca': encodeBase64(res['root-ca']),
rootCa: encodeBase64(res.rootCa),
}
}

28
web/projects/setup-wizard/src/app/services/mock-api.service.ts
View File

@@ -55,12 +55,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,
},
@@ -78,12 +78,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,
},
@@ -101,12 +101,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',
},
@@ -122,9 +122,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: '',
}
}
@@ -156,9 +156,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),
}
}

10
web/projects/setup-wizard/src/app/services/state.service.ts
View File

@@ -14,7 +14,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),
})
}
@@ -23,10 +23,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,
})