Changeset 17972 in josm for trunk/src/org

Timestamp:

2021-07-09T22:33:03+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21065 - update fully automatic OAuth authentication to adapt to recent OSM server changes

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/oauth/OsmPrivileges.java (modified) (2 diffs)
• gui/oauth/OsmOAuthAuthorizationClient.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/oauth/OsmPrivileges.java

@@ -13 +13 @@
     private boolean allowWritePrefs;
     private boolean allowModifyNotes;
+    private boolean allowWriteDiary;
 
     /**
@@ -109 +110 @@
         this.allowModifyNotes = allowModifyNotes;
     }
+
+    /**
+     * Determines if the client is allowed to write diary.
+     * @return {@code true} if the client is allowed to write diary, {@code false} otherwise
+     * @since 17972
+     */
+    public boolean isAllowWriteDiary() {
+        return allowWriteDiary;
+    }
+
+    /**
+     * Sets whether the client is allowed to write diary.
+     * @param allowWriteDiary {@code true} if the client is allowed to write diary, {@code false} otherwise
+     * @since 17972
+     */
+    public void setAllowWriteDiary(boolean allowWriteDiary) {
+        this.allowWriteDiary = allowWriteDiary;
+    }
 }

trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

@@ -360 +360 @@
         parameters.put("oauth_callback", "");
         parameters.put("authenticity_token", sessionId.token);
-        if (privileges.isAllowWriteApi()) {
-            parameters.put("allow_write_api", "yes");
-        }
-        if (privileges.isAllowWriteGpx()) {
-            parameters.put("allow_write_gpx", "yes");
-        }
-        if (privileges.isAllowReadGpx()) {
-            parameters.put("allow_read_gpx", "yes");
-        }
-        if (privileges.isAllowWritePrefs()) {
-            parameters.put("allow_write_prefs", "yes");
-        }
-        if (privileges.isAllowReadPrefs()) {
-            parameters.put("allow_read_prefs", "yes");
-        }
-        if (privileges.isAllowModifyNotes()) {
-            parameters.put("allow_write_notes", "yes");
-        }
-
-        parameters.put("commit", "Save changes");
+        parameters.put("allow_write_api", booleanParam(privileges.isAllowWriteApi()));
+        parameters.put("allow_write_gpx", booleanParam(privileges.isAllowWriteGpx()));
+        parameters.put("allow_read_gpx", booleanParam(privileges.isAllowReadGpx()));
+        parameters.put("allow_write_prefs", booleanParam(privileges.isAllowWritePrefs()));
+        parameters.put("allow_read_prefs", booleanParam(privileges.isAllowReadPrefs()));
+        parameters.put("allow_write_notes", booleanParam(privileges.isAllowModifyNotes()));
+        parameters.put("allow_write_diary", booleanParam(privileges.isAllowWriteDiary()));
 
         String request = buildPostRequest(parameters);
@@ -405 +392 @@
             }
         }
+    }
+
+    private static String booleanParam(boolean param) {
+        return param ? "1" : "0";
     }