Changeset 15757 in josm for trunk

Timestamp:

2020-01-25T16:11:37+01:00 (5 years ago)

Author:

GerdP

Message:

fix #11914: show OSM username in titlebar

• update UserIdentityManager when CredentialsManager is updated.
• call purgeCredentialsCache() when user is changed so that we don't use previously user when the new user+password combination is bad.

File:

• trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java

@@ -132 +132 @@
             }
         }
+        // see #11914: clear cache before we store new value
+        purgeCredentialsCache(requestorType);
         delegate.store(requestorType, host, credentials);
     }
@@ -138 +140 @@
     public CredentialsAgentResponse getCredentials(RequestorType requestorType, String host, boolean noSuccessWithLastResponse)
             throws CredentialsAgentException {
-        return delegate.getCredentials(requestorType, host, noSuccessWithLastResponse);
+        CredentialsAgentResponse credentials = delegate.getCredentials(requestorType, host, noSuccessWithLastResponse);
+        if (requestorType == RequestorType.SERVER) {
+            // see #11914 : Keep UserIdentityManager up to date
+            String userName = credentials.getUsername();
+            userName = userName == null ? "" : userName.trim();
+            if (!Objects.equals(UserIdentityManager.getInstance().getUserName(), userName)) {
+                if (userName.isEmpty())
+                    UserIdentityManager.getInstance().setAnonymous();
+                else
+                    UserIdentityManager.getInstance().setPartiallyIdentified(userName);
+            }
+        }
+        return credentials;
     }