chore: Migrate authentication to new tables (#1929)
This work provides a foundation for a more pluggable authentication system such as the one outlined in #1317. closes #1317
This commit is contained in:
151
server/commands/userCreator.js
Normal file
151
server/commands/userCreator.js
Normal file
@ -0,0 +1,151 @@
|
||||
// @flow
|
||||
import Sequelize from "sequelize";
|
||||
import { Event, User, UserAuthentication } from "../models";
|
||||
import { sequelize } from "../sequelize";
|
||||
|
||||
const Op = Sequelize.Op;
|
||||
|
||||
type UserCreatorResult = {|
|
||||
user: User,
|
||||
isNewUser: boolean,
|
||||
authentication: UserAuthentication,
|
||||
|};
|
||||
|
||||
export default async function userCreator({
|
||||
name,
|
||||
email,
|
||||
isAdmin,
|
||||
avatarUrl,
|
||||
teamId,
|
||||
authentication,
|
||||
ip,
|
||||
}: {|
|
||||
name: string,
|
||||
email: string,
|
||||
isAdmin?: boolean,
|
||||
avatarUrl?: string,
|
||||
teamId: string,
|
||||
ip: string,
|
||||
authentication: {|
|
||||
authenticationProviderId: string,
|
||||
providerId: string,
|
||||
scopes: string[],
|
||||
accessToken?: string,
|
||||
refreshToken?: string,
|
||||
|},
|
||||
|}): Promise<UserCreatorResult> {
|
||||
const { authenticationProviderId, providerId, ...rest } = authentication;
|
||||
const auth = await UserAuthentication.findOne({
|
||||
where: {
|
||||
authenticationProviderId,
|
||||
providerId,
|
||||
},
|
||||
include: [
|
||||
{
|
||||
model: User,
|
||||
as: "user",
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
// Someone has signed in with this authentication before, we just
|
||||
// want to update the details instead of creating a new record
|
||||
if (auth) {
|
||||
const { user } = auth;
|
||||
|
||||
await user.update({ email });
|
||||
await auth.update(rest);
|
||||
|
||||
return { user, authentication: auth, isNewUser: false };
|
||||
}
|
||||
|
||||
// A `user` record might exist in the form of an invite even if there is no
|
||||
// existing authentication record that matches. In Outline an invite is a
|
||||
// shell user record.
|
||||
const invite = await User.findOne({
|
||||
where: {
|
||||
email,
|
||||
teamId,
|
||||
lastActiveAt: {
|
||||
[Op.eq]: null,
|
||||
},
|
||||
},
|
||||
include: [
|
||||
{
|
||||
model: UserAuthentication,
|
||||
as: "authentications",
|
||||
required: false,
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
// We have an existing invite for his user, so we need to update it with our
|
||||
// new details and link up the authentication method
|
||||
if (invite && !invite.authentications.length) {
|
||||
let transaction = await sequelize.transaction();
|
||||
let auth;
|
||||
try {
|
||||
await invite.update(
|
||||
{
|
||||
name,
|
||||
avatarUrl,
|
||||
},
|
||||
{ transaction }
|
||||
);
|
||||
auth = await invite.createAuthentication(authentication, {
|
||||
transaction,
|
||||
});
|
||||
await transaction.commit();
|
||||
} catch (err) {
|
||||
await transaction.rollback();
|
||||
throw err;
|
||||
}
|
||||
|
||||
return { user: invite, authentication: auth, isNewUser: false };
|
||||
}
|
||||
|
||||
// No auth, no user – this is an entirely new sign in.
|
||||
let transaction = await sequelize.transaction();
|
||||
|
||||
try {
|
||||
const user = await User.create(
|
||||
{
|
||||
name,
|
||||
email,
|
||||
isAdmin,
|
||||
teamId,
|
||||
avatarUrl,
|
||||
service: null,
|
||||
authentications: [authentication],
|
||||
},
|
||||
{
|
||||
include: "authentications",
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
await Event.create(
|
||||
{
|
||||
name: "users.create",
|
||||
actorId: user.id,
|
||||
userId: user.id,
|
||||
teamId: user.teamId,
|
||||
data: {
|
||||
name: user.name,
|
||||
},
|
||||
ip,
|
||||
},
|
||||
{
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
await transaction.commit();
|
||||
return {
|
||||
user,
|
||||
authentication: user.authentications[0],
|
||||
isNewUser: true,
|
||||
};
|
||||
} catch (err) {
|
||||
await transaction.rollback();
|
||||
throw err;
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user