Merge pull request #5857 from appwrite/feat-oauth-provider-name
Update Project providers to also include the provider key
This commit is contained in:
commit
0a5d53ec35
4 changed files with 13 additions and 6 deletions
|
@ -232,7 +232,7 @@ return [ // Ordered by ABC.
|
|||
'mock' => false
|
||||
],
|
||||
'paypalSandbox' => [
|
||||
'name' => 'PayPal',
|
||||
'name' => 'PayPal Sandbox',
|
||||
'developers' => 'https://developer.paypal.com/docs/api/overview/',
|
||||
'icon' => 'icon-paypal',
|
||||
'enabled' => true,
|
||||
|
@ -302,7 +302,7 @@ return [ // Ordered by ABC.
|
|||
'mock' => false,
|
||||
],
|
||||
'tradeshiftBox' => [
|
||||
'name' => 'Tradeshift',
|
||||
'name' => 'Tradeshift Sandbox',
|
||||
'developers' => 'https://developers.tradeshift.com/docs/api',
|
||||
'icon' => 'icon-tradeshiftbox',
|
||||
'enabled' => true,
|
||||
|
|
|
@ -136,7 +136,7 @@ class Project extends Model
|
|||
'type' => Response::MODEL_PROVIDER,
|
||||
'description' => 'List of Providers.',
|
||||
'default' => [],
|
||||
'example' => new \stdClass(),
|
||||
'example' => [new \stdClass()],
|
||||
'array' => true,
|
||||
])
|
||||
->addRule('platforms', [
|
||||
|
@ -273,7 +273,8 @@ class Project extends Model
|
|||
}
|
||||
|
||||
$projectProviders[] = new Document([
|
||||
'name' => ucfirst($key),
|
||||
'key' => $key,
|
||||
'name' => $provider['name'] ?? '',
|
||||
'appId' => $providerValues[$key . 'Appid'] ?? '',
|
||||
'secret' => $providerValues[$key . 'Secret'] ?? '',
|
||||
'enabled' => $providerValues[$key . 'Enabled'] ?? false,
|
||||
|
|
|
@ -15,6 +15,12 @@ class Provider extends Model
|
|||
public function __construct()
|
||||
{
|
||||
$this
|
||||
->addRule('key', [
|
||||
'type' => self::TYPE_STRING,
|
||||
'description' => 'Provider.',
|
||||
'default' => '',
|
||||
'example' => 'github',
|
||||
])
|
||||
->addRule('name', [
|
||||
'type' => self::TYPE_STRING,
|
||||
'description' => 'Provider name.',
|
||||
|
|
|
@ -618,7 +618,7 @@ class ProjectsConsoleClientTest extends Scope
|
|||
foreach ($providers as $key => $provider) {
|
||||
$asserted = false;
|
||||
foreach ($response['body']['providers'] as $responseProvider) {
|
||||
if ($responseProvider['name'] === ucfirst($key)) {
|
||||
if ($responseProvider['key'] === $key) {
|
||||
$this->assertEquals('AppId-' . ucfirst($key), $responseProvider['appId']);
|
||||
$this->assertEquals('Secret-' . ucfirst($key), $responseProvider['secret']);
|
||||
$this->assertFalse($responseProvider['enabled']);
|
||||
|
@ -660,7 +660,7 @@ class ProjectsConsoleClientTest extends Scope
|
|||
foreach ($providers as $key => $provider) {
|
||||
$asserted = false;
|
||||
foreach ($response['body']['providers'] as $responseProvider) {
|
||||
if ($responseProvider['name'] === ucfirst($key)) {
|
||||
if ($responseProvider['key'] === $key) {
|
||||
// On first provider, test enabled=false
|
||||
$this->assertEquals($i !== 0, $responseProvider['enabled']);
|
||||
$asserted = true;
|
||||
|
|
Loading…
Reference in a new issue