[483333] [USS] Add terms of use check to login screen

https://bugs.eclipse.org/bugs/show_bug.cgi?id=483333

2 files changed, 29 insertions, 11 deletions

diff --git a/org.eclipse.userstorage.ui/User Storage IDE.launch b/org.eclipse.userstorage.ui/User Storage IDE.launch
index f3ba4ae..9ece2f1 100644
--- a/org.eclipse.userstorage.ui/User Storage IDE.launch
+++ b/org.eclipse.userstorage.ui/User Storage IDE.launch
@@ -21,7 +21,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.userstorage.ui.showServices=false&#13;&#10;-Dorg.eclipse.userstorage.ui.showTestButton=true"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.userstorage.ui.showServices=false&#13;&#10;-Dorg.eclipse.userstorage.ui.showTestButton=true&#13;&#10;-DXXXorg.eclipse.userstorage.serviceURI=http://localhost:8080/&#13;&#10;-DXXXorg.eclipse.userstorage.termsOfUseLink="/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
 <booleanAttribute key="show_selected_only" value="false"/>
diff --git a/org.eclipse.userstorage.ui/src/org/eclipse/userstorage/ui/internal/CredentialsComposite.java b/org.eclipse.userstorage.ui/src/org/eclipse/userstorage/ui/internal/CredentialsComposite.java
index 5f6eb64..ec1aa1b 100644
--- a/org.eclipse.userstorage.ui/src/org/eclipse/userstorage/ui/internal/CredentialsComposite.java
+++ b/org.eclipse.userstorage.ui/src/org/eclipse/userstorage/ui/internal/CredentialsComposite.java
@@ -289,11 +289,11 @@ public class CredentialsComposite extends Composite
     return link;
   }
 
-  private void enableLink(Link link, Callable<URI> uriProvider)
+  private void enableLink(Link link, Callable<URI> uriProvider, boolean enabled)
   {
     try
     {
-      link.setEnabled(termsOfUseAgreed && uriProvider.call() != null);
+      link.setEnabled(enabled && uriProvider.call() != null);
     }
     catch (Exception ex)
     {
@@ -303,14 +303,32 @@ public class CredentialsComposite extends Composite
 
   private void updateEnablement()
   {
-    usernameLabel.setEnabled(termsOfUseAgreed);
-    usernameText.setEnabled(termsOfUseAgreed);
-    passwordLabel.setEnabled(termsOfUseAgreed);
-    passwordText.setEnabled(termsOfUseAgreed);
-
-    enableLink(createAccountLink, createAccountURIProvider);
-    enableLink(editAccountLink, editAccountURIProvider);
-    enableLink(recoverPasswordLink, recoverPasswordURIProvider);
+    boolean enabled = isValid();
+
+    usernameLabel.setEnabled(enabled);
+    usernameText.setEnabled(enabled);
+    passwordLabel.setEnabled(enabled);
+    passwordText.setEnabled(enabled);
+
+    enableLink(createAccountLink, createAccountURIProvider, enabled);
+    enableLink(editAccountLink, editAccountURIProvider, enabled);
+    enableLink(recoverPasswordLink, recoverPasswordURIProvider, enabled);
+  }
+
+  private boolean isValid()
+  {
+    if (service == null)
+    {
+      return false;
+    }
+
+    String termsOfUseLink = service.getTermsOfUseLink();
+    if (StringUtil.isEmpty(termsOfUseLink))
+    {
+      return true;
+    }
+
+    return termsOfUseAgreed;
   }
 
   private void hideTermsOfUse()