1 files changed, 9 insertions, 2 deletions
diff --git a/lib/chef_zero/rest_base.rb b/lib/chef_zero/rest_base.rb
index 72361ab..de81ae6 100644
--- a/lib/chef_zero/rest_base.rb
+++ b/lib/chef_zero/rest_base.rb
@@ -120,11 +120,18 @@ module ChefZero
     end
 
     def build_uri(base_uri, rest_path)
-      RestBase::build_uri(base_uri, rest_path)
+      if server.options[:single_org]
+        # Strip off /organizations/chef if we are in single org mode
+        if rest_path[0..1] != [ 'organizations', 'chef' ]
+          raise "Unexpected URL #{rest_path[0..1]} passed to build_uri in single org mode"
+        end
+        "#{base_uri}/#{rest_path[2..-1].join('/')}"
+      else
+        "#{base_uri}/#{rest_path.join('/')}"
+      end
     end
 
     def self.build_uri(base_uri, rest_path)
-      "#{base_uri}/#{rest_path.join('/')}"
     end
 
     def populate_defaults(request, response)