This commit is contained in:
parent
1003c32ffc
commit
93d7af4473
|
@ -362,7 +362,7 @@ public class Notifications {
|
||||||
GCubeUser jarvis = UserManagerWSBuilder.getInstance().getUserManager().getUserByEmail(LiferayJSONWsCredentials.getSingleton().getUser());
|
GCubeUser jarvis = UserManagerWSBuilder.getInstance().getUserManager().getUserByEmail(LiferayJSONWsCredentials.getSingleton().getUser());
|
||||||
SecurityTokenProvider.instance.set(LiferayJSONWsCredentials.getSingleton().getNotifierUserToken());
|
SecurityTokenProvider.instance.set(LiferayJSONWsCredentials.getSingleton().getNotifierUserToken());
|
||||||
username = jarvis.getUsername();
|
username = jarvis.getUsername();
|
||||||
fullName = "Catalogue" + "("+caller.getClient().getId()+")"; // the actual name of the IAM Client
|
fullName = caller.getClient().getId(); // the actual name of the IAM Client
|
||||||
senderUser = um.getUserByUsername(username);
|
senderUser = um.getUserByUsername(username);
|
||||||
user = new SocialNetworkingUser(senderUser.getUsername(), senderUser.getEmail(), fullName, senderUser.getUserAvatarURL());
|
user = new SocialNetworkingUser(senderUser.getUsername(), senderUser.getEmail(), fullName, senderUser.getUserAvatarURL());
|
||||||
}else{
|
}else{
|
||||||
|
|
|
@ -48,8 +48,8 @@ public class TokensUtils {
|
||||||
* @return a boolean value
|
* @return a boolean value
|
||||||
*/
|
*/
|
||||||
public static boolean isUserToken(Caller caller){
|
public static boolean isUserToken(Caller caller){
|
||||||
|
String username = caller.getClient().getId();
|
||||||
return caller.getClient().getType().equals(ClientType.USER);
|
return !username.startsWith("service-account-");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue