Author: prabath
Date: Thu Jan 10 02:49:13 2008
New Revision: 12104
Log:
OpenID integration
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/UserInfoServlet.java
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
Thu Jan 10 02:49:13 2008
@@ -63,15 +63,15 @@
ServerConfiguration serverConfig = null;
String host = null;
- String httpsPort = null;
+ String httpPort = null;
serverConfig = ServerConfiguration.getInstance();
host = serverConfig.getFirstProperty("HostName");
- httpsPort = serverConfig.getFirstProperty("Ports.HTTPS");
+ httpPort = serverConfig.getFirstProperty("Ports.HTTP");
// This is the OpenID provider server url, right now on https - also
can
// be on http.
- opAddress = "http://"; + host + ":" + httpsPort + "/server/";
+ opAddress = "http://"; + host + ":" + httpPort + "/server/";
manager.setOPEndpointUrl(opAddress);
}
@@ -600,9 +600,10 @@
.get(IdentityConstants.CLAIM_CITY));
else
claimValues.put(CITY, "none");
-
+
// state
- if
(mapValues.containsKey(IdentityConstants.CLAIM_STATE))
+ if (mapValues
+ .containsKey(IdentityConstants.CLAIM_STATE))
claimValues.put(STATE, (String) mapValues
.get(IdentityConstants.CLAIM_STATE));
else
@@ -641,6 +642,23 @@
/**
*
+ * @param user
+ * @return
+ */
+ public static String generateOpenID(String user) {
+ ServerConfiguration serverConfig = null;
+ String host = null;
+ String httpPort = null;
+
+ serverConfig = ServerConfiguration.getInstance();
+ host = serverConfig.getFirstProperty("HostName");
+ httpPort = serverConfig.getFirstProperty("Ports.HTTP");
+
+ return "http://"; + host + ":" + httpPort + "/user/" + user;
+ }
+
+ /**
+ *
* @param username
* @param password
* @return
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/UserInfoServlet.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/UserInfoServlet.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/UserInfoServlet.java
Thu Jan 10 02:49:13 2008
@@ -27,8 +27,7 @@
String caller = null;
String back = "";
- serverUrl = "http://"; + req.getServerName() + ":" + req.getServerPort()
- + "/server";
+ serverUrl = OpenIDProvider.getOpAddress();
caller = req.getPathInfo();
@@ -50,8 +49,7 @@
+ " xmlns=\"xri://$xrd*($v*2.0)\">\n" + " <XRD>\n"
+ " <Service priority=\"0\">\n"
+ " <Type>http://openid.net/signon/1.0</Type>\n"
- + " <URI>http://"; + req.getServerName() + ":"
- + req.getServerPort() + "/server</URI>\n"
+ + " <URI>"+serverUrl+"</URI>\n"
+ " </Service>\n" + " </XRD>\n" + "</xrds:XRDS>";
}
}
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
