yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #454 from outline/issue-448

Browse Source 
Request auth on first load with existing token
This commit is contained in:
Jori Lallo
2017-11-28 23:00:00 -08:00
committed by GitHub
parent 9f3e739952 a573c76512
commit 883e584da2
5 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/api/auth.js
View File

@@ -1,11 +1,24 @@
// @flow
import Router from 'koa-router';
import auth from './middlewares/authentication';
import { presentUser, presentTeam } from '../presenters';
import { User, Team } from '../models';
import * as Slack from '../slack';
const router = new Router();
router.post('auth.info', auth(), async ctx => {
const user = ctx.state.user;
const team = await Team.findOne({ where: { id: user.teamId } });
ctx.body = {
data: {
user: await presentUser(ctx, user),
team: await presentTeam(ctx, team),
},
};
});
router.post('auth.slack', async ctx => {
const { code } = ctx.body;
ctx.assertPresent(code, 'code is required');

27
server/pages/Api.js
View File

@@ -159,9 +159,18 @@ export default function Pricing() {
<h2>Methods</h2>
<Methods>
<Method method="auth.info" label="Get current auth">
<Description>
This method returns the user and team info for the user identified
by the token.
</Description>
<Arguments />
</Method>
<Method method="user.info" label="Get current user">
<Description>
This method returns the information for currently logged in user.
This method returns the profile info for the user identified by
the token.
</Description>
<Arguments>
<Argument id="id" description="Collection id" required />
@@ -254,7 +263,7 @@ export default function Pricing() {
<Arguments pagination>
<Argument
id="collection"
description="Collection id to filter by"
description="Collection ID to filter by"
/>
</Arguments>
</Method>
@@ -278,7 +287,7 @@ export default function Pricing() {
<Arguments>
<Argument
id="id"
description="Document id or URI identifier"
description="Document ID or URI identifier"
required
/>
</Arguments>
@@ -340,7 +349,7 @@ export default function Pricing() {
<Arguments>
<Argument
id="id"
description="Document id or URI identifier"
description="Document ID or URI identifier"
required
/>
<Argument id="title" description="Title for the document" />
@@ -361,7 +370,7 @@ export default function Pricing() {
<Arguments>
<Argument
id="id"
description="Document id or URI identifier"
description="Document ID or URI identifier"
required
/>
<Argument
@@ -379,7 +388,7 @@ export default function Pricing() {
<Arguments>
<Argument
id="id"
description="Document id or URI identifier"
description="Document ID or URI identifier"
required
/>
</Arguments>
@@ -393,7 +402,7 @@ export default function Pricing() {
<Arguments>
<Argument
id="id"
description="Document id or URI identifier"
description="Document ID or URI identifier"
required
/>
</Arguments>
@@ -406,7 +415,7 @@ export default function Pricing() {
<Arguments>
<Argument
id="id"
description="Document id or URI identifier"
description="Document ID or URI identifier"
required
/>
</Arguments>
@@ -419,7 +428,7 @@ export default function Pricing() {
<Arguments>
<Argument
id="id"
description="Document id or URI identifier"
description="Document ID or URI identifier"
required
/>
</Arguments>