Skip to content

Commit 6116937

Browse files
committed
app: auth after config reset
1 parent 214ed5a commit 6116937

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

crates/companion-app/src/main.rs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,22 @@ fn update(state: &mut State, message: Message) -> Task<Message> {
5656
let none = Task::none();
5757

5858
match message {
59+
Message::Auth => {
60+
let Some(config) = &mut state.config else {
61+
error!("config not loaded, skipping forgetting");
62+
return none;
63+
};
64+
65+
if state.server_ok
66+
&& let Ok(res) = state.client.auth()
67+
{
68+
trace!("saving auth");
69+
config.set_auth_key(res.key);
70+
let _ = config
71+
.save_on_disk()
72+
.inspect_err(|e| error!("failed to save config on disk: {e}"));
73+
}
74+
}
5975
Message::RegisterOnServer => {
6076
debug_assert!(
6177
state.server_ok,
@@ -207,6 +223,8 @@ fn update(state: &mut State, message: Message) -> Task<Message> {
207223
.inspect_err(|e| error!("failed to save config on disk: {e}"));
208224

209225
state.need_reset_config = false;
226+
227+
return Task::done(Message::Auth);
210228
}
211229
}
212230

@@ -370,13 +388,15 @@ fn subscription(state: &State) -> Subscription<Message> {
370388

371389
#[derive(Debug, Clone)]
372390
enum Message {
391+
Auth,
373392
RegisterOnServer,
374393
SelectProfile(String),
375394
FileUpdated(FileUpdateEvent),
376395
ShareProfile(Uuid),
377396
ShowProfileShared,
378397
HideProfileShared,
379398
ForgetRegister(Uuid),
399+
380400
ConfigProbablyBroken,
381401
ResetConfig,
382402
}

0 commit comments

Comments
 (0)