Programming exercises: Fix routing to repository view

src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java

@@ -243,9 +243,7 @@ public final class Constants {
 
     public static final String INFO_SSH_KEYS_URL_DETAIL = "sshKeysURL";
 
-    public static final String INFO_VERSION_CONTROL_ACCESS_TOKEN_DETAIL = "useVersionControlAccessToken";
-
-    public static final String INFO_SHOW_CLONE_URL_WITHOUT_TOKEN = "showCloneUrlWithoutToken";
+    public static final String INFO_CODE_BUTTON_AUTHENTICATION_MECHANISMS = "authenticationMechanisms";
 
     public static final String REGISTRATION_ENABLED = "registrationEnabled";
 

src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitlabInfoContributor.java

@@ -1,6 +1,9 @@
 package de.tum.cit.aet.artemis.programming.service.gitlab;
 
+import static de.tum.cit.aet.artemis.core.config.Constants.INFO_CODE_BUTTON_AUTHENTICATION_MECHANISMS;
+
 import java.net.URL;
+import java.util.List;
 import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Value;
@@ -27,11 +30,8 @@ public class GitlabInfoContributor implements InfoContributor {
     @Value("${artemis.version-control.ssh-keys-url-path:#{null}}")
     private Optional<String> gitlabSshKeysUrlPath;
 
-    @Value("${artemis.version-control.use-version-control-access-token:#{false}}")
-    private Boolean useVersionControlAccessToken;
-
-    @Value("${artemis.version-control.show-clone-url-without-token:true}")
-    private boolean showCloneUrlWithoutToken;
+    @Value("${artemis.version-control.repository-authentication-mechanisms:password,token,ssh}")
+    private List<String> orderedAuthenticationMechanisms;
 
     @Override
     public void contribute(Info.Builder builder) {
@@ -54,8 +54,6 @@ public void contribute(Info.Builder builder) {
                 builder.withDetail(Constants.INFO_SSH_KEYS_URL_DETAIL, sshKeysUrl);
             }
         }
-
-        builder.withDetail(Constants.INFO_VERSION_CONTROL_ACCESS_TOKEN_DETAIL, useVersionControlAccessToken);
-        builder.withDetail(Constants.INFO_SHOW_CLONE_URL_WITHOUT_TOKEN, showCloneUrlWithoutToken);
+        builder.withDetail(INFO_CODE_BUTTON_AUTHENTICATION_MECHANISMS, orderedAuthenticationMechanisms);
     }
 }

src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCInfoContributor.java

@@ -1,10 +1,12 @@
 package de.tum.cit.aet.artemis.programming.service.localvc;
 
+import static de.tum.cit.aet.artemis.core.config.Constants.INFO_CODE_BUTTON_AUTHENTICATION_MECHANISMS;
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,11 +30,8 @@ public class LocalVCInfoContributor implements InfoContributor {
     @Value("${server.url}")
     private String artemisServerUrl;
 
-    @Value("${artemis.version-control.use-version-control-access-token:false}")
-    private boolean useVcsAccessToken;
-
-    @Value("${artemis.version-control.show-clone-url-without-token:true}")
-    private boolean showCloneUrlWithoutToken;
+    @Value("${artemis.version-control.repository-authentication-mechanisms:password,token,ssh}")
+    private List<String> orderedAuthenticationMechanisms;
 
     @Value("${artemis.version-control.ssh-port:7921}")
     private int sshPort;
@@ -45,12 +44,8 @@ public void contribute(Info.Builder builder) {
         // Store name of the version control system
         builder.withDetail(Constants.VERSION_CONTROL_NAME, "Local VC");
 
-        // Show the access token in case it is available in the clone URL
-        // with the account.service.ts and its check if the access token is required
-        // TODO: Find a better way to test this in LocalVCInfoContributorTest
-        builder.withDetail(Constants.INFO_VERSION_CONTROL_ACCESS_TOKEN_DETAIL, useVcsAccessToken);
-        builder.withDetail(Constants.INFO_SHOW_CLONE_URL_WITHOUT_TOKEN, showCloneUrlWithoutToken);
-
+        // Store the authentication mechanisms that should be used by the code-button and their order
+        builder.withDetail(INFO_CODE_BUTTON_AUTHENTICATION_MECHANISMS, orderedAuthenticationMechanisms);
         // Store ssh url template
         try {
             var serverUri = new URI(artemisServerUrl);

src/main/resources/config/application-artemis.yml

@@ -58,7 +58,8 @@ artemis:
     #        ssh-private-key-folder-path: <ssh-private-key-folder-path>       # the path to the folder in which the private ssh key file (e.g. id_rsa) is stored that can be used to clone git repos on the version control server
     #        ssh-private-key-password: <ssh-private-key-password>        # the password for the private ssh key
     default-branch: main            # The branch that should be used as default branch for all newly created repositories. This does NOT have to be equal to the default branch of the VCS
-    use-version-control-access-token: true # for Gitlab and LocalVC setups. For gitlab: a Gitlab-API token can be generated for each user and used as part of the Git clone URL shown to students to allow for password-less Git operations via HTTP. For LocalVC: Artemis generates access tokens for users to use repositories similar to the gitlab setup
+    use-version-control-access-token: true # for Gitlab setups. For gitlab: a Gitlab-API token can be generated for each user and used as part of the Git clone URL shown to students to allow for password-less Git operations via HTTP.
+    repository-authentication-mechanisms: token,ssh,password  # the order of authentication mechanisms in the code button pop up. Removing parts removes them from the drop-down
   continuous-integration:
     user: <username>                # e.g. ga12abc
     password: <password>

src/main/resources/config/application-localvc.yml

@@ -12,6 +12,3 @@ artemis:
         url: http://localhost:8000
         build-agent-git-username: buildjob_user # Replace with more secure credentials for production. Required for https access to localvc. This config must be set for build agents and localvc.
         build-agent-git-password: buildjob_password # Replace with more secure credentials for production. Required for https access to localvc. This config must be set for build agents and localvc. You can also use an ssh key
-        use-version-control-access-token: true
-        show-clone-url-without-token: true
-

src/main/webapp/app/detail-overview-list/components/programming-auxiliary-repository-buttons-detail/programming-auxiliary-repository-buttons-detail.component.html

@@ -7,7 +7,7 @@
                     class="ms-2"
                     [smallButtons]="true"
                     [repositoryUri]="auxiliaryRepository.repositoryUri"
-                    [routerLinkForRepositoryView]="['.', 'repository', 'AUXILIARY', 'repo', auxiliaryRepository.id]"
+                    [routerLinkForRepositoryView]="['.', 'repository', 'AUXILIARY', auxiliaryRepository.id]"
                 />
                 <jhi-programming-exercise-instructor-repo-download
                     class="ms-2"

src/main/webapp/app/detail-overview-list/components/programming-repository-buttons-detail/programming-repository-buttons-detail.component.html

@@ -1,6 +1,6 @@
 @if (detail.data.participation?.repositoryUri && detail.data.exerciseId) {
     <div class="clone-buttons">
-        <jhi-code-button [smallButtons]="true" [routerLinkForRepositoryView]="['.', 'repository', detail.data.type]" [repositoryUri]="detail.data.participation?.repositoryUri!" />
+        <jhi-code-button [smallButtons]="true" [repositoryUri]="detail.data.participation?.repositoryUri!" [routerLinkForRepositoryView]="['.', 'repository', detail.data.type]" />
         <jhi-programming-exercise-instructor-repo-download class="ms-2" [exerciseId]="detail.data.exerciseId" [repositoryType]="detail.data.type" />
     </div>
 } @else {

src/main/webapp/app/exam/manage/exam-management.route.ts

@@ -3,7 +3,7 @@ import { UserRouteAccessService } from 'app/core/auth/user-route-access-service'
 
 import { TextExerciseResolver } from 'app/exercises/text/manage/text-exercise/text-exercise.route';
 
-import { ProgrammingExerciseResolve } from 'app/exercises/programming/manage/programming-exercise-management-routing.module';
+import { ProgrammingExerciseResolve, repositorySubRoutes } from 'app/exercises/programming/manage/programming-exercise-management-routing.module';
 
 import { PendingChangesGuard } from 'app/shared/guard/pending-changes.guard';
 import { Authority } from 'app/shared/constants/authority.constants';
@@ -25,8 +25,6 @@ import { FileUploadExerciseManagementResolve } from 'app/exercises/file-upload/m
 import { ModelingExerciseResolver } from 'app/exercises/modeling/manage/modeling-exercise-resolver.service';
 import { CourseResolve, ExamResolve, ExerciseGroupResolve, StudentExamResolve } from 'app/exam/manage/exam-management-resolve.service';
 
-import { LocalVCGuard } from 'app/localvc/localvc-guard.service';
-
 export const examManagementRoute: Routes = [
     {
         path: '',
@@ -267,31 +265,12 @@ export const examManagementRoute: Routes = [
         canActivate: [UserRouteAccessService],
     },
     {
-        path: ':examId/student-exams/:studentExamId/summary/exercises/:exerciseId/repository/:participationId',
-        loadComponent: () => import('app/localvc/repository-view/repository-view.component').then((m) => m.RepositoryViewComponent),
-        data: {
-            authorities: [Authority.TA, Authority.EDITOR, Authority.INSTRUCTOR, Authority.ADMIN],
-            pageTitle: 'artemisApp.repository.title',
-        },
-        canActivate: [UserRouteAccessService, LocalVCGuard],
-    },
-    {
-        path: ':examId/student-exams/:studentExamId/summary/exercises/:exerciseId/repository/:participationId/commit-history',
-        loadComponent: () => import('app/localvc/commit-history/commit-history.component').then((m) => m.CommitHistoryComponent),
-        data: {
-            authorities: [Authority.TA, Authority.EDITOR, Authority.INSTRUCTOR, Authority.ADMIN],
-            pageTitle: 'artemisApp.repository.commitHistory.title',
-        },
-        canActivate: [UserRouteAccessService, LocalVCGuard],
+        path: ':examId/student-exams/:studentExamId/programming-exercises/:exerciseId/repository/:repositoryType',
+        children: repositorySubRoutes,
     },
     {
-        path: ':examId/student-exams/:studentExamId/summary/exercises/:exerciseId/repository/:participationId/commit-history/:commitHash',
-        loadComponent: () => import('app/localvc/commit-details-view/commit-details-view.component').then((m) => m.CommitDetailsViewComponent),
-        data: {
-            authorities: [Authority.TA, Authority.EDITOR, Authority.INSTRUCTOR, Authority.ADMIN],
-            pageTitle: 'artemisApp.repository.commitHistory.commitDetails.title',
-        },
-        canActivate: [UserRouteAccessService, LocalVCGuard],
+        path: ':examId/student-exams/:studentExamId/programming-exercises/:exerciseId/repository/:repositoryType/:repositoryId',
+        children: repositorySubRoutes,
     },
     {
         path: ':examId/student-exams/:studentExamId/exam-timeline',
@@ -596,84 +575,11 @@ export const examManagementRoute: Routes = [
     },
     {
         path: ':examId/exercise-groups/:exerciseGroupId/programming-exercises/:exerciseId/repository/:repositoryType',
-        loadComponent: () => import('app/localvc/repository-view/repository-view.component').then((m) => m.RepositoryViewComponent),
-        data: {
-            authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
-            pageTitle: 'artemisApp.repository.title',
-        },
-        canActivate: [UserRouteAccessService, LocalVCGuard],
+        children: repositorySubRoutes,
     },
     {
-        path: ':examId/exercise-groups/:exerciseGroupId/programming-exercises/:exerciseId/repository/:repositoryType/vcs-access-log',
-        loadComponent: () => import('app/localvc/vcs-repository-access-log-view/vcs-repository-access-log-view.component').then((m) => m.VcsRepositoryAccessLogViewComponent),
-        data: {
-            authorities: [Authority.ADMIN, Authority.INSTRUCTOR],
-            pageTitle: 'artemisApp.repository.title',
-        },
-        canActivate: [UserRouteAccessService, LocalVCGuard],
-    },
-    {
-        path: ':examId/exercise-groups/:exerciseGroupId/programming-exercises/:exerciseId/repository/:repositoryType/repo/:repositoryId',
-        loadComponent: () => import('app/localvc/repository-view/repository-view.component').then((m) => m.RepositoryViewComponent),
-        data: {
-            authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
-            pageTitle: 'artemisApp.repository.title',
-        },
-        canActivate: [UserRouteAccessService, LocalVCGuard],
-    },
-    {
-        path: ':examId/exercise-groups/:exerciseGroupId/programming-exercises/:exerciseId/repository/:repositoryType/commit-history',
-        loadComponent: () => import('app/localvc/commit-history/commit-history.component').then((m) => m.CommitHistoryComponent),
-        data: {
-            authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
-            pageTitle: 'artemisApp.repository.title',
-        },
-        canActivate: [UserRouteAccessService, LocalVCGuard],
-    },
-    {
-        path: ':examId/exercise-groups/:exerciseGroupId/programming-exercises/:exerciseId/repository/:repositoryType/commit-history/:commitHash',
-        loadComponent: () => import('app/localvc/commit-details-view/commit-details-view.component').then((m) => m.CommitDetailsViewComponent),
-        data: {
-            authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
-            pageTitle: 'artemisApp.repository.title',
-        },
-        canActivate: [UserRouteAccessService, LocalVCGuard],
-    },
-    {
-        path: ':examId/exercise-groups/:exerciseGroupId/programming-exercises/:exerciseId/participations/:participationId/repository',
-        loadComponent: () => import('app/localvc/repository-view/repository-view.component').then((m) => m.RepositoryViewComponent),
-        data: {
-            authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
-            pageTitle: 'artemisApp.repository.title',
-        },
-        canActivate: [UserRouteAccessService, LocalVCGuard],
-    },
-    {
-        path: ':examId/exercise-groups/:exerciseGroupId/programming-exercises/:exerciseId/participations/:participationId/repository/vcs-access-log',
-        loadComponent: () => import('app/localvc/vcs-repository-access-log-view/vcs-repository-access-log-view.component').then((m) => m.VcsRepositoryAccessLogViewComponent),
-        data: {
-            authorities: [Authority.ADMIN, Authority.INSTRUCTOR],
-            pageTitle: 'artemisApp.repository.title',
-        },
-        canActivate: [UserRouteAccessService, LocalVCGuard],
-    },
-    {
-        path: ':examId/exercise-groups/:exerciseGroupId/programming-exercises/:exerciseId/participations/:participationId/repository/commit-history',
-        loadComponent: () => import('app/localvc/commit-history/commit-history.component').then((m) => m.CommitHistoryComponent),
-        data: {
-            authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
-            pageTitle: 'artemisApp.repository.title',
-        },
-        canActivate: [UserRouteAccessService, LocalVCGuard],
-    },
-    {
-        path: ':examId/exercise-groups/:exerciseGroupId/programming-exercises/:exerciseId/participations/:participationId/repository/commit-history/:commitHash',
-        loadComponent: () => import('app/localvc/commit-details-view/commit-details-view.component').then((m) => m.CommitDetailsViewComponent),
-        data: {
-            authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
-            pageTitle: 'artemisApp.repository.title',
-        },
-        canActivate: [UserRouteAccessService, LocalVCGuard],
+        path: ':examId/exercise-groups/:exerciseGroupId/programming-exercises/:exerciseId/repository/:repositoryType/:repositoryId',
+        children: repositorySubRoutes,
     },
     {
         path: ':examId/exercise-groups/:exerciseGroupId/quiz-exercises/:exerciseId',

src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.html

@@ -6,11 +6,16 @@
                     @if (submission) {
                         <h5 jhiTranslate="artemisApp.exam.examSummary.yourSubmission"></h5>
                     }
+                    <h1>Programming exam summary</h1>
                     <jhi-code-button
                         [smallButtons]="true"
-                        [repositoryUri]="participation?.userIndependentRepositoryUri || ''"
-                        [routerLinkForRepositoryView]="routerLink + '/exercises/' + exercise.id + '/repository/' + participation.id"
                         [participations]="[participation]"
+                        [repositoryUri]="participation?.userIndependentRepositoryUri ?? ''"
+                        [routerLinkForRepositoryView]="
+                            isInCourseManagement
+                                ? ['..', 'programming-exercises', exercise.id!, 'repository', 'USER', participation.id!]
+                                : [routerLink, 'exercises', exercise.id!, 'repository', participation.id!]
+                        "
                     />
                     <br />
                     <span>

src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.ts

@@ -67,12 +67,13 @@ export class ProgrammingExamSummaryComponent implements OnInit {
 
     routerLink: string;
     localVCEnabled = false;
+    isInCourseManagement = false;
 
     ngOnInit() {
         this.routerLink = this.router.url;
         this.result = this.participation.results?.[0];
         this.commitHash = this.submission?.commitHash?.slice(0, 11);
-
+        this.isInCourseManagement = this.router.url.includes('course-management');
         const isBuilding = false;
         const missingResultInfo = MissingResultInformation.NONE;