Merge pull request #686 from swagger-api/issue-681

added fix for #681

Author: fehguy

browser/swagger-client.js

@@ -143,7 +143,29 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
               this.resolveInline(root, spec, response, resolutionTable, unresolvedRefs, location);
             }
             if (response.schema) {
-              this.resolveTo(root, response.schema, resolutionTable, location);
+              var responseObj = response;
+              if(_.isArray(responseObj.schema.allOf)) {
+                // move to a definition
+                var modelName = 'inline_model';
+                var name = modelName;
+                var done = false; var counter = 0;
+                while(!done) {
+                  if(typeof spec.definitions[name] === 'undefined') {
+                    done = true;
+                    break;
+                  }
+                  name = modelName + '_' + counter;
+                  counter ++;
+                }
+                spec.definitions[name] = { allOf: responseObj.schema.allOf };
+                delete responseObj.schema.allOf;
+                delete responseObj.schema.type;
+                responseObj.schema.$ref = '#/definitions/' + name;
+                this.processAllOf(root, name, spec.definitions[name], resolutionTable, unresolvedRefs, spec);
+              }
+              else {
+                this.resolveTo(root, response.schema, resolutionTable, location);
+              }
             }
           }
         }