diff --git a/app/sdks/js/docs/examples/projects/update-task.md b/app/sdks/js/docs/examples/projects/update-task.md index 693c61ee6..c5bb04d59 100644 --- a/app/sdks/js/docs/examples/projects/update-task.md +++ b/app/sdks/js/docs/examples/projects/update-task.md @@ -5,7 +5,7 @@ sdk setKey('') ; -let promise = sdk.projects.updateTask('[PROJECT_ID]', '[TASK_ID]', '[NAME]', 'play', '', 0, 'GET', 'https://example.com'); +let promise = sdk.projects.updateTask('[PROJECT_ID]', '[TASK_ID]', '[NAME]', 'play', '', 1, 'GET', 'https://example.com'); promise.then(function (response) { console.log(response); diff --git a/app/sdks/js/package.json b/app/sdks/js/package.json index c6274d7e5..98d108fa0 100644 --- a/app/sdks/js/package.json +++ b/app/sdks/js/package.json @@ -2,7 +2,7 @@ "name": "appwrite", "homepage": "https://appwrite.io/support", "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https://appwrite.io/docs](https://appwrite.io/docs)", - "version": "v1.0.19", + "version": "v1.0.20", "license": "BSD-3-Clause", "main": "src/sdk.js", "repository": { diff --git a/app/sdks/js/src/sdk.js b/app/sdks/js/src/sdk.js index 0114ce9e7..f89576ea1 100644 --- a/app/sdks/js/src/sdk.js +++ b/app/sdks/js/src/sdk.js @@ -138,7 +138,7 @@ globalParams.push({key: key, value: value}); }; - addGlobalHeader('x-sdk-version', 'appwrite:javascript:v1.0.19'); + addGlobalHeader('x-sdk-version', 'appwrite:javascript:v1.0.20'); addGlobalHeader('content-type', ''); /** @@ -572,6 +572,63 @@ }); }, + /** + * OAuth Callback + * + * + * @param {string} projectId + * @param {string} provider + * @param {string} code + * @param {string} state + * @throws {Error} + * @return {Promise} */ + oauthCallback: function(projectId, provider, code, state = '') { + if(projectId === undefined) { + throw new Error('Missing required parameter: "projectId"'); + } + + if(provider === undefined) { + throw new Error('Missing required parameter: "provider"'); + } + + if(code === undefined) { + throw new Error('Missing required parameter: "code"'); + } + + let path = '/auth/oauth/callback/{provider}/{projectId}'.replace(new RegExp('{projectId}', 'g'), projectId).replace(new RegExp('{provider}', 'g'), provider); + + return http + .get(path, {'content-type': 'application/json'}, + { + 'code': code, + 'state': state + }); + }, + + /** + * OAuth Login + * + * + * @param {string} provider + * @param {string} success + * @param {string} failure + * @throws {Error} + * @return {Promise} */ + oauth: function(provider, success = '', failure = '') { + if(provider === undefined) { + throw new Error('Missing required parameter: "provider"'); + } + + let path = '/auth/oauth/{provider}'.replace(new RegExp('{provider}', 'g'), provider); + + return http + .get(path, {'content-type': 'application/json'}, + { + 'success': success, + 'failure': failure + }); + }, + /** * Password Recovery * @@ -768,63 +825,6 @@ { 'redirect': redirect }); - }, - - /** - * OAuth Callback - * - * - * @param {string} projectId - * @param {string} provider - * @param {string} code - * @param {string} state - * @throws {Error} - * @return {Promise} */ - oauthCallback: function(projectId, provider, code, state = '') { - if(projectId === undefined) { - throw new Error('Missing required parameter: "projectId"'); - } - - if(provider === undefined) { - throw new Error('Missing required parameter: "provider"'); - } - - if(code === undefined) { - throw new Error('Missing required parameter: "code"'); - } - - let path = '/oauth/callback/{provider}/{projectId}'.replace(new RegExp('{projectId}', 'g'), projectId).replace(new RegExp('{provider}', 'g'), provider); - - return http - .get(path, {'content-type': 'application/json'}, - { - 'code': code, - 'state': state - }); - }, - - /** - * OAuth Login - * - * - * @param {string} provider - * @param {string} success - * @param {string} failure - * @throws {Error} - * @return {Promise} */ - oauth: function(provider, success = '', failure = '') { - if(provider === undefined) { - throw new Error('Missing required parameter: "provider"'); - } - - let path = '/oauth/{provider}'.replace(new RegExp('{provider}', 'g'), provider); - - return http - .get(path, {'content-type': 'application/json'}, - { - 'success': success, - 'failure': failure - }); } }; diff --git a/app/sdks/js/src/sdk.min.js b/app/sdks/js/src/sdk.min.js index 50751e5ef..caffff26f 100644 --- a/app/sdks/js/src/sdk.min.js +++ b/app/sdks/js/src/sdk.min.js @@ -1,5 +1,5 @@ (function(window){window.Appwrite=function(){let config={endpoint:'https://appwrite.test/v1',project:'',key:'',locale:'',mode:'',};let setEndpoint=function(endpoint){config.endpoint=endpoint;return this};let setProject=function(value){http.addGlobalHeader('X-Appwrite-Project',value);config.project=value;return this};let setKey=function(value){http.addGlobalHeader('X-Appwrite-Key',value);config.key=value;return this};let setLocale=function(value){http.addGlobalHeader('X-Appwrite-Locale',value);config.locale=value;return this};let setMode=function(value){http.addGlobalHeader('X-Appwrite-Mode',value);config.mode=value;return this};let http=function(document){let globalParams=[],globalHeaders=[];let addParam=function(url,param,value){let a=document.createElement('a'),regex=/(?:\?|&|&)+([^=]+)(?:=([^&]*))*/g;let match,str=[];a.href=url;param=encodeURIComponent(param);while(match=regex.exec(a.search))if(param!==match[1])str.push(match[1]+(match[2]?"="+match[2]:""));str.push(param+(value?"="+encodeURIComponent(value):""));a.search=str.join("&");return a.href};let buildQuery=function(params){let str=[];for(let p in params){if(Array.isArray(params[p])){for(let index=0;indexupdateTask('[PROJECT_ID]', '[TASK_ID]', '[NAME]', 'play', '', 0, 'GET', 'https://example.com'); \ No newline at end of file +$result = $projects->updateTask('[PROJECT_ID]', '[TASK_ID]', '[NAME]', 'play', '', 1, 'GET', 'https://example.com'); \ No newline at end of file diff --git a/app/sdks/php/src/Appwrite/Client.php b/app/sdks/php/src/Appwrite/Client.php index 4a5cbc007..b5b604305 100644 --- a/app/sdks/php/src/Appwrite/Client.php +++ b/app/sdks/php/src/Appwrite/Client.php @@ -37,7 +37,7 @@ class Client */ protected $headers = [ 'content-type' => '', - 'x-sdk-version' => 'appwrite:php:v1.0.6', + 'x-sdk-version' => 'appwrite:php:v1.0.7', ]; /** diff --git a/app/sdks/php/src/Appwrite/Services/Auth.php b/app/sdks/php/src/Appwrite/Services/Auth.php index 36b3c55a1..c3bebe8a8 100644 --- a/app/sdks/php/src/Appwrite/Services/Auth.php +++ b/app/sdks/php/src/Appwrite/Services/Auth.php @@ -88,6 +88,49 @@ class Auth extends Service ], $params); } + /** + * OAuth Callback + * + * @param string $projectId + * @param string $provider + * @param string $code + * @param string $state + * @throws Exception + * @return array + */ + public function oauthCallback($projectId, $provider, $code, $state = '') + { + $path = str_replace(['{projectId}', '{provider}'], [$projectId, $provider], '/auth/oauth/callback/{provider}/{projectId}'); + $params = []; + + $params['code'] = $code; + $params['state'] = $state; + + return $this->client->call(Client::METHOD_GET, $path, [ + ], $params); + } + + /** + * OAuth Login + * + * @param string $provider + * @param string $success + * @param string $failure + * @throws Exception + * @return array + */ + public function oauth($provider, $success = '', $failure = '') + { + $path = str_replace(['{provider}'], [$provider], '/auth/oauth/{provider}'); + $params = []; + + $params['success'] = $success; + $params['failure'] = $failure; + + return $this->client->call(Client::METHOD_GET, $path, [ + ], $params); + } + /** * Password Recovery * @@ -250,47 +293,4 @@ class Auth extends Service ], $params); } - /** - * OAuth Callback - * - * @param string $projectId - * @param string $provider - * @param string $code - * @param string $state - * @throws Exception - * @return array - */ - public function oauthCallback($projectId, $provider, $code, $state = '') - { - $path = str_replace(['{projectId}', '{provider}'], [$projectId, $provider], '/oauth/callback/{provider}/{projectId}'); - $params = []; - - $params['code'] = $code; - $params['state'] = $state; - - return $this->client->call(Client::METHOD_GET, $path, [ - ], $params); - } - - /** - * OAuth Login - * - * @param string $provider - * @param string $success - * @param string $failure - * @throws Exception - * @return array - */ - public function oauth($provider, $success = '', $failure = '') - { - $path = str_replace(['{provider}'], [$provider], '/oauth/{provider}'); - $params = []; - - $params['success'] = $success; - $params['failure'] = $failure; - - return $this->client->call(Client::METHOD_GET, $path, [ - ], $params); - } - } \ No newline at end of file diff --git a/app/sdks/python/appwrite/services/auth.py b/app/sdks/python/appwrite/services/auth.py index 65b686272..ddf7469c0 100644 --- a/app/sdks/python/appwrite/services/auth.py +++ b/app/sdks/python/appwrite/services/auth.py @@ -35,6 +35,31 @@ class Auth(Service): return self.client.call('delete', path, { }, params) + def oauth_callback(self, project_id, provider, code, state=''): + """OAuth Callback""" + + params = {} + path = '/auth/oauth/callback/{provider}/{projectId}' + path.replace('{projectId}', project_id) + path.replace('{provider}', provider) + params['code'] = code + params['state'] = state + + return self.client.call('get', path, { + }, params) + + def oauth(self, provider, success='', failure=''): + """OAuth Login""" + + params = {} + path = '/auth/oauth/{provider}' + path.replace('{provider}', provider) + params['success'] = success + params['failure'] = failure + + return self.client.call('get', path, { + }, params) + def recovery(self, email, redirect): """Password Recovery""" @@ -94,28 +119,3 @@ class Auth(Service): return self.client.call('post', path, { }, params) - - def oauth_callback(self, project_id, provider, code, state=''): - """OAuth Callback""" - - params = {} - path = '/oauth/callback/{provider}/{projectId}' - path.replace('{projectId}', project_id) - path.replace('{provider}', provider) - params['code'] = code - params['state'] = state - - return self.client.call('get', path, { - }, params) - - def oauth(self, provider, success='', failure=''): - """OAuth Login""" - - params = {} - path = '/oauth/{provider}' - path.replace('{provider}', provider) - params['success'] = success - params['failure'] = failure - - return self.client.call('get', path, { - }, params) diff --git a/app/sdks/ruby/lib/appwrite/services/auth.rb b/app/sdks/ruby/lib/appwrite/services/auth.rb index 39df1285b..b896d6e98 100644 --- a/app/sdks/ruby/lib/appwrite/services/auth.rb +++ b/app/sdks/ruby/lib/appwrite/services/auth.rb @@ -36,6 +36,33 @@ module Appwrite }, params); end + def oauth_callback(project_id:, provider:, code:, state: '') + path = '/auth/oauth/callback/{provider}/{projectId}' + .gsub('{project_id}', project_id) + .gsub('{provider}', provider) + + params = { + 'code': code, + 'state': state + } + + return @client.call('get', path, { + }, params); + end + + def oauth(provider:, success: '', failure: '') + path = '/auth/oauth/{provider}' + .gsub('{provider}', provider) + + params = { + 'success': success, + 'failure': failure + } + + return @client.call('get', path, { + }, params); + end + def recovery(email:, redirect:) path = '/auth/recovery' @@ -101,33 +128,6 @@ module Appwrite }, params); end - def oauth_callback(project_id:, provider:, code:, state: '') - path = '/oauth/callback/{provider}/{projectId}' - .gsub('{project_id}', project_id) - .gsub('{provider}', provider) - - params = { - 'code': code, - 'state': state - } - - return @client.call('get', path, { - }, params); - end - - def oauth(provider:, success: '', failure: '') - path = '/oauth/{provider}' - .gsub('{provider}', provider) - - params = { - 'success': success, - 'failure': failure - } - - return @client.call('get', path, { - }, params); - end - protected diff --git a/app/tasks/sdks.php b/app/tasks/sdks.php index f146fd6a3..9fcdc2834 100644 --- a/app/tasks/sdks.php +++ b/app/tasks/sdks.php @@ -38,7 +38,7 @@ $cli $clients = [ 'php' => [ - 'version' => 'v1.0.6', + 'version' => 'v1.0.7', 'result' => __DIR__ . '/../sdks/php/', 'gitURL' => 'https://github.com/appwrite/sdk-for-php.git', 'gitRepo' => 'git@github.com:appwrite/sdk-for-php.git', @@ -47,7 +47,7 @@ $cli 'warning' => '', ], 'js' => [ - 'version' => 'v1.0.19', + 'version' => 'v1.0.20', 'result' => __DIR__ . '/../sdks/js/', 'gitURL' => 'https://github.com/appwrite/sdk-for-js.git', 'gitRepo' => 'git@github.com:appwrite/sdk-for-js.git', @@ -56,7 +56,7 @@ $cli 'warning' => '', ], 'node' => [ - 'version' => 'v1.0.23', + 'version' => 'v1.0.24', 'result' => __DIR__ . '/../sdks/node/', 'gitURL' => 'https://github.com/appwrite/sdk-for-node.git', 'gitRepo' => 'git@github.com:appwrite/sdk-for-node.git',