Author: [email protected]
Date: Tue Apr 5 10:20:03 2011
New Revision: 941
Log:
[AMDATU-356] Fixed user retrieval from UserAdmin, not using the "USERNAME"
property
Modified:
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/login/service/LoginService.java
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/login/service/service/LoginServiceImpl.java
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/course/service/service/CourseResource.java
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
trunk/amdatu-opensocial/profile/src/main/java/org/amdatu/opensocial/profile/service/PersonServiceImpl.java
Modified:
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/login/service/LoginService.java
==============================================================================
---
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/login/service/LoginService.java
(original)
+++
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/login/service/LoginService.java
Tue Apr 5 10:20:03 2011
@@ -16,8 +16,8 @@
*/
package org.amdatu.authorization.login.service;
-import javax.ws.rs.core.Response;
import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Response;
/**
@@ -26,11 +26,6 @@
*/
public interface LoginService {
/**
- * Key under which the username is stored in the credentials of the User.
- */
- String USER_NAME_CREDENTIAL_KEY = "username";
-
- /**
* Key under which the password is stored in the credentials of the User.
*/
String PASSWORD_CREDENTIAL_KEY = "password";
Modified:
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/login/service/service/LoginServiceImpl.java
==============================================================================
---
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/login/service/service/LoginServiceImpl.java
(original)
+++
trunk/amdatu-authorization/login-service/src/main/java/org/amdatu/authorization/login/service/service/LoginServiceImpl.java
Tue Apr 5 10:20:03 2011
@@ -122,7 +122,6 @@
if (adminUser != null) {
adminUser.getCredentials().put(PASSWORD_CREDENTIAL_KEY, DEFAULT_PASSWORD);
adminUser.getCredentials().put(TENANT_CREDENTIAL_KEY, m_tenant.getId());
-
adminUser.getProperties().put(USER_NAME_CREDENTIAL_KEY, DEFAULT_USERNAME);
Group adminGroup = (Group)
m_userAdmin.createRole(DEFAULT_ADMIN_GROUP, Role.GROUP);
adminGroup.addMember(adminUser);
m_logService.log(LogService.LOG_INFO, "No users
available in tenant '" + m_tenant.getId()
Modified:
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/course/service/service/CourseResource.java
==============================================================================
---
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/course/service/service/CourseResource.java
(original)
+++
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/course/service/service/CourseResource.java
Tue Apr 5 10:20:03 2011
@@ -33,7 +33,6 @@
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.amdatu.authorization.login.service.LoginService;
import org.amdatu.core.config.templates.ConfigTemplateManager;
import org.amdatu.example.course.service.Course;
import org.amdatu.example.course.service.CourseList;
@@ -46,6 +45,7 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.service.log.LogService;
+import org.osgi.service.useradmin.Role;
import org.osgi.service.useradmin.User;
import org.osgi.service.useradmin.UserAdmin;
@@ -124,11 +124,11 @@
Response.ok(courseList).cacheControl(m_cacheControl).build();
} else {
// Get the profile
- User user =
m_userAdmin.getUser(LoginService.USER_NAME_CREDENTIAL_KEY, viewer);
- if (user != null) {
+ Role userRole = m_userAdmin.getRole(viewer);
+ if (userRole != null && userRole.getType() == Role.USER) {
// Loop over all person services until we found a service
that knows this person (which
// means the person is available in that tenant).
- Person person = m_personService.getPerson(user);
+ Person person = m_personService.getPerson((User) userRole);
if (person != null) {
List<Course> courses =
m_courseService.getAvailableCourses(person);
courseList.setCourses(courses);
Modified:
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
Tue Apr 5 10:20:03 2011
@@ -51,7 +51,6 @@
import org.amdatu.authentication.tokenprovider.InvalidTokenException;
import org.amdatu.authentication.tokenprovider.TokenProvider;
import org.amdatu.authentication.tokenprovider.TokenProviderException;
-import org.amdatu.authorization.login.service.LoginService;
import org.amdatu.cassandra.persistencemanager.CassandraException;
import org.amdatu.core.tenant.Tenant;
import org.amdatu.libraries.utilities.ConversionUtil;
@@ -79,6 +78,7 @@
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.service.log.LogService;
+import org.osgi.service.useradmin.Role;
import org.osgi.service.useradmin.User;
import org.osgi.service.useradmin.UserAdmin;
@@ -295,8 +295,11 @@
User user = null;
String[] gadgetIds = null;
if (viewer != null && !"anonymous".equals(viewer)) {
- user =
m_userAdmin.getUser(LoginService.USER_NAME_CREDENTIAL_KEY, viewer);
-
+ Role userRole = m_userAdmin.getRole(viewer);
+ if (userRole.getType() != Role.USER) {
+ throw new JSONException("Role '" + viewer + "' is not of
type 'User'");
+ }
+ user = (User) userRole;
byte[] bytesValue = (byte[])
user.getProperties().get(OpenSocialConstants.APP_DATA);
if (bytesValue != null) {
Map<String, String> values = (Map<String, String>)
ConversionUtil.byteArrayToObject(bytesValue);
Modified:
trunk/amdatu-opensocial/profile/src/main/java/org/amdatu/opensocial/profile/service/PersonServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/profile/src/main/java/org/amdatu/opensocial/profile/service/PersonServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/profile/src/main/java/org/amdatu/opensocial/profile/service/PersonServiceImpl.java
Tue Apr 5 10:20:03 2011
@@ -28,7 +28,6 @@
import java.util.Set;
import java.util.concurrent.Future;
-import org.amdatu.authorization.login.service.LoginService;
import org.amdatu.opensocial.profile.PersonService;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.util.ImmediateFuture;
@@ -134,7 +133,12 @@
private User getUser(String personId) {
// Retrieved all persons that match the specified profile.
try {
- return
TenantHostnameDispatchExtenderFilter.getUserAdmin().getUser(LoginService.USER_NAME_CREDENTIAL_KEY,
personId);
+ Role userRole =
TenantHostnameDispatchExtenderFilter.getUserAdmin().getRole(personId);
+ if (userRole != null && userRole.getType() == Role.USER) {
+ return (User) userRole;
+ } else {
+ return null;
+ }
} catch (InvalidSyntaxException e) {
m_logService.log(LogService.LOG_ERROR, "Could not
retrieve user for person '" + personId + "'.", e);
return null;
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
