helpers/Dojo/SharedAssignmentHelper.ts

@@ -3,7 +3,7 @@ import DojoStatusCode       from '../../types/Dojo/DojoStatusCode';
 import Json5FileValidator   from '../Json5FileValidator';
 import * as Gitlab          from '@gitbeaker/rest';
 import GitlabPipelineStatus from '../../types/Gitlab/GitlabPipelineStatus';
-import GlobalHelper         from '../../../helpers/GlobalHelper';
+import GitlabManager        from '../../../managers/GitlabManager';
 
 
 class SharedAssignmentHelper {
@@ -20,7 +20,7 @@ class SharedAssignmentHelper {
     }
 
     async isPublishable(repositoryId: number): Promise<{ isPublishable: boolean, lastPipeline: Gitlab.PipelineSchema | null, status?: { code: DojoStatusCode, message: string } }> {
-        const pipelines = await GlobalHelper.gitlabManager.getRepositoryPipelines(repositoryId, 'main');
+        const pipelines = await GitlabManager.getRepositoryPipelines(repositoryId, 'main');
         if ( pipelines.length > 0 ) {
             const lastPipeline = pipelines[0];
             if ( lastPipeline.status !== GitlabPipelineStatus.SUCCESS.valueOf() ) {

managers/SharedGitlabManager.ts

@@ -13,9 +13,8 @@ class SharedGitlabManager {
 
     setToken(token: string) {
         this.api = new Gitlab(Object.assign({
-                                                host : SharedConfig.gitlab.URL,
-                                                token: token
-                                            }));
+                                                host: SharedConfig.gitlab.URL
+                                            }, this.refreshTokenFunction ? { oauthToken: token } : { token: token }));
     }
 
     constructor(token: string, refreshTokenFunction?: () => Promise<string>) {