From 8e1a0617141ab0e48d155f947095c66f829d412e Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Fri, 17 Feb 2023 11:53:36 +0500
Subject: [PATCH 1/2] Add check to fail gracefully when no locations assigned

---
 .../web/controller/UserController.java        | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/opensrp/web/controller/UserController.java b/src/main/java/org/opensrp/web/controller/UserController.java
index d16852eec..b95af4890 100644
--- a/src/main/java/org/opensrp/web/controller/UserController.java
+++ b/src/main/java/org/opensrp/web/controller/UserController.java
@@ -200,13 +200,18 @@ public ResponseEntity<String> authenticate(Authentication authentication) throws
 		try {
 			String userId = u.getBaseEntityId();
 			practionerOrganizationIds = practitionerService.getOrganizationsByUserId(userId);
-			
-			for (AssignedLocations assignedLocation : organizationService
-			        .findAssignedLocationsAndPlans(practionerOrganizationIds.right)) {
-				if (StringUtils.isNotBlank(assignedLocation.getJurisdictionId()))
-					locationIds.add(assignedLocation.getJurisdictionId());
-				if (StringUtils.isNotBlank(assignedLocation.getPlanId()))
-					planIdentifiers.add(assignedLocation.getPlanId());
+
+			if (practionerOrganizationIds != null && practionerOrganizationIds.right.size() > 0) {
+				for (AssignedLocations assignedLocation : organizationService
+						.findAssignedLocationsAndPlans(practionerOrganizationIds.right)) {
+					if (StringUtils.isNotBlank(assignedLocation.getJurisdictionId()))
+						locationIds.add(assignedLocation.getJurisdictionId());
+					if (StringUtils.isNotBlank(assignedLocation.getPlanId()))
+						planIdentifiers.add(assignedLocation.getPlanId());
+				}
+			} else {
+				throw new MissingTeamAssignmentException(
+						"User not mapped on any location. Make sure that user is assigned to an organization with valid Location(s) ");
 			}
 			
 			jurisdictions.addAll(locationService.findLocationByIdsWithChildren(false, locationIds, Integer.MAX_VALUE));

From 28c15c102d04bdb7da38b0605120e3b0ab938839 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Fri, 17 Feb 2023 12:17:07 +0500
Subject: [PATCH 2/2] Bump web and core versions

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4a8425ad7..c33f69e51 100755
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <artifactId>opensrp-server-web</artifactId>
     <packaging>war</packaging>
-    <version>2.10.10-SNAPSHOT</version>
+    <version>2.10.11-SNAPSHOT</version>
     <name>opensrp-server-web</name>
     <description>OpenSRP Server Web Application</description>
     <url>https://github.com/OpenSRP/opensrp-server-web</url>
@@ -24,7 +24,7 @@
         <redis.jedis.version>3.8.0</redis.jedis.version>
         <opensrp.updatePolicy>always</opensrp.updatePolicy>
         <nexus-staging-maven-plugin.version>1.5.1</nexus-staging-maven-plugin.version>
-        <opensrp.core.version>2.14.5-SNAPSHOT</opensrp.core.version>
+        <opensrp.core.version>2.14.7-ALPHA1-SNAPSHOT</opensrp.core.version>
         <opensrp.connector.version>2.4.1-SNAPSHOT</opensrp.connector.version>
         <opensrp.interface.version>2.0.1-SNAPSHOT</opensrp.interface.version>
         <powermock.version>2.0.5</powermock.version>