1
0
Fork 0
mirror of synced 2024-06-28 11:10:46 +12:00

Fixed OAuth settings update error

This commit is contained in:
eldadfux 2019-09-28 22:31:14 +03:00
parent 5d8661fd27
commit fa9a7c778b
2 changed files with 13 additions and 6 deletions

View file

@ -1076,7 +1076,7 @@ foreach ($providers as $key => $provider) {
$collections[Database::SYSTEM_COLLECTION_PROJECTS]['rules'][] = [
'$collection' => Database::SYSTEM_COLLECTION_RULES,
'label' => 'OAuth '.ucfirst($key).' ID',
'key' => 'oauth'.ucfirst($key),
'key' => 'usersOauth'.ucfirst($key) . 'Appid',
'type' => 'text',
'default' => '',
'required' => false,
@ -1085,8 +1085,8 @@ foreach ($providers as $key => $provider) {
$collections[Database::SYSTEM_COLLECTION_PROJECTS]['rules'][] = [
'$collection' => Database::SYSTEM_COLLECTION_RULES,
'label' => 'OAuth '.ucfirst($key).' Access Token',
'key' => 'oauth'.ucfirst($key).'AccessToken',
'label' => 'OAuth '.ucfirst($key).' Secret',
'key' => 'usersOauth'.ucfirst($key).'Secret',
'type' => 'text',
'default' => '',
'required' => false,

View file

@ -307,8 +307,13 @@ $providers = $this->getParam('providers', []);
<li data-state="/console/users/providers?project={{router.params.project}}">
<h2>Providers</h2>
<div class="box margin-bottom margin-top-large">
<div class="box margin-bottom margin-top-large"
data-service="projects.getProject"
data-event="load,platform-create,platform-update,platform-delete"
data-name="console-project"
data-param-project-id="{{router.params.project}}"
data-scope="console">
<ul class="list">
<?php foreach ($providers as $provider => $data): if(isset($data['enabled']) && !$data['enabled']) { continue; } ?>
<li class="clear <?php echo (isset($data['enabled']) && !$data['enabled']) ? 'dev-feature' : ''; ?>">
@ -357,7 +362,9 @@ $providers = $this->getParam('providers', []);
<span>
<?php echo ucfirst($provider); ?>
<span data-ls-if="{{console-project.usersOauth<?php echo ucfirst($provider); ?>Appid}} === '' || {{console-project.usersOauth<?php echo ucfirst($provider); ?>Secret}} == '' || {{console-project.usersOauth<?php echo ucfirst($provider); ?>Appid}} === undefined || {{console-project.usersOauth<?php echo ucfirst($provider); ?>Secret}} === undefined">
<span data-ls-if="
!{{console-project.usersOauth<?php echo ucfirst($provider); ?>Appid}} ||
!{{console-project.usersOauth<?php echo ucfirst($provider); ?>Secret}}" data-debug="1">
&nbsp;<span class="tag red">Disabled</span>
</span>
</span>