From c30e1ae536fed75e7cbc5b6b9df675714fe018d7 Mon Sep 17 00:00:00 2001 From: Matija Obreza Date: Wed, 14 Aug 2019 09:46:44 +0200 Subject: [PATCH] Using new Production server URL https://api.genesys-pgr.org --- .../main/java/org/genesys2/anno/gui/SettingsDialog.java | 4 ++-- .../main/java/org/genesys2/anno/model/OAuthSettings.java | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/anno-gui/src/main/java/org/genesys2/anno/gui/SettingsDialog.java b/anno-gui/src/main/java/org/genesys2/anno/gui/SettingsDialog.java index 73709fe..cab9d43 100644 --- a/anno-gui/src/main/java/org/genesys2/anno/gui/SettingsDialog.java +++ b/anno-gui/src/main/java/org/genesys2/anno/gui/SettingsDialog.java @@ -65,10 +65,10 @@ import java.util.Set; public class SettingsDialog extends Dialog { - private static final String CUSTOM_SERVER_URL = "http://localhost:8080"; + public static final String CUSTOM_SERVER_URL = "http://localhost:8080"; private static final String SANDBOX_SERVER_URL = "https://api.sandbox.genesys-pgr.org"; private static final String SANDBOX_CLIENT_ID = "Ap8Od.ydMSWlJ7qL9sJWtXXMCA@sandbox.genesys-pgr.org"; - private static final String PRODUCTION_SERVER_URL = "https://www.genesys-pgr.org"; + private static final String PRODUCTION_SERVER_URL = "https://api.genesys-pgr.org"; private static final String PRODUCTION_CLIENT_ID = "fTxcm.TrySiiiOLncyeWfmQKyp@www.genesys-pgr.org"; private Binding scope; diff --git a/anno-gui/src/main/java/org/genesys2/anno/model/OAuthSettings.java b/anno-gui/src/main/java/org/genesys2/anno/model/OAuthSettings.java index d0663f1..2ac4232 100644 --- a/anno-gui/src/main/java/org/genesys2/anno/model/OAuthSettings.java +++ b/anno-gui/src/main/java/org/genesys2/anno/model/OAuthSettings.java @@ -16,12 +16,13 @@ package org.genesys2.anno.model; import org.genesys2.anno.gui.AbstractModelObject; +import org.genesys2.anno.gui.SettingsDialog; public class OAuthSettings extends AbstractModelObject { - private String serverUrl = "http://localhost:8080"; - private String authorizationEndpoint = "http://localhost:8080/oauth/authorize"; - private String tokenEndpoint = "http://localhost:8080/oauth/token"; - private String apiUrl = "http://localhost:8080/api/v0"; + private String serverUrl = SettingsDialog.CUSTOM_SERVER_URL; + private String authorizationEndpoint = SettingsDialog.CUSTOM_SERVER_URL + "/oauth/authorize"; + private String tokenEndpoint = SettingsDialog.CUSTOM_SERVER_URL + "/oauth/token"; + private String apiUrl = SettingsDialog.CUSTOM_SERVER_URL + "/api/v0"; private String accessToken = ""; private String refreshToken = ""; private String clientKey = ""; -- GitLab