diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2021-10-24 13:59:42 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2021-10-24 13:59:42 -0600 |
| commit | 4e924cc7aeb4edceb84d43d97f0542539f614cdd (patch) | |
| tree | 8d36b3c40e90d6ab6de3a5ecfbd6424f53414d48 | |
| parent | 01eddab0c79a55484d45b95a9869d96677f620ac (diff) | |
| download | alpine-4e924cc7aeb4edceb84d43d97f0542539f614cdd.tar.xz | |
* Improvements to Alpine help for xoauth2 and corrections to the menu
for authorization using the device method.
| -rw-r--r-- | alpine/imap.c | 2 | ||||
| -rw-r--r-- | alpine/keymenu.c | 8 | ||||
| -rw-r--r-- | pith/pine.hlp | 50 |
3 files changed, 49 insertions, 11 deletions
diff --git a/alpine/imap.c b/alpine/imap.c index 4957111f..9600cebf 100644 --- a/alpine/imap.c +++ b/alpine/imap.c @@ -435,7 +435,7 @@ oauth2_set_device_info(OAUTH2_S *oa2, char *method) /* don't want to re-enter c-client */ sargs.quell_newmail = 1; setbitmap(sargs.keys.bitmap); - sargs.help.text = h_oauth2_start; + sargs.help.text = h_oauth2_start_device; sargs.help.title = _("HELP FOR SETTING UP XOAUTH2"); sargs.aux_function = oauth2deviceinfo_get_accesscode; sargs.aux_value = (void *) &aux_value; diff --git a/alpine/keymenu.c b/alpine/keymenu.c index 7d463021..a05bae70 100644 --- a/alpine/keymenu.c +++ b/alpine/keymenu.c @@ -576,17 +576,17 @@ INST_KEY_MENU(oauth2_auth_keymenu, oauth2_alpine_auth_keys); struct key oauth2_device_alpine_auth_keys[] = {HELP_MENU, NULL_MENU, - NULL_MENU, {"V","[" N_("View URL") "]",{MC_VIEW_HANDLE,3,{'v',ctrl('M'),ctrl('J')}},KS_NONE}, {"E",N_("Exit"),{MC_NO,1,{'e'}},KS_NONE}, - NULL_MENU, PREVPAGE_MENU, NEXTPAGE_MENU, PRYNTTXT_MENU, WHEREIS_MENU, FWDEMAIL_MENU, - {"S", N_("Save"), {MC_SAVETEXT,1,{'s'}}, KS_SAVE}}; -INST_KEY_MENU(oauth2_device_auth_keymenu, oauth2_alpine_auth_keys); + {"S", N_("Save"), {MC_SAVETEXT,1,{'s'}}, KS_SAVE}, + NULL_MENU, + NULL_MENU}; +INST_KEY_MENU(oauth2_device_auth_keymenu, oauth2_device_alpine_auth_keys); struct key forge_keys[] = {HELP_MENU, diff --git a/pith/pine.hlp b/pith/pine.hlp index 53f4864c..48db2823 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 607 2021-10-23 21:25:07 +Alpine Commit 608 2021-10-24 13:59:38 ============= h_news ================= <HTML> <HEAD> @@ -2282,19 +2282,57 @@ You are trying to connect to a server that uses the XOAUTH2 method of authentication. <P> -In order to set this up, you need to authenticate in the target server -and authorize Alpine to access your email account. +In order to complete this process use a browser in the same computer +that you are using Alpine to open the given URL. <P> -After you have authorized Alpine, the server will generate an -"access code." In order to use this code, press 'C' -and copy and paste this code back into Alpine. +You will be sent to authenticate and later to authorize Alpine access to +your email. Once you have completed the authorization process you will get +a code. Input this code into Alpine by pressing 'C'. If you do not see a +code, but see an error message in your browser, copy and paste the URL of +the error page and paste into alpine after pressing the 'C' key. <P> After you have input the code, Alpine will conclude logging you into your account. <P> +If your version of Alpine was compiled to save passwords, then Alpine will save +the refresh and access tokens securely, otherwise you will have to repeat this +process every time you login to this server. + +<P> +<End of setting up XOAUTH2 Authentication help> +</BODY> +</HTML> +====== h_oauth2_start_device ====== +<HTML> +<HEAD> +<TITLE>Setting up XOAUTH2 Authentication Using the Device Flow</TITLE> +</HEAD> +<BODY> +<H1>Setting up XOAUTH2 Authentication Using the Device Flow</H1> + +You are trying to connect to a server that uses the XOAUTH2 method of +authentication. + +<P> +In order to complete this process use a browser in the same computer +that you are using Alpine to open the given URL and enter the code that you +were given by Alpine in that screen. + +<P> +You will be sent to authenticate and later to authorize Alpine access to +your email. Once you have completed the authorization process Alpine will +get the refresh and access tokens from the service servers and the authentication +process will be completed by Alpine. + +<P> +If your version of Alpine was compiled to save passwords, then Alpine will save +the refresh and access tokens securely, otherwise you will have to repeat this +process every time you login to this server. + +<P> <End of setting up XOAUTH2 Authentication help> </BODY> </HTML> |