mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 14:18:27 +01:00
Code Issues Projects Releases Wiki Activity

Fix: Connect google OAuth under Profile Settings -> Connected Accounts throws invalid redirect uri.

Browse Source
This commit is contained in:
buddh4 2017-05-25 17:20:11 +02:00
parent 3d86175a91
commit e899710a0a
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
protected/humhub/docs/CHANGELOG.md
View File

@ -17,6 +17,7 @@ HumHub Change Log
- Fix: `ActiveQueryContent:readable()` for guest users missing join - Fix: `ActiveQueryContent:readable()` for guest users missing join
- Enh: Added `ContentActiveRecord:managePermission` for changing the default write permission of ContentActiveRecord classes - Enh: Added `ContentActiveRecord:managePermission` for changing the default write permission of ContentActiveRecord classes
- Enh: Moved all default `WallEntryControls` to `WallEntry:getContextMenu()` widget. - Enh: Moved all default `WallEntryControls` to `WallEntry:getContextMenu()` widget.
- Fix: Connect google OAuth under `Profile Settings -> Connected Accounts` throws invalid redirect uri.
1.2.0 (April 16, 2017) 1.2.0 (April 16, 2017)
-------------------------------- --------------------------------

11
protected/humhub/docs/guide/admin/authentication.md
View File

@ -57,16 +57,17 @@ return [
Google Google
------ ------
In order to use Google OAuth you must create a project at <https://console.developers.google.com/project> In order to use Google OAuth you must create a **project** at <https://console.developers.google.com/project>
and setup its credentials at <https://console.developers.google.com/project/[yourProjectId]/apiui/credential>. and setup its credentials at <https://console.developers.google.com/project/[yourProjectId]/apiui/credential>.
In order to enable using scopes for retrieving user attributes, you should also enable Google+ API at In order to enable using scopes for retrieving user attributes, you have to enable Google+ API at
<https://console.developers.google.com/project/[yourProjectId]/apiui/api/plus>. <https://console.developers.google.com/project/[yourProjectId]/apiui/api/plus>.
Authorization callback URLs: Add one of the following **authorization callback URLs** to your googles **Credentials** configuration:
- http://domain/path-to-humhub/user/auth/external?authclient=google (With clean urls enabled) - http://<domain>/<path-to-humhub>/user/auth/external?authclient=google (With clean urls enabled)
- http://domain/path-to-humhub/index.php?r=user%2Fauth%2Fexternal&authclient=google (Without clean urls) - http://<domain>/<path-to-humhub>/index.php?r=user%2Fauth%2Fexternal&authclient=google (Without clean urls)
>Note: Replace **domain** and **path-to-humhub** in the mentioned redirect urls.
Add following block to your configuration (protected/config/common.php): Add following block to your configuration (protected/config/common.php):

2
protected/humhub/modules/user/views/account/connected-accounts.php
View File

@ -28,7 +28,7 @@ use yii\helpers\Url;
<?php elseif (in_array($client->getId(), $activeAuthClientIds)) : ?> <?php elseif (in_array($client->getId(), $activeAuthClientIds)) : ?>
<?php echo Html::a(Yii::t('UserModule.base', 'Disconnect account'), ['connected-accounts', 'disconnect' => $client->getId()], ['class' => 'btn btn-danger btn-sm', 'data-method' => 'POST']); ?> <?php echo Html::a(Yii::t('UserModule.base', 'Disconnect account'), ['connected-accounts', 'disconnect' => $client->getId()], ['class' => 'btn btn-danger btn-sm', 'data-method' => 'POST']); ?>
<?php else: ?> <?php else: ?>
<?php echo Html::a(Yii::t('UserModule.base', 'Connect account'), Url::to(['/user/auth/external', 'authclient' => $client->getId()]), ['class' => 'btn btn-success btn-sm']); ?> <?php echo Html::a(Yii::t('UserModule.base', 'Connect account'), Url::to(['/user/auth/external', 'authclient' => $client->getId()]), ['class' => 'btn btn-success btn-sm', 'data-pjax-prevent' => ""]); ?>
<?php endif; ?> <?php endif; ?>
</td> </td>
</tr> </tr>