feat: map preferred_username claim to user record (#2569)

server/commands/accountProvisioner.js

@@ -17,6 +17,7 @@ type Props = {|
     name: string,
     email: string,
     avatarUrl?: string,
+    username?: string,
   |},
   team: {|
     name: string,
@@ -74,6 +75,7 @@ export default async function accountProvisioner({
     const result = await userCreator({
       name: userParams.name,
       email: userParams.email,
+      username: userParams.username,
       isAdmin: isNewTeam,
       avatarUrl: userParams.avatarUrl,
       teamId: team.id,

server/commands/accountProvisioner.test.js

@@ -32,6 +32,7 @@ describe("accountProvisioner", () => {
         name: "Jenny Tester",
         email: "jenny@example.com",
         avatarUrl: "https://example.com/avatar.png",
+        username: "jtester",
       },
       team: {
         name: "New team",
@@ -57,6 +58,7 @@ describe("accountProvisioner", () => {
     expect(auth.scopes[0]).toEqual("read");
     expect(team.name).toEqual("New team");
     expect(user.email).toEqual("jenny@example.com");
+    expect(user.username).toEqual("jtester");
     expect(isNewUser).toEqual(true);
     expect(isNewTeam).toEqual(true);
     expect(mailer.sendTemplate).toHaveBeenCalled();
@@ -73,6 +75,7 @@ describe("accountProvisioner", () => {
     const authentications = await existing.getAuthentications();
     const authentication = authentications[0];
     const newEmail = "test@example.com";
+    const newUsername = "tname";
 
     const { user, isNewUser, isNewTeam } = await accountProvisioner({
       ip,
@@ -80,6 +83,7 @@ describe("accountProvisioner", () => {
         name: existing.name,
         email: newEmail,
         avatarUrl: existing.avatarUrl,
+        username: newUsername,
       },
       team: {
         name: existingTeam.name,
@@ -102,6 +106,7 @@ describe("accountProvisioner", () => {
     expect(auth.scopes.length).toEqual(1);
     expect(auth.scopes[0]).toEqual("read");
     expect(user.email).toEqual(newEmail);
+    expect(user.username).toEqual(newUsername);
     expect(isNewTeam).toEqual(false);
     expect(isNewUser).toEqual(false);
     expect(mailer.sendTemplate).not.toHaveBeenCalled();
@@ -162,6 +167,7 @@ describe("accountProvisioner", () => {
         name: "Jenny Tester",
         email: "jenny@example.com",
         avatarUrl: "https://example.com/avatar.png",
+        username: "jtester",
       },
       team: {
         name: team.name,
@@ -186,6 +192,7 @@ describe("accountProvisioner", () => {
     expect(auth.scopes.length).toEqual(1);
     expect(auth.scopes[0]).toEqual("read");
     expect(user.email).toEqual("jenny@example.com");
+    expect(user.username).toEqual("jtester");
     expect(isNewUser).toEqual(true);
     expect(mailer.sendTemplate).toHaveBeenCalled();
 

server/commands/userCreator.js

@@ -14,6 +14,7 @@ type UserCreatorResult = {|
 export default async function userCreator({
   name,
   email,
+  username,
   isAdmin,
   avatarUrl,
   teamId,
@@ -22,6 +23,7 @@ export default async function userCreator({
 }: {|
   name: string,
   email: string,
+  username?: string,
   isAdmin?: boolean,
   avatarUrl?: string,
   teamId: string,
@@ -63,7 +65,7 @@ export default async function userCreator({
     }
 
     if (user) {
-      await user.update({ email });
+      await user.update({ email, username });
       await auth.update(rest);
 
       return { user, authentication: auth, isNewUser: false };
@@ -128,6 +130,7 @@ export default async function userCreator({
       {
         name,
         email,
+        username,
         isAdmin,
         teamId,
         avatarUrl,

server/commands/userCreator.test.js

@@ -13,10 +13,12 @@ describe("userCreator", () => {
     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,
@@ -34,6 +36,7 @@ describe("userCreator", () => {
     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);
   });
 
@@ -101,6 +104,7 @@ describe("userCreator", () => {
     const result = await userCreator({
       name: "Test Name",
       email: "test@example.com",
+      username: "tname",
       teamId: team.id,
       ip,
       authentication: {
@@ -117,6 +121,7 @@ describe("userCreator", () => {
     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(isNewUser).toEqual(true);
   });