* Add defaultUserRole on server * Handle defaultUserRole on frontend * Handle tests * Handle user role in userCreator * Minor improvments * Fix prettier issue * Undefined when isNewTeam is false * Update app/scenes/Settings/Security.js Co-authored-by: Tom Moor <tom.moor@gmail.com> * Update app/scenes/Settings/Security.js Co-authored-by: Tom Moor <tom.moor@gmail.com> * Update app/scenes/Settings/Security.js Co-authored-by: Tom Moor <tom.moor@gmail.com> * Remove duplicate validation * Update Team.js * fix: Move note out of restricted width wrapper * Move language setting to use 'note' prop * Remove admin option Co-authored-by: Tom Moor <tom.moor@gmail.com>
230 lines
6.9 KiB
JavaScript
230 lines
6.9 KiB
JavaScript
// @flow
|
|
import { buildUser, buildTeam, buildInvite } from "../test/factories";
|
|
import { flushdb } from "../test/support";
|
|
import userCreator from "./userCreator";
|
|
|
|
beforeEach(() => flushdb());
|
|
|
|
describe("userCreator", () => {
|
|
const ip = "127.0.0.1";
|
|
|
|
it("should update exising user and authentication", async () => {
|
|
const existing = await buildUser();
|
|
const authentications = await existing.getAuthentications();
|
|
const existingAuth = authentications[0];
|
|
const newEmail = "test@example.com";
|
|
const newUsername = "tname";
|
|
|
|
const result = await userCreator({
|
|
name: existing.name,
|
|
email: newEmail,
|
|
username: newUsername,
|
|
avatarUrl: existing.avatarUrl,
|
|
teamId: existing.teamId,
|
|
ip,
|
|
authentication: {
|
|
authenticationProviderId: existingAuth.authenticationProviderId,
|
|
providerId: existingAuth.providerId,
|
|
accessToken: "123",
|
|
scopes: ["read"],
|
|
},
|
|
});
|
|
|
|
const { user, authentication, isNewUser } = result;
|
|
|
|
expect(authentication.accessToken).toEqual("123");
|
|
expect(authentication.scopes.length).toEqual(1);
|
|
expect(authentication.scopes[0]).toEqual("read");
|
|
expect(user.email).toEqual(newEmail);
|
|
expect(user.username).toEqual(newUsername);
|
|
expect(isNewUser).toEqual(false);
|
|
});
|
|
|
|
it("should create user with deleted user matching providerId", async () => {
|
|
const existing = await buildUser();
|
|
const authentications = await existing.getAuthentications();
|
|
const existingAuth = authentications[0];
|
|
const newEmail = "test@example.com";
|
|
|
|
await existing.destroy();
|
|
|
|
const result = await userCreator({
|
|
name: "Test Name",
|
|
email: "test@example.com",
|
|
teamId: existing.teamId,
|
|
ip,
|
|
authentication: {
|
|
authenticationProviderId: existingAuth.authenticationProviderId,
|
|
providerId: existingAuth.providerId,
|
|
accessToken: "123",
|
|
scopes: ["read"],
|
|
},
|
|
});
|
|
|
|
const { user, authentication, isNewUser } = result;
|
|
|
|
expect(authentication.accessToken).toEqual("123");
|
|
expect(authentication.scopes.length).toEqual(1);
|
|
expect(authentication.scopes[0]).toEqual("read");
|
|
expect(user.email).toEqual(newEmail);
|
|
expect(isNewUser).toEqual(true);
|
|
});
|
|
|
|
it("should handle duplicate providerId for different iDP", async () => {
|
|
const existing = await buildUser();
|
|
const authentications = await existing.getAuthentications();
|
|
const existingAuth = authentications[0];
|
|
let error;
|
|
|
|
try {
|
|
await userCreator({
|
|
name: "Test Name",
|
|
email: "test@example.com",
|
|
teamId: existing.teamId,
|
|
ip,
|
|
authentication: {
|
|
authenticationProviderId: "example.org",
|
|
providerId: existingAuth.providerId,
|
|
accessToken: "123",
|
|
scopes: ["read"],
|
|
},
|
|
});
|
|
} catch (err) {
|
|
error = err;
|
|
}
|
|
|
|
expect(error && error.toString()).toContain("already exists for");
|
|
});
|
|
|
|
it("should create a new user", async () => {
|
|
const team = await buildTeam();
|
|
const authenticationProviders = await team.getAuthenticationProviders();
|
|
const authenticationProvider = authenticationProviders[0];
|
|
|
|
const result = await userCreator({
|
|
name: "Test Name",
|
|
email: "test@example.com",
|
|
username: "tname",
|
|
teamId: team.id,
|
|
ip,
|
|
authentication: {
|
|
authenticationProviderId: authenticationProvider.id,
|
|
providerId: "fake-service-id",
|
|
accessToken: "123",
|
|
scopes: ["read"],
|
|
},
|
|
});
|
|
|
|
const { user, authentication, isNewUser } = result;
|
|
|
|
expect(authentication.accessToken).toEqual("123");
|
|
expect(authentication.scopes.length).toEqual(1);
|
|
expect(authentication.scopes[0]).toEqual("read");
|
|
expect(user.email).toEqual("test@example.com");
|
|
expect(user.username).toEqual("tname");
|
|
expect(user.isAdmin).toEqual(false);
|
|
expect(user.isViewer).toEqual(false);
|
|
expect(isNewUser).toEqual(true);
|
|
});
|
|
|
|
it("should prefer isAdmin argument over defaultUserRole", async () => {
|
|
const team = await buildTeam({ defaultUserRole: "viewer" });
|
|
const authenticationProviders = await team.getAuthenticationProviders();
|
|
const authenticationProvider = authenticationProviders[0];
|
|
|
|
const result = await userCreator({
|
|
name: "Test Name",
|
|
email: "test@example.com",
|
|
username: "tname",
|
|
teamId: team.id,
|
|
isAdmin: true,
|
|
ip,
|
|
authentication: {
|
|
authenticationProviderId: authenticationProvider.id,
|
|
providerId: "fake-service-id",
|
|
accessToken: "123",
|
|
scopes: ["read"],
|
|
},
|
|
});
|
|
|
|
const { user } = result;
|
|
|
|
expect(user.isAdmin).toEqual(true);
|
|
});
|
|
|
|
it("should prefer defaultUserRole when isAdmin is undefined or false", async () => {
|
|
const team = await buildTeam({ defaultUserRole: "viewer" });
|
|
const authenticationProviders = await team.getAuthenticationProviders();
|
|
const authenticationProvider = authenticationProviders[0];
|
|
|
|
const result = await userCreator({
|
|
name: "Test Name",
|
|
email: "test@example.com",
|
|
username: "tname",
|
|
teamId: team.id,
|
|
ip,
|
|
authentication: {
|
|
authenticationProviderId: authenticationProvider.id,
|
|
providerId: "fake-service-id",
|
|
accessToken: "123",
|
|
scopes: ["read"],
|
|
},
|
|
});
|
|
|
|
const { user: tname } = result;
|
|
|
|
expect(tname.username).toEqual("tname");
|
|
expect(tname.isAdmin).toEqual(false);
|
|
expect(tname.isViewer).toEqual(true);
|
|
|
|
const tname2Result = await userCreator({
|
|
name: "Test2 Name",
|
|
email: "tes2@example.com",
|
|
username: "tname2",
|
|
teamId: team.id,
|
|
isAdmin: false,
|
|
ip,
|
|
authentication: {
|
|
authenticationProviderId: authenticationProvider.id,
|
|
providerId: "fake-service-id",
|
|
accessToken: "123",
|
|
scopes: ["read"],
|
|
},
|
|
});
|
|
|
|
const { user: tname2 } = tname2Result;
|
|
|
|
expect(tname2.username).toEqual("tname2");
|
|
expect(tname2.isAdmin).toEqual(false);
|
|
expect(tname2.isViewer).toEqual(true);
|
|
});
|
|
|
|
it("should create a user from an invited user", async () => {
|
|
const team = await buildTeam();
|
|
const invite = await buildInvite({ teamId: team.id });
|
|
const authenticationProviders = await team.getAuthenticationProviders();
|
|
const authenticationProvider = authenticationProviders[0];
|
|
|
|
const result = await userCreator({
|
|
name: invite.name,
|
|
email: invite.email,
|
|
teamId: invite.teamId,
|
|
ip,
|
|
authentication: {
|
|
authenticationProviderId: authenticationProvider.id,
|
|
providerId: "fake-service-id",
|
|
accessToken: "123",
|
|
scopes: ["read"],
|
|
},
|
|
});
|
|
|
|
const { user, authentication, isNewUser } = result;
|
|
|
|
expect(authentication.accessToken).toEqual("123");
|
|
expect(authentication.scopes.length).toEqual(1);
|
|
expect(authentication.scopes[0]).toEqual("read");
|
|
expect(user.email).toEqual(invite.email);
|
|
expect(isNewUser).toEqual(true);
|
|
});
|
|
});
|