New Flutter App (beta)| - {{content}} - | +{{content}} |
New Flutter App (beta)
New iOS App (soon)
New Android App New Android App (soon) New iOS App (soon)
New Unity Game (soon)Initialize your SDK with your Appwrite server API endpoint and project ID, which can be found in your project settings page. + +```kotlin +import io.appwrite.Client +import io.appwrite.services.Account + +val client = Client(context) + .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint + .setProject("5df5acd0d48c2") // Your project ID + .setSelfSigned(true) // Remove in production +``` + +Before starting to send any API calls to your new Appwrite instance, make sure your Android emulators has network access to the Appwrite server hostname or IP address. + +When trying to connect to Appwrite from an emulator or a mobile device, localhost is the hostname of the device or emulator and not your local Appwrite instance. You should replace localhost with your private IP. You can also use a service like [ngrok](https://ngrok.com/) to proxy the Appwrite API. + +### Make Your First Request + +
Once your SDK object is set, access any of the Appwrite services and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the [API References](https://appwrite.io/docs) section.
+
+```kotlin
+// Register User
+val account = Account(client)
+val response = account.create(
+ "email@example.com",
+ "password"
+)
+```
+
+### Full Example
+
+```kotlin
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+val client = Client(context)
+ .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+ .setProject("5df5acd0d48c2") // Your project ID
+ .setSelfSigned(true) // Remove in production
+
+val account = Account(client)
+val response = account.create(
+ "email@example.com",
+ "password"
+)
+```
+
+### Error Handling
+The Appwrite Android SDK raises an `AppwriteException` object with `message`, `code` and `response` properties. You can handle any errors by catching `AppwriteException` and present the `message` to the user or handle it yourself based on the provided error information. Below is an example.
+
+```kotlin
+try {
+ var response = account.create("email@example.com", "password")
+ Log.d("Appwrite response", response.body?.string())
+} catch(e : AppwriteException) {
+ Log.e("AppwriteException",e.message.toString())
+}
+```
+
+### Learn more
+You can use following resources to learn more and get help
+- 🚀 [Getting Started Tutorial](https://appwrite.io/docs/getting-started-for-android)
+- 📜 [Appwrite Docs](https://appwrite.io/docs)
+- 💬 [Discord Community](https://appwrite.io/discord)
+- 🚂 [Appwrite Android Playground](https://github.com/appwrite/playground-for-android)
\ No newline at end of file
diff --git a/docs/sdks/deno/GETTING_STARTED.md b/docs/sdks/deno/GETTING_STARTED.md
index b8f851a4b9..3a239003fa 100644
--- a/docs/sdks/deno/GETTING_STARTED.md
+++ b/docs/sdks/deno/GETTING_STARTED.md
@@ -1,7 +1,7 @@
## Getting Started
### Init your SDK
-Initialize your SDK code with your project ID which can be found in your project settings page and your new API secret Key from project's API keys section.
+Initialize your SDK with your Appwrite server API endpoint and project ID which can be found in your project settings page and your new API secret Key from project's API keys section.
```typescript
let client = new sdk.Client();
@@ -17,7 +17,7 @@ client
### Make your first request
-Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the API References section.
+Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the [API References](https://appwrite.io/docs) section.
```typescript
let users = new sdk.Users(client);
diff --git a/docs/sdks/flutter/GETTING_STARTED.md b/docs/sdks/flutter/GETTING_STARTED.md
index 9af9720d89..0a7244b197 100644
--- a/docs/sdks/flutter/GETTING_STARTED.md
+++ b/docs/sdks/flutter/GETTING_STARTED.md
@@ -23,7 +23,7 @@ The Appwrite SDK uses ASWebAuthenticationSession on iOS 12+ and SFAuthentication
4. In Deployment Info, 'Target' select iOS 11.0
### Android
-In order to capture the Appwrite OAuth callback url, the following activity needs to be added to your [AndroidManifest.xml](https://github.com/appwrite/playground-for-flutter/blob/master/android/app/src/main/AndroidManifest.xml). Be sure to relpace the **[PROJECT_ID]** string with your actual Appwrite project ID. You can find your Appwrite project ID in you project settings screen in your Appwrite console.
+In order to capture the Appwrite OAuth callback url, the following activity needs to be added to your [AndroidManifest.xml](https://github.com/appwrite/playground-for-flutter/blob/master/android/app/src/main/AndroidManifest.xml). Be sure to replace the **[PROJECT_ID]** string with your actual Appwrite project ID. You can find your Appwrite project ID in your project settings screen in the console.
```xml
Initialize your SDK code with your project ID, which can be found in your project settings page.
+ Initialize your SDK with your Appwrite server API endpoint and project ID, which can be found in your project settings page.
```dart
import 'package:appwrite/appwrite.dart';
@@ -68,7 +68,7 @@ When trying to connect to Appwrite from an emulator or a mobile device, localhos
### Make Your First Request
- Once your SDK object is set, access any of the Appwrite services and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the API References section.
+ Once your SDK object is set, access any of the Appwrite services and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the [API References](https://appwrite.io/docs) section.
```dart
// Register User
diff --git a/docs/sdks/nodejs/GETTING_STARTED.md b/docs/sdks/nodejs/GETTING_STARTED.md
index b2ce5f091c..ee19ca3c3d 100644
--- a/docs/sdks/nodejs/GETTING_STARTED.md
+++ b/docs/sdks/nodejs/GETTING_STARTED.md
@@ -1,7 +1,7 @@
## Getting Started
### Init your SDK
-Initialize your SDK code with your project ID which can be found in your project settings page and your new API secret Key project API keys section.
+Initialize your SDK with your Appwrite server API endpoint and project ID which can be found in your project settings page and your new API secret Key project API keys section.
```js
const sdk = require('node-appwrite');
@@ -17,7 +17,7 @@ client
```
### Make Your First Request
-Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the API References section.
+Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the [API References](https://appwrite.io/docs) section.
```js
let users = new sdk.Users(client);
diff --git a/docs/sdks/php/GETTING_STARTED.md b/docs/sdks/php/GETTING_STARTED.md
index a7ceb61372..7aef8cdccf 100644
--- a/docs/sdks/php/GETTING_STARTED.md
+++ b/docs/sdks/php/GETTING_STARTED.md
@@ -1,7 +1,7 @@
## Getting Started
### Init your SDK
-Initialize your SDK code with your project ID which can be found in your project settings page and your new API secret Key from project's API keys section.
+Initialize your SDK with your Appwrite server API endpoint and project ID which can be found in your project settings page and your new API secret Key from project's API keys section.
```php
$client = new Client();
@@ -15,7 +15,7 @@ $client
```
### Make Your First Request
-Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the API References section.
+Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the [API References](https://appwrite.io/docs) section.
```php
$users = new Users($client);
diff --git a/docs/sdks/python/GETTING_STARTED.md b/docs/sdks/python/GETTING_STARTED.md
index 81c7954509..b68f51affb 100644
--- a/docs/sdks/python/GETTING_STARTED.md
+++ b/docs/sdks/python/GETTING_STARTED.md
@@ -1,7 +1,7 @@
## Getting Started
### Init your SDK
-Initialize your SDK code with your project ID which can be found in your project settings page and your new API secret Key from project's API keys section.
+Initialize your SDK with your Appwrite server API endpoint and project ID which can be found in your project settings page and your new API secret Key from project's API keys section.
```python
from appwrite.client import Client
@@ -18,7 +18,7 @@ client = Client()
```
### Make Your First Request
-Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the API References section.
+Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the [API References](https://appwrite.io/docs) section.
```python
users = Users(client)
diff --git a/docs/sdks/ruby/GETTING_STARTED.md b/docs/sdks/ruby/GETTING_STARTED.md
index acabf1c0a9..820f1669eb 100644
--- a/docs/sdks/ruby/GETTING_STARTED.md
+++ b/docs/sdks/ruby/GETTING_STARTED.md
@@ -1,7 +1,7 @@
## Getting Started
### Init your SDK
-Initialize your SDK code with your project ID which can be found in your project settings page and your new API secret Key from project's API keys section.
+Initialize your SDK with your Appwrite server API endpoint and project ID which can be found in your project settings page and your new API secret Key from project's API keys section.
```ruby
require 'appwrite'
@@ -17,7 +17,7 @@ client
```
### Make Your First Request
-Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the API References section.
+Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the [API References](https://appwrite.io/docs) section.
```ruby
users = Appwrite::Users.new(client);
diff --git a/docs/sdks/web/GETTING_STARTED.md b/docs/sdks/web/GETTING_STARTED.md
index ba337b178f..1fe6250d29 100644
--- a/docs/sdks/web/GETTING_STARTED.md
+++ b/docs/sdks/web/GETTING_STARTED.md
@@ -6,7 +6,7 @@ For you to init your SDK and interact with Appwrite services you need to add a w
From the options, choose to add a **Web** platform and add your client app hostname. By adding your hostname to your project platform you are allowing cross-domain communication between your project and the Appwrite API.
### Init your SDK
-Initialize your SDK code with your project ID which can be found in your project settings page.
+Initialize your SDK with your Appwrite server API endpoint and project ID which can be found in your project settings page.
```js
// Init your Web SDK
@@ -19,7 +19,7 @@ sdk
```
### Make Your First Request
-Once your SDK object is set, access any of the Appwrite services and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the API References section.
+Once your SDK object is set, access any of the Appwrite services and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the [API References](https://appwrite.io/docs) section.
```js
// Register User
diff --git a/public/images/clients/ios.png b/public/images/clients/ios.png
new file mode 100644
index 0000000000..82e11f98d6
Binary files /dev/null and b/public/images/clients/ios.png differ
diff --git a/public/images/clients/linux.png b/public/images/clients/linux.png
new file mode 100644
index 0000000000..d819e17b0a
Binary files /dev/null and b/public/images/clients/linux.png differ
diff --git a/public/images/clients/macos.png b/public/images/clients/macos.png
new file mode 100644
index 0000000000..64d35acc0b
Binary files /dev/null and b/public/images/clients/macos.png differ
diff --git a/public/images/clients/windows.png b/public/images/clients/windows.png
new file mode 100644
index 0000000000..14575ae0f8
Binary files /dev/null and b/public/images/clients/windows.png differ
diff --git a/src/Appwrite/Database/Pool.php b/src/Appwrite/Database/Pool.php
new file mode 100644
index 0000000000..f6ab232664
--- /dev/null
+++ b/src/Appwrite/Database/Pool.php
@@ -0,0 +1,20 @@
+available = false;
+ while (!$this->pool->isEmpty()) {
+ $this->pool->pop();
+ }
+ }
+}
diff --git a/src/Appwrite/Database/Pool/PDOPool.php b/src/Appwrite/Database/Pool/PDOPool.php
new file mode 100644
index 0000000000..75da61e6eb
--- /dev/null
+++ b/src/Appwrite/Database/Pool/PDOPool.php
@@ -0,0 +1,49 @@
+pool = new SplQueue;
+ $this->size = $size;
+ for ($i = 0; $i < $this->size; $i++) {
+ $pdo = new PDO(
+ "mysql:" .
+ "host={$host};" .
+ "dbname={$schema};" .
+ "charset={$charset}",
+ $user,
+ $pass,
+ [
+ PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4',
+ PDO::ATTR_TIMEOUT => 3, // Seconds
+ PDO::ATTR_PERSISTENT => true,
+ PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
+ PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+ PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true
+ ]
+ );
+ $this->pool->enqueue($pdo);
+ }
+ }
+
+ public function put(PDO $pdo)
+ {
+ $this->pool->enqueue($pdo);
+ }
+
+ public function get(): PDO
+ {
+ if ($this->available && count($this->pool) > 0) {
+ return $this->pool->dequeue();
+ }
+ sleep(0.01);
+ return $this->get();
+ }
+}
diff --git a/src/Appwrite/Database/Pool/RedisPool.php b/src/Appwrite/Database/Pool/RedisPool.php
new file mode 100644
index 0000000000..08e102abb0
--- /dev/null
+++ b/src/Appwrite/Database/Pool/RedisPool.php
@@ -0,0 +1,42 @@
+pool = new SplQueue;
+ $this->size = $size;
+ for ($i = 0; $i < $this->size; $i++) {
+ $redis = new Redis();
+ $redis->pconnect($host, $port);
+ $redis->setOption(Redis::OPT_READ_TIMEOUT, -1);
+
+ if ($auth) {
+ $redis->auth($auth);
+ }
+
+ $this->pool->enqueue($redis);
+ }
+ }
+
+ public function put(Redis $redis)
+ {
+ $this->pool->enqueue($redis);
+ }
+
+ public function get(): Redis
+ {
+ if ($this->available && !$this->pool->isEmpty()) {
+ return $this->pool->dequeue();
+ }
+ sleep(0.1);
+ return $this->get();
+ }
+}
diff --git a/src/Appwrite/Network/Validator/Origin.php b/src/Appwrite/Network/Validator/Origin.php
index 8101d9a30c..1581c445c6 100644
--- a/src/Appwrite/Network/Validator/Origin.php
+++ b/src/Appwrite/Network/Validator/Origin.php
@@ -13,6 +13,9 @@ class Origin extends Validator
const CLIENT_TYPE_FLUTTER_MACOS = 'flutter-macos';
const CLIENT_TYPE_FLUTTER_WINDOWS = 'flutter-windows';
const CLIENT_TYPE_FLUTTER_LINUX = 'flutter-linux';
+ const CLIENT_TYPE_ANDROID = 'android';
+ const CLIENT_TYPE_IOS = 'ios';
+
const SCHEME_TYPE_HTTP = 'http';
const SCHEME_TYPE_HTTPS = 'https';
@@ -69,6 +72,8 @@ class Origin extends Validator
case self::CLIENT_TYPE_FLUTTER_MACOS:
case self::CLIENT_TYPE_FLUTTER_WINDOWS:
case self::CLIENT_TYPE_FLUTTER_LINUX:
+ case self::CLIENT_TYPE_ANDROID:
+ case self::CLIENT_TYPE_IOS:
$this->clients[] = (isset($platform['key'])) ? $platform['key'] : '';
break;
@@ -90,7 +95,7 @@ class Origin extends Validator
}
/**
- * Check if Origin has been whiltlisted
+ * Check if Origin has been allowed
* for access to the API
*
* @param mixed $origin
diff --git a/src/Appwrite/Resque/Worker.php b/src/Appwrite/Resque/Worker.php
new file mode 100644
index 0000000000..db8dc91ce7
--- /dev/null
+++ b/src/Appwrite/Resque/Worker.php
@@ -0,0 +1,29 @@
+init();
+ }
+
+ public function perform()
+ {
+ $this->run();
+ }
+
+ public function tearDown(): void
+ {
+ $this->shutdown();
+ }
+}
\ No newline at end of file
diff --git a/src/Appwrite/Utopia/Response/Filters/V07.php b/src/Appwrite/Utopia/Response/Filters/V07.php
index 6001450b9a..36831b4733 100644
--- a/src/Appwrite/Utopia/Response/Filters/V07.php
+++ b/src/Appwrite/Utopia/Response/Filters/V07.php
@@ -55,6 +55,8 @@ class V07 extends Filter {
case Response::MODEL_ANY:
case Response::MODEL_PREFERENCES: /** ANY was replaced by PREFERENCES in 0.8.x but this is backward compatible with 0.7.x */
case Response::MODEL_NONE:
+ case Response::MODEL_ERROR:
+ case Response::MODEL_ERROR_DEV:
$parsedResponse = $content;
break;
default:
diff --git a/tests/e2e/General/HTTPTest.php b/tests/e2e/General/HTTPTest.php
index 8d38b3e882..c233f241b3 100644
--- a/tests/e2e/General/HTTPTest.php
+++ b/tests/e2e/General/HTTPTest.php
@@ -94,33 +94,33 @@ class HTTPTest extends Scope
$this->assertStringContainsString('# robotstxt.org/', $response['body']);
}
- public function testSpecSwagger2()
- {
- $response = $this->client->call(Client::METHOD_GET, '/specs/swagger2?platform=client', [
- 'content-type' => 'application/json',
- ], []);
+ // public function testSpecSwagger2()
+ // {
+ // $response = $this->client->call(Client::METHOD_GET, '/specs/swagger2?platform=client', [
+ // 'content-type' => 'application/json',
+ // ], []);
- if(!file_put_contents(__DIR__ . '/../../resources/swagger2.json', json_encode($response['body']))) {
- throw new Exception('Failed to save spec file');
- }
+ // if(!file_put_contents(__DIR__ . '/../../resources/swagger2.json', json_encode($response['body']))) {
+ // throw new Exception('Failed to save spec file');
+ // }
- $client = new Client();
- $client->setEndpoint('https://validator.swagger.io');
+ // $client = new Client();
+ // $client->setEndpoint('https://validator.swagger.io');
- /**
- * Test for SUCCESS
- */
- $response = $client->call(Client::METHOD_POST, '/validator/debug', [
- 'content-type' => 'application/json',
- ], json_decode(file_get_contents(realpath(__DIR__ . '/../../resources/swagger2.json')), true));
+ // /**
+ // * Test for SUCCESS
+ // */
+ // $response = $client->call(Client::METHOD_POST, '/validator/debug', [
+ // 'content-type' => 'application/json',
+ // ], json_decode(file_get_contents(realpath(__DIR__ . '/../../resources/swagger2.json')), true));
- $response['body'] = json_decode($response['body'], true);
+ // $response['body'] = json_decode($response['body'], true);
- $this->assertEquals(200, $response['headers']['status-code']);
- $this->assertTrue(empty($response['body']));
+ // $this->assertEquals(200, $response['headers']['status-code']);
+ // $this->assertTrue(empty($response['body']));
- unlink(realpath(__DIR__ . '/../../resources/swagger2.json'));
- }
+ // unlink(realpath(__DIR__ . '/../../resources/swagger2.json'));
+ // }
public function testSpecOpenAPI3()
{
@@ -209,4 +209,4 @@ class HTTPTest extends Scope
$this->assertIsString($body['server-ruby']);
$this->assertIsString($body['server-cli']);
}
-}
\ No newline at end of file
+}
diff --git a/tests/e2e/Services/Users/UsersBase.php b/tests/e2e/Services/Users/UsersBase.php
index ebefa2abb9..be64204749 100644
--- a/tests/e2e/Services/Users/UsersBase.php
+++ b/tests/e2e/Services/Users/UsersBase.php
@@ -122,6 +122,35 @@ trait UsersBase
return $data;
}
+ /**
+ * @depends testGetUser
+ */
+ public function testUpdateEmailVerification(array $data):array
+ {
+ /**
+ * Test for SUCCESS
+ */
+ $user = $this->client->call(Client::METHOD_PATCH, '/users/' . $data['userId'] . '/verification', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), [
+ 'emailVerification' => true,
+ ]);
+
+ $this->assertEquals($user['headers']['status-code'], 200);
+ $this->assertEquals($user['body']['emailVerification'], true);
+
+ $user = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'], array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()));
+
+ $this->assertEquals($user['headers']['status-code'], 200);
+ $this->assertEquals($user['body']['emailVerification'], true);
+
+ return $data;
+ }
+
/**
* @depends testGetUser
*/