diff --git a/admin_manual/configuration_files/external_storage/google.rst b/admin_manual/configuration_files/external_storage/google.rst index 978364c1e..1792af25c 100644 --- a/admin_manual/configuration_files/external_storage/google.rst +++ b/admin_manual/configuration_files/external_storage/google.rst @@ -10,10 +10,6 @@ All applications that access a Google API must be registered through the `Google Cloud Console `_. Follow along carefully because the Google interface is a bit of a maze and it's easy to get lost. -.. note:: Your ownCloud server must have a registered domain name and be - accessible over the Internet; Google Drive will not connect to a LAN-only - server. - If you already have a Google account, such as Groups, Drive, or Mail, you can use your existing login to log into the Google Cloud Console. After logging in click the **Create Project** button. @@ -28,78 +24,90 @@ your own, then click the **Create** button. .. figure:: images/google-drive1.png :alt: New project creation screen. -The next screen is your **Project Dashboard**. The Activities screen on the -bottom left shows your current status. In the left sidebar click **APIs -& Auth > APIs**, and then click **Google Apps APIs > Drive API**. +You'll be returned to your dashboard. .. figure:: images/google-drive2.png :alt: Project dashboard, with all project options. - -Before you click **Enable API** you might want to click on **Learn more** or -**Explore this API**. Then click **Enable API**. + :scale: 75% + +Google helpfully highlights your next step in blue, the **Use Google APIs** +box. Make sure that your new project is selected, click on **Use Google APIs** , +and it takes you to Google's APIs screen. There are many Google APIs; look for +the **Google Apps APIs** and click **Drive API.** .. figure:: images/google-drive3.png - :alt: "Enable API" button. + :alt: Drive API link. -**Enable API** takes you to the Drive API dashboard, with tabs for -**Overview, Usage, Quota**, and **Drive UI Integration**. Feel free to -explore, and then go to **APIs & Auth > Credentials**. This screen has two -sections: **OAuth** and **Public API Access**. +**Drive API** takes you to the API Manager overview. Click the blue **Enable +API** button. .. figure:: images/google-drive4.png :alt: API dashboard. - -Click **OAuth > Create New Client ID**. The next screen that opens is **Create -Client ID**. Check **Web Application** and click the **Configure Consent -Screen** button. You'll see the consent screen the first time you create a -mountpoint for your Google Drive in ownCloud. - +Now you must create your credentials, so click on **Go to credentials**. + .. figure:: images/google-drive5.png :alt: Create Client ID screen. - -There are just a few required fields on the Consent Screen form: the email -address of your Google account and your app name. The optional fields include -your site URL, a link to your logo, and links to your privacy and terms of -service policies. Your logo must be a hosted file because there is no upload -dialogue. Click **Save** when you're finished. + +For some reason Google warns us again that we need to create credentials. We +will use 0Auth 2.0. .. figure:: images/google-drive6.png - :alt: Consent screen. + :alt: Another warning to create credentials. + +Now we have to create a consent screen. This is the information in the screen +Google shows you when you connect your new Google app to ownCloud the first +time. Click **Configure consent screen**. Then fill in the required form fields. +Your logo must be hosted, as you cannot upload it, so enter its URL. When +you're finished click **Save**. -Now you should be on the **Edit Client Settings** screen. The **Authorized -JavaScript Origins** is your root domain, for example -``https://www.example.com``. You need two **Authorized Redirect URIs**, which -must be in the following form:: +.. figure:: images/google-drive8.png + :alt: Creating the consent screen. + +The next screen that opens is **Create Client ID**. Check **Web Application**, +then enter your app name. **Authorized JavaScript Origins** is your root domain, +for example ``https://www.example.com``, without a trailing slash. You need two +**Authorized Redirect URIs**, and they must be in this form:: https://example.com/owncloud/index.php/settings/personal https://example.com/owncloud/index.php/settings/admin Replace ``https://example.com/owncloud/`` with your own ownCloud server URL, -then click **Save**. +then click **Create**. + +.. figure:: images/google-drive9.png + :alt: Creating client credentials. + +Now Google reveals to you your **Client ID** and **Client Secret**. Click +**OK**. .. figure:: images/google-drive10.png - :alt: Edit Client Settings screen + :alt: Client ID and client secret. -This should take you back to the OAuth screen, with a summary of your settings -and editing buttons. This contains your **Client ID** and **Client Secret**, -which you need to set up your ownCloud connection. +You can see these anytime in your Google console; just click on your app name +to see complete information. .. figure:: images/google-drive11.png - :alt: OAuth screen + :alt: Client ID and client secret + +Now you have everything you need to mount your Google Drive in ownCloud. -Go to your Admin page in ownCloud, create your new folder name, enter the -Client ID and Client Secret, select your users and groups, and click **Grant -Access**. +Go to the External Storage section of your Admin page, create your new folder +name, enter the Client ID and Client Secret, and click **Grant Access**. Your +consent page appears when ownCloud makes a successful connection. Click +**Allow**. -.. figure:: images/google-drive8.png - :alt: Google Drive configuration on ownCloud Admin page. +.. figure:: images/google-drive12.png + :alt: Google Drive consent page. -Google will open a dialogue asking for permission to connect to ownCloud. Click -**Accept**. When you see the green light confirming a successful connection +When you see the green light confirming a successful connection you're finished. +.. figure:: images/google-drive13.png + :alt: Google Drive mount in ownCloud. + See :doc:`../external_storage_configuration_gui` for additional mount options and information. See :doc:`auth_mechanisms` for more information on authentication schemes. +603026686136-qnv9ooocacrkrh1vs0cht83eprgm2sbb.apps.googleusercontent.com \ No newline at end of file diff --git a/admin_manual/configuration_files/external_storage/images/google-drive.png b/admin_manual/configuration_files/external_storage/images/google-drive.png index 0598d4d2f..cf5edb276 100644 Binary files a/admin_manual/configuration_files/external_storage/images/google-drive.png and b/admin_manual/configuration_files/external_storage/images/google-drive.png differ diff --git a/admin_manual/configuration_files/external_storage/images/google-drive1.png b/admin_manual/configuration_files/external_storage/images/google-drive1.png index 89d78d4e7..466387456 100644 Binary files a/admin_manual/configuration_files/external_storage/images/google-drive1.png and b/admin_manual/configuration_files/external_storage/images/google-drive1.png differ diff --git a/admin_manual/configuration_files/external_storage/images/google-drive10.png b/admin_manual/configuration_files/external_storage/images/google-drive10.png index 013e0d1a5..136ee34ac 100644 Binary files a/admin_manual/configuration_files/external_storage/images/google-drive10.png and b/admin_manual/configuration_files/external_storage/images/google-drive10.png differ diff --git a/admin_manual/configuration_files/external_storage/images/google-drive11.png b/admin_manual/configuration_files/external_storage/images/google-drive11.png index 5de63caa5..b92521ce5 100644 Binary files a/admin_manual/configuration_files/external_storage/images/google-drive11.png and b/admin_manual/configuration_files/external_storage/images/google-drive11.png differ diff --git a/admin_manual/configuration_files/external_storage/images/google-drive12.png b/admin_manual/configuration_files/external_storage/images/google-drive12.png new file mode 100644 index 000000000..d9f56793a Binary files /dev/null and b/admin_manual/configuration_files/external_storage/images/google-drive12.png differ diff --git a/admin_manual/configuration_files/external_storage/images/google-drive13.png b/admin_manual/configuration_files/external_storage/images/google-drive13.png new file mode 100644 index 000000000..59f116c10 Binary files /dev/null and b/admin_manual/configuration_files/external_storage/images/google-drive13.png differ diff --git a/admin_manual/configuration_files/external_storage/images/google-drive2.png b/admin_manual/configuration_files/external_storage/images/google-drive2.png index ce2c38303..f3c6da806 100644 Binary files a/admin_manual/configuration_files/external_storage/images/google-drive2.png and b/admin_manual/configuration_files/external_storage/images/google-drive2.png differ diff --git a/admin_manual/configuration_files/external_storage/images/google-drive3.png b/admin_manual/configuration_files/external_storage/images/google-drive3.png index e20ad659e..58612c61c 100644 Binary files a/admin_manual/configuration_files/external_storage/images/google-drive3.png and b/admin_manual/configuration_files/external_storage/images/google-drive3.png differ diff --git a/admin_manual/configuration_files/external_storage/images/google-drive4.png b/admin_manual/configuration_files/external_storage/images/google-drive4.png index e6e01aca6..79151c050 100644 Binary files a/admin_manual/configuration_files/external_storage/images/google-drive4.png and b/admin_manual/configuration_files/external_storage/images/google-drive4.png differ diff --git a/admin_manual/configuration_files/external_storage/images/google-drive5.png b/admin_manual/configuration_files/external_storage/images/google-drive5.png index 3ad9f6c6c..0b6020850 100644 Binary files a/admin_manual/configuration_files/external_storage/images/google-drive5.png and b/admin_manual/configuration_files/external_storage/images/google-drive5.png differ diff --git a/admin_manual/configuration_files/external_storage/images/google-drive6.png b/admin_manual/configuration_files/external_storage/images/google-drive6.png index 3d2cfe346..de522e76e 100644 Binary files a/admin_manual/configuration_files/external_storage/images/google-drive6.png and b/admin_manual/configuration_files/external_storage/images/google-drive6.png differ diff --git a/admin_manual/configuration_files/external_storage/images/google-drive7.png b/admin_manual/configuration_files/external_storage/images/google-drive7.png new file mode 100644 index 000000000..de522e76e Binary files /dev/null and b/admin_manual/configuration_files/external_storage/images/google-drive7.png differ diff --git a/admin_manual/configuration_files/external_storage/images/google-drive8.png b/admin_manual/configuration_files/external_storage/images/google-drive8.png index 330f2e7e5..7ad55c8cc 100644 Binary files a/admin_manual/configuration_files/external_storage/images/google-drive8.png and b/admin_manual/configuration_files/external_storage/images/google-drive8.png differ diff --git a/admin_manual/configuration_files/external_storage/images/google-drive9.png b/admin_manual/configuration_files/external_storage/images/google-drive9.png new file mode 100644 index 000000000..2ce998ec7 Binary files /dev/null and b/admin_manual/configuration_files/external_storage/images/google-drive9.png differ