Make it possible to use multiple Office 365 connectors (6.x)

@rolki could you rebase the branch against 3.0.x so the MR gets mergable, then I can test your fix.

Thanks!

Hi @fabianderijk,
Just wondering if you still want to merge this PR as we are actively use it and would be nice to see it as a part of your module.

Hi @vnech, yes i would like to have this added to the module. I just haven't had a lot of time to check this.

In the meantime, the 5.0.x branch has been created, and I think this should be added there as well as all new features will be added there. I've c opied all changes from the MR to a MR for the 5.0.x branch. Everything seems to be working there. I've tested it, and I can login using multiple Azure apps.

Can someone check as well: https://git.drupalcode.org/project/o365/-/merge_requests/33

Planning to move https://git.drupalcode.org/project/o365/-/merge_requests/33 into an issue fork so that others may also contribute and work on it.

I noticed the o365_requirements() was still attempting to read from $settings['api_settings'] which is no longer the case.

I will do a check on this code today.

When this works we will have to come up with a strategy on how to release this because this is a major change and may (better yet, will) break working sites. So we probably need to make a 6.0.x branch first before so we can merge this MR into that branch, write documentation on how to upgrade, etcetera.

I've reviewed everything on a working intranet we use the module on. Everything is working when using the code in de MR.

I will create a 6.0.x branch to merge this into and start writing documentation on how to upgrade.

Great work everyone!

Attached a static patch of the current MR supporting the latest 5.0.4 version.

Attached a version which uses a post update hook to avoid collision with the existing #3405024: logout update hook.

Great work everyone, this would be a nice addition indeed!

What are the next steps to resolve this issue? Anything I or we can help with @fabianderijk?

@bramtenhove the new 6.0.x branch has been created. Can you point your MR to this branch? See https://git.drupalcode.org/project/o365/-/tree/6.0.x

Hi @fabianderijk
Could you please change the target branch to 6.x in MR #34? I can't do this (seems like I don't have permissions)...

I tested the changes from MR #34 and everything works as expected.

HTT:

1. Apply MR #34 patch
2. Run drush updb -y; drush cr
3. In you settings.php add following settings:
   

   // Specific settings for "o365" authentication connectors.
   $settings['o365']['default']['client_id'] = '{PLACEHOLDER}';
   $settings['o365']['default']['client_secret'] = '{PLACEHOLDER}';
   $settings['o365']['default']['tenant_id'] = '{PLACEHOLDER}';
     

The target branch has now changed to the 6.0.x branch.

Added a new patch that adds a bit more defensive code, as we were seeing errors like:

TypeError: Drupal\\o365\\AuthenticationService::redirectToAuthorizationUrl(): Argument #1 ($o365_connector) must be of type Drupal\\o365\\O365ConnectorInterface, null given,

Attaching a new one as the prev was based of 5.x

I've tested the MR and everything works as expected. I fixed some phpcs and cspell issues and will merge this in the 6.x branch AND finally create a 6.0.0-beta1 release so we can let other people test as well.

We still need to update some of the documentation, for instance how the structure of the data in settings.php needs to be. I will, for now, add this to the release notes and the homepage of the module.

Thanks for all the good work!

I've just added a extra commit with a small change in cspell to credit some extra people that helped in this issue