Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Microsoft office 365 Cloud and Office Online Server support #9686

Merged
merged 3 commits into from
Aug 30, 2024
Merged

Conversation

micbar
Copy link
Contributor

@micbar micbar commented Jul 24, 2024

Description

  1. Add Support for MS office365 Cloud via the Cloud Provider Program
  2. Add Support for MS office365 Cloud via Proxy
  3. Add Support for MS Office Online Server on Premises

Related Issue

Motivation and Context

Web Office Integration

How Has This Been Tested?

  • test environment: Office Online Server
  • test case Office 365 Cloud

Screenshots (if appropriate):

Word

1237846198723127

Excel

242352342342324

Powerpoint

126351267351923

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

Copy link

update-docs bot commented Jul 24, 2024

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@micbar micbar force-pushed the ms365 branch 7 times, most recently from ee41e42 to b4c8577 Compare July 31, 2024 23:12
@micbar micbar force-pushed the ms365 branch 6 times, most recently from 7768e86 to ecb32fa Compare August 5, 2024 16:20
@micbar micbar changed the title feat: office 365 proxy support feat: Microsoft office 365 Cloud and Office Online Server support Aug 5, 2024
@micbar
Copy link
Contributor Author

micbar commented Aug 6, 2024

@JammingBen
I will not finish that before my vacation.

Deliverables from Web

To continue, i would need some information from the web team

  1. HostEditUrl and HostViewUrl - these urls are the Web Urls where we can access the opened editor in the correct view mode. Like /external-office365 . @JammingBen has pointed me to web-app-external: view mode web#9879
  2. Sharing URL which opens the Web App with the opened sidebar ready for sharing

Language codes

The language codes which are accepted by MS are only the long ones like de-DE and en-US. Currently this is implemented as a "workaround" in this PR. Would be nice to get this sorted out with web.

@mmattel
Copy link
Contributor

mmattel commented Aug 14, 2024

With regards to the proxy envvars, do we have a similar situation as described in
Microsoft Office Online / WOPI Integration?
We should in any case do some doc work in the collaboration readme...

Note, do we add that to the ocis_full deployment example?

@jvillafanez
Copy link
Member

Linking with #9827 because it probably should be applied before this PR. In addition to simplify the code, it removes the HostViewURL and HostEditURL from the WOPI context. They're expected to be re-added at some point (probably with this PR).

In addition to that, the connector's methods are now returning a ConnectorResponse which basically includes the expected HTTP status, headers and body (the body is expected to be json-encoded later). New headers added in this PR are expected to be handled within the connector, so the httpAdapter just needs to forward the data. We need to re-adjust the PR to fit it.

For the wopisrc package, note that the PutRelativeFile operation needs to generate a new wopisrc link to the new file. This is currently done in the FileConnector object, but we'll need merge it with the new code in this PR in order to support the wopi proxy. Also note that the PutFile operation is used in the PutRelativeFile operation; I don't think this PR will affect it (we probably don't need to check new information), but we should double-check.

@micbar micbar force-pushed the ms365 branch 8 times, most recently from 57a351f to c52946e Compare August 30, 2024 08:33
@micbar micbar marked this pull request as ready for review August 30, 2024 09:15
Copy link

sonarcloud bot commented Aug 30, 2024

Copy link
Contributor

@fschade fschade left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀

looks good, but I only reviewed the code and didn't start it

@micbar micbar merged commit 2d88701 into master Aug 30, 2024
3 checks passed
@micbar micbar deleted the ms365 branch August 30, 2024 17:38
ownclouders pushed a commit that referenced this pull request Aug 30, 2024
feat: Microsoft office 365 Cloud and Office Online Server support
@micbar micbar mentioned this pull request Sep 12, 2024
18 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants