Merge pull request #21 from TheJumpCloud/ts-updates-2018-10-11

API v1 and v2 updates 2018-10-11

v1/README.md

@@ -84,8 +84,8 @@ Class | Method | HTTP request | Description
  - [Commandresultslist](docs/Commandresultslist.md)
  - [Commandslist](docs/Commandslist.md)
  - [CommandslistResults](docs/CommandslistResults.md)
+ - [Errorresponse](docs/Errorresponse.md)
  - [Fde](docs/Fde.md)
- - [InlineResponse400](docs/InlineResponse400.md)
  - [Organizationslist](docs/Organizationslist.md)
  - [OrganizationslistResults](docs/OrganizationslistResults.md)
  - [Radiusserver](docs/Radiusserver.md)

v1/api/swagger.yaml

@@ -993,12 +993,6 @@ paths:
         type: "integer"
         default: 10
         x-exportParamName: "Limit"
-      - name: "x-org-id"
-        in: "header"
-        description: ""
-        required: false
-        type: "string"
-        x-exportParamName: "XOrgId"
       - name: "Content-Type"
         in: "header"
         required: true
@@ -2128,7 +2122,23 @@ paths:
         400:
           description: ""
           schema:
-            $ref: "#/definitions/inline_response_400"
+            $ref: "#/definitions/errorresponse"
+        401:
+          description: ""
+          schema:
+            $ref: "#/definitions/errorresponse"
+        403:
+          description: ""
+          schema:
+            $ref: "#/definitions/errorresponse"
+        404:
+          description: ""
+          schema:
+            $ref: "#/definitions/errorresponse"
+        500:
+          description: ""
+          schema:
+            $ref: "#/definitions/errorresponse"
       security:
       - x-api-key: []
       x-stoplight:
@@ -2183,6 +2193,8 @@ paths:
             type: "object"
             description: "Bad Request"
             properties: {}
+      security:
+      - x-api-key: []
       x-stoplight:
         id: "sshkey_list"
         beforeScript: null
@@ -2240,6 +2252,8 @@ paths:
             type: "object"
             description: "Bad Request"
             properties: {}
+      security:
+      - x-api-key: []
       x-stoplight:
         id: "sshkey_post"
         beforeScript: null
@@ -2289,6 +2303,8 @@ paths:
             type: "object"
             description: "Bad Request"
             properties: {}
+      security:
+      - x-api-key: []
       x-stoplight:
         id: "sshkey_delete"
         beforeScript: null
@@ -2606,6 +2622,16 @@ definitions:
       id: "sshkeylist"
       name: "SSHKeyList"
       public: true
+  errorresponse:
+    type: "object"
+    properties:
+      message:
+        type: "string"
+    title: "ErrorResponse"
+    x-stoplight:
+      id: "errorresponse"
+      name: "ErrorResponse"
+      public: true
   systemuser:
     type: "object"
     properties:
@@ -4573,10 +4599,6 @@ definitions:
       networkSourceIp: "0.0.0.0"
       tagsNames:
       - "tag1"
-  inline_response_400:
-    properties:
-      message:
-        type: "string"
   systemuser_attributes:
     properties:
       ?
@@ -5101,6 +5123,27 @@ parameters:
     required: false
     type: "string"
     x-exportParamName: "Search"
+responses:
+  trait:standardErrors:400:
+    description: ""
+    schema:
+      $ref: "#/definitions/errorresponse"
+  trait:standardErrors:401:
+    description: ""
+    schema:
+      $ref: "#/definitions/errorresponse"
+  trait:standardErrors:403:
+    description: ""
+    schema:
+      $ref: "#/definitions/errorresponse"
+  trait:standardErrors:404:
+    description: ""
+    schema:
+      $ref: "#/definitions/errorresponse"
+  trait:standardErrors:500:
+    description: ""
+    schema:
+      $ref: "#/definitions/errorresponse"
 x-stoplight:
   beforeScript: ""
   afterScript: ""

v1/docs/InlineResponse400.md → v1/docs/Errorresponse.md

@@ -1,4 +1,4 @@
-# InlineResponse400
+# Errorresponse
 
 ## Properties
 Name | Type | Description | Notes

v1/docs/SearchApi.md

@@ -34,7 +34,6 @@ Name | Type | Description  | Notes
  **body** | [**Search**](Search.md)|  | 
  **fields** | **string**| Use a space seperated string of field parameters to include the data in the response. If omitted the default list of fields will be returned.  | [default to ]
  **limit** | **int32**| The number of records to return at once. Limited to 100. | [default to 10]
- **xOrgId** | **string**|  | [default to ]
  **skip** | **int32**| The offset into the records to return. | [default to 0]
 
 ### Return type

v1/docs/SystemusersApi.md

@@ -49,7 +49,7 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-No authorization required
+[x-api-key](../README.md#x-api-key)
 
 ### HTTP request headers
 
@@ -90,7 +90,7 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-No authorization required
+[x-api-key](../README.md#x-api-key)
 
 ### HTTP request headers
 
@@ -132,7 +132,7 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-No authorization required
+[x-api-key](../README.md#x-api-key)
 
 ### HTTP request headers
 

v1/inline_response_400.go → v1/errorresponse.go

@@ -9,7 +9,7 @@
 
 package v1
 
-type InlineResponse400 struct {
+type Errorresponse struct {
 
 	Message string `json:"message,omitempty"`
 }

v1/search_api.go

@@ -35,7 +35,6 @@ type SearchApiService service
      @param "body" (Search) 
      @param "fields" (string) Use a space seperated string of field parameters to include the data in the response. If omitted the default list of fields will be returned. 
      @param "limit" (int32) The number of records to return at once. Limited to 100.
-     @param "xOrgId" (string) 
      @param "skip" (int32) The offset into the records to return.
  @return Organizationslist*/
 func (a *SearchApiService) SearchOrganizationsPost(ctx context.Context, contentType string, accept string, localVarOptionals map[string]interface{}) (Organizationslist,  *http.Response, error) {
@@ -60,9 +59,6 @@ func (a *SearchApiService) SearchOrganizationsPost(ctx context.Context, contentT
 	if err := typeCheckParameter(localVarOptionals["limit"], "int32", "limit"); err != nil {
 		return successPayload, nil, err
 	}
-	if err := typeCheckParameter(localVarOptionals["xOrgId"], "string", "xOrgId"); err != nil {
-		return successPayload, nil, err
-	}
 	if err := typeCheckParameter(localVarOptionals["skip"], "int32", "skip"); err != nil {
 		return successPayload, nil, err
 	}
@@ -95,9 +91,6 @@ func (a *SearchApiService) SearchOrganizationsPost(ctx context.Context, contentT
 	if localVarHttpHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHttpHeaderAccept
 	}
-	if localVarTempParam, localVarOk := localVarOptionals["xOrgId"].(string); localVarOk {
-		localVarHeaderParams["x-org-id"] = parameterToString(localVarTempParam, "")
-	}
 	localVarHeaderParams["Content-Type"] = parameterToString(contentType, "")
 	localVarHeaderParams["Accept"] = parameterToString(accept, "")
 	// body params

v1/systemusers_api.go

@@ -80,6 +80,18 @@ func (a *SystemusersApiService) SshkeyDelete(ctx context.Context, id string, con
 	if localVarTempParam, localVarOk := localVarOptionals["xOrgId"].(string); localVarOk {
 		localVarHeaderParams["x-org-id"] = parameterToString(localVarTempParam, "")
 	}
+	if ctx != nil {
+		// API Key Authentication
+		if auth, ok := ctx.Value(ContextAPIKey).(APIKey); ok {
+			var key string
+			if auth.Prefix != "" {
+				key = auth.Prefix + " " + auth.Key
+			} else {
+				key = auth.Key
+			}
+			localVarHeaderParams["x-api-key"] = key
+		}
+	}
 	r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
@@ -152,6 +164,18 @@ func (a *SystemusersApiService) SshkeyList(ctx context.Context, id string, conte
 	if localVarTempParam, localVarOk := localVarOptionals["xOrgId"].(string); localVarOk {
 		localVarHeaderParams["x-org-id"] = parameterToString(localVarTempParam, "")
 	}
+	if ctx != nil {
+		// API Key Authentication
+		if auth, ok := ctx.Value(ContextAPIKey).(APIKey); ok {
+			var key string
+			if auth.Prefix != "" {
+				key = auth.Prefix + " " + auth.Key
+			} else {
+				key = auth.Key
+			}
+			localVarHeaderParams["x-api-key"] = key
+		}
+	}
 	r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return successPayload, nil, err
@@ -234,6 +258,18 @@ func (a *SystemusersApiService) SshkeyPost(ctx context.Context, id string, conte
 	if localVarTempParam, localVarOk := localVarOptionals["body"].(Sshkeypost); localVarOk {
 		localVarPostBody = &localVarTempParam
 	}
+	if ctx != nil {
+		// API Key Authentication
+		if auth, ok := ctx.Value(ContextAPIKey).(APIKey); ok {
+			var key string
+			if auth.Prefix != "" {
+				key = auth.Prefix + " " + auth.Key
+			} else {
+				key = auth.Key
+			}
+			localVarHeaderParams["x-api-key"] = key
+		}
+	}
 	r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return successPayload, nil, err

v2/README.md

@@ -264,16 +264,14 @@ Class | Method | HTTP request | Description
  - [BulkUserCreate](docs/BulkUserCreate.md)
  - [Directory](docs/Directory.md)
  - [Emailrequest](docs/Emailrequest.md)
+ - [Errorresponse](docs/Errorresponse.md)
  - [GraphConnection](docs/GraphConnection.md)
  - [GraphManagementReq](docs/GraphManagementReq.md)
  - [GraphObject](docs/GraphObject.md)
  - [GraphObjectWithPaths](docs/GraphObjectWithPaths.md)
  - [GraphType](docs/GraphType.md)
  - [Group](docs/Group.md)
  - [GroupType](docs/GroupType.md)
- - [InlineResponse200](docs/InlineResponse200.md)
- - [InlineResponse204](docs/InlineResponse204.md)
- - [InlineResponse400](docs/InlineResponse400.md)
  - [JobDetails](docs/JobDetails.md)
  - [JobId](docs/JobId.md)
  - [JobWorkresult](docs/JobWorkresult.md)
@@ -300,6 +298,7 @@ Class | Method | HTTP request | Description
  - [SystemGroupData](docs/SystemGroupData.md)
  - [SystemGroupGraphManagementReq](docs/SystemGroupGraphManagementReq.md)
  - [SystemGroupMembersReq](docs/SystemGroupMembersReq.md)
+ - [Systemfdekey](docs/Systemfdekey.md)
  - [Systemuser](docs/Systemuser.md)
  - [SystemuserAttributes](docs/SystemuserAttributes.md)
  - [Systemuserputpost](docs/Systemuserputpost.md)