Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-24 09:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch '1.7.x' into database-aliases

Browse source
This commit is contained in:
Darshan 2025-05-10 09:38:17 +05:30 committed by GitHub
commit e1c5b3f59e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 51 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
app/config/oAuthProviders.php
View file

@ -11,6 +11,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Amazon',
], ],
'apple' => [ 'apple' => [
'name' => 'Apple', 'name' => 'Apple',
@ -21,6 +22,7 @@ return [
'form' => 'apple.phtml', // Preparation for adding ability to customized OAuth UI forms, currently handled hardcoded. 'form' => 'apple.phtml', // Preparation for adding ability to customized OAuth UI forms, currently handled hardcoded.
'beta' => true, 'beta' => true,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Apple',
], ],
'auth0' => [ 'auth0' => [
'name' => 'Auth0', 'name' => 'Auth0',
@ -31,6 +33,7 @@ return [
'form' => 'auth0.phtml', 'form' => 'auth0.phtml',
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Auth0',
], ],
'authentik' => [ 'authentik' => [
'name' => 'Authentik', 'name' => 'Authentik',
@ -41,6 +44,7 @@ return [
'form' => 'authentik.phtml', 'form' => 'authentik.phtml',
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Authentik',
], ],
'autodesk' => [ 'autodesk' => [
'name' => 'Autodesk', 'name' => 'Autodesk',
@ -51,6 +55,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Autodesk',
], ],
'bitbucket' => [ 'bitbucket' => [
'name' => 'BitBucket', 'name' => 'BitBucket',
@ -61,6 +66,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Bitbucket',
], ],
'bitly' => [ 'bitly' => [
'name' => 'Bitly', 'name' => 'Bitly',
@ -70,7 +76,8 @@ return [
'sandbox' => false, 'sandbox' => false,
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Bitly',
], ],
'box' => [ 'box' => [
'name' => 'Box', 'name' => 'Box',
@ -80,7 +87,8 @@ return [
'sandbox' => false, 'sandbox' => false,
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Box',
], ],
'dailymotion' => [ 'dailymotion' => [
'name' => 'Dailymotion', 'name' => 'Dailymotion',
@ -90,7 +98,8 @@ return [
'sandbox' => false, 'sandbox' => false,
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Dailymotion',
], ],
'discord' => [ 'discord' => [
'name' => 'Discord', 'name' => 'Discord',
@ -101,6 +110,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Discord',
], ],
'disqus' => [ 'disqus' => [
'name' => 'Disqus', 'name' => 'Disqus',
@ -111,6 +121,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Disqus',
], ],
'dropbox' => [ 'dropbox' => [
'name' => 'Dropbox', 'name' => 'Dropbox',
@ -121,6 +132,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Dropbox',
], ],
'etsy' => [ 'etsy' => [
'name' => 'Etsy', 'name' => 'Etsy',
@ -131,6 +143,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Etsy',
], ],
'facebook' => [ 'facebook' => [
'name' => 'Facebook', 'name' => 'Facebook',
@ -141,6 +154,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Facebook',
], ],
'figma' => [ 'figma' => [
'name' => 'Figma', 'name' => 'Figma',
@ -151,6 +165,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Figma',
], ],
'github' => [ 'github' => [
'name' => 'GitHub', 'name' => 'GitHub',
@ -161,6 +176,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Github',
], ],
'gitlab' => [ 'gitlab' => [
'name' => 'GitLab', 'name' => 'GitLab',
@ -171,6 +187,7 @@ return [
'form' => 'gitlab.phtml', 'form' => 'gitlab.phtml',
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Gitlab',
], ],
'google' => [ 'google' => [
'name' => 'Google', 'name' => 'Google',
@ -181,6 +198,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Google',
], ],
'linkedin' => [ 'linkedin' => [
'name' => 'LinkedIn', 'name' => 'LinkedIn',
@ -191,6 +209,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Linkedin',
], ],
'microsoft' => [ 'microsoft' => [
'name' => 'Microsoft', 'name' => 'Microsoft',
@ -201,6 +220,7 @@ return [
'form' => 'microsoft.phtml', 'form' => 'microsoft.phtml',
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Microsoft',
], ],
'notion' => [ 'notion' => [
'name' => 'Notion', 'name' => 'Notion',
@ -211,6 +231,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Notion',
], ],
'oidc' => [ 'oidc' => [
'name' => 'OpenID Connect', 'name' => 'OpenID Connect',
@ -221,6 +242,7 @@ return [
'form' => 'oidc.phtml', 'form' => 'oidc.phtml',
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Oidc',
], ],
'okta' => [ 'okta' => [
'name' => 'Okta', 'name' => 'Okta',
@ -231,6 +253,7 @@ return [
'form' => 'okta.phtml', 'form' => 'okta.phtml',
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Okta',
], ],
'paypal' => [ 'paypal' => [
'name' => 'PayPal', 'name' => 'PayPal',
@ -240,7 +263,8 @@ return [
'sandbox' => false, 'sandbox' => false,
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Paypal',
], ],
'paypalSandbox' => [ 'paypalSandbox' => [
'name' => 'PayPal Sandbox', 'name' => 'PayPal Sandbox',
@ -250,7 +274,8 @@ return [
'sandbox' => true, 'sandbox' => true,
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Paypal',
], ],
'podio' => [ 'podio' => [
'name' => 'Podio', 'name' => 'Podio',
@ -261,6 +286,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Podio',
], ],
'salesforce' => [ 'salesforce' => [
'name' => 'Salesforce', 'name' => 'Salesforce',
@ -271,6 +297,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Salesforce',
], ],
'slack' => [ 'slack' => [
'name' => 'Slack', 'name' => 'Slack',
@ -281,6 +308,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Slack',
], ],
'spotify' => [ 'spotify' => [
'name' => 'Spotify', 'name' => 'Spotify',
@ -291,6 +319,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Spotify',
], ],
'stripe' => [ 'stripe' => [
'name' => 'Stripe', 'name' => 'Stripe',
@ -300,7 +329,8 @@ return [
'sandbox' => false, 'sandbox' => false,
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Stripe',
], ],
'tradeshift' => [ 'tradeshift' => [
'name' => 'Tradeshift', 'name' => 'Tradeshift',
@ -311,6 +341,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Tradeshift',
], ],
'tradeshiftBox' => [ 'tradeshiftBox' => [
'name' => 'Tradeshift Sandbox', 'name' => 'Tradeshift Sandbox',
@ -321,6 +352,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Tradeshift',
], ],
'twitch' => [ 'twitch' => [
'name' => 'Twitch', 'name' => 'Twitch',
@ -331,6 +363,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Twitch',
], ],
'wordpress' => [ 'wordpress' => [
'name' => 'WordPress', 'name' => 'WordPress',
@ -340,7 +373,8 @@ return [
'sandbox' => false, 'sandbox' => false,
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Wordpress',
], ],
'yahoo' => [ 'yahoo' => [
'name' => 'Yahoo', 'name' => 'Yahoo',
@ -351,6 +385,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Yahoo',
], ],
'yammer' => [ 'yammer' => [
'name' => 'Yammer', 'name' => 'Yammer',
@ -361,6 +396,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Yammer',
], ],
'yandex' => [ 'yandex' => [
'name' => 'Yandex', 'name' => 'Yandex',
@ -371,6 +407,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Yandex',
], ],
'zoho' => [ 'zoho' => [
'name' => 'Zoho', 'name' => 'Zoho',
@ -381,6 +418,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Zoho',
], ],
'zoom' => [ 'zoom' => [
'name' => 'Zoom', 'name' => 'Zoom',
@ -391,6 +429,7 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => false, 'mock' => false,
'class' => 'Appwrite\\Auth\\OAuth2\\Zoom',
], ],
// 'instagram' => [ // 'instagram' => [
// 'name' => 'Instagram', // 'name' => 'Instagram',
@ -399,6 +438,7 @@ return [
// 'enabled' => false, // 'enabled' => false,
// 'beta' => false, // 'beta' => false,
// 'mock' => false, // 'mock' => false,
// 'class' => 'Appwrite\\Auth\\OAuth2\\Instagram',
// ], // ],
// 'twitter' => [ // 'twitter' => [
// 'name' => 'twitter', // 'name' => 'twitter',
@ -407,6 +447,7 @@ return [
// 'enabled' => false, // 'enabled' => false,
// 'beta' => false, // 'beta' => false,
// 'mock' => false, // 'mock' => false,
// 'class' => 'Appwrite\\Auth\\OAuth2\\Twitter',
// ], // ],
// Keep Last // Keep Last
@ -419,5 +460,6 @@ return [
'form' => false, 'form' => false,
'beta' => false, 'beta' => false,
'mock' => true, 'mock' => true,
'class' => 'Appwrite\\Auth\\OAuth2\\Mock',
], ],
]; ];

4
app/controllers/api/account.php
View file

@ -1212,8 +1212,8 @@ App::get('/v1/account/sessions/oauth2/:provider')
throw new Exception(Exception::PROJECT_PROVIDER_DISABLED, 'This provider is disabled. Please configure the provider app ID and app secret key from your ' . APP_NAME . ' console to continue.'); throw new Exception(Exception::PROJECT_PROVIDER_DISABLED, 'This provider is disabled. Please configure the provider app ID and app secret key from your ' . APP_NAME . ' console to continue.');
} }
$className = 'Appwrite\\Auth\\OAuth2\\' . \ucfirst($provider); $oAuthProviders = Config::getParam('oAuthProviders');
$className = $oAuthProviders[$provider]['class'];
if (!\class_exists($className)) { if (!\class_exists($className)) {
throw new Exception(Exception::PROJECT_PROVIDER_UNSUPPORTED); throw new Exception(Exception::PROJECT_PROVIDER_UNSUPPORTED);
} }