From 3b869e215eb19cb0ff5644e53a0a5b226422d543 Mon Sep 17 00:00:00 2001
From: Michael Hirsch <michael.hirsch@bosch-si.com>
Date: Mon, 31 Oct 2016 15:44:30 +0100
Subject: [PATCH] fix current tenant when not an UserPrincipal

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
---
 .../eclipse/hawkbit/security/SecurityContextTenantAware.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextTenantAware.java b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextTenantAware.java
index e79aafcee..8e0d21f8f 100644
--- a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextTenantAware.java
+++ b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextTenantAware.java
@@ -40,6 +40,8 @@ public class SecurityContextTenantAware implements TenantAware {
             final Object principal = context.getAuthentication().getPrincipal();
             if (principal instanceof UserPrincipal) {
                 return ((UserPrincipal) principal).getTenant();
+            } else if (context.getAuthentication().getDetails() instanceof TenantAwareAuthenticationDetails) {
+                return ((TenantAwareAuthenticationDetails) context.getAuthentication().getDetails()).getTenant();
             }
         }
         return null;