Author: jleroux
Date: Mon Oct 30 08:19:08 2017
New Revision: 1813732
URL: http://svn.apache.org/viewvc?rev=1813732&view=rev
Log:
Implemented: Token Based Authentication
(OFBIZ-9833)
Fixes a typo
Thanks: Deepak on dev ML
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java?rev=1813732&r1=1813731&r2=1813732&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
Mon Oct 30 08:19:08 2017
@@ -310,9 +310,9 @@ public class ExternalLoginKeysManager {
public static String getExternalServerName(HttpServletRequest request) {
String reportingServerName = "";
Delegator delegator = (Delegator) request.getAttribute("delegator");
- if (delegator != null &&
"Y".equals(EntityUtilProperties.getPropertyValue("embisphere",
"use-external-server", "Y", delegator))) {
- reportingServerName =
EntityUtilProperties.getPropertyValue("embisphere", "external-server-name",
"localhost:8443", delegator);
- String reportingServerQuery =
EntityUtilProperties.getPropertyValue("embisphere", "external-server-query",
"/catalog/control/", delegator);
+ if (delegator != null &&
"Y".equals(EntityUtilProperties.getPropertyValue("security",
"use-external-server", "Y", delegator))) {
+ reportingServerName =
EntityUtilProperties.getPropertyValue("security", "external-server-name",
"localhost:8443", delegator);
+ String reportingServerQuery =
EntityUtilProperties.getPropertyValue("security", "external-server-query",
"/catalog/control/", delegator);
reportingServerName = "https://" + reportingServerName +
reportingServerQuery;
}
return reportingServerName;
@@ -320,7 +320,7 @@ public class ExternalLoginKeysManager {
public static long getJwtTokenTimeToLive(HttpServletRequest request) {
Delegator delegator = (Delegator) request.getAttribute("delegator");
- if (delegator != null) return 1000 *
Long.parseLong(EntityUtilProperties.getPropertyValue("embisphere",
"external-server-token-duration", "30", delegator));
+ if (delegator != null) return 1000 *
Long.parseLong(EntityUtilProperties.getPropertyValue("security",
"external-server-token-duration", "30", delegator));
else return 1000 * 30;
}