Merge branch 'dev' into dev-pg

mtwomey · mtwomey · commit 5ee37b3eea2c · 2020-06-29T16:44:23.000-05:00
diff --git a/src/main/java/com/appirio/tech/core/service/identity/resource/UserResource.java b/src/main/java/com/appirio/tech/core/service/identity/resource/UserResource.java
@@ -498,7 +498,7 @@ public ApiResponse createObject(
         }
 
         // Add business user role if needed
-        if (user.getRegSource().matches("tcBusiness")) {
+        if (user.getRegSource() != null && user.getRegSource().matches("tcBusiness")) {
             assignRoleByName("Business User", user);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,7 @@ public ApiResponse createObject(`
`498`	`498`	`}`
`499`	`499`
`500`	`500`	`// Add business user role if needed`
`501`		`- if (user.getRegSource().matches("tcBusiness")) {`
	`501`	`+ if (user.getRegSource() != null && user.getRegSource().matches("tcBusiness")) {`
`502`	`502`	`assignRoleByName("Business User", user);`
`503`	`503`	`}`
`504`	`504`