CSCEXAM-1404 User agreemenet promp for all roles

CSCfi · Jan 28, 2025 · cfdebeb · cfdebeb
1 parent 67f95cc
commit cfdebeb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/app/controllers/user/UserController.java b/app/controllers/user/UserController.java
@@ -214,7 +214,6 @@ public Result getUnenrolledStudents(Long eid, String criteria) {
     }
 
     @Authenticated
-    @Restrict({ @Group("STUDENT") })
     public Result updateUserAgreementAccepted(Http.Request request) {
         Result result;
         User user = DB.find(User.class)

diff --git a/ui/src/app/session/session.service.ts b/ui/src/app/session/session.service.ts
@@ -179,8 +179,7 @@ export class SessionService implements OnDestroy {
 
     private processLogin$(user: User): Observable<User> {
         const userAgreementConfirmation$ = (u: User): Observable<User> =>
-            //    switchMap((u: User) => (u.isStudent && !u.userAgreementAccepted ? this.openUserAgreementModal$(u) : of(u)));
-            defer(() => (u.isStudent && !u.userAgreementAccepted ? this.openUserAgreementModal$(u) : of(u)));
+            defer(() => (!u.userAgreementAccepted ? this.openUserAgreementModal$(u) : of(u)));
         return user.loginRole
             ? userAgreementConfirmation$(user)
             : this.openRoleSelectModal$(user).pipe(switchMap((u) => userAgreementConfirmation$(u)));