Multi-tenant using config file by RawanMatar89 · Pull Request #637 · openedx/openedx-app-ios

RawanMatar89 · 2025-09-07T08:44:33Z

Describtion:

This PR introduces multi-tenant support to the app, allowing users to select their institution (tenant) at run-time with distinct configurations, branding.

TODO:

Refactor to avoid using ThemeManager references in the code
Initial ADR and OEP: here
YAML configuration documentation (after review)
Fixed conflicts with the develop branch
Initial review by RG team
Final review by RG team
Fix lint issues after the final review

Screenshots:

first screen if multi-tenant implemented in config	first screen if one-tenant implemented in config

each tenant could has it own login screen e.g.:

The user can switch between tenant from setting screen:
|Settings screen - switch tenant section|Select a tenant screen|

custom brand-colors for each tenant:

Home screen	Discover screen

openedx-webhooks · 2025-09-07T08:44:38Z

Thanks for the pull request, @RawanMatar89!

This repository is currently maintained by @openedx/openedx-mobile-maintainers.

Once you've gone through the following steps feel free to tag them in a comment and let them know that your changes are ready for engineering review.

🔘 Get product approval

If you haven't already, check this list to see if your contribution needs to go through the product review process.

If it does, you'll need to submit a product proposal for your contribution, and have it reviewed by the Product Working Group.
- This process (including the steps you'll need to take) is documented here.
If it doesn't, simply proceed with the next step.

🔘 Provide context

To help your reviewers and other members of the community understand the purpose and larger context of your changes, feel free to add as much of the following information to the PR description as you can:

Dependencies

This PR must be merged before / after / at the same time as ...
Blockers

This PR is waiting for OEP-1234 to be accepted.
Timeline information

This PR must be merged by XX date because ...
Partner information

This is for a course on edx.org.
Supporting documentation
Relevant Open edX discussion forum threads

🔘 Get a green build

If one or more checks are failing, continue working on your changes until this is no longer the case and your build turns green.

Details

Where can I find more information?

If you'd like to get more details on all aspects of the review process for open source pull requests (OSPRs), check out the following resources:

When can I expect my changes to be merged?

Our goal is to get community contributions seen and reviewed as efficiently as possible.

However, the amount of time that it takes to review and merge a PR can vary significantly based on factors such as:

The size and impact of the changes that it introduces
The need for product review
Maintenance status of the parent repository

💡 As a result it may take up to several weeks or months to complete a review and merge your PR.

mphilbrick211 · 2025-09-10T21:06:57Z

Hi @RawanMatar89! Just flagging a couple failing checks here.

OmarIthawi

Thanks @RawanMatar89, I have few notes to reduce the git diff and to ensure we have an easy Developer Experience for someone who's developing and testing on a single Tenant.

We also need to document the main changes done in this pull request in a document in this repository for iOS-specific changes as complimentary document to the OEP.

@IvanStepanok @volodymyr-chekyrta please give this a quick review so we continue on polishing it in parallel with the OEP.

OmarIthawi · 2025-09-15T08:38:57Z

Authorization/Authorization/Presentation/Base/FieldsView.swift

+                .tint(themeManager.theme.colors.infoColor)
+                .foregroundStyle(themeManager.theme.colors.textSecondaryLight)


I think we should avoid adding uneeded diff, so the Theme class should be updated at runtime in-place:

Suggested change

.tint(themeManager.theme.colors.infoColor)

.foregroundStyle(themeManager.theme.colors.textSecondaryLight)

.tint(Theme.colors.infoColor)

.foregroundStyle(Theme.colors.textSecondaryLight)

OmarIthawi · 2025-09-15T08:39:18Z

Authorization/Authorization/Presentation/Base/FieldsView.swift

    let cssInjector: CSSInjector
    let proxy: GeometryProxy
    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var themeManager: ThemeManager


Suggested change

@EnvironmentObject var themeManager: ThemeManager

OmarIthawi · 2025-09-15T08:41:09Z

Theme/Theme/ThemeManager.swift

+            self.theme = selectedTheme
+            self.theme.name = localizedName


I think theme manager should not be updated, but the theme itself should be.

This will reduce the diff for practical reasons.

- self.theme = selectedTheme - self.theme.name = localizedName + Theme.name = localizedName

OmarIthawi · 2025-09-15T08:44:00Z

Theme/Theme/ThemeManager.swift

+public final class ThemeManager: ObservableObject {
+    public static let shared = ThemeManager()
+
+    @Published public private(set) var theme: ThemeDefinition


I recommend merging ThemeDefinition and Theme in a single class.

thank you @OmarIthawi , Done

…into MultiTenant # Conflicts: # Core/Core/Extensions/Notification.swift # Course/Course/Presentation/Container/CourseContainerView.swift # Course/Course/Presentation/Outline/ContinueWithView.swift

mphilbrick211 · 2025-12-19T18:22:05Z

Hi @RawanMatar89 @OmarIthawi! Is this pull request still in progress?

mphilbrick211 · 2026-01-22T22:34:50Z

Hi @RawanMatar89 @OmarIthawi! Is this pull request still in progress?

Friendly ping on this @RawanMatar89 @OmarIthawi

RawanMatar89 · 2026-01-24T08:20:05Z

Hi @RawanMatar89 @OmarIthawi! Is this pull request still in progress?

Friendly ping on this @RawanMatar89 @OmarIthawi

hi @mphilbrick211, we’ve slowed down a bit on this PR, but we’re aiming to finish it soon, with the minimum accepted updates.

RawanMatar89 added 3 commits August 27, 2025 18:15

feat: multi tenant implementation

ebc58ba

feat: cont multi tenant implementation

e5bd636

fix: multitenant configurations ans fixes

0ee7cbb

openedx-webhooks added the open-source-contribution PR author is not from Axim or 2U label Sep 7, 2025

openedx-webhooks added this to Contributions Sep 7, 2025

github-project-automation bot moved this to Needs Triage in Contributions Sep 7, 2025

mphilbrick211 moved this from Needs Triage to Waiting on Author in Contributions Sep 10, 2025

separate local DB implementation for each tenant

74b1937

OmarIthawi suggested changes Sep 15, 2025

View reviewed changes

RawanMatar89 changed the base branch from main to develop September 15, 2025 08:50

RawanMatar89 added 4 commits September 21, 2025 20:56

fix: revert to use only theme colors

4196251

fix: revert the use of themeManager.theme.colors

c519025

fix: update tenants configuration

984a103

Merge branch 'develop' of https://github.com/openedx/openedx-app-ios …

dc953e1

…into MultiTenant # Conflicts: # Core/Core/Extensions/Notification.swift # Course/Course/Presentation/Container/CourseContainerView.swift # Course/Course/Presentation/Outline/ContinueWithView.swift

		.tint(themeManager.theme.colors.infoColor)
		.foregroundStyle(themeManager.theme.colors.textSecondaryLight)

Conversation

RawanMatar89 commented Sep 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Describtion:

TODO:

Screenshots:

Uh oh!

openedx-webhooks commented Sep 7, 2025

Uh oh!

mphilbrick211 commented Sep 10, 2025

Uh oh!

OmarIthawi left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mphilbrick211 commented Dec 19, 2025

Uh oh!

mphilbrick211 commented Jan 22, 2026

Uh oh!

RawanMatar89 commented Jan 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

RawanMatar89 commented Sep 7, 2025 •

edited

Loading