also handle u4i on the client

ls1intum · Jun 10, 2019 · 3c30b8e · 3c30b8e
1 parent 6c24bbc
commit 3c30b8e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -95,8 +95,10 @@ artemis:
     id: artemis_lti
     oauth-key: artemis_lti_key
     oauth-secret: <secret>
-    user-prefix: edx_
-    user-group-name: edx
+    user-prefix_edx: edx_
+    user-prefix_u4i: u4i_
+    user-group-name_edx: edx
+    user-group-name_u4i: u4i
   git:
     name: artemis
     email: [email protected]

diff --git a/src/main/webapp/app/course-list/exercise-list/exercise-list.component.ts b/src/main/webapp/app/course-list/exercise-list/exercise-list.component.ts
@@ -86,8 +86,8 @@ export class ExerciseListComponent implements OnInit, OnDestroy {
 
     ngOnInit(): void {
         this.accountService.identity().then(user => {
-            // Only load password if current user login starts with 'edx'
-            if (user && user.login && user.login.startsWith('edx')) {
+            // Only load password if current user login starts with 'edx_' or 'u4i_'
+            if (user && user.login && (user.login.startsWith('edx_') || user.login.startsWith('u4i_'))) {
                 this.getRepositoryPassword();
             }
         });

diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
@@ -61,8 +61,8 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit {
 
     ngOnInit(): void {
         this.accountService.identity().then(user => {
-            // Only load password if current user login starts with 'edx'
-            if (user && user.login && user.login.startsWith('edx')) {
+            // Only load password if current user login starts with 'edx_' or 'u4i_'
+            if (user && user.login && (user.login.startsWith('edx_') || user.login.startsWith('u4i_'))) {
                 this.getRepositoryPassword();
             }
         });