Changeset 32944 for main

Timestamp:

2019-04-01T12:38:16+13:00 (5 years ago)

Author:

kjdon

Message:

making some methods/variables public so we can access them from other places. Making verifyRecaptcha static so can be called from anywhere

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/Authentication.java (modified) (8 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/Authentication.java

@@ -46 +46 @@
 
     //Error codes
-    protected static final int NO_ERROR = 0;
+    public static final int NO_ERROR = 0;
     protected static final int ERROR_NOT_LOGGED_IN = -1;
     protected static final int ERROR_ADMIN_NOT_LOGGED_IN = -2;
@@ -143 +143 @@
     protected static final String LOGIN = "Login";
   protected static final String BLANK = "Info"; // a dummy page just for showing an error message
+  
     //the services on offer
-    protected static final String AUTHENTICATION_SERVICE = "Authentication";
+    public static final String AUTHENTICATION_SERVICE = "Authentication";
     protected static final String GET_USER_INFORMATION_SERVICE = "GetUserInformation";
     protected static final String CHANGE_USER_EDIT_MODE_SERVICE = "ChangeUserEditMode";
@@ -150 +151 @@
 
     protected static boolean _derbyWrapperDoneForcedShutdown = false;
-
+  
   // some XML strings
   protected static final String RECAPTCHA_ELEM = "recaptcha";
@@ -239 +240 @@
         remoteAuthentication_service.setAttribute(GSXML.NAME_ATT, REMOTE_AUTHENTICATION_SERVICE);
         this.short_service_info.appendChild(remoteAuthentication_service);
-        
 
         DerbyWrapper.createDatabaseIfNeeded();
@@ -276 +276 @@
         // check recaptcha
         if (_recaptchaSecretKey == null || _recaptchaSecretKey.length() == 0 || _recaptchaSiteKey == null || _recaptchaSiteKey.length() == 0) {
+          _recaptchaSecretKey = null;
+          _recaptchaSiteKey = null;
           _recaptchaOpList = null;
         }
@@ -290 +292 @@
     }
 
+  public String getRecaptchaSiteKey() {
+    return _recaptchaSiteKey;
+  }
+
+  public String getRecaptchaSecretKey() {
+
+    return _recaptchaSecretKey;
+  }
   protected Element getServiceDescription(Document doc, String service_id, String lang, String subset)
     {
@@ -346 +356 @@
       
     }
+  public static String getErrorKey(int error_code) {
+    
+    return _errorKeyMap.get(error_code);
+  }
     protected Element processChangeUserEditMode(Element request)
     {
@@ -978 +992 @@
     }
 
-  public int verifyRecaptcha(String secret_key, String user_response) {
+  public static int verifyRecaptcha(String secret_key, String user_response) {
 
     if (user_response == null || user_response.length() == 0) {