coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Customize route for first signin for tracking

Browse Source
This commit is contained in:
Tom Moor
2018-12-08 08:57:34 -08:00
parent d3911b9e20
commit b068ba9f02
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/auth/google.js
View File

@ -77,7 +77,7 @@ router.get('google.callback', auth({ required: false }), async ctx => {
}, },
}); });
const [user] = await User.findOrCreate({ const [user, isFirstSignin] = await User.findOrCreate({
where: { where: {
service: 'google', service: 'google',
serviceId: profile.data.id, serviceId: profile.data.id,
@ -97,7 +97,7 @@ router.get('google.callback', auth({ required: false }), async ctx => {
} }
// set cookies on response and redirect to team subdomain // set cookies on response and redirect to team subdomain
ctx.signIn(user, team, 'google'); ctx.signIn(user, team, 'google', isFirstSignin);
}); });
export default router; export default router;

4
server/auth/slack.js
View File

@ -46,7 +46,7 @@ router.get('slack.callback', auth({ required: false }), async ctx => {
}, },
}); });
const [user] = await User.findOrCreate({ const [user, isFirstSignin] = await User.findOrCreate({
where: { where: {
service: 'slack', service: 'slack',
serviceId: data.user.id, serviceId: data.user.id,
@ -66,7 +66,7 @@ router.get('slack.callback', auth({ required: false }), async ctx => {
} }
// set cookies on response and redirect to team subdomain // set cookies on response and redirect to team subdomain
ctx.signIn(user, team, 'slack'); ctx.signIn(user, team, 'slack', isFirstSignin);
}); });
router.get('slack.commands', auth(), async ctx => { router.get('slack.commands', auth(), async ctx => {

4
server/middlewares/authentication.js
View File

@ -93,7 +93,7 @@ export default function auth(options?: { required?: boolean } = {}) {
ctx.cache[user.id] = user; ctx.cache[user.id] = user;
} }
ctx.signIn = (user, team, service) => { ctx.signIn = (user, team, service, isFirstSignin = false) => {
// update the database when the user last signed in // update the database when the user last signed in
user.updateSignedIn(ctx.request.ip); user.updateSignedIn(ctx.request.ip);
@ -138,7 +138,7 @@ export default function auth(options?: { required?: boolean } = {}) {
httpOnly: false, httpOnly: false,
expires, expires,
}); });
ctx.redirect(`${team.url}/dashboard`); ctx.redirect(`${team.url}/dashboard${isFirstSignin ? '?welcome' : ''}`);
} }
}; };