[#13678] Update services, pages, and email to use accountId#13746
Open
TobyCyan wants to merge 11 commits intoTEAMMATES:feat/oidcfrom
Open
[#13678] Update services, pages, and email to use accountId#13746TobyCyan wants to merge 11 commits intoTEAMMATES:feat/oidcfrom
TobyCyan wants to merge 11 commits intoTEAMMATES:feat/oidcfrom
Conversation
TobyCyan
force-pushed
the
update-front-end-pages
branch
from
1a0491b to
a5fc927
Compare
TobyCyan
changed the title
There was a problem hiding this comment.
Pull request overview
This PR is part of #13678 (MS Entra ID auth support) and refactors front-end/admin flows and email generation to use accountId instead of googleId, reducing Google-specific coupling across UI links, search results, and account-reset/registration emails.
Changes:
- Replaced
googleIdwithaccountIdacross several Angular services/pages (admin search/accounts, instructor course edit, link generation). - Added new “accountId reset” email fragments + expected-email fixtures, and updated email generator/types to use accountId-based templates/types.
- Updated search result models and admin reset flows to display/reset
accountId.
Reviewed changes
Copilot reviewed 18 out of 22 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| src/web/services/student.service.ts | Renames API call parameter from googleId to accountId at the service boundary. |
| src/web/services/search.service.ts | Updates admin search result shaping + link generation to carry accountId. |
| src/web/services/link.service.ts | Renames link helper parameters to accountId while preserving query param keys. |
| src/web/services/course.service.ts | Updates masquerade-mode course fetchers to accept accountId. |
| src/web/services/account.service.ts | Updates getAccount signature to accept accountId. |
| src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.ts | Updates instructor edit panel model to use accountId. |
| src/web/app/pages-instructor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.html | Displays accountId in the joined-instructor panel. |
| src/web/app/pages-instructor/instructor-course-edit-page/instructor-course-edit-page.component.ts | Tracks current instructor via accountId and uses it in create/delete flows. |
| src/web/app/pages-help/instructor-help-page/instructor-help-sessions-section/instructor-help-sessions-data.ts | Updates help-page example data to use accountId. |
| src/web/app/pages-admin/admin-search-page/admin-search-page.component.ts | Renames reset handlers + user-facing text to “account ID”. |
| src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts | Updates admin search unit test fixtures to accountId. |
| src/web/app/pages-admin/admin-search-page/admin-search-page.component.html | Displays accountId in admin search results + updates reset actions. |
| src/web/app/pages-admin/admin-accounts-page/admin-accounts-page.component.ts | Uses accountId for delete/removal operations and account lookups. |
| src/web/app/pages-admin/admin-accounts-page/admin-accounts-page.component.html | Displays “Account ID” instead of “Google ID”. |
| src/web/app/components/account-requests-table/admin-reject-with-reason-modal/admin-reject-with-reason-modal.component.ts | Updates rejection email placeholder replacement to {accountId}. |
| src/test/resources/emails/instructorCourseRejoinAfterAccountIdResetEmailWithInstitute.html | Adds expected email fixture for instructor rejoin after accountId reset (with institute). |
| src/test/resources/emails/instructorCourseRejoinAfterAccountIdResetEmail.html | Adds expected email fixture for instructor rejoin after accountId reset. |
| src/main/resources/studentEmailFragment-accountIdReset.html | Adds new student rejoin fragment for accountId reset. |
| src/main/resources/instructorEmailFragment-accountIdReset.html | Adds new instructor rejoin fragment for accountId reset. |
| src/main/java/teammates/sqllogic/api/SqlEmailGenerator.java | Updates “yet to join” logic + introduces accountId-reset rejoin emails and accountId placeholder for course registration email. |
| src/main/java/teammates/common/util/Templates.java | Switches email fragment constants to accountId-reset fragments. |
| src/main/java/teammates/common/util/EmailType.java | Renames email types for accountId-reset rejoin emails. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
...uctor/instructor-course-edit-page/instructor-edit-panel/instructor-edit-panel.component.html
Outdated
Show resolved
Hide resolved
...nt-requests-table/admin-reject-with-reason-modal/admin-reject-with-reason-modal.component.ts
Outdated
Show resolved
Hide resolved
…h-reason-modal/admin-reject-with-reason-modal.component.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
...nt-requests-table/admin-reject-with-reason-modal/admin-reject-with-reason-modal.component.ts
Outdated
Show resolved
Hide resolved
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of #13678
Outline of Solution
googleIdwithaccountIdin relevant front-end pages/services/email.