Skip to content

Commit a589cf1

Browse files
authored
Merge pull request #118 from Pastranauwu/hotfix/dub_selections
Fix: Handle ReloginNeeded case after 2FA validation in GTK frontend
2 parents bd5c995 + 77bc0d2 commit a589cf1

2 files changed

Lines changed: 12 additions & 36 deletions

File tree

frontends/gtk/dub.selections.json

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,19 @@
11
{
22
"fileVersion": 1,
33
"versions": {
4-
"argparse": "1.3.0",
5-
"arsd-official": "10.9.10",
6-
"automem": "0.6.9",
7-
"bindbc-freetype": "1.0.5",
8-
"bindbc-loader": "1.0.3",
9-
"bindbc-opengl": "1.0.5",
10-
"bindbc-sdl": "1.0.1",
11-
"botan": "1.13.6",
4+
"automem": "0.6.11",
5+
"botan": "1.13.8",
126
"botan-math": "1.0.4",
13-
"cachetools": "0.4.1",
14-
"concepts": "0.0.9",
15-
"concurrency": "5.0.4",
16-
"dfl": {"version":"224d9348286620c8ea4854690a09e7380d6f5b2f","repository":"git+https://github.com/Dadoum/dfl.git"},
17-
"dlangui": "0.10.4",
18-
"dqt": {"version":"6a44b55f3a3691da930cb9eefe2a745afe1b764d","repository":"git+https://github.com/tim-dlang/dqt.git"},
19-
"dsfml": "2.1.1",
20-
"dxml": "0.4.4",
7+
"cachetools": "0.4.2",
218
"dynamic-loader": {"version":"9202b389affa6be0740e7295dea8f0146537a784","repository":"git+https://github.com/Dadoum/dynamicloader.git"},
22-
"glx-d": "1.1.0",
239
"gtk_d": "1.0.3",
24-
"icontheme": "1.2.3",
25-
"ikod-containers": "0.0.22",
26-
"inilike": "1.2.2",
27-
"intel-intrinsics": "1.11.15",
28-
"isfreedesktop": "0.1.1",
29-
"keyring": {"path":"../../keyring/"},
30-
"memutils": "1.0.10",
31-
"mir-core": "1.6.0",
32-
"plist": "~master",
10+
"intel-intrinsics": "1.11.25",
11+
"memutils": "1.0.11",
3312
"plist-d": {"version":"6fdaa60d62bbf7c55044069e8f03cbe74401c444","repository":"git+https://github.com/Dadoum/libplist-d.git"},
34-
"progress": "5.0.2",
3513
"provision": {"version":"645d56d8e8c86c057893321843db00b21f1aaeb2","repository":"git+https://github.com/Dadoum/Provision.git"},
3614
"requests": "2.1.2",
37-
"sideloader": {"path":"../../"},
38-
"silly": "1.2.0-dev.2",
3915
"slf4d": "2.4.3",
4016
"test_allocator": "0.3.4",
41-
"undead": "1.1.8",
42-
"unit-threaded": "0.10.8",
43-
"windows-headers": "1.0.5",
44-
"x11": "1.0.21",
45-
"xdgpaths": "0.2.5"
17+
"unit-threaded": "2.2.3"
4618
}
4719
}

frontends/gtk/source/ui/authentication/tfaslide.d

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class TFASlide: Box, AssistantSlide {
106106
submitCode(
107107
codeEntry.getText()
108108
).match!(
109-
(AppleLoginError error) {
109+
(AppleLoginError error) {
110110
auto errorStr = format!"%s (%d)"(error.description, error);
111111
getLogger().errorF!"Apple auth error: %s"(errorStr);
112112

@@ -117,9 +117,13 @@ class TFASlide: Box, AssistantSlide {
117117
authAssistant.setCursor(authAssistant.defaultCursor);
118118
});
119119
},
120-
(Success) {
120+
(Success _) {
121121
// All right, resume auth thread!
122122
send(mainThreadTid, true);
123+
},
124+
(ReloginNeeded _) {
125+
// 2FA was successful, resume auth thread!
126+
send(mainThreadTid, true);
123127
}
124128
);
125129
}).start();

0 commit comments

Comments
 (0)