Upstream sync

server/authorization/organization.go

@@ -20,6 +20,14 @@ func isSameOrganization(organizationA viewmodel.Organization, organizationB view
 }
 
 func grabOrgFromUser(user viewmodel.User) (viewmodel.Organization, error) {
+	if len(user.Profiles) < 1 {
+		return viewmodel.Organization{}, fmt.Errorf("User has no organizations %v", user)
+	}
+
+	return user.Profiles[0].Organization, nil
+}
+
+func grabOrgFromUserDirectly(user viewmodel.User) (viewmodel.Organization, error) {
 	if len(user.Organizations) < 1 {
 		return viewmodel.Organization{}, fmt.Errorf("User has no organizations %v", user)
 	}