Added switching to the identity toolbar menu

One can now use the identity toolbar menu to switch between client certificates that have been used on the current site. The five latest ones are remembered.

30 files changed, 214 insertions, 23 deletions

diff --git a/po/en.po b/po/en.po
index 066c4eca..9a154c5c 100644
--- a/po/en.po
+++ b/po/en.po
@@ -321,6 +321,10 @@ msgstr "Show History"
 msgid "menu.show.identities"
 msgstr "Show Identities"
 
+# Active identity toolbar menu.
+msgid "menu.hide.identities"
+msgstr "Hide Identities"
+""
 # Used in the View menu on macOS. Shows sidebar and switches sidebar tab.
 msgid "menu.show.outline"
 msgstr "Show Page Outline"
@@ -629,6 +633,11 @@ msgstr "Stop Using Everywhere"
 msgid "ident.export"
 msgstr "Export"
 
+# The %s represents the name of an identity.
+#, c-format
+msgid "ident.switch"
+msgstr "Switch to %s"
+
 msgid "heading.ident.use"
 msgstr "IDENTITY USAGE"
 
diff --git a/res/about/version.gmi b/res/about/version.gmi
index a9043b2c..7a14e79b 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -6,6 +6,10 @@
 ```
 # Release notes
 
+## 1.10
+New features:
+* Identity toolbar menu can be used to switch between alternate identities that have been used on the site. If you have multiple accounts on a site, this makes it more convenient to switch between them.
+
 ## 1.9.2
 * Windows: Use the correct version number for update checks.
 * Shorter label for "Mark All as Read" in Feeds sidebar actions.
@@ -22,7 +26,6 @@
 * Fixed the New Tab button not staying at the right edge of the window, depending on how many tabs are open.
 
 ## 1.9
-
 New features:
 * Added a toolbar button for toggling the left sidebar.
 * Added an unsplit button in the toolbar when in split view mode.
diff --git a/res/lang/cs.bin b/res/lang/cs.bin
index 647e1f34..d3e06c73 100644
--- a/res/lang/cs.bin
+++ b/res/lang/cs.bin
diff --git a/res/lang/de.bin b/res/lang/de.bin
index b2bb35a0..b9d155a7 100644
--- a/res/lang/de.bin
+++ b/res/lang/de.bin
diff --git a/res/lang/en.bin b/res/lang/en.bin
index fbf4c73c..5bb8299a 100644
--- a/res/lang/en.bin
+++ b/res/lang/en.bin
diff --git a/res/lang/eo.bin b/res/lang/eo.bin
index 7156b7c8..ff1ddb01 100644
--- a/res/lang/eo.bin
+++ b/res/lang/eo.bin
diff --git a/res/lang/es.bin b/res/lang/es.bin
index 1acb50d1..ba9b2343 100644
--- a/res/lang/es.bin
+++ b/res/lang/es.bin
diff --git a/res/lang/es_MX.bin b/res/lang/es_MX.bin
index 078de89d..f4ddcc72 100644
--- a/res/lang/es_MX.bin
+++ b/res/lang/es_MX.bin
diff --git a/res/lang/fi.bin b/res/lang/fi.bin
index ccd3e133..f73891d6 100644
--- a/res/lang/fi.bin
+++ b/res/lang/fi.bin
diff --git a/res/lang/fr.bin b/res/lang/fr.bin
index 96c1148e..0851f535 100644
--- a/res/lang/fr.bin
+++ b/res/lang/fr.bin
diff --git a/res/lang/gl.bin b/res/lang/gl.bin
index 4269b5ed..80215589 100644
--- a/res/lang/gl.bin
+++ b/res/lang/gl.bin
diff --git a/res/lang/hu.bin b/res/lang/hu.bin
index 7b7edb50..7d7ed94e 100644
--- a/res/lang/hu.bin
+++ b/res/lang/hu.bin
diff --git a/res/lang/ia.bin b/res/lang/ia.bin
index 4750b545..572015c2 100644
--- a/res/lang/ia.bin
+++ b/res/lang/ia.bin
diff --git a/res/lang/ie.bin b/res/lang/ie.bin
index e4c90ef9..bb485f4e 100644
--- a/res/lang/ie.bin
+++ b/res/lang/ie.bin
diff --git a/res/lang/isv.bin b/res/lang/isv.bin
index 80754fc5..f90a1e7d 100644
--- a/res/lang/isv.bin
+++ b/res/lang/isv.bin
diff --git a/res/lang/pl.bin b/res/lang/pl.bin
index c0affedf..753e595b 100644
--- a/res/lang/pl.bin
+++ b/res/lang/pl.bin
diff --git a/res/lang/ru.bin b/res/lang/ru.bin
index 966deaea..edcebb14 100644
--- a/res/lang/ru.bin
+++ b/res/lang/ru.bin
diff --git a/res/lang/sk.bin b/res/lang/sk.bin
index deda3b69..b843a383 100644
--- a/res/lang/sk.bin
+++ b/res/lang/sk.bin
diff --git a/res/lang/sr.bin b/res/lang/sr.bin
index 8d8591e6..1ef302d9 100644
--- a/res/lang/sr.bin
+++ b/res/lang/sr.bin
diff --git a/res/lang/tok.bin b/res/lang/tok.bin
index 1b0c0733..6e3c7af7 100644
--- a/res/lang/tok.bin
+++ b/res/lang/tok.bin
diff --git a/res/lang/tr.bin b/res/lang/tr.bin
index 60ef518d..71b9382f 100644
--- a/res/lang/tr.bin
+++ b/res/lang/tr.bin
diff --git a/res/lang/uk.bin b/res/lang/uk.bin
index 2ed16909..f7040f2f 100644
--- a/res/lang/uk.bin
+++ b/res/lang/uk.bin
diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin
index 3a83dd40..3ccab576 100644
--- a/res/lang/zh_Hans.bin
+++ b/res/lang/zh_Hans.bin
diff --git a/res/lang/zh_Hant.bin b/res/lang/zh_Hant.bin
index 7da4b273..39393417 100644
--- a/res/lang/zh_Hant.bin
+++ b/res/lang/zh_Hant.bin
diff --git a/src/app.c b/src/app.c
index 9f4d60e3..540c46d8 100644
--- a/src/app.c
+++ b/src/app.c
@@ -3149,6 +3149,25 @@ iBool handleCommand_App(const char *cmd) {
         postCommand_App("idents.changed");
         return iTrue;
     }
+    else if (equal_Command(cmd, "ident.switch")) {
+        /* This is different than "ident.signin" in that the currently used identity's activation
+           URL is used instead of the current one. */
+        const iString     *docUrl = url_DocumentWidget(document_App());
+        const iGmIdentity *cur    = identityForUrl_GmCerts(d->certs, docUrl);
+        iGmIdentity       *dst    = findIdentity_GmCerts(
+            d->certs, collect_Block(hexDecode_Rangecc(range_Command(cmd, "fp"))));
+        if (cur && dst && cur != dst) {
+            iString *useUrl = copy_String(findUse_GmIdentity(cur, docUrl));
+            if (isEmpty_String(useUrl)) {
+                useUrl = copy_String(docUrl);
+            }
+            signIn_GmCerts(d->certs, dst, useUrl);
+            postCommand_App("idents.changed");
+            postCommand_App("navigate.reload");
+            delete_String(useUrl);
+        }
+        return iTrue;
+    }
     else if (equal_Command(cmd, "idents.changed")) {
         saveIdentities_GmCerts(d->certs);
         return iFalse;
diff --git a/src/gmcerts.c b/src/gmcerts.c
index f95fea7d..345c36e0 100644
--- a/src/gmcerts.c
+++ b/src/gmcerts.c
@@ -201,6 +201,15 @@ void clearUse_GmIdentity(iGmIdentity *d) {
     clear_StringSet(d->useUrls);
 }
 
+const iString *findUse_GmIdentity(const iGmIdentity *d, const iString *url) {
+    iConstForEach(StringSet, using, d->useUrls) {
+        if (startsWith_String(url, cstr_String(using.value))) {
+            return using.value;
+        }
+    }
+    return NULL;
+}
+
 const iString *name_GmIdentity(const iGmIdentity *d) {
     iString *name = collect_String(subject_TlsCertificate(d->cert));
     if (startsWith_String(name, "CN = ")) {
diff --git a/src/gmcerts.h b/src/gmcerts.h
index 02a41c14..6ece1954 100644
--- a/src/gmcerts.h
+++ b/src/gmcerts.h
@@ -48,8 +48,9 @@ iBool   isUsed_GmIdentity           (const iGmIdentity *);
 iBool   isUsedOn_GmIdentity         (const iGmIdentity *, const iString *url);
 iBool   isUsedOnDomain_GmIdentity   (const iGmIdentity *, const iRangecc domain);
 
-void    setUse_GmIdentity   (iGmIdentity *, const iString *url, iBool use);
-void    clearUse_GmIdentity (iGmIdentity *);
+void    setUse_GmIdentity           (iGmIdentity *, const iString *url, iBool use);
+void    clearUse_GmIdentity         (iGmIdentity *);
+const iString *findUse_GmIdentity   (const iGmIdentity *, const iString *url);
 
 const iString *name_GmIdentity(const iGmIdentity *);
 
diff --git a/src/sitespec.c b/src/sitespec.c
index 6f4546f0..f8b77c86 100644
--- a/src/sitespec.c
+++ b/src/sitespec.c
@@ -25,6 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/file.h>
 #include <the_Foundation/path.h>
 #include <the_Foundation/stringhash.h>
+#include <the_Foundation/stringarray.h>
 #include <the_Foundation/toml.h>
 
 iDeclareClass(SiteParams)
@@ -35,6 +36,7 @@ struct Impl_SiteParams {
     uint16_t titanPort;
     iString  titanIdentity; /* fingerprint */
     int      dismissWarnings;
+    iStringArray usedIdentities; /* fingerprints; latest ones at the end */
     /* TODO: theme seed, style settings */
 };
 
@@ -42,12 +44,23 @@ void init_SiteParams(iSiteParams *d) {
     d->titanPort = 0; /* undefined */
     init_String(&d->titanIdentity);
     d->dismissWarnings = 0;
+    init_StringArray(&d->usedIdentities);
 }
 
 void deinit_SiteParams(iSiteParams *d) {
+    deinit_StringArray(&d->usedIdentities);
     deinit_String(&d->titanIdentity);
 }
 
+static size_t findUsedIdentity_SiteParams_(const iSiteParams *d, const iString *fingerprint) {
+    iConstForEach(StringArray, i, &d->usedIdentities) {
+        if (equal_String(i.value, fingerprint)) {
+            return index_StringArrayConstIterator(&i);
+        }
+    }
+    return iInvalidPos;
+}
+
 iDefineClass(SiteParams)
 iDefineObjectConstruction(SiteParams)
     
@@ -130,6 +143,12 @@ static void handleIniKeyValue_SiteSpec_(void *context, const iString *table, con
     else if (!cmp_String(key, "dismissWarnings") && value->type == int64_TomlType) {
         d->loadParams->dismissWarnings = value->value.int64;
     }
+    else if (!cmp_String(key, "usedIdentities") && value->type == string_TomlType) {
+        iRangecc seg = iNullRange;
+        while (nextSplit_Rangecc(range_String(value->value.string), " ", &seg)) {
+            pushBack_StringArray(&d->loadParams->usedIdentities, collectNewRange_String(seg));
+        }
+    }
 }
 
 static iBool load_SiteSpec_(iSiteSpec *d) {
@@ -151,6 +170,7 @@ static void save_SiteSpec_(iSiteSpec *d) {
     if (open_File(f, writeOnly_FileMode | text_FileMode)) {
         iString *buf = new_String();
         iConstForEach(StringHash, i, &d->sites) {
+            iBeginCollect();
             const iBlock *     key    = &i.value->keyBlock;
             const iSiteParams *params = i.value->object;
             format_String(buf, "[%s]\n", cstr_Block(key));
@@ -164,8 +184,15 @@ static void save_SiteSpec_(iSiteSpec *d) {
             if (params->dismissWarnings) {
                 appendFormat_String(buf, "dismissWarnings = 0x%x\n", params->dismissWarnings);
             }
+            if (!isEmpty_StringArray(&params->usedIdentities)) {
+                appendFormat_String(
+                    buf,
+                    "usedIdentities = \"%s\"\n",
+                    cstrCollect_String(joinCStr_StringArray(&params->usedIdentities, " ")));
+            }
             appendCStr_String(buf, "\n");
             write_File(f, utf8_String(buf));
+            iEndCollect();
         }
         delete_String(buf);
     }
@@ -188,14 +215,19 @@ void deinit_SiteSpec(void) {
     deinit_String(&d->saveDir);
 }
 
-void setValue_SiteSpec(const iString *site, enum iSiteSpecKey key, int value) {
-    iSiteSpec *d = &siteSpec_;
+static iSiteParams *findParams_SiteSpec_(iSiteSpec *d, const iString *site) {
     const iString *hashKey = collect_String(lower_String(site));
     iSiteParams *params = value_StringHash(&d->sites, hashKey);
     if (!params) {
         params = new_SiteParams();
         insert_StringHash(&d->sites, hashKey, params);
     }
+    return params;
+}
+
+void setValue_SiteSpec(const iString *site, enum iSiteSpecKey key, int value) {
+    iSiteSpec *d = &siteSpec_;
+    iSiteParams *params = findParams_SiteSpec_(d, site);
     iBool needSave = iFalse;
     switch (key) {
         case titanPort_SiteSpecKey:
@@ -216,12 +248,7 @@ void setValue_SiteSpec(const iString *site, enum iSiteSpecKey key, int value) {
 
 void setValueString_SiteSpec(const iString *site, enum iSiteSpecKey key, const iString *value) {
     iSiteSpec *d = &siteSpec_;
-    const iString *hashKey = collect_String(lower_String(site));
-    iSiteParams *params = value_StringHash(&d->sites, hashKey);
-    if (!params) {
-        params = new_SiteParams();
-        insert_StringHash(&d->sites, hashKey, params);
-    }
+    iSiteParams *params = findParams_SiteSpec_(d, site);
     iBool needSave = iFalse;
     switch (key) {
         case titanIdentity_SiteSpecKey:
@@ -238,6 +265,44 @@ void setValueString_SiteSpec(const iString *site, enum iSiteSpecKey key, const i
     }
 }
 
+static void insertOrRemoveString_SiteSpec_(iSiteSpec *d, const iString *site, enum iSiteSpecKey key,
+                                           const iString *value, iBool doInsert) {
+    iSiteParams *params = findParams_SiteSpec_(d, site);
+    iBool needSave = iFalse;
+    switch (key) {
+        case usedIdentities_SiteSpecKey: {
+            const size_t index = findUsedIdentity_SiteParams_(params, value);
+            if (doInsert && index == iInvalidPos) {
+                pushBack_StringArray(&params->usedIdentities, value);
+                needSave = iTrue;
+            }
+            else if (!doInsert && index != iInvalidPos) {
+                remove_StringArray(&params->usedIdentities, index);
+                needSave = iTrue;
+            }
+            break;
+        }
+        default:
+            break;
+    }
+    if (needSave) {
+        save_SiteSpec_(d);
+    }    
+}
+
+void insertString_SiteSpec(const iString *site, enum iSiteSpecKey key, const iString *value) {
+    insertOrRemoveString_SiteSpec_(&siteSpec_, site, key, value, iTrue);
+}
+
+void removeString_SiteSpec(const iString *site, enum iSiteSpecKey key, const iString *value) {
+    insertOrRemoveString_SiteSpec_(&siteSpec_, site, key, value, iFalse);
+}
+
+const iStringArray *strings_SiteSpec(const iString *site, enum iSiteSpecKey key) {
+    const iSiteParams *params = findParams_SiteSpec_(&siteSpec_, site);
+    return &params->usedIdentities;
+}
+
 int value_SiteSpec(const iString *site, enum iSiteSpecKey key) {
     iSiteSpec *d = &siteSpec_;
     const iSiteParams *params = constValue_StringHash(&d->sites, collect_String(lower_String(site)));
diff --git a/src/sitespec.h b/src/sitespec.h
index 5adaeb8c..11c40e3c 100644
--- a/src/sitespec.h
+++ b/src/sitespec.h
@@ -22,22 +22,26 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #pragma once
 
-#include <the_Foundation/string.h>
+#include <the_Foundation/stringarray.h>
 
 iDeclareType(SiteSpec)
-    
+
 enum iSiteSpecKey {
-    titanPort_SiteSpecKey,
-    titanIdentity_SiteSpecKey,
-    dismissWarnings_SiteSpecKey,
+    titanPort_SiteSpecKey,       /* int */
+    titanIdentity_SiteSpecKey,   /* String */
+    dismissWarnings_SiteSpecKey, /* int */
+    usedIdentities_SiteSpecKey,  /* StringArray */
 };
-    
+
 void    init_SiteSpec       (const char *saveDir);
 void    deinit_SiteSpec     (void);
 
 /* changes saved immediately */
 void    setValue_SiteSpec       (const iString *site, enum iSiteSpecKey key, int value); 
 void    setValueString_SiteSpec (const iString *site, enum iSiteSpecKey key, const iString *value);
+void    insertString_SiteSpec   (const iString *site, enum iSiteSpecKey key, const iString *value);
+void    removeString_SiteSpec   (const iString *site, enum iSiteSpecKey key, const iString *value);
 
-int             value_SiteSpec          (const iString *site, enum iSiteSpecKey key);
-const iString * valueString_SiteSpec    (const iString *site, enum iSiteSpecKey key);
+int                 value_SiteSpec          (const iString *site, enum iSiteSpecKey key);
+const iString *     valueString_SiteSpec    (const iString *site, enum iSiteSpecKey key);
+const iStringArray *strings_SiteSpec        (const iString *site, enum iSiteSpecKey key);
diff --git a/src/ui/root.c b/src/ui/root.c
index c2161d80..f06ae842 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -38,6 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "../history.h"
 #include "../gmcerts.h"
 #include "../gmutil.h"
+#include "../sitespec.h"
 #include "../visited.h"
 
 #if defined (iPlatformMsys)
@@ -330,6 +331,66 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
         openMenuFlags_Widget(menu, zero_I2(), postCommands_MenuOpenFlags | center_MenuOpenFlags);
         return iTrue;
     }
+    else if (equal_Command(cmd, "identmenu.open")) {
+        iWidget *button = findWidget_Root("navbar.ident");
+        iArray items;
+        init_Array(&items, sizeof(iMenuItem));
+        /* Current identity. */
+        const iString     *docUrl = url_DocumentWidget(document_App());
+        const iGmIdentity *ident  = identityForUrl_GmCerts(certs_App(), docUrl);
+        const iString     *fp     = collect_String(hexEncode_Block(&ident->fingerprint));
+        pushBackN_Array(&items,
+                        (iMenuItem[]){ { format_CStr("///" uiHeading_ColorEscape "%s",
+                                                     ident ? cstr_String(name_GmIdentity(ident))
+                                                           : "${menu.identity.notactive}") },
+                                       { "---" } },
+                        2);
+        /* Alternate identities. */ {
+            const iString *site = collectNewRange_String(urlRoot_String(docUrl));
+            iBool haveAlts = iFalse;
+            iConstForEach(StringArray, i, strings_SiteSpec(site, usedIdentities_SiteSpecKey)) {
+                if (!equal_String(i.value, fp)) {
+                    const iBlock *otherFp = collect_Block(hexDecode_Rangecc(range_String(i.value)));
+                    const iGmIdentity *other = findIdentity_GmCerts(certs_App(), otherFp);
+                    if (other) {
+                        pushBack_Array(
+                            &items,
+                            &(iMenuItem){
+                                format_CStr(translateCStr_Lang("\U0001f816 ${ident.switch}"),
+                                            cstr_String(name_GmIdentity(other))),
+                                0,
+                                0,
+                                format_CStr("ident.switch fp:%s", cstr_String(i.value)) });
+                        haveAlts = iTrue;
+                    }
+                }
+            }
+            if (haveAlts) {
+                pushBack_Array(&items, &(iMenuItem){ "---" });
+            }
+        }
+        iSidebarWidget *sidebar = findWidget_App("sidebar");
+        pushBackN_Array(
+            &items,
+            (iMenuItem[]){
+                { add_Icon " ${menu.identity.new}", newIdentity_KeyShortcut, "ident.new" },
+                { "${menu.identity.import}", SDLK_i, KMOD_PRIMARY | KMOD_SHIFT, "ident.import" },
+                { "---" },
+                { isVisible_Widget(sidebar) && mode_SidebarWidget(sidebar) == identities_SidebarMode
+                      ? leftHalf_Icon " ${menu.hide.identities}"
+                      : leftHalf_Icon " ${menu.show.identities}",
+                  0,
+                  0,
+                  deviceType_App() == phone_AppDeviceType ? "toolbar.showident"
+                                                          : "sidebar.mode arg:3 toggle:1" },
+            },
+            4);
+        iWidget *menu =
+            makeMenu_Widget(button, constData_Array(&items), size_Array(&items));
+        openMenu_Widget(menu, topLeft_Rect(bounds_Widget(button)));
+        deinit_Array(&items);
+        return iTrue;
+    }
     else if (equal_Command(cmd, "contextclick")) {
         iBool showBarMenu = iFalse;
         if (equal_Rangecc(range_Command(cmd, "id"), "buttons")) {
@@ -780,6 +841,26 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
                 dismissPortraitPhoneSidebars_Root(get_Root());
                 updateNavBarIdentity_(navBar);
                 updateNavDirButtons_(navBar);
+                /* Update site-specific used identities. */ {
+                    const iGmIdentity *ident =
+                        identityForUrl_GmCerts(certs_App(), url_DocumentWidget(document_App()));
+                    if (ident) {
+                        const iString *site =
+                            collectNewRange_String(urlRoot_String(canonicalUrl_String(urlStr)));
+                        const iStringArray *usedIdents =
+                            strings_SiteSpec(site, usedIdentities_SiteSpecKey);
+                        const iString *fingerprint = collect_String(hexEncode_Block(&ident->fingerprint));
+                        /* Keep this identity at the end of the list. */
+                        removeString_SiteSpec(site, usedIdentities_SiteSpecKey, fingerprint);
+                        insertString_SiteSpec(site, usedIdentities_SiteSpecKey, fingerprint);
+                        /* Keep the list short. */
+                        while (size_StringArray(usedIdents) > 5) {
+                            removeString_SiteSpec(site,
+                                                  usedIdentities_SiteSpecKey,
+                                                  constAt_StringArray(usedIdents, 0));
+                        }
+                    }
+                }
                 /* Icon updates should be limited to automatically chosen icons if the user
                    is allowed to pick their own in the future. */
                 if (updateBookmarkIcon_Bookmarks(bookmarks_App(), urlStr,
@@ -1268,10 +1349,10 @@ void createUserInterface_Root(iRoot *d) {
             setId_Widget(addChild_Widget(rightEmbed, iClob(makePadding_Widget(0))), "url.embedpad");
         }
         /* The active identity menu. */ {
-            iLabelWidget *idMenu = makeMenuButton_LabelWidget(
-                "\U0001f464", identityButtonMenuItems_, iElemCount(identityButtonMenuItems_));
-            setAlignVisually_LabelWidget(idMenu, iTrue);
-            setId_Widget(addChildFlags_Widget(navBar, iClob(idMenu), collapse_WidgetFlag), "navbar.ident");
+            iLabelWidget *idButton = new_LabelWidget(person_Icon, "identmenu.open");
+//                "\U0001f464", identityButtonMenuItems_, iElemCount(identityButtonMenuItems_));
+            setAlignVisually_LabelWidget(idButton, iTrue);
+            setId_Widget(addChildFlags_Widget(navBar, iClob(idButton), collapse_WidgetFlag), "navbar.ident");
         }
         addChildFlags_Widget(navBar, iClob(new_Widget()), expand_WidgetFlag);
         setId_Widget(addChildFlags_Widget(navBar,