Changeset 31390 in osm for applications/editors/josm/plugins/mapillary/src/org/openstreetmap

Timestamp:

2015-07-16T13:56:24+02:00 (10 years ago)

Author:

nokutu

Message:

Login system implemented

Location:

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary

Files:

• MapillaryAbstractImage.java (modified) (1 diff)
• MapillaryImportedImage.java (modified) (1 diff)
• gui/HyperlinkLabel.java (modified) (1 diff)
• gui/MapillaryOAuthUI.java (deleted)
• gui/MapillaryPreferenceSetting.java (modified) (3 diffs)
• oauth/MapillaryOAuthApi.java (deleted)
• oauth/PortListener.java (modified) (5 diffs)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryAbstractImage.java

@@ -13 +13 @@
 /**
  * Abstract superclass for all image objects. At the moment there is just 2,
- * {@code MapillaryImportedImage} and {@code MapillaryImage}.
+ * {@link MapillaryImportedImage} and {@link MapillaryImage}.
  *
  * @author nokutu

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryImportedImage.java

@@ -95 +95 @@
   private static String currentDate() {
     Calendar cal = Calendar.getInstance();
-
     SimpleDateFormat formatter = new SimpleDateFormat("yyyy:MM:dd hh:mm:ss");
     return formatter.format(cal.getTime());
-
   }
 }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/HyperlinkLabel.java

@@ -109 +109 @@
   /**
    * Fires an ActionEvent to all interested listeners.
+   * @param evt 
    */
   protected void fireActionPerformed(ActionEvent evt) {

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Desktop;
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 
 import javax.swing.AbstractAction;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
-import javax.swing.JDialog;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 
@@ -18 +20 @@
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryPlugin;
+import org.openstreetmap.josm.plugins.mapillary.oauth.PortListener;
 
 /**
@@ -97 +100 @@
     @Override
     public void actionPerformed(ActionEvent arg0) {
-      JButton login = new JButton();
-      JButton cancel = new JButton();
-      JOptionPane pane = new JOptionPane(new MapillaryOAuthUI(),
-          JOptionPane.PLAIN_MESSAGE, JOptionPane.DEFAULT_OPTION, null,
-          new JButton[] { login, cancel });
-      login.setAction(new LoginAction(pane));
-      cancel.setAction(new CancelAction(pane));
-      JDialog dlg = pane.createDialog(Main.parent, tr("Login"));
-      dlg.setVisible(true);
-      dlg.dispose();
-    }
-  }
+      PortListener portListener = new PortListener();
+      portListener.start();
 
-  private class LoginAction extends AbstractAction {
-
-    private static final long serialVersionUID = -7157028112711343289L;
-
-    private JOptionPane pane;
-
-    public LoginAction(JOptionPane pane) {
-      putValue(NAME, tr("Login"));
-      this.pane = pane;
-    }
-
-    @Override
-    public void actionPerformed(ActionEvent e) {
-      pane.setValue(JOptionPane.OK_OPTION);
-    }
-  }
-
-  private class CancelAction extends AbstractAction {
-
-    private static final long serialVersionUID = 2329066472975953270L;
-
-    private JOptionPane pane;
-
-    public CancelAction(JOptionPane pane) {
-      putValue(NAME, tr("Cancel"));
-      this.pane = pane;
-    }
-
-    @Override
-    public void actionPerformed(ActionEvent e) {
-      pane.setValue(JOptionPane.CANCEL_OPTION);
+      String url = "http://www.mapillary.io/connect?redirect_uri=http:%2F%2Flocalhost:8763%2F&client_id=MkJKbDA0bnZuZlcxeTJHTmFqN3g1dzplZTlkZjQyYjYyZTczOTdi&response_type=token&scope=user:email";
+      Desktop desktop = Desktop.getDesktop();
+      try {
+        desktop.browse(new URI(url));
+      } catch (IOException | URISyntaxException ex) {
+        ex.printStackTrace();
+      } catch (UnsupportedOperationException ex) {
+        Runtime runtime = Runtime.getRuntime();
+        try {
+          runtime.exec("xdg-open " + url);
+        } catch (IOException exc) {
+          exc.printStackTrace();
+        }
+      }
     }
   }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/PortListener.java

@@ -8 +8 @@
 import java.util.Scanner;
 
-import javax.swing.JLabel;
-import javax.swing.SwingUtilities;
-
 import org.openstreetmap.josm.Main;
 
@@ -18 +15 @@
  */
 public class PortListener extends Thread {
-
-  JLabel text;
-
-  /**
-   * Main constructor.
-   *
-   * @param text
-   */
-  public PortListener(JLabel text) {
-    this.text = text;
-  }
 
   @Override
@@ -38 +24 @@
       Scanner in = new Scanner(new InputStreamReader(clientSocket.getInputStream()));
       String s;
-      String code = null;
+      String accessToken = null;
       while (in.hasNextLine()) {
         s = in.nextLine();
-        if (s.contains("?code=")) {
-          code = s.substring(s.indexOf("=") + 1, s.indexOf("HTTP") - 1);
+        if (s.contains("access_token=")) {
+          String[] ss = s.split("&");
+          for (int i = 0; i < ss.length; i++) {
+            if (ss[i].contains("access_token=")) {
+              accessToken = ss[i].substring(ss[i].indexOf("access_token=") + 13, ss[i].length());
+              break;
+            }
+          }
           break;
         }
@@ -49 +41 @@
       writeContent(out);
 
-      System.out.println("The code is: " + code);
+      Main.info("Successful login with Mapillary, the access token is: " + accessToken);
+      Main.pref.put("mapillary.access-token", accessToken);
 
       out.close();
@@ -57 +50 @@
       Main.error(e);
     }
-    if (!SwingUtilities.isEventDispatchThread()) {
-      SwingUtilities.invokeLater(new Runnable() {
-        @Override
-        public void run() {
-          text.setText("Authorization successful");
-        }
-      });
-    } else
-      text.setText("Authorization successful");
   }
 
   private void writeContent(PrintWriter out) {
-    String response = "";
-    response += "<html><body>Authorization successful</body></html>";
+    String response = "<html><head><title>Mapillary login</title></head><body>Login successful, return to JOSM.</body></html>";
     out.println("HTTP/1.1 200 OK");
     out.println("Content-Length: " + response.length());