status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-23 03:58:49 +00:00
Code Issues Projects Releases Wiki Activity

Onboarding: saving credentials to Keychain after account creation

Browse Source 
Closes: #17085
This commit is contained in:
Michał Cieślak 2025-02-18 18:48:10 +01:00 committed by Igor Sirotin
parent d49f8a1219
commit 1f0d65ada5
No known key found for this signature in database
GPG Key ID: 425E227CAAB81F95
9 changed files with 50 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/boot/app_controller.nim
View File

@ -544,7 +544,8 @@ proc finishAppLoading*(self: AppController) =
self.startupModule = nil
if not self.onboardingModule.isNil:
self.onboardingModule.onAppLoaded()
let account = self.accountsService.getLoggedInAccount()
self.onboardingModule.onAppLoaded(account.keyUid)
self.onboardingModule = nil
self.mainModule.checkAndPerformProfileMigrationIfNeeded()

2
src/app/modules/onboarding/io_interface.nim
View File

@ -10,7 +10,7 @@ import app/modules/onboarding/post_onboarding/task
method delete*(self: AccessInterface) {.base.} =
raise newException(ValueError, "No implementation available")
method onAppLoaded*(self: AccessInterface) {.base.} =
method onAppLoaded*(self: AccessInterface, keyUid: string) {.base.} =
raise newException(ValueError, "No implementation available")
method onNodeLogin*(self: AccessInterface, error: string, account: AccountDto, settings: SettingsDto) {.base.} =

4
src/app/modules/onboarding/module.nim
View File

@ -69,8 +69,8 @@ method delete*[T](self: Module[T]) =
self.viewVariant.delete
self.controller.delete
method onAppLoaded*[T](self: Module[T]) =
self.view.appLoaded()
method onAppLoaded*[T](self: Module[T], keyUid: string) =
self.view.appLoaded(keyUid)
singletonInstance.engine.setRootContextProperty("onboardingModule", newQVariant())
self.view.delete
self.view = nil

2
src/app/modules/onboarding/view.nim
View File

@ -34,7 +34,7 @@ QtObject:
### QtSignals ###
proc appLoaded*(self: View) {.signal.}
proc appLoaded*(self: View, keyUid: string) {.signal.}
proc accountLoginError*(self: View, error: string, wrongPassword: bool) {.signal.}
### QtProperties ###

22
storybook/pages/OnboardingLayoutPage.qml
View File

@ -174,11 +174,9 @@ SplitView {
}
}
biometricsAvailable: ctrlBiometrics.checked
isBiometricsLogin: ctrlTouchIdUser.checked
keychain: keychain
onBiometricsRequested: (profileId) => biometricsPopup.open()
onDismissBiometricsRequested: biometricsPopup.close()
biometricsAvailable: ctrlBiometrics.checked
onFinished: (flow, data) => {
console.warn("!!! ONBOARDING FINISHED; flow:", flow, "; data:", JSON.stringify(data))
@ -348,16 +346,22 @@ SplitView {
}
}
BiometricsPopup {
id: biometricsPopup
KeychainMock {
id: keychain
x: root.Window.width - width
parent: root
onObtainingPasswordSuccess: {
readonly property alias touchIdChecked: ctrlTouchIdUser.checked
onTouchIdCheckedChanged: onboarding.keychainChanged()
function hasCredential(account) {
const isKeycard = onboarding.currentPage instanceof LoginScreen
&& onboarding.currentPage.selectedProfileIsKeycard
onboarding.setBiometricResponse(isKeycard ? mockDriver.pin : mockDriver.password)
keychain.saveCredential(account, isKeycard ? mockDriver.pin : mockDriver.password)
return touchIdChecked ? Keychain.StatusSuccess
: Keychain.StatusNotFound
}
}

5
ui/app/AppLayouts/Onboarding2/OnboardingFlow.qml
View File

@ -31,7 +31,7 @@ OnboardingStackView {
// functions
required property var generateMnemonic
required property var isBiometricsLogin
required property var isBiometricsLogin // (string account) => bool
required property var passwordStrengthScoreFunction
required property var isSeedPhraseValid
required property var isSeedPhraseDuplicate
@ -191,7 +191,8 @@ OnboardingStackView {
keycardRemainingPukAttempts: root.remainingPukAttempts
loginAccountsModel: root.loginAccountsModel
isBiometricsLogin: root.isBiometricsLogin(loginScreen.selectedProfileKeyId)
isBiometricsLogin: root.biometricsAvailable &&
root.isBiometricsLogin(loginScreen.selectedProfileKeyId)
onBiometricsRequested: (profileId) => root.biometricsRequested(profileId)
onDismissBiometricsRequested: root.dismissBiometricsRequested()

4
ui/app/AppLayouts/Onboarding2/OnboardingLayout.qml
View File

@ -20,9 +20,9 @@ Page {
required property OnboardingStore onboardingStore
required property Keychain keychain
property bool biometricsAvailable: Qt.platform.os === Constants.mac
property bool biometricsAvailable
property bool networkChecksEnabled: true
property alias keycardPinInfoPageDelay: onboardingFlow.keycardPinInfoPageDelay
readonly property alias stack: onboardingFlow // TODO remove external stack access

2
ui/app/AppLayouts/Onboarding2/stores/OnboardingStore.qml
View File

@ -7,7 +7,7 @@ import AppLayouts.Onboarding.enums 1.0
QtObject {
id: root
signal appLoaded
signal appLoaded(string keyUid)
readonly property QtObject d: StatusQUtils.QObject {
id: d

42
ui/main.qml
View File

@ -425,7 +425,7 @@ StatusWindow {
Keychain {
service: "StatusDesktop"
id: keychain
id: appKeychain
}
Component {
@ -449,20 +449,41 @@ StatusWindow {
anchors.fill: parent
networkChecksEnabled: true
// TODO: cover case when biometrics is globally disabled on mac
biometricsAvailable: Qt.platform.os === Constants.mac
onboardingStore: onboardingStore
keychain: keychain
onboardingStore: OnboardingStore {
id: onboardingStore
onAppLoaded: {
applicationWindow.appIsReady = true
applicationWindow.storeAppState()
moveToAppMain()
}
onAccountLoginError: function (error, wrongPassword) {
onboardingLayout.unwindToLoginScreen() // error handled internally
}
}
keychain: appKeychain
onFinished: (flow, data) => {
const error = onboardingStore.finishOnboardingFlow(flow, data)
if (error != "") {
if (error !== "") {
// We should never be here since everything should be validated already
console.error("!!! ONBOARDING FINISHED WITH ERROR:", error)
return
}
stack.push(splashScreenV2, { runningProgressAnimation: true })
if (!data.enableBiometrics)
return
onboardingStore.appLoaded.connect((keyUid) => {
appKeychain.saveCredential(keyUid, data.password || data.pin)
})
}
onLoginRequested: function (keyUid, method, data) {
@ -477,19 +498,6 @@ StatusWindow {
}
}
onCurrentPageNameChanged: Global.addCentralizedMetricIfEnabled("navigation", {viewId: currentPageName})
OnboardingStore {
id: onboardingStore
onAppLoaded: {
applicationWindow.appIsReady = true
applicationWindow.storeAppState()
moveToAppMain()
}
onAccountLoginError: function (error, wrongPassword) {
onboardingLayout.unwindToLoginScreen() // error handled internally
}
}
}
}