diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2021-09-29 19:05:12 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2021-09-29 19:05:12 -0600 |
| commit | a443129c36cd2f93c48a00c6b59b25c7585c64c2 (patch) | |
| tree | 5148fbb98895ea0307fb6c2372efb7c53f7af63e | |
| parent | 3ee981816abfb7d47ffc0ac522fff002b5749b72 (diff) | |
| download | alpine-a443129c36cd2f93c48a00c6b59b25c7585c64c2.tar.xz | |
* Cancel refresh token when XOAUTH2 authentication fails.
| -rw-r--r-- | alpine/help.c | 1 | ||||
| -rw-r--r-- | alpine/imap.c | 5 | ||||
| -rw-r--r-- | pith/pine.hlp | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/alpine/help.c b/alpine/help.c index e9c7b34a..cd755e3e 100644 --- a/alpine/help.c +++ b/alpine/help.c @@ -146,6 +146,7 @@ helper_internal(HelpType text, char *frag, char *title, int flags) if(status != HTTP_OK){ shown_text = NO_HELP; if(help_text) fs_give((void **) &help_text); + q_status_message(SM_ORDER, 0, 2, _("Failed to retrieve help text. Try again later.")); return MC_FINISH; } else{ diff --git a/alpine/imap.c b/alpine/imap.c index f4f3d125..6b125e66 100644 --- a/alpine/imap.c +++ b/alpine/imap.c @@ -905,7 +905,6 @@ mm_login_oauth2(NETMBX *mb, char *user, char *method, oa2list->param[OA2_State].value = login->param[OA2_State].value; if(login->cancel_refresh_token){ - login->cancel_refresh_token = 0; imap_delete_passwd_auth(&mm_login_list, user, registered ? hostlist2 : hostlist, (mb->sslflag||mb->tlsflag), OA2NAME); @@ -957,6 +956,10 @@ mm_login_oauth2(NETMBX *mb, char *user, char *method, NewExpirationTime = 0L; ChangeAccessToken = ChangeRefreshToken = ChangeExpirationTime = 0; + /* We have done all steps that cancellation requires us by this time */ + if(login->cancel_refresh_token) + login->cancel_refresh_token = 0; + if(token && *token){ char *s, *t; diff --git a/pith/pine.hlp b/pith/pine.hlp index 38b0dc56..a671ea7a 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 594 2021-09-24 20:22:07 +Alpine Commit 595 2021-09-29 19:05:06 ============= h_news ================= <HTML> <HEAD> |