@@ -14,6 +14,7 @@ import { setErrorIcon, ERROR_ICON_TYPES } from '../utils/errors';
14
14
import { COMPETITION_TRACKS , getApiResponsePayload } from '../utils/tc' ;
15
15
import { getTcM2mToken , getApi } from './api' ;
16
16
import { getService as getMembersService } from './members' ;
17
+ import { getService as getSubmissionsService } from './submissions' ;
17
18
18
19
export const ORDER_BY = {
19
20
SUBMISSION_END_DATE : 'submissionEndDate' ,
@@ -189,6 +190,7 @@ class ChallengesService {
189
190
tokenV2,
190
191
tokenV3,
191
192
memberService : getMembersService ( ) ,
193
+ submissionsServices : getSubmissionsService ( tokenV3 ) ,
192
194
} ;
193
195
}
194
196
@@ -319,6 +321,11 @@ class ChallengesService {
319
321
challenge . registrants = registrants . result ;
320
322
}
321
323
324
+ const submissions = await this . private . submissionsServices . getSubmissions ( {
325
+ challengeId : challenge . legacy . id ,
326
+ } ) ;
327
+ challenge . submissions = submissions ;
328
+
322
329
challenge . fetchedWithAuth = Boolean ( this . private . apiV5 . private . token ) ;
323
330
324
331
return challenge ;
@@ -476,7 +483,16 @@ class ChallengesService {
476
483
name : roleName ,
477
484
isActive : true ,
478
485
} ;
479
- const roles = await this . private . apiV5 . get ( `/resource-roles?${ qs . stringify ( params ) } ` )
486
+ let api = this . private . apiV5 ;
487
+
488
+ // Check if user is authenticated
489
+ if ( ! api . private . token && isomorphy . isServerSide ( ) ) {
490
+ // if not, make call with m2m token
491
+ const m2mToken = await this . private . getTcM2mToken ( ) ;
492
+ api = getApi ( 'V5' , m2mToken ) ;
493
+ }
494
+
495
+ const roles = await api . get ( `/resource-roles?${ qs . stringify ( params ) } ` )
480
496
. then ( checkErrorV5 ) . then ( res => res ) ;
481
497
482
498
if ( _ . isEmpty ( roles . result ) ) {
0 commit comments