Skip to content

Commit

Permalink
Merge pull request #334 from JarvusInnovations/develop
Browse files Browse the repository at this point in the history
Release: v1.20.0
  • Loading branch information
themightychris authored Mar 18, 2022
2 parents ff95d5a + 95ce45b commit 809698c
Show file tree
Hide file tree
Showing 40 changed files with 1,007 additions and 275 deletions.
1 change: 1 addition & 0 deletions api-docs/_openapi.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
openapi: 3.0.1
9 changes: 0 additions & 9 deletions api-docs/_security.yml

This file was deleted.

1 change: 0 additions & 1 deletion api-docs/_swagger.yml

This file was deleted.

9 changes: 9 additions & 0 deletions api-docs/components/parameters/accept.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: Accept
in: header
description: Desired MIME type for response body
schema:
type: string
enum:
- text/html
- application/json
- text/csv
8 changes: 8 additions & 0 deletions api-docs/components/parameters/dir.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name: dir
in: query
description: Used with the `sort` parameter to set the direction to order
schema:
type: string
enum:
- ASC
- DESC
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: format
in: query
description: Desired file format for response body
type: string
enum:
- html
- json
- csv
schema:
type: string
enum:
- html
- json
- csv
6 changes: 6 additions & 0 deletions api-docs/components/parameters/identifier.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
name: identifier
in: path
description: Unique numeric `ID` or string `Handle` identifier for a record
required: true
schema:
type: string
11 changes: 11 additions & 0 deletions api-docs/components/parameters/include.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: include
in: query
description: Name(s) of related objects to embed in response. Pass `*` to include
all available related objects. Nested objects may be requested using dot notation,
e.g. `include=Creator.Modifier`
style: form
explode: false
schema:
type: array
items:
type: string
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
name: limit
in: query
type: integer
default: 48
description: Maximum number of records to return in each response. 0 to disable limiting
description: Maximum number of records to return in each response. 0 to disable
limiting
schema:
type: integer
default: 48
5 changes: 5 additions & 0 deletions api-docs/components/parameters/offset.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: offset
in: query
description: Number of records to skip for current page
schema:
type: integer
5 changes: 5 additions & 0 deletions api-docs/components/parameters/query.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: q
in: query
description: Keyword search query
schema:
type: string
12 changes: 12 additions & 0 deletions api-docs/components/parameters/relatedTable.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: relatedTable
in: query
description: Provide the names of one or more direct relationship of the requested records
and a consolidated array of all unique related records will be returned on the side. Each
array will be returned in a property matching the name of the relationship under the
top-level property `related`
style: form
explode: false
schema:
type: array
items:
type: string
6 changes: 6 additions & 0 deletions api-docs/components/parameters/sort.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
name: sort
in: query
description: The name of a `sorter` or field declared on the record model
to order results with
schema:
type: string
1 change: 1 addition & 0 deletions api-docs/components/schemas/Session.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
x-activeRecord: Session
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
type: object
properties:
success:
type: boolean
data:
$ref: '#/definitions/Session'
$ref: '#/components/schemas/Session'
returnURL:
type: string
description: URL that user should be sent to after login
4 changes: 4 additions & 0 deletions api-docs/components/securitySchemes/SessionToken.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
type: apiKey
description: Session token prefixed with Token, e.g. `Token XXXXXXXXXXXXXXXXXXXXXX`
name: Authorization
in: header
1 change: 0 additions & 1 deletion api-docs/consumes.yml

This file was deleted.

21 changes: 0 additions & 21 deletions api-docs/definitions/Session.yml

This file was deleted.

File renamed without changes.
8 changes: 0 additions & 8 deletions api-docs/parameters/accept.yml

This file was deleted.

7 changes: 0 additions & 7 deletions api-docs/parameters/include.yml

This file was deleted.

4 changes: 0 additions & 4 deletions api-docs/parameters/offset.yml

This file was deleted.

4 changes: 0 additions & 4 deletions api-docs/parameters/query.yml

This file was deleted.

8 changes: 8 additions & 0 deletions api-docs/paths/blog.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
x-recordsRequestHandler: Emergence\CMS\BlogRequestHandler
get:
parameters:
- name: AuthorID
in: query
description: The `ID` of a person the match blog post authors to
schema:
type: integer
1 change: 1 addition & 0 deletions api-docs/paths/comments.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
x-recordsRequestHandler: Emergence\Comments\CommentsRequestHandler
1 change: 1 addition & 0 deletions api-docs/paths/content-blocks.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
x-recordsRequestHandler: Emergence\CMS\ContentBlocksRequestHandler
14 changes: 14 additions & 0 deletions api-docs/paths/groups.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
x-recordsRequestHandler: Emergence\People\Groups\GroupsRequestHandler
get:
parameters:
- name: parentGroup
in: query
description: The ID of a parent group to filter groups to, or nothing to get all
top-level groups. To retrieve all groups regardless of hierarchy, pass `parentGroup=any`
schema:
oneOf:
- type: string
enum:
- any
- type: integer
default: null
58 changes: 58 additions & 0 deletions api-docs/paths/login.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
post:
tags:
- Session
summary: Create a new session
security: []
parameters:
- $ref: '#/components/parameters/include'
- $ref: '#/components/parameters/format'
- $ref: '#/components/parameters/accept'
requestBody:
required: true
content:
application/x-www-form-urlencoded:
schema:
type: object
required:
- _LOGIN[password]
- _LOGIN[username]
properties:
_LOGIN[username]:
type: string
_LOGIN[password]:
type: string
format: password
_LOGIN[returnMethod]:
type: string
description: Set to `POST` to return session in response to POST
request instead of redirecting to post-login URL
default: POST
enum:
- GET
- POST
responses:
200:
description: Login credentials accepted, session created
content:
application/json:
schema:
$ref: '#/components/schemas/SessionResponse'
401:
description: Username or password invalid
get:
tags:
- Session
summary: Get current Session
parameters:
- $ref: '#/components/parameters/include'
- $ref: '#/components/parameters/format'
- $ref: '#/components/parameters/accept'
responses:
200:
description: Session found
content:
application/json:
schema:
$ref: '#/components/schemas/SessionResponse'
401:
description: Sesson not provided, not valid, or expired
46 changes: 0 additions & 46 deletions api-docs/paths/login.yml

This file was deleted.

1 change: 1 addition & 0 deletions api-docs/paths/pages.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
x-recordsRequestHandler: Emergence\CMS\PagesRequestHandler
1 change: 1 addition & 0 deletions api-docs/paths/people.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
x-recordsRequestHandler: PeopleRequestHandler
8 changes: 8 additions & 0 deletions api-docs/paths/tags.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
x-recordsRequestHandler: TagsRequestHandler
get:
parameters:
- name: prefix
in: query
description: A handle prefix to match tags against, e.g. `tech` matches `tech.javascript`
schema:
type: string
1 change: 0 additions & 1 deletion api-docs/produces.yml

This file was deleted.

1 change: 1 addition & 0 deletions api-docs/security.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- SessionToken: []
Loading

0 comments on commit 809698c

Please sign in to comment.