Merge branch 'develop' into feature/api-updates

This commit is contained in:
Connor Turland 2016-10-12 17:52:50 +00:00
commit f31d95d374
3 changed files with 3 additions and 2 deletions

BIN
.env.swp Normal file

Binary file not shown.

View file

@ -1,7 +1,7 @@
#%RAML 1.0
---
title: Metamaps
version: v2.0
version: 2.0
baseUri: https://metamaps.cc/api/v2
mediaType: application/json
protocols: [ HTTPS ]

View file

@ -1 +1,2 @@
There are three ways to log in: cookie-based authentication, token-based authentication, or OAuth 2. Check the security tab of any of the endpoints above for instructions on logging in.
There are three ways to log in: cookie-based authentication, token-based authentication, or OAuth 2. If you're testing the API or making simple scripts, cookie-based or token-based is the best. If you're developing and app and want users to be able to log into Metamaps inside your app, you'll be able to use the OAuth 2 mechanism. Check the security tab of any of the endpoints above for instructions on logging in.