Admins can make comments on users

core/amber/src/main/scala/edu/uci/ics/texera/web/ServletAwareConfigurator.scala

@@ -44,6 +44,7 @@ class ServletAwareConfigurator extends ServerEndpointConfig.Configurator with La
               null,
               null,
               null,
+              null,
               null
             )
           )

core/amber/src/main/scala/edu/uci/ics/texera/web/auth/GuestAuthFilter.scala

@@ -18,7 +18,7 @@ import javax.ws.rs.core.SecurityContext
     override protected def newInstance = new GuestAuthFilter
   }
 
-  val GUEST: User = new User(null, "guest", null, null, null, null, UserRoleEnum.REGULAR)
+  val GUEST: User = new User(null, "guest", null, null, null, null, UserRoleEnum.REGULAR, null)
 }
 
 @PreMatching

core/amber/src/main/scala/edu/uci/ics/texera/web/auth/UserAuthenticator.scala

@@ -20,7 +20,8 @@ object UserAuthenticator extends Authenticator[JwtContext, SessionUser] with Laz
       val role =
         UserRoleEnum.valueOf(context.getJwtClaims.getClaimValue("role").asInstanceOf[String])
       val googleId = context.getJwtClaims.getClaimValue("googleId").asInstanceOf[String]
-      val user = new User(userId, userName, email, null, googleId, null, role)
+      val comment = context.getJwtClaims.getClaimValue("comment").asInstanceOf[String]
+      val user = new User(userId, userName, email, null, googleId, null, role, comment)
       Optional.of(new SessionUser(user))
     } catch {
       case e: Exception =>

core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/admin/user/AdminUserResource.scala

@@ -47,6 +47,9 @@ class AdminUserResource {
     updatedUser.setName(user.getName)
     updatedUser.setEmail(user.getEmail)
     updatedUser.setRole(user.getRole)
+    if (user.getComment != null) {
+      updatedUser.setComment(user.getComment)
+    }
     userDao.update(updatedUser)
   }
 

core/amber/src/test/scala/edu/uci/ics/texera/web/resource/dashboard/file/WorkflowResourceSpec.scala

@@ -38,6 +38,7 @@ class WorkflowResourceSpec
     user.setName("test_user")
     user.setRole(UserRoleEnum.ADMIN)
     user.setPassword("123")
+    user.setComment("test_comment")
     user
   }
 
@@ -47,6 +48,7 @@ class WorkflowResourceSpec
     user.setName("test_user2")
     user.setRole(UserRoleEnum.ADMIN)
     user.setPassword("123")
+    user.setComment("test_comment2")
     user
   }
 

core/dao/project/build.properties

@@ -0,0 +1 @@
+sbt.version=1.10.6

core/gui/src/app/common/service/user/auth.service.ts

@@ -123,6 +123,7 @@ export class AuthService {
       googleId: this.jwtHelperService.decodeToken(token).googleId,
       googleAvatar: this.jwtHelperService.decodeToken(token).googleAvatar,
       role: role,
+      comment: this.jwtHelperService.decodeToken(token).comment,
     };
   }
 

core/gui/src/app/common/service/user/stub-user.service.ts

@@ -8,12 +8,14 @@ import { PublicInterfaceOf } from "../../util/stub";
 export const MOCK_USER_ID = 1;
 export const MOCK_USER_NAME = "testUser";
 export const MOCK_USER_EMAIL = "[email protected]";
+export const MOCK_USER_COMMENT = "testComent";
 export const MOCK_USER = {
   uid: MOCK_USER_ID,
   name: MOCK_USER_NAME,
   email: MOCK_USER_EMAIL,
   googleId: undefined,
   role: Role.REGULAR,
+  comment: MOCK_USER_COMMENT,
 };
 
 /**

core/gui/src/app/common/type/user.ts

@@ -23,6 +23,7 @@ export interface User
     role: Role;
     color?: string;
     googleAvatar?: string;
+    comment: string;
   }> {}
 
 export interface File