Skip to content

Commit 2756395

Browse files
committed
MOBILE-3617 login: Use login helper singleton on course helper
1 parent 78d41bd commit 2756395

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/core/course/providers/helper.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import { CoreCourseProvider } from './course';
3434
import { CoreCourseOfflineProvider } from './course-offline';
3535
import { CoreCourseModuleDelegate } from './module-delegate';
3636
import { CoreCourseModulePrefetchDelegate } from './module-prefetch-delegate';
37-
import { CoreLoginHelperProvider } from '@core/login/providers/helper';
37+
import { CoreLoginHelper, CoreLoginHelperProvider } from '@core/login/providers/helper';
3838
import { CoreConstants } from '@core/constants';
3939
import { CoreSite } from '@classes/site';
4040
import { CoreLoggerProvider } from '@providers/logger';
@@ -122,7 +122,6 @@ export class CoreCourseHelperProvider {
122122
private timeUtils: CoreTimeUtilsProvider,
123123
private utils: CoreUtilsProvider,
124124
private translate: TranslateService,
125-
private loginHelper: CoreLoginHelperProvider,
126125
private courseOptionsDelegate: CoreCourseOptionsDelegate,
127126
private siteHomeProvider: CoreSiteHomeProvider,
128127
private eventsProvider: CoreEventsProvider,
@@ -1302,7 +1301,7 @@ export class CoreCourseHelperProvider {
13021301
if (courseId == site.getSiteHomeId()) {
13031302
// Check if site home is available.
13041303
return this.siteHomeProvider.isAvailable().then(() => {
1305-
this.loginHelper.redirect('CoreSiteHomeIndexPage', params, siteId);
1304+
CoreLoginHelper.instance.redirect('CoreSiteHomeIndexPage', params, siteId);
13061305
}).finally(() => {
13071306
modal.dismiss();
13081307
});
@@ -1610,7 +1609,7 @@ export class CoreCourseHelperProvider {
16101609
params = params || {};
16111610
Object.assign(params, { course: course });
16121611

1613-
return this.loginHelper.redirect(CoreLoginHelperProvider.OPEN_COURSE, params, siteId);
1612+
return CoreLoginHelper.instance.redirect(CoreLoginHelperProvider.OPEN_COURSE, params, siteId);
16141613
}
16151614
}
16161615

src/core/login/providers/helper.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import { CoreConstants } from '@core/constants';
3434
import { Md5 } from 'ts-md5/dist/md5';
3535
import { CoreSite } from '@classes/site';
3636
import { CoreUrl } from '@singletons/url';
37+
import { makeSingleton } from '@singletons/core.singletons';
3738

3839
/**
3940
* Data related to a SSO authentication.
@@ -1417,3 +1418,5 @@ export class CoreLoginHelperProvider {
14171418
});
14181419
}
14191420
}
1421+
1422+
export class CoreLoginHelper extends makeSingleton(CoreLoginHelperProvider) {}

0 commit comments

Comments
 (0)