From c77c408fdb5df5379a19ded89dec3173516e317a Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Wed, 22 Nov 2023 10:20:12 +0100 Subject: [PATCH] MOBILE-4469 site: Rename candidate site to authenticated site --- .../services/recentlyaccesseditems.ts | 2 +- .../starredcourses/services/starredcourses.ts | 2 +- .../block/timeline/services/timeline.ts | 2 +- src/addons/blog/services/blog.ts | 2 +- src/addons/calendar/services/calendar.ts | 2 +- src/addons/competency/services/competency.ts | 2 +- .../services/coursecompletion.ts | 2 +- src/addons/enrol/guest/services/guest.ts | 2 +- src/addons/enrol/self/services/self.ts | 2 +- .../airnotifier/services/airnotifier.ts | 2 +- src/addons/messages/services/messages-sync.ts | 2 +- src/addons/messages/services/messages.ts | 2 +- src/addons/mod/assign/services/assign.ts | 2 +- .../services/bigbluebuttonbn.ts | 2 +- src/addons/mod/book/services/book.ts | 2 +- src/addons/mod/chat/services/chat.ts | 2 +- src/addons/mod/choice/services/choice.ts | 2 +- src/addons/mod/data/services/data.ts | 2 +- src/addons/mod/feedback/services/feedback.ts | 2 +- src/addons/mod/folder/services/folder.ts | 2 +- src/addons/mod/forum/services/forum.ts | 2 +- src/addons/mod/glossary/services/glossary.ts | 2 +- .../mod/h5pactivity/services/h5pactivity.ts | 2 +- src/addons/mod/imscp/services/imscp.ts | 2 +- src/addons/mod/label/services/label.ts | 2 +- src/addons/mod/lesson/services/lesson.ts | 2 +- src/addons/mod/lti/services/lti.ts | 2 +- src/addons/mod/page/services/page.ts | 2 +- src/addons/mod/quiz/services/quiz.ts | 2 +- src/addons/mod/resource/services/resource.ts | 2 +- src/addons/mod/scorm/services/scorm.ts | 2 +- src/addons/mod/survey/services/survey.ts | 2 +- src/addons/mod/url/services/url.ts | 2 +- src/addons/mod/wiki/services/wiki.ts | 2 +- src/addons/mod/workshop/services/workshop.ts | 2 +- src/addons/notes/services/notes.ts | 2 +- .../notifications/services/notifications.ts | 2 +- src/core/classes/page-load-watcher.ts | 2 +- ...andidate-site.ts => authenticated-site.ts} | 32 +++++++++---------- src/core/classes/sites/site.ts | 6 ++-- .../features/comments/services/comments.ts | 2 +- src/core/features/course/services/course.ts | 2 +- .../services/module-prefetch-delegate.ts | 2 +- .../courses/services/courses-helper.ts | 2 +- src/core/features/courses/services/courses.ts | 2 +- .../features/courses/services/dashboard.ts | 2 +- src/core/features/filter/services/filter.ts | 2 +- src/core/features/grades/services/grades.ts | 2 +- src/core/features/h5p/services/h5p.ts | 2 +- src/core/features/rating/services/rating.ts | 2 +- .../reportbuilder/services/reportbuilder.ts | 2 +- .../features/sitehome/services/sitehome.ts | 2 +- .../siteplugins/classes/call-ws-directive.ts | 2 +- .../components/module-index/module-index.ts | 2 +- .../plugin-content/plugin-content.ts | 2 +- .../directives/call-ws-new-content.ts | 2 +- .../siteplugins/directives/new-content.ts | 2 +- .../siteplugins/pages/plugin/plugin.ts | 2 +- .../services/siteplugins-helper.ts | 2 +- .../siteplugins/services/siteplugins.ts | 2 +- src/core/features/tag/services/tag.ts | 2 +- .../support/authenticated-support-config.ts | 6 ++-- src/core/features/user/services/user.ts | 2 +- src/core/features/xapi/services/xapi.ts | 2 +- src/core/services/groups.ts | 2 +- src/core/services/sites-factory.ts | 12 +++---- src/core/services/sites.ts | 9 +++--- src/storybook/stubs/classes/site.ts | 2 +- 68 files changed, 95 insertions(+), 96 deletions(-) rename src/core/classes/sites/{candidate-site.ts => authenticated-site.ts} (98%) diff --git a/src/addons/block/recentlyaccesseditems/services/recentlyaccesseditems.ts b/src/addons/block/recentlyaccesseditems/services/recentlyaccesseditems.ts index 04f67c3e6e4..13ca419b700 100644 --- a/src/addons/block/recentlyaccesseditems/services/recentlyaccesseditems.ts +++ b/src/addons/block/recentlyaccesseditems/services/recentlyaccesseditems.ts @@ -16,7 +16,7 @@ import { Injectable } from '@angular/core'; import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreCourse } from '@features/course/services/course'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { makeSingleton } from '@singletons'; import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate'; diff --git a/src/addons/block/starredcourses/services/starredcourses.ts b/src/addons/block/starredcourses/services/starredcourses.ts index 27617ca75ed..5b7e8834d9f 100644 --- a/src/addons/block/starredcourses/services/starredcourses.ts +++ b/src/addons/block/starredcourses/services/starredcourses.ts @@ -14,7 +14,7 @@ import { Injectable } from '@angular/core'; import { CoreSites } from '@services/sites'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { makeSingleton } from '@singletons'; const ROOT_CACHE_KEY = 'AddonBlockStarredCourses:'; diff --git a/src/addons/block/timeline/services/timeline.ts b/src/addons/block/timeline/services/timeline.ts index 5cb784b0fb9..84cb541117a 100644 --- a/src/addons/block/timeline/services/timeline.ts +++ b/src/addons/block/timeline/services/timeline.ts @@ -24,7 +24,7 @@ import { } from '@addons/calendar/services/calendar'; import moment from 'moment-timezone'; import { makeSingleton } from '@singletons'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; // Cache key was maintained from block myoverview when blocks were splitted. const ROOT_CACHE_KEY = 'myoverview:'; diff --git a/src/addons/blog/services/blog.ts b/src/addons/blog/services/blog.ts index 0732b9002b1..9b91ee30726 100644 --- a/src/addons/blog/services/blog.ts +++ b/src/addons/blog/services/blog.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Injectable } from '@angular/core'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { CoreSite } from '@classes/sites/site'; import { CoreTagItem } from '@features/tag/services/tag'; import { CoreSites } from '@services/sites'; diff --git a/src/addons/calendar/services/calendar.ts b/src/addons/calendar/services/calendar.ts index 552e30e8113..9bafd3be76c 100644 --- a/src/addons/calendar/services/calendar.ts +++ b/src/addons/calendar/services/calendar.ts @@ -50,7 +50,7 @@ import { } from '@features/reminders/services/reminders'; import { CoreReminderDBRecord } from '@features/reminders/services/database/reminders'; import { CoreEvents } from '@singletons/events'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmaCalendar:'; diff --git a/src/addons/competency/services/competency.ts b/src/addons/competency/services/competency.ts index d064722f6fa..d3c30b34eef 100644 --- a/src/addons/competency/services/competency.ts +++ b/src/addons/competency/services/competency.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Injectable } from '@angular/core'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { CoreSite } from '@classes/sites/site'; import { CoreCommentsArea } from '@features/comments/services/comments'; import { CoreCourseSummary, CoreCourseModuleSummary } from '@features/course/services/course'; diff --git a/src/addons/coursecompletion/services/coursecompletion.ts b/src/addons/coursecompletion/services/coursecompletion.ts index 3067060e374..53825c48c8c 100644 --- a/src/addons/coursecompletion/services/coursecompletion.ts +++ b/src/addons/coursecompletion/services/coursecompletion.ts @@ -23,7 +23,7 @@ import { makeSingleton } from '@singletons'; import { CoreError } from '@classes/errors/error'; import { asyncObservable, firstValueFrom } from '@/core/utils/rxjs'; import { map } from 'rxjs/operators'; -import { CoreSiteWSPreSets, WSObservable } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets, WSObservable } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmaCourseCompletion:'; diff --git a/src/addons/enrol/guest/services/guest.ts b/src/addons/enrol/guest/services/guest.ts index a9249f6f6ed..dc5bcfdf956 100644 --- a/src/addons/enrol/guest/services/guest.ts +++ b/src/addons/enrol/guest/services/guest.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Injectable } from '@angular/core'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { CoreSite } from '@classes/sites/site'; import { CoreEnrolEnrolmentInfo } from '@features/enrol/services/enrol'; import { CoreSites } from '@services/sites'; diff --git a/src/addons/enrol/self/services/self.ts b/src/addons/enrol/self/services/self.ts index 38de56740d0..a3aea2138f2 100644 --- a/src/addons/enrol/self/services/self.ts +++ b/src/addons/enrol/self/services/self.ts @@ -14,7 +14,7 @@ import { Injectable } from '@angular/core'; import { CoreWSError } from '@classes/errors/wserror'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { CoreSite } from '@classes/sites/site'; import { CoreCoursesProvider } from '@features/courses/services/courses'; import { CoreSites } from '@services/sites'; diff --git a/src/addons/messageoutput/airnotifier/services/airnotifier.ts b/src/addons/messageoutput/airnotifier/services/airnotifier.ts index 6b5ace8eaa0..e8c94d7b42b 100644 --- a/src/addons/messageoutput/airnotifier/services/airnotifier.ts +++ b/src/addons/messageoutput/airnotifier/services/airnotifier.ts @@ -25,7 +25,7 @@ import { CoreEvents, CoreEventSiteData } from '@singletons/events'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreUtils } from '@services/utils/utils'; import { CorePath } from '@singletons/path'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmaMessageOutputAirnotifier:'; diff --git a/src/addons/messages/services/messages-sync.ts b/src/addons/messages/services/messages-sync.ts index 879453a1970..ef66db7918a 100644 --- a/src/addons/messages/services/messages-sync.ts +++ b/src/addons/messages/services/messages-sync.ts @@ -31,7 +31,7 @@ import { CoreConstants } from '@/core/constants'; import { CoreUser } from '@features/user/services/user'; import { CoreError } from '@classes/errors/error'; import { CoreTextErrorObject, CoreTextUtils } from '@services/utils/text'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; /** * Service to sync messages. diff --git a/src/addons/messages/services/messages.ts b/src/addons/messages/services/messages.ts index 31c1ab770ea..158756a45d1 100644 --- a/src/addons/messages/services/messages.ts +++ b/src/addons/messages/services/messages.ts @@ -33,7 +33,7 @@ import { CoreError } from '@classes/errors/error'; import { AddonMessagesSyncEvents, AddonMessagesSyncProvider } from './messages-sync'; import { CoreWSError } from '@classes/errors/wserror'; import { AddonNotificationsPreferencesNotificationProcessorState } from '@addons/notifications/services/notifications'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmaMessages:'; diff --git a/src/addons/mod/assign/services/assign.ts b/src/addons/mod/assign/services/assign.ts index 4f78429ca80..413b4ac2616 100644 --- a/src/addons/mod/assign/services/assign.ts +++ b/src/addons/mod/assign/services/assign.ts @@ -35,7 +35,7 @@ import { AddonModAssignAutoSyncData, AddonModAssignManualSyncData, AddonModAssig import { CoreFormFields } from '@singletons/form'; import { CoreFileHelper } from '@services/file-helper'; import { CoreIonicColorNames } from '@singletons/colors'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmaModAssign:'; diff --git a/src/addons/mod/bigbluebuttonbn/services/bigbluebuttonbn.ts b/src/addons/mod/bigbluebuttonbn/services/bigbluebuttonbn.ts index 59ac2bd7709..eb226fe30a5 100644 --- a/src/addons/mod/bigbluebuttonbn/services/bigbluebuttonbn.ts +++ b/src/addons/mod/bigbluebuttonbn/services/bigbluebuttonbn.ts @@ -15,7 +15,7 @@ import { Injectable } from '@angular/core'; import { CoreError } from '@classes/errors/error'; import { CoreWSError } from '@classes/errors/wserror'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { CoreSite } from '@classes/sites/site'; import { CoreCourseCommonModWSOptions } from '@features/course/services/course'; import { CoreCourseLogHelper } from '@features/course/services/log-helper'; diff --git a/src/addons/mod/book/services/book.ts b/src/addons/mod/book/services/book.ts index 011e111cb90..69ec1c32959 100644 --- a/src/addons/mod/book/services/book.ts +++ b/src/addons/mod/book/services/book.ts @@ -26,7 +26,7 @@ import { CoreTextUtils } from '@services/utils/text'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreFile } from '@services/file'; import { CoreError } from '@classes/errors/error'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; /** * Constants to define how the chapters and subchapters of a book should be displayed in that table of contents. diff --git a/src/addons/mod/chat/services/chat.ts b/src/addons/mod/chat/services/chat.ts index a2cc552bb93..08556ab36eb 100644 --- a/src/addons/mod/chat/services/chat.ts +++ b/src/addons/mod/chat/services/chat.ts @@ -14,7 +14,7 @@ import { Injectable } from '@angular/core'; import { CoreError } from '@classes/errors/error'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { CoreSite } from '@classes/sites/site'; import { CoreCourseCommonModWSOptions } from '@features/course/services/course'; import { CoreCourseLogHelper } from '@features/course/services/log-helper'; diff --git a/src/addons/mod/choice/services/choice.ts b/src/addons/mod/choice/services/choice.ts index a4e7b1a5432..260d1b01ab7 100644 --- a/src/addons/mod/choice/services/choice.ts +++ b/src/addons/mod/choice/services/choice.ts @@ -26,7 +26,7 @@ import { CoreStatusWithWarningsWSResponse, CoreWSExternalFile, CoreWSExternalWar import { makeSingleton, Translate } from '@singletons'; import { AddonModChoiceOffline } from './choice-offline'; import { AddonModChoiceAutoSyncData, AddonModChoiceSyncProvider } from './choice-sync'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmaModChoice:'; diff --git a/src/addons/mod/data/services/data.ts b/src/addons/mod/data/services/data.ts index 7d7f5a606f4..7bffea41d7f 100644 --- a/src/addons/mod/data/services/data.ts +++ b/src/addons/mod/data/services/data.ts @@ -29,7 +29,7 @@ import { makeSingleton, Translate } from '@singletons'; import { AddonModDataFieldsDelegate } from './data-fields-delegate'; import { AddonModDataOffline } from './data-offline'; import { AddonModDataAutoSyncData, AddonModDataSyncProvider } from './data-sync'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmaModData:'; diff --git a/src/addons/mod/feedback/services/feedback.ts b/src/addons/mod/feedback/services/feedback.ts index abd4cdbca8c..31a29f930d9 100644 --- a/src/addons/mod/feedback/services/feedback.ts +++ b/src/addons/mod/feedback/services/feedback.ts @@ -25,7 +25,7 @@ import { CoreWSExternalFile, CoreWSExternalWarning, CoreWSStoredFile } from '@se import { makeSingleton, Translate } from '@singletons'; import { AddonModFeedbackOffline } from './feedback-offline'; import { AddonModFeedbackAutoSyncData, AddonModFeedbackSyncProvider } from './feedback-sync'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'AddonModFeedback:'; diff --git a/src/addons/mod/folder/services/folder.ts b/src/addons/mod/folder/services/folder.ts index cc4d02f8d21..459ca6b1205 100644 --- a/src/addons/mod/folder/services/folder.ts +++ b/src/addons/mod/folder/services/folder.ts @@ -14,7 +14,7 @@ import { Injectable } from '@angular/core'; import { CoreError } from '@classes/errors/error'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { CoreSite } from '@classes/sites/site'; import { CoreCourse } from '@features/course/services/course'; import { CoreCourseLogHelper } from '@features/course/services/log-helper'; diff --git a/src/addons/mod/forum/services/forum.ts b/src/addons/mod/forum/services/forum.ts index 33d6025d00d..5c1184ab510 100644 --- a/src/addons/mod/forum/services/forum.ts +++ b/src/addons/mod/forum/services/forum.ts @@ -29,7 +29,7 @@ import { CoreUtils } from '@services/utils/utils'; import { CoreStatusWithWarningsWSResponse, CoreWSExternalFile, CoreWSExternalWarning, CoreWSStoredFile } from '@services/ws'; import { makeSingleton, Translate } from '@singletons'; import { AddonModForumOffline, AddonModForumOfflineDiscussion, AddonModForumReplyOptions } from './forum-offline'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmaModForum:'; diff --git a/src/addons/mod/glossary/services/glossary.ts b/src/addons/mod/glossary/services/glossary.ts index 968e11603f4..f6257a11ec8 100644 --- a/src/addons/mod/glossary/services/glossary.ts +++ b/src/addons/mod/glossary/services/glossary.ts @@ -28,7 +28,7 @@ import { makeSingleton, Translate } from '@singletons'; import { CoreEvents } from '@singletons/events'; import { AddonModGlossaryEntryDBRecord, ENTRIES_TABLE_NAME } from './database/glossary'; import { AddonModGlossaryOffline } from './glossary-offline'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; export const GLOSSARY_ENTRY_ADDED = 'addon_mod_glossary_entry_added'; export const GLOSSARY_ENTRY_UPDATED = 'addon_mod_glossary_entry_updated'; diff --git a/src/addons/mod/h5pactivity/services/h5pactivity.ts b/src/addons/mod/h5pactivity/services/h5pactivity.ts index 0d87a14ab80..561a5e37bbc 100644 --- a/src/addons/mod/h5pactivity/services/h5pactivity.ts +++ b/src/addons/mod/h5pactivity/services/h5pactivity.ts @@ -27,7 +27,7 @@ import { CoreWSError } from '@classes/errors/wserror'; import { CoreError } from '@classes/errors/error'; import { AddonModH5PActivityAutoSyncData, AddonModH5PActivitySyncProvider } from './h5pactivity-sync'; import { CoreTime } from '@singletons/time'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; export const MOD_H5PACTIVITY_STATE_ID = 'state'; diff --git a/src/addons/mod/imscp/services/imscp.ts b/src/addons/mod/imscp/services/imscp.ts index 121c82d4c34..d756a88ce2e 100644 --- a/src/addons/mod/imscp/services/imscp.ts +++ b/src/addons/mod/imscp/services/imscp.ts @@ -26,7 +26,7 @@ import { CoreUtils } from '@services/utils/utils'; import { CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws'; import { makeSingleton, Translate } from '@singletons'; import { CorePath } from '@singletons/path'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmaModImscp:'; diff --git a/src/addons/mod/label/services/label.ts b/src/addons/mod/label/services/label.ts index e0a9c9cc047..07f3c076723 100644 --- a/src/addons/mod/label/services/label.ts +++ b/src/addons/mod/label/services/label.ts @@ -14,7 +14,7 @@ import { Injectable } from '@angular/core'; import { CoreError } from '@classes/errors/error'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { CoreSite } from '@classes/sites/site'; import { CoreFilepool } from '@services/filepool'; import { CoreSites, CoreSitesCommonWSOptions } from '@services/sites'; diff --git a/src/addons/mod/lesson/services/lesson.ts b/src/addons/mod/lesson/services/lesson.ts index f60cb486d1c..37ce3389d93 100644 --- a/src/addons/mod/lesson/services/lesson.ts +++ b/src/addons/mod/lesson/services/lesson.ts @@ -28,7 +28,7 @@ import { CoreEvents } from '@singletons/events'; import { AddonModLessonPasswordDBRecord, PASSWORD_TABLE_NAME } from './database/lesson'; import { AddonModLessonOffline, AddonModLessonPageAttemptRecord } from './lesson-offline'; import { AddonModLessonAutoSyncData, AddonModLessonSyncProvider } from './lesson-sync'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmaModLesson:'; diff --git a/src/addons/mod/lti/services/lti.ts b/src/addons/mod/lti/services/lti.ts index 94b1f2bc2fa..29f8f2aec4f 100644 --- a/src/addons/mod/lti/services/lti.ts +++ b/src/addons/mod/lti/services/lti.ts @@ -15,7 +15,7 @@ import { Injectable } from '@angular/core'; import { CoreError } from '@classes/errors/error'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { CoreSite } from '@classes/sites/site'; import { CoreCourseLogHelper } from '@features/course/services/log-helper'; import { CoreFile } from '@services/file'; diff --git a/src/addons/mod/page/services/page.ts b/src/addons/mod/page/services/page.ts index b88af249814..af285f171fb 100644 --- a/src/addons/mod/page/services/page.ts +++ b/src/addons/mod/page/services/page.ts @@ -22,7 +22,7 @@ import { CoreCourse } from '@features/course/services/course'; import { CoreUtils } from '@services/utils/utils'; import { CoreCourseLogHelper } from '@features/course/services/log-helper'; import { CoreError } from '@classes/errors/error'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmaModPage:'; diff --git a/src/addons/mod/quiz/services/quiz.ts b/src/addons/mod/quiz/services/quiz.ts index d424fd68448..487e6f388b1 100644 --- a/src/addons/mod/quiz/services/quiz.ts +++ b/src/addons/mod/quiz/services/quiz.ts @@ -40,7 +40,7 @@ import { AddonModQuizAccessRuleDelegate } from './access-rules-delegate'; import { AddonModQuizAttempt } from './quiz-helper'; import { AddonModQuizOffline, AddonModQuizQuestionsWithAnswers } from './quiz-offline'; import { AddonModQuizAutoSyncData, AddonModQuizSyncProvider } from './quiz-sync'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmaModQuiz:'; diff --git a/src/addons/mod/resource/services/resource.ts b/src/addons/mod/resource/services/resource.ts index a250f89780e..6d9c451a764 100644 --- a/src/addons/mod/resource/services/resource.ts +++ b/src/addons/mod/resource/services/resource.ts @@ -14,7 +14,7 @@ import { Injectable } from '@angular/core'; import { CoreError } from '@classes/errors/error'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { CoreSite } from '@classes/sites/site'; import { CoreCourse } from '@features/course/services/course'; import { CoreCourseLogHelper } from '@features/course/services/log-helper'; diff --git a/src/addons/mod/scorm/services/scorm.ts b/src/addons/mod/scorm/services/scorm.ts index f468d7e9f77..8fe7759d551 100644 --- a/src/addons/mod/scorm/services/scorm.ts +++ b/src/addons/mod/scorm/services/scorm.ts @@ -31,7 +31,7 @@ import { CoreEvents } from '@singletons/events'; import { CorePath } from '@singletons/path'; import { AddonModScormOffline } from './scorm-offline'; import { AddonModScormAutoSyncEventData, AddonModScormSyncProvider } from './scorm-sync'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; // Private constants. const VALID_STATUSES = ['notattempted', 'passed', 'completed', 'failed', 'incomplete', 'browsed', 'suspend']; diff --git a/src/addons/mod/survey/services/survey.ts b/src/addons/mod/survey/services/survey.ts index 1a21a9acdf0..cb7d670b3f4 100644 --- a/src/addons/mod/survey/services/survey.ts +++ b/src/addons/mod/survey/services/survey.ts @@ -24,7 +24,7 @@ import { CoreUtils } from '@services/utils/utils'; import { CoreStatusWithWarningsWSResponse, CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws'; import { makeSingleton, Translate } from '@singletons'; import { AddonModSurveyOffline } from './survey-offline'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmaModSurvey:'; diff --git a/src/addons/mod/url/services/url.ts b/src/addons/mod/url/services/url.ts index 90d92f7b157..2e9ac211133 100644 --- a/src/addons/mod/url/services/url.ts +++ b/src/addons/mod/url/services/url.ts @@ -23,7 +23,7 @@ import { CoreCourse } from '@features/course/services/course'; import { CoreUtils } from '@services/utils/utils'; import { CoreCourseLogHelper } from '@features/course/services/log-helper'; import { CoreError } from '@classes/errors/error'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmaModUrl:'; diff --git a/src/addons/mod/wiki/services/wiki.ts b/src/addons/mod/wiki/services/wiki.ts index 9dc3d8f8de5..93fc4afea36 100644 --- a/src/addons/mod/wiki/services/wiki.ts +++ b/src/addons/mod/wiki/services/wiki.ts @@ -28,7 +28,7 @@ import { CoreEvents } from '@singletons/events'; import { AddonModWikiPageDBRecord } from './database/wiki'; import { AddonModWikiOffline } from './wiki-offline'; import { AddonModWikiAutoSyncData, AddonModWikiManualSyncData, AddonModWikiSyncProvider } from './wiki-sync'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmaModWiki:'; diff --git a/src/addons/mod/workshop/services/workshop.ts b/src/addons/mod/workshop/services/workshop.ts index 0fe9ba780d5..e84468991c3 100644 --- a/src/addons/mod/workshop/services/workshop.ts +++ b/src/addons/mod/workshop/services/workshop.ts @@ -28,7 +28,7 @@ import { CoreFormFields } from '@singletons/form'; import { AddonModWorkshopOffline } from './workshop-offline'; import { AddonModWorkshopAutoSyncData, AddonModWorkshopSyncProvider } from './workshop-sync'; import { ADDON_MOD_WORKSHOP_COMPONENT } from '@addons/mod/workshop/constants'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmaModWorkshop:'; diff --git a/src/addons/notes/services/notes.ts b/src/addons/notes/services/notes.ts index 37f19187fb9..e15e81d6414 100644 --- a/src/addons/notes/services/notes.ts +++ b/src/addons/notes/services/notes.ts @@ -22,7 +22,7 @@ import { CoreUtils } from '@services/utils/utils'; import { CoreWSExternalWarning } from '@services/ws'; import { makeSingleton, Translate } from '@singletons'; import { AddonNotesOffline } from './notes-offline'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmaNotes:'; diff --git a/src/addons/notifications/services/notifications.ts b/src/addons/notifications/services/notifications.ts index 441da75f06d..aeaf0660f7e 100644 --- a/src/addons/notifications/services/notifications.ts +++ b/src/addons/notifications/services/notifications.ts @@ -24,7 +24,7 @@ import { CoreLogger } from '@singletons/logger'; import { Translate, makeSingleton } from '@singletons'; import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate'; import { AddonNotificationsPushNotification } from './handlers/push-click'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; declare module '@singletons/events' { diff --git a/src/core/classes/page-load-watcher.ts b/src/core/classes/page-load-watcher.ts index 2ad6ec0de06..870dcc2ac38 100644 --- a/src/core/classes/page-load-watcher.ts +++ b/src/core/classes/page-load-watcher.ts @@ -18,7 +18,7 @@ import { Subscription } from 'rxjs'; import { AsyncDirective } from './async-directive'; import { PageLoadsManager } from './page-loads-manager'; import { CorePromisedValue } from './promised-value'; -import { WSObservable } from './sites/candidate-site'; +import { WSObservable } from './sites/authenticated-site'; /** * Class to watch requests from a page load (including requests from page sub-components). diff --git a/src/core/classes/sites/candidate-site.ts b/src/core/classes/sites/authenticated-site.ts similarity index 98% rename from src/core/classes/sites/candidate-site.ts rename to src/core/classes/sites/authenticated-site.ts index 8cf456c9e5a..6244eb79547 100644 --- a/src/core/classes/sites/candidate-site.ts +++ b/src/core/classes/sites/authenticated-site.ts @@ -48,7 +48,7 @@ import { CoreErrorLogs } from '@singletons/error-logs'; * Class that represents a site (combination of site + user) where the user has authenticated but the site hasn't been validated * yet, it might be a site not supported by the app. */ -export class CoreCandidateSite extends CoreUnauthenticatedSite { +export class CoreAuthenticatedSite extends CoreUnauthenticatedSite { static readonly REQUEST_QUEUE_FORCE_WS = false; // Use "tool_mobile_call_external_functions" even for calling a single function. @@ -112,11 +112,11 @@ export class CoreCandidateSite extends CoreUnauthenticatedSite { constructor( siteUrl: string, token: string, - otherData: CoreCandidateSiteOptionalData = {}, + otherData: CoreAuthenticatedSiteOptionalData = {}, ) { super(siteUrl, otherData.publicConfig); - this.logger = CoreLogger.getInstance('CoreCandidateSite'); + this.logger = CoreLogger.getInstance('CoreAuthenticaedSite'); this.token = token; this.privateToken = otherData.privateToken; } @@ -387,7 +387,7 @@ export class CoreCandidateSite extends CoreUnauthenticatedSite { */ // eslint-disable-next-line @typescript-eslint/no-explicit-any requestObservable(method: string, data: any, preSets: CoreSiteWSPreSets): WSObservable { - if (this.isLoggedOut() && !CoreCandidateSite.ALLOWED_LOGGEDOUT_WS.includes(method)) { + if (this.isLoggedOut() && !CoreAuthenticatedSite.ALLOWED_LOGGEDOUT_WS.includes(method)) { // Site is logged out, it cannot call WebServices. this.triggerSiteEvent(CoreEvents.SESSION_EXPIRED, {}); @@ -879,7 +879,7 @@ export class CoreCandidateSite extends CoreUnauthenticatedSite { const requests = this.requestQueue; this.requestQueue = []; - if (requests.length == 1 && !CoreCandidateSite.REQUEST_QUEUE_FORCE_WS) { + if (requests.length == 1 && !CoreAuthenticatedSite.REQUEST_QUEUE_FORCE_WS) { // Only one request, do a regular web service call. try { const data = await CoreWS.call(requests[0].method, requests[0].data, requests[0].wsPreSets); @@ -1453,9 +1453,9 @@ export class CoreCandidateSite extends CoreUnauthenticatedSite { return 0; } - if (CoreCandidateSite.MOODLE_RELEASES[data.major] === undefined) { + if (CoreAuthenticatedSite.MOODLE_RELEASES[data.major] === undefined) { // Major version not found. Use the last one. - const major = Object.keys(CoreCandidateSite.MOODLE_RELEASES).pop(); + const major = Object.keys(CoreAuthenticatedSite.MOODLE_RELEASES).pop(); if (!major) { return 0; } @@ -1463,7 +1463,7 @@ export class CoreCandidateSite extends CoreUnauthenticatedSite { data.major = major; } - return CoreCandidateSite.MOODLE_RELEASES[data.major] + data.minor; + return CoreAuthenticatedSite.MOODLE_RELEASES[data.major] + data.minor; } /** @@ -1493,7 +1493,7 @@ export class CoreCandidateSite extends CoreUnauthenticatedSite { */ protected getNextMajorVersionNumber(version: string): number { const data = this.getMajorAndMinor(version); - const releases = Object.keys(CoreCandidateSite.MOODLE_RELEASES); + const releases = Object.keys(CoreAuthenticatedSite.MOODLE_RELEASES); if (!data) { // Invalid version. @@ -1504,10 +1504,10 @@ export class CoreCandidateSite extends CoreUnauthenticatedSite { if (position == -1 || position == releases.length - 1) { // Major version not found or it's the last one. Use the last one. - return CoreCandidateSite.MOODLE_RELEASES[releases[position]]; + return CoreAuthenticatedSite.MOODLE_RELEASES[releases[position]]; } - return CoreCandidateSite.MOODLE_RELEASES[releases[position + 1]]; + return CoreAuthenticatedSite.MOODLE_RELEASES[releases[position + 1]]; } /** @@ -1517,9 +1517,9 @@ export class CoreCandidateSite extends CoreUnauthenticatedSite { * @returns Expiration delay. */ getExpirationDelay(updateFrequency?: number): number { - updateFrequency = updateFrequency || CoreCandidateSite.FREQUENCY_USUALLY; - let expirationDelay = CoreCandidateSite.UPDATE_FREQUENCIES[updateFrequency] || - CoreCandidateSite.UPDATE_FREQUENCIES[CoreCandidateSite.FREQUENCY_USUALLY]; + updateFrequency = updateFrequency || CoreAuthenticatedSite.FREQUENCY_USUALLY; + let expirationDelay = CoreAuthenticatedSite.UPDATE_FREQUENCIES[updateFrequency] || + CoreAuthenticatedSite.UPDATE_FREQUENCIES[CoreAuthenticatedSite.FREQUENCY_USUALLY]; if (CoreNetwork.isNetworkAccessLimited()) { // Not WiFi, increase the expiration delay a 50% to decrease the data usage in this case. @@ -1609,9 +1609,9 @@ export function chainRequests>( } /** - * Optional data to create a candidate site. + * Optional data to create an authenticated site. */ -export type CoreCandidateSiteOptionalData = { +export type CoreAuthenticatedSiteOptionalData = { privateToken?: string; publicConfig?: CoreSitePublicConfigResponse; }; diff --git a/src/core/classes/sites/site.ts b/src/core/classes/sites/site.ts index 9db41d4eeaa..28cc4023302 100644 --- a/src/core/classes/sites/site.ts +++ b/src/core/classes/sites/site.ts @@ -51,13 +51,13 @@ import { map } from 'rxjs/operators'; import { firstValueFrom } from '../../utils/rxjs'; import { CoreFilepool } from '@services/filepool'; import { CoreSiteInfo } from './unauthenticated-site'; -import { CoreCandidateSite, CoreCandidateSiteOptionalData, CoreSiteWSPreSets, WSObservable } from './candidate-site'; +import { CoreAuthenticatedSite, CoreAuthenticatedSiteOptionalData, CoreSiteWSPreSets, WSObservable } from './authenticated-site'; /** * Class that represents a site (combination of site + user). * It will have all the site data and provide utility functions regarding a site. */ -export class CoreSite extends CoreCandidateSite { +export class CoreSite extends CoreAuthenticatedSite { id: string; config?: CoreSiteConfig; @@ -920,7 +920,7 @@ export class CoreSite extends CoreCandidateSite { /** * Optional data to create a site. */ -export type CoreSiteOptionalData = CoreCandidateSiteOptionalData & { +export type CoreSiteOptionalData = CoreAuthenticatedSiteOptionalData & { info?: CoreSiteInfo; config?: CoreSiteConfig; loggedOut?: boolean; diff --git a/src/core/features/comments/services/comments.ts b/src/core/features/comments/services/comments.ts index 6359fb3c917..288dd72935c 100644 --- a/src/core/features/comments/services/comments.ts +++ b/src/core/features/comments/services/comments.ts @@ -23,7 +23,7 @@ import { makeSingleton } from '@singletons'; import { CoreEvents } from '@singletons/events'; import { CoreCommentsOffline } from './comments-offline'; import { CoreCommentsSyncAutoSyncData, CoreCommentsSyncProvider } from './comments-sync'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmComments:'; diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts index 05f832cda11..aba3a28c85d 100644 --- a/src/core/features/course/services/course.ts +++ b/src/core/features/course/services/course.ts @@ -55,7 +55,7 @@ import { SQLiteDB } from '@classes/sqlitedb'; import { CorePlatform } from '@services/platform'; import { asyncObservable, firstValueFrom } from '@/core/utils/rxjs'; import { map } from 'rxjs/operators'; -import { CoreSiteWSPreSets, WSObservable } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets, WSObservable } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmCourse:'; diff --git a/src/core/features/course/services/module-prefetch-delegate.ts b/src/core/features/course/services/module-prefetch-delegate.ts index bd0d84f55a9..845e2c99fd7 100644 --- a/src/core/features/course/services/module-prefetch-delegate.ts +++ b/src/core/features/course/services/module-prefetch-delegate.ts @@ -24,7 +24,7 @@ import { CoreTimeUtils } from '@services/utils/time'; import { CoreUtils } from '@services/utils/utils'; import { CoreCourse, CoreCourseAnyModuleData, CoreCourseModuleContentFile } from './course'; import { CoreCache } from '@classes/cache'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { CoreConstants } from '@/core/constants'; import { CoreDelegate, CoreDelegateHandler } from '@classes/delegate'; import { makeSingleton } from '@singletons'; diff --git a/src/core/features/courses/services/courses-helper.ts b/src/core/features/courses/services/courses-helper.ts index 9bf1e2c1de4..a6464390a4e 100644 --- a/src/core/features/courses/services/courses-helper.ts +++ b/src/core/features/courses/services/courses-helper.ts @@ -29,7 +29,7 @@ import moment from 'moment-timezone'; import { of } from 'rxjs'; import { firstValueFrom, zipIncludingComplete } from '@/core/utils/rxjs'; import { catchError, map } from 'rxjs/operators'; -import { chainRequests, WSObservable } from '@classes/sites/candidate-site'; +import { chainRequests, WSObservable } from '@classes/sites/authenticated-site'; // Id for a course item representing all courses (for example, for course filters). export const ALL_COURSES_ID = -1; diff --git a/src/core/features/courses/services/courses.ts b/src/core/features/courses/services/courses.ts index 34f7b2df216..57b4b8a5fe5 100644 --- a/src/core/features/courses/services/courses.ts +++ b/src/core/features/courses/services/courses.ts @@ -25,7 +25,7 @@ import { map } from 'rxjs/operators'; import { AddonEnrolGuest, AddonEnrolGuestInfo } from '@addons/enrol/guest/services/guest'; import { AddonEnrolSelf } from '@addons/enrol/self/services/self'; import { CoreEnrol, CoreEnrolEnrolmentInfo, CoreEnrolEnrolmentMethod } from '@features/enrol/services/enrol'; -import { CoreSiteWSPreSets, WSObservable } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets, WSObservable } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmCourses:'; diff --git a/src/core/features/courses/services/dashboard.ts b/src/core/features/courses/services/dashboard.ts index a8fd4c57a80..c207ef908cd 100644 --- a/src/core/features/courses/services/dashboard.ts +++ b/src/core/features/courses/services/dashboard.ts @@ -21,7 +21,7 @@ import { makeSingleton } from '@singletons'; import { CoreError } from '@classes/errors/error'; import { map } from 'rxjs/operators'; import { asyncObservable, firstValueFrom } from '@/core/utils/rxjs'; -import { CoreSiteWSPreSets, WSObservable } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets, WSObservable } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'CoreCoursesDashboard:'; diff --git a/src/core/features/filter/services/filter.ts b/src/core/features/filter/services/filter.ts index b7ff84a2348..f82862f84cf 100644 --- a/src/core/features/filter/services/filter.ts +++ b/src/core/features/filter/services/filter.ts @@ -23,7 +23,7 @@ import { CoreFilterDelegate } from './filter-delegate'; import { makeSingleton } from '@singletons'; import { CoreEvents, CoreEventSiteData } from '@singletons/events'; import { CoreLogger } from '@singletons/logger'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; /** * Service to provide filter functionalities. diff --git a/src/core/features/grades/services/grades.ts b/src/core/features/grades/services/grades.ts index cd72f3d28d5..789fe0df2d5 100644 --- a/src/core/features/grades/services/grades.ts +++ b/src/core/features/grades/services/grades.ts @@ -18,7 +18,7 @@ import { CoreSites } from '@services/sites'; import { makeSingleton } from '@singletons'; import { CoreLogger } from '@singletons/logger'; import { CoreWSExternalWarning } from '@services/ws'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { CoreError } from '@classes/errors/error'; import { SafeNumber } from '@/core/utils/types'; diff --git a/src/core/features/h5p/services/h5p.ts b/src/core/features/h5p/services/h5p.ts index d12a1eb64f4..81586e55afa 100644 --- a/src/core/features/h5p/services/h5p.ts +++ b/src/core/features/h5p/services/h5p.ts @@ -29,7 +29,7 @@ import { CoreH5PValidator } from '../classes/validator'; import { makeSingleton } from '@singletons'; import { CoreError } from '@classes/errors/error'; import { CorePath } from '@singletons/path'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; /** * Service to provide H5P functionalities. diff --git a/src/core/features/rating/services/rating.ts b/src/core/features/rating/services/rating.ts index bdfd3846de4..dfc5dd3bd81 100644 --- a/src/core/features/rating/services/rating.ts +++ b/src/core/features/rating/services/rating.ts @@ -23,7 +23,7 @@ import { CoreWSExternalWarning } from '@services/ws'; import { makeSingleton } from '@singletons'; import { CoreEvents } from '@singletons/events'; import { CoreRatingOffline } from './rating-offline'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'CoreRating:'; diff --git a/src/core/features/reportbuilder/services/reportbuilder.ts b/src/core/features/reportbuilder/services/reportbuilder.ts index 0d06aaa6c1c..35cd93677c5 100644 --- a/src/core/features/reportbuilder/services/reportbuilder.ts +++ b/src/core/features/reportbuilder/services/reportbuilder.ts @@ -14,7 +14,7 @@ import { Injectable } from '@angular/core'; import { CoreError } from '@classes/errors/error'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { CoreSites } from '@services/sites'; import { CoreWSExternalWarning } from '@services/ws'; import { makeSingleton } from '@singletons'; diff --git a/src/core/features/sitehome/services/sitehome.ts b/src/core/features/sitehome/services/sitehome.ts index c45908f3acc..cc87271ed82 100644 --- a/src/core/features/sitehome/services/sitehome.ts +++ b/src/core/features/sitehome/services/sitehome.ts @@ -22,7 +22,7 @@ import { CoreCourses } from '../../courses/services/courses'; import { AddonModForum, AddonModForumData } from '@addons/mod/forum/services/forum'; import { CoreError } from '@classes/errors/error'; import { CoreBlockHelper } from '@features/block/services/block-helper'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; /** * Items with index 1 and 3 were removed on 2.5 and not being supported in the app. diff --git a/src/core/features/siteplugins/classes/call-ws-directive.ts b/src/core/features/siteplugins/classes/call-ws-directive.ts index 3d2287c7dc6..f908c4ed429 100644 --- a/src/core/features/siteplugins/classes/call-ws-directive.ts +++ b/src/core/features/siteplugins/classes/call-ws-directive.ts @@ -15,7 +15,7 @@ import { Input, OnInit, OnDestroy, ElementRef, Output, EventEmitter, Directive } from '@angular/core'; import { Subscription } from 'rxjs'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { CoreSitePluginsPluginContentComponent } from '../components/plugin-content/plugin-content'; import { CoreSitePlugins } from '../services/siteplugins'; import { CoreLogger } from '@singletons/logger'; diff --git a/src/core/features/siteplugins/components/module-index/module-index.ts b/src/core/features/siteplugins/components/module-index/module-index.ts index e13a4dd218b..e7464fca3ba 100644 --- a/src/core/features/siteplugins/components/module-index/module-index.ts +++ b/src/core/features/siteplugins/components/module-index/module-index.ts @@ -14,7 +14,7 @@ import { Component, OnInit, OnDestroy, Input, ViewChild, HostBinding } from '@angular/core'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { CoreCourseModuleSummaryResult, CoreCourseModuleSummaryComponent, diff --git a/src/core/features/siteplugins/components/plugin-content/plugin-content.ts b/src/core/features/siteplugins/components/plugin-content/plugin-content.ts index e13667e2c31..eadce9a79f1 100644 --- a/src/core/features/siteplugins/components/plugin-content/plugin-content.ts +++ b/src/core/features/siteplugins/components/plugin-content/plugin-content.ts @@ -27,7 +27,7 @@ import { import { Subject } from 'rxjs'; import { Md5 } from 'ts-md5'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { CoreCompileHtmlComponent } from '@features/compile/components/compile-html/compile-html'; import { CoreSitePlugins, CoreSitePluginsContent, CoreSitePluginsProvider } from '@features/siteplugins/services/siteplugins'; import { CoreNavigator } from '@services/navigator'; diff --git a/src/core/features/siteplugins/directives/call-ws-new-content.ts b/src/core/features/siteplugins/directives/call-ws-new-content.ts index b5273194627..e80331f452e 100644 --- a/src/core/features/siteplugins/directives/call-ws-new-content.ts +++ b/src/core/features/siteplugins/directives/call-ws-new-content.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Directive, Input, ElementRef, Optional } from '@angular/core'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { CoreNavigator } from '@services/navigator'; import { CoreUtils } from '@services/utils/utils'; import { Md5 } from 'ts-md5'; diff --git a/src/core/features/siteplugins/directives/new-content.ts b/src/core/features/siteplugins/directives/new-content.ts index 8bf59292863..5459916691d 100644 --- a/src/core/features/siteplugins/directives/new-content.ts +++ b/src/core/features/siteplugins/directives/new-content.ts @@ -15,7 +15,7 @@ import { Directive, Input, OnInit, ElementRef, Optional } from '@angular/core'; import { Md5 } from 'ts-md5'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { CoreNavigator } from '@services/navigator'; import { CoreUtils } from '@services/utils/utils'; import { CoreSitePluginsPluginContentComponent } from '../components/plugin-content/plugin-content'; diff --git a/src/core/features/siteplugins/pages/plugin/plugin.ts b/src/core/features/siteplugins/pages/plugin/plugin.ts index 6532a7bd17f..4571faab02f 100644 --- a/src/core/features/siteplugins/pages/plugin/plugin.ts +++ b/src/core/features/siteplugins/pages/plugin/plugin.ts @@ -14,7 +14,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { CoreSitePluginsContent } from '@features/siteplugins/services/siteplugins'; import { CanLeave } from '@guards/can-leave'; import { CoreNavigator } from '@services/navigator'; diff --git a/src/core/features/siteplugins/services/siteplugins-helper.ts b/src/core/features/siteplugins/services/siteplugins-helper.ts index ffcec0afb20..0307eb25aae 100644 --- a/src/core/features/siteplugins/services/siteplugins-helper.ts +++ b/src/core/features/siteplugins/services/siteplugins-helper.ts @@ -20,7 +20,7 @@ import { AddonModAssignSubmissionDelegate } from '@addons/mod/assign/services/su import { AddonModQuizAccessRuleDelegate } from '@addons/mod/quiz/services/access-rules-delegate'; import { CoreDelegate, CoreDelegateHandler } from '@classes/delegate'; import { CoreError } from '@classes/errors/error'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; import { CoreBlockDelegate } from '@features/block/services/block-delegate'; import { CoreCompile } from '@features/compile/services/compile'; import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate'; diff --git a/src/core/features/siteplugins/services/siteplugins.ts b/src/core/features/siteplugins/services/siteplugins.ts index 56e70fab20c..1c2d5ad4bb3 100644 --- a/src/core/features/siteplugins/services/siteplugins.ts +++ b/src/core/features/siteplugins/services/siteplugins.ts @@ -32,7 +32,7 @@ import { CoreSitePluginsModuleHandler } from '../classes/handlers/module-handler import { CorePromisedValue } from '@classes/promised-value'; import { CorePlatform } from '@services/platform'; import { CoreEnrolAction, CoreEnrolInfoIcon } from '@features/enrol/services/enrol-delegate'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'CoreSitePlugins:'; diff --git a/src/core/features/tag/services/tag.ts b/src/core/features/tag/services/tag.ts index bf5f6ec0c35..cc5261426d1 100644 --- a/src/core/features/tag/services/tag.ts +++ b/src/core/features/tag/services/tag.ts @@ -18,7 +18,7 @@ import { CoreSite } from '@classes/sites/site'; import { CoreWSExternalWarning } from '@services/ws'; import { makeSingleton, Translate } from '@singletons'; import { CoreError } from '@classes/errors/error'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'CoreTag:'; diff --git a/src/core/features/user/classes/support/authenticated-support-config.ts b/src/core/features/user/classes/support/authenticated-support-config.ts index 948de8c7fe1..587eb3e9d07 100644 --- a/src/core/features/user/classes/support/authenticated-support-config.ts +++ b/src/core/features/user/classes/support/authenticated-support-config.ts @@ -16,7 +16,7 @@ import { CoreSite } from '@classes/sites/site'; import { CoreSites } from '@services/sites'; import { CoreUserSupportConfig } from './support-config'; import { CoreSiteConfigSupportAvailability } from '@classes/sites/unauthenticated-site'; -import { CoreCandidateSite } from '@classes/sites/candidate-site'; +import { CoreAuthenticatedSite } from '@classes/sites/authenticated-site'; /** * Support config for an authenticated user. @@ -32,9 +32,9 @@ export class CoreUserAuthenticatedSupportConfig extends CoreUserSupportConfig { return new CoreUserAuthenticatedSupportConfig(CoreSites.getRequiredCurrentSite()); } - private site: CoreSite | CoreCandidateSite; + private site: CoreSite | CoreAuthenticatedSite; - constructor(site: CoreSite | CoreCandidateSite) { + constructor(site: CoreSite | CoreAuthenticatedSite) { super(); this.site = site; diff --git a/src/core/features/user/services/user.ts b/src/core/features/user/services/user.ts index b40dcb60abc..a577bd3337b 100644 --- a/src/core/features/user/services/user.ts +++ b/src/core/features/user/services/user.ts @@ -28,7 +28,7 @@ import { CoreError } from '@classes/errors/error'; import { USERS_TABLE_NAME, CoreUserDBRecord } from './database/user'; import { CoreUserHelper } from './user-helper'; import { CoreUrlUtils } from '@services/utils/url'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmUser:'; diff --git a/src/core/features/xapi/services/xapi.ts b/src/core/features/xapi/services/xapi.ts index 4562e804d1c..a48ab6b7ed7 100644 --- a/src/core/features/xapi/services/xapi.ts +++ b/src/core/features/xapi/services/xapi.ts @@ -24,7 +24,7 @@ import { CoreXAPIItemAgent } from '../classes/item-agent'; import { CoreXAPIIRI } from '../classes/iri'; import { CoreError } from '@classes/errors/error'; import { CoreLogger } from '@singletons/logger'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; export const XAPI_STATE_DELETED = 'STATE_DELETED'; diff --git a/src/core/services/groups.ts b/src/core/services/groups.ts index 6fa1584c547..960ae0d865d 100644 --- a/src/core/services/groups.ts +++ b/src/core/services/groups.ts @@ -20,7 +20,7 @@ import { CoreError } from '@classes/errors/error'; import { makeSingleton, Translate } from '@singletons'; import { CoreWSExternalWarning } from '@services/ws'; import { CoreCourses } from '@features/courses/services/courses'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; const ROOT_CACHE_KEY = 'mmGroups:'; diff --git a/src/core/services/sites-factory.ts b/src/core/services/sites-factory.ts index 371c142ce21..0bc2b46c879 100644 --- a/src/core/services/sites-factory.ts +++ b/src/core/services/sites-factory.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Injectable } from '@angular/core'; -import { CoreCandidateSite, CoreCandidateSiteOptionalData } from '@classes/sites/candidate-site'; +import { CoreAuthenticatedSite, CoreAuthenticatedSiteOptionalData } from '@classes/sites/authenticated-site'; import { CoreSite, CoreSiteOptionalData } from '@classes/sites/site'; import { CoreUnauthenticatedSite, CoreSitePublicConfigResponse } from '@classes/sites/unauthenticated-site'; @@ -26,7 +26,7 @@ import { makeSingleton } from '@singletons'; export class CoreSitesFactoryService { /** - * Make a site object. + * Create a site instance. * * @param id Site ID. * @param siteUrl Site URL. @@ -44,15 +44,15 @@ export class CoreSitesFactoryService { } /** - * Create a candidate site instance. + * Create an authenticated site instance. * * @param siteUrl Site URL. * @param token Site's WS token. * @param options Other options. - * @returns Candidate site instance. + * @returns Authenticated site instance. */ - makeCandidateSite(siteUrl: string, token: string, options: CoreCandidateSiteOptionalData = {}): CoreCandidateSite { - return new CoreCandidateSite(siteUrl, token, options); + makeAuthenticatedSite(siteUrl: string, token: string, options: CoreAuthenticatedSiteOptionalData = {}): CoreAuthenticatedSite { + return new CoreAuthenticatedSite(siteUrl, token, options); } /** diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts index 0ba7ee3054e..e4e7d6c88f5 100644 --- a/src/core/services/sites.ts +++ b/src/core/services/sites.ts @@ -64,7 +64,7 @@ import { CoreContentLinksHelper } from '@features/contentlinks/services/contentl import { CoreAutoLogoutType, CoreAutoLogout } from '@features/autologout/services/autologout'; import { CoreCacheManager } from '@services/cache-manager'; import { CoreSiteInfo, CoreSiteInfoResponse, CoreSitePublicConfigResponse } from '@classes/sites/unauthenticated-site'; -import { CoreSiteWSPreSets } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site'; export const CORE_SITE_SCHEMAS = new InjectionToken('CORE_SITE_SCHEMAS'); export const CORE_SITE_CURRENT_SITE_ID_CONFIG = 'current_site_id'; @@ -514,12 +514,12 @@ export class CoreSitesProvider { login = true; } - // Create a "candidate" site to fetch the site info. - const candidateSite = CoreSitesFactory.makeCandidateSite(siteUrl, token, { privateToken }); + // Validate the site. + const authSite = CoreSitesFactory.makeAuthenticatedSite(siteUrl, token, { privateToken }); let isNewSite = true; try { - const info = await candidateSite.fetchSiteInfo(); + const info = await authSite.fetchSiteInfo(); const result = this.isValidMoodleVersion(info); if (result !== CoreSitesProvider.VALID_VERSION) { @@ -572,7 +572,6 @@ export class CoreSitesProvider { this.sites[siteId] = site; if (login) { - // Turn candidate site into current site. this.currentSite = site; // Store session. await this.login(siteId); diff --git a/src/storybook/stubs/classes/site.ts b/src/storybook/stubs/classes/site.ts index f15f1964cc7..4d266913b08 100644 --- a/src/storybook/stubs/classes/site.ts +++ b/src/storybook/stubs/classes/site.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreSiteWSPreSets, WSObservable } from '@classes/sites/candidate-site'; +import { CoreSiteWSPreSets, WSObservable } from '@classes/sites/authenticated-site'; import { CoreSite, CoreSiteConfigResponse } from '@classes/sites/site'; import { CoreSiteInfo } from '@classes/sites/unauthenticated-site'; import { of } from 'rxjs';