diff --git a/modules/admin_manual/images/configuration/integration/ms-teams/add-a-tab-ms-teams.png b/modules/admin_manual/images/configuration/integration/ms-teams/add-a-tab-ms-teams.png deleted file mode 100644 index dedfc2391..000000000 Binary files a/modules/admin_manual/images/configuration/integration/ms-teams/add-a-tab-ms-teams.png and /dev/null differ diff --git a/modules/admin_manual/images/configuration/integration/ms-teams/add-website-ms-teams.png b/modules/admin_manual/images/configuration/integration/ms-teams/add-website-ms-teams.png deleted file mode 100644 index cd8a8d9f0..000000000 Binary files a/modules/admin_manual/images/configuration/integration/ms-teams/add-website-ms-teams.png and /dev/null differ diff --git a/modules/admin_manual/images/configuration/integration/ms-teams/app-description-msteamsgen.png b/modules/admin_manual/images/configuration/integration/ms-teams/app-description-msteamsgen.png deleted file mode 100644 index 5d70f502c..000000000 Binary files a/modules/admin_manual/images/configuration/integration/ms-teams/app-description-msteamsgen.png and /dev/null differ diff --git a/modules/admin_manual/images/configuration/integration/ms-teams/app-name-msteamsgen.png b/modules/admin_manual/images/configuration/integration/ms-teams/app-name-msteamsgen.png deleted file mode 100644 index bf4d87740..000000000 Binary files a/modules/admin_manual/images/configuration/integration/ms-teams/app-name-msteamsgen.png and /dev/null differ diff --git a/modules/admin_manual/images/configuration/integration/ms-teams/define-app-version-msteamsgen.png b/modules/admin_manual/images/configuration/integration/ms-teams/define-app-version-msteamsgen.png deleted file mode 100644 index 59cf62163..000000000 Binary files a/modules/admin_manual/images/configuration/integration/ms-teams/define-app-version-msteamsgen.png and /dev/null differ diff --git a/modules/admin_manual/images/configuration/integration/ms-teams/download-zip-msteamsgen.png b/modules/admin_manual/images/configuration/integration/ms-teams/download-zip-msteamsgen.png deleted file mode 100644 index 80d9a8811..000000000 Binary files a/modules/admin_manual/images/configuration/integration/ms-teams/download-zip-msteamsgen.png and /dev/null differ diff --git a/modules/admin_manual/images/configuration/integration/ms-teams/enter-app-id-msteamsgen.png b/modules/admin_manual/images/configuration/integration/ms-teams/enter-app-id-msteamsgen.png deleted file mode 100644 index 8da113f0b..000000000 Binary files a/modules/admin_manual/images/configuration/integration/ms-teams/enter-app-id-msteamsgen.png and /dev/null differ diff --git a/modules/admin_manual/images/configuration/integration/ms-teams/name-and-url-ms-teams.png b/modules/admin_manual/images/configuration/integration/ms-teams/name-and-url-ms-teams.png deleted file mode 100644 index bf58a66cd..000000000 Binary files a/modules/admin_manual/images/configuration/integration/ms-teams/name-and-url-ms-teams.png and /dev/null differ diff --git a/modules/admin_manual/images/configuration/integration/ms-teams/owncloud-url-msteamsgen.png b/modules/admin_manual/images/configuration/integration/ms-teams/owncloud-url-msteamsgen.png deleted file mode 100644 index f13f57794..000000000 Binary files a/modules/admin_manual/images/configuration/integration/ms-teams/owncloud-url-msteamsgen.png and /dev/null differ diff --git a/modules/admin_manual/images/configuration/integration/ms-teams/set-accent-color-msteamsgen.png b/modules/admin_manual/images/configuration/integration/ms-teams/set-accent-color-msteamsgen.png deleted file mode 100644 index 85c32f402..000000000 Binary files a/modules/admin_manual/images/configuration/integration/ms-teams/set-accent-color-msteamsgen.png and /dev/null differ diff --git a/modules/admin_manual/pages/configuration/integration/index.adoc b/modules/admin_manual/pages/configuration/integration/index.adoc index 9c755208e..703bf3ebf 100644 --- a/modules/admin_manual/pages/configuration/integration/index.adoc +++ b/modules/admin_manual/pages/configuration/integration/index.adoc @@ -2,6 +2,4 @@ This section is dedicated to integrating ownCloud with other products. -- xref:configuration/integration/ms-teams.adoc[Microsoft Teams] - - xref:configuration/integration/splunk.adoc[ownCloud App for Splunk] diff --git a/modules/admin_manual/pages/configuration/integration/ms-teams.adoc b/modules/admin_manual/pages/configuration/integration/ms-teams.adoc deleted file mode 100644 index 7cdfaf903..000000000 --- a/modules/admin_manual/pages/configuration/integration/ms-teams.adoc +++ /dev/null @@ -1,157 +0,0 @@ -= Integrate ownCloud into Microsoft Teams -:toc: right -:toclevel: 3 -:appsource-url: https://appsource.microsoft.com/en-us/marketplace/apps?product=teams -:publish-custom-app-url: https://docs.microsoft.com/en-us/MicrosoftTeams/upload-custom-apps -:teams-app-setup-policies-url: https://docs.microsoft.com/en-us/microsoftteams/teams-app-setup-policies -:manage-apps-url: https://docs.microsoft.com/en-us/MicrosoftTeams/manage-apps -:what-are-tabs-url: https://docs.microsoft.com/en-us/microsoftteams/platform/tabs/what-are-tabs -:msteams-generator-url: https://msteamsgen.owncloud.com - -== Introduction - -If you're using Microsoft Teams in your organization or for private purposes, you will likely want to access your ownCloud installation from your Microsoft Teams account. For this purpose, we created the {msteams-generator-url}[ownCloud Generator for Admins] with which you can generate a customized Microsoft Teams app for your users accessing your ownCloud services. Each ownCloud domain to be accessed requires a separate generated Microsoft Teams app for your users. The generated app must then be uploaded in your organization's app catalog. - -NOTE: As a prerequisite, the OpenID Connect app is required. If you already have a OpenID Connect configuration made with another service, you have to reconfigure with Microsoft Azure AD, as only one identity provider configuration is allowed. - -CAUTION: To configure this app in an ownCloud Dockerised environment, you need to access and update the `.htaccess` file from the container which is not accessible by default. You also need to edit your _additional_ xref:installation/configuration_notes.adoc#using-a-configuration-file[configuration file] with keys that are not available as environment variables. - -== Prerequisites - -To get this working, you need to enable and configure the following components: - -=== Option 1 "Enterprise": With Single Sign-On (SSO) and ownCloud Enterprise Edition -. Microsoft Azure Active Directory - -. ownCloud apps: -.. OpenID Connect -.. MS-Teams Bridge App - -. The custom app(s) you have generated with {msteams-generator-url}[ownCloud Generator for Admins] - -. Microsoft Teams - -=== Option 2 "Standard": With Basic Authentication and ownCloud Standard Edition - -. ownCloud apps: -.. OpenID Connect -. The custom Microsoft Teams app(s) you have generated with the {msteams-generator-url}[ownCloud Generator for Admins] -. Microsoft Teams - -Note: If you are using the Standard Edition, you can skip the following steps that describe the configuration of Azure AD and the MS-Teams Bridge App. - -== ownCloud - -=== Installation - -Perform the following steps: - -. Enable the MS-Teams Bridge app. -. Enable the OpenID Connect app. - -=== Configure the MS-Teams Bridge App - -You need to configure the MS-Teams Bridge app in two steps: - -. Create a Docker volume for the `.htaccess` file only in the containers location `/var/www/owncloud/.htaccess` and mount it to a location of choice. -+ -IMPORTANT: Please note that this file may be updated by ownCloud and will need to be reviewed before any changes are reapplied. - -. Add a _header_ directive to the Apache `.htaccess` configuration located in section `` -+ -[source,apache,options="nowrap"] ----- -Header merge Content-Security-Policy "frame-ancestors 'self' teams.microsoft.com *.teams.microsoft.com" -Header edit* Content-Security-Policy , ; ----- -+ -Using `merge`, the response header is appended to any existing header of the same name, unless the value to be appended already appears in the header's comma-delimited list of values. When a new value is merged onto an existing header it is separated from the existing header with a comma. Merging avoids that headers of the same type and content being sent multiple times. This can happen if headers are also set on other locations. - -. Add a config key to your _additional_ xref:installation/configuration_notes.adoc#using-a-configuration-file[configuration file]. -+ -This key is necessary for security reasons. Users will be asked to click a login button each time when accessing the ownCloud app after a fresh start of their Microsoft Teams app or after idle time. This behavior is by design. The button name can be freely set based on your requirements. -+ -[source,php] ----- -'msteamsbridge' => [ - "loginButtonName" => "Login to ownCloud with Azure AD", -], ----- - -. If not already configured, enable xref:configuration/server/index_php_less_urls.adoc[index.php less URL´s] on your web server. - -== Microsoft - -=== Microsoft Azure and OpenID Connect - -Before you start to create your Microsoft Teams App, follow the procedure described in -xref:configuration/user/oidc/ms-azure-setup.adoc[Example Setup Using Microsoft Azure] to configure Microsoft Azure AD and OpenID Connect. - -=== Create Your Microsoft Teams App - -The following procedure creates an ownCloud app ready to be used by your users with Microsoft Teams in your environment. - -. In {msteams-generator-url}[ownCloud Generator for Admins] follow the guided instructions step by step. - -. Enter the Microsoft App/Client ID for your app. The ID´s to be entered *must* be the xref:configuration/user/oidc/ms-azure-setup.adoc#client-id[CLIENT-ID] from Microsoft Azure. -+ -image:configuration/integration/ms-teams/enter-app-id-msteamsgen.png[,width=350] - -. Enter the version of the app you create. -+ -image:configuration/integration/ms-teams/define-app-version-msteamsgen.png[,width=350] - -. Enter the name of the app you create. Take care about how to name your app. It *cannot* be changed later on. We recommend naming it *ownCloud for Teams* for easy identification. -+ -image:configuration/integration/ms-teams/app-name-msteamsgen.png[,width=350] - -. Enter the description of the app you create. -+ -image:configuration/integration/ms-teams/app-description-msteamsgen.png[,width=350] - -. Set the AccentColor of the app you create. -+ -image:configuration/integration/ms-teams/set-accent-color-msteamsgen.png[,width=350] - -. Enter the URL how you access your owncloud instance like `+https://cloud.example.com+`. -+ -image:configuration/integration/ms-teams/owncloud-url-msteamsgen.png[,width=350] - -. After performing all the steps, click the menu:download[] button and store the generated zip file locally. -+ -image:configuration/integration/ms-teams/download-zip-msteamsgen.png[,width=350] - -. Go to the app section of Microsoft Teams and upload the generated zip file to your organization's app catalogue. Follow the {publish-custom-app-url}[Publish a custom app by uploading an app package] guide for more information. - -. The new app is now available to users in your organization's app catalog. - -. See the following documents on how to pin the app, set the order how apps appear or how to install apps on behalf of users. -.. {manage-apps-url}[Manage your apps in the Microsoft Teams admin center] -.. {teams-app-setup-policies-url}[Manage app setup policies in Microsoft Teams] - -See the xref:classic_ui:integration/ms-teams.adoc[users documentation] about their necessary steps how to integrate ownCloud into Microsoft Teams. - -=== Alternative ownCloud Website Tab - -As an alternative to creating an app for Microsoft Teams, it's also possible to embed ownCloud as a Microsoft Teams tab website. Tabs are Teams-aware webpages embedded in Microsoft Teams. See the {what-are-tabs-url}[What are Microsoft Teams tabs] documentation to find out more. - -. Press the btn:[+] plus button at the top of the Teams window. -+ -image:configuration/integration/ms-teams/add-a-tab-ms-teams.png[,width=350] - -. Search for *website* and add by clicking on it. -+ -image:configuration/integration/ms-teams/add-website-ms-teams.png[,width=350] - -. Add a meaningful name and the following URL replacing "cloud.example.com" with how you access your ownCloud instance. -+ -image:configuration/integration/ms-teams/name-and-url-ms-teams.png[,width=350] -+ -[source,url] ----- -https://cloud.example.com/apps/msteamsbridge ----- - -== Support - -If you encounter problems with the integration of ownCloud and Teams, please contact ownCloud support or look for answers to those problems at the {oc-central-url}[Forum] diff --git a/modules/admin_manual/pages/configuration/server/config_apps_sample_php_parameters.adoc b/modules/admin_manual/pages/configuration/server/config_apps_sample_php_parameters.adoc index b84cfeb07..56eefb293 100644 --- a/modules/admin_manual/pages/configuration/server/config_apps_sample_php_parameters.adoc +++ b/modules/admin_manual/pages/configuration/server/config_apps_sample_php_parameters.adoc @@ -382,27 +382,6 @@ To use this option, you need at least ownCloud’s Microsoft Office Online app v 'wopi.business-flow.enabled' => 'no', .... -== App: Microsoft Teams Bridge - -Possible key: `msteamsbridge` ARRAY - -Subkey: `loginButtonName` STRING - -=== Login Button Label -This key is necessary for security reasons. Users will be asked to click a login -button each time when accessing the ownCloud app after a fresh start of their -Microsoft Teams app or after idle time. This behavior is by design. The button -name can be freely set based on your requirements. - -==== Code Sample - -[source,php] -.... -'msteamsbridge' => [ - "loginButtonName" => "Login to ownCloud with Azure AD", -], -.... - == App: OpenID Connect (OIDC) Possible key: `openid-connect` ARRAY diff --git a/modules/admin_manual/pages/maintenance/upgrading/manual_upgrade.adoc b/modules/admin_manual/pages/maintenance/upgrading/manual_upgrade.adoc index 3ba2bdc36..fe93ecc2a 100644 --- a/modules/admin_manual/pages/maintenance/upgrading/manual_upgrade.adoc +++ b/modules/admin_manual/pages/maintenance/upgrading/manual_upgrade.adoc @@ -57,7 +57,7 @@ Go to menu:Settings[Admin > Apps] and disable all third-party apps. === Backup Manual Changes in `.htaccess` -If you have made changes in `.htaccess` located at the webroot of ownCloud, you must backup these changes. Only backup the changes made but not the complete file as this file will be recreated on upgrades and may contain different settings provided by ownCloud. Manual changes in `.htaccess` can be necessary when you e.g. xref:configuration/integration/ms-teams.adoc[Integrate ownCloud into Microsoft Teams] or fixing WebDav connection errors as xref:troubleshooting/general_troubleshooting.adoc#error-0x80070043-the-network-name-cannot-be-found-while-adding-a-network-drive[The network name cannot be found] on Windows. +If you have made changes in `.htaccess` located at the webroot of ownCloud, you must backup these changes. Only backup the changes made but not the complete file as this file will be recreated on upgrades and may contain different settings provided by ownCloud. Manual changes in `.htaccess` can be necessary when you e.g. fix WebDav connection errors as xref:troubleshooting/general_troubleshooting.adoc#error-0x80070043-the-network-name-cannot-be-found-while-adding-a-network-drive[The network name cannot be found] on Windows. === Backup Manual Changes in `.user.ini` diff --git a/modules/admin_manual/partials/nav.adoc b/modules/admin_manual/partials/nav.adoc index a8368d425..07dbac6b5 100644 --- a/modules/admin_manual/partials/nav.adoc +++ b/modules/admin_manual/partials/nav.adoc @@ -52,7 +52,6 @@ **** xref:admin_manual:configuration/files/trashbin_options.adoc[Managing the Trashbin] *** xref:admin_manual:configuration/integration/index.adoc[Integration] -**** xref:admin_manual:configuration/integration/ms-teams.adoc[Microsoft Teams] **** xref:admin_manual:configuration/integration/splunk.adoc[ownCloud App for Splunk] *** xref:admin_manual:configuration/general_topics/index.adoc[General Topics] diff --git a/modules/classic_ui/images/integration/ms-teams/login-to-owncloud-with-azure-ad.png b/modules/classic_ui/images/integration/ms-teams/login-to-owncloud-with-azure-ad.png deleted file mode 100644 index ca2c94b6f..000000000 Binary files a/modules/classic_ui/images/integration/ms-teams/login-to-owncloud-with-azure-ad.png and /dev/null differ diff --git a/modules/classic_ui/images/integration/ms-teams/owncloud-teams-app.png b/modules/classic_ui/images/integration/ms-teams/owncloud-teams-app.png deleted file mode 100644 index 7ce932235..000000000 Binary files a/modules/classic_ui/images/integration/ms-teams/owncloud-teams-app.png and /dev/null differ diff --git a/modules/classic_ui/pages/integration/index.adoc b/modules/classic_ui/pages/integration/index.adoc deleted file mode 100644 index b13fc1f32..000000000 --- a/modules/classic_ui/pages/integration/index.adoc +++ /dev/null @@ -1,6 +0,0 @@ -= Integration - -This section is dedicated to integrating ownCloud with other products, for now only Microsoft Teams, but more to come. - -- xref:integration/ms-teams.adoc[Microsoft Teams] - diff --git a/modules/classic_ui/pages/integration/ms-teams.adoc b/modules/classic_ui/pages/integration/ms-teams.adoc deleted file mode 100644 index 195f1f6dd..000000000 --- a/modules/classic_ui/pages/integration/ms-teams.adoc +++ /dev/null @@ -1,27 +0,0 @@ -= Integrate ownCloud into Microsoft Teams -:toc: right -:description: You can access your ownCloud via Microsoft Teams if your administrator has created an app available in your organization's app catalog. It is possible that the admin already has enabled the app for the users, in this case you do not need to search for it in your organization's app catalog as it is already pinned. - -== Introduction - -{description} - -== Access the App - -To access the app, perform the following steps: - -. Log in to Teams. - -. Click on the overflow menu, select Apps and search for *ownCloud for Teams* or the name provided by your admin. -+ -image:integration/ms-teams/owncloud-teams-app.png[,width=60%] -+ -TIP: You can pin the app to your left sidebar permanently. Right-click on the icon and select "Pin". - -. Log in to ownCloud by clicking on *Login to ownCloud with Azure AD*. -+ -image:integration/ms-teams/login-to-owncloud-with-azure-ad.png[,width=80%] - -. For security reasons, you need to repeat the login process after a certain idle time. - -. Repeat the steps if there is more than one ownCloud for Teams app available accessing different ownCloud hosts. diff --git a/modules/classic_ui/partials/nav.adoc b/modules/classic_ui/partials/nav.adoc index 4a3e82ba4..1633d34dd 100644 --- a/modules/classic_ui/partials/nav.adoc +++ b/modules/classic_ui/partials/nav.adoc @@ -35,8 +35,6 @@ *** xref:classic_ui:apps/contacts.adoc[Contacts] *** xref:classic_ui:apps/market.adoc[Market] *** xref:classic_ui:apps/media_viewer_app.adoc[Media Viewer App] -** xref:classic_ui:integration/index.adoc[Integration] -*** xref:classic_ui:integration/ms-teams.adoc[Microsoft Teams] ** xref:classic_ui:pim/index.adoc[Synchronization Clients] *** xref:classic_ui:pim/sync_ios.adoc[Sync iOS] *** xref:classic_ui:pim/sync_kde.adoc[Sync KDE]