Skip to content

Commit 1b0acc8

Browse files
kodumbeatskodumbeats
committed
Merge branch 'dev' into fix-952-patch-user-prefs-event
2 parents 5361dda + 70935fe commit 1b0acc8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+337
-213
lines changed

‎CHANGES.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
- Anonymous login
44

5-
# Version 0.7.1 (Not Released Yet)
5+
# Version 0.7.1
66

77
## Features
88

9-
- Better error logs on appwrite cretificates worker
9+
- Better error logs on appwrite certificates worker
1010
- Added option for Redis authentication
1111
- Force adding a security email on setup
1212
- SMTP is now disabled by default, no dummy SMTP is included in setup
@@ -27,6 +27,8 @@
2727
## Bug Fixes
2828

2929
- Updated missing storage env vars
30+
- Fixed a bug, that Response format header was not added in the access-control-allow-header list.
31+
- Fixed a bug where countryName is unknown on sessions (#933)
3032

3133
## Security
3234

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ docker run -it --rm \
5353
--volume /var/run/docker.sock:/var/run/docker.sock \
5454
--volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
5555
--entrypoint="install" \
56-
appwrite/appwrite:0.7.0
56+
appwrite/appwrite:0.7.1
5757
```
5858

5959
### Windows
@@ -65,7 +65,7 @@ docker run -it --rm ^
6565
--volume //var/run/docker.sock:/var/run/docker.sock ^
6666
--volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
6767
--entrypoint="install" ^
68-
appwrite/appwrite:0.7.0
68+
appwrite/appwrite:0.7.1
6969
```
7070

7171
#### PowerShell
@@ -75,7 +75,7 @@ docker run -it --rm ,
7575
--volume /var/run/docker.sock:/var/run/docker.sock ,
7676
--volume ${pwd}/appwrite:/usr/src/code/appwrite:rw ,
7777
--entrypoint="install" ,
78-
appwrite/appwrite:0.7.0
78+
appwrite/appwrite:0.7.1
7979
```
8080

8181
Once the Docker installation completes, go to http://localhost to access the Appwrite console from your browser. Please note that on non-linux native hosts, the server might take a few minutes to start after installation completes.

‎app/config/platforms.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
[
3333
'key' => 'flutter',
3434
'name' => 'Flutter',
35-
'version' => '0.3.0',
35+
'version' => '0.4.0-dev.2',
3636
'url' => 'https://github.com/appwrite/sdk-for-flutter',
3737
'package' => 'https://pub.dev/packages/appwrite',
3838
'enabled' => true,
@@ -165,7 +165,7 @@
165165
[
166166
'key' => 'deno',
167167
'name' => 'Deno',
168-
'version' => '0.1.0',
168+
'version' => '0.1.1',
169169
'url' => 'https://github.com/appwrite/sdk-for-deno',
170170
'package' => 'https://deno.land/x/appwrite',
171171
'enabled' => true,
@@ -199,7 +199,7 @@
199199
[
200200
'key' => 'python',
201201
'name' => 'Python',
202-
'version' => '0.1.0',
202+
'version' => '0.1.1',
203203
'url' => 'https://github.com/appwrite/sdk-for-python',
204204
'package' => 'https://pypi.org/project/appwrite/',
205205
'enabled' => true,
@@ -216,7 +216,7 @@
216216
[
217217
'key' => 'ruby',
218218
'name' => 'Ruby',
219-
'version' => '2.0.0',
219+
'version' => '2.0.2',
220220
'url' => 'https://github.com/appwrite/sdk-for-ruby',
221221
'package' => 'https://rubygems.org/gems/appwrite',
222222
'enabled' => true,
@@ -284,7 +284,7 @@
284284
[
285285
'key' => 'dart',
286286
'name' => 'Dart',
287-
'version' => '0.2.0',
287+
'version' => '0.3.1',
288288
'url' => 'https://github.com/appwrite/sdk-for-dart',
289289
'package' => 'https://pub.dev/packages/dart_appwrite',
290290
'enabled' => true,
@@ -301,7 +301,7 @@
301301
[
302302
'key' => 'cli',
303303
'name' => 'Command Line',
304-
'version' => '0.5.0',
304+
'version' => '0.6.0',
305305
'url' => 'https://github.com/appwrite/sdk-for-cli',
306306
'package' => 'https://github.com/appwrite/sdk-for-cli',
307307
'enabled' => true,

‎app/config/variables.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@
107107
'name' => '_APP_SYSTEM_SECURITY_EMAIL_ADDRESS',
108108
'description' => 'This is the email address used to issue SSL certificates for custom domains or the user agent in your webhooks payload.',
109109
'introduction' => '0.7.0',
110-
'default' => '',
111-
'required' => true,
110+
'default' => 'certs@appwrite.io',
111+
'required' => false,
112112
'question' => '',
113113
],
114114
[

‎app/controllers/api/account.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,11 @@
236236
->setStatusCode(Response::STATUS_CODE_CREATED)
237237
;
238238

239+
$countries = $locale->getText('countries');
240+
239241
$session
240242
->setAttribute('current', true)
241-
->setAttribute('countryName', (isset($countries[$session->getAttribute('countryCode')])) ? $countries[$session->getAttribute('countryCode')] : $locale->getText('locale.country.unknown'))
243+
->setAttribute('countryName', (isset($countries[strtoupper($session->getAttribute('countryCode'))])) ? $countries[strtoupper($session->getAttribute('countryCode'))] : $locale->getText('locale.country.unknown'))
242244
;
243245

244246
$response->dynamic($session, Response::MODEL_SESSION);
@@ -679,8 +681,8 @@
679681
continue;
680682
}
681683

682-
$token->setAttribute('countryName', (isset($countries[$token->getAttribute('contryCode')]))
683-
? $countries[$token->getAttribute('contryCode')]
684+
$token->setAttribute('countryName', (isset($countries[strtoupper($token->getAttribute('countryCode'))]))
685+
? $countries[strtoupper($token->getAttribute('countryCode'))]
684686
: $locale->getText('locale.country.unknown'));
685687
$token->setAttribute('current', ($current == $token->getId()) ? true : false);
686688

‎app/controllers/api/users.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@
205205
continue;
206206
}
207207

208-
$token->setAttribute('countryName', (isset($countries[$token->getAttribute('contryCode')]))
209-
? $countries[$token->getAttribute('contryCode')]
208+
$token->setAttribute('countryName', (isset($countries[strtoupper($token->getAttribute('contryCode'))]))
209+
? $countries[strtoupper($token->getAttribute('contryCode'))]
210210
: $locale->getText('locale.country.unknown'));
211211
$token->setAttribute('current', false);
212212

‎app/controllers/general.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
->addHeader('Server', 'Appwrite')
118118
->addHeader('X-Content-Type-Options', 'nosniff')
119119
->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE')
120-
->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-SDK-Version, Cache-Control, Expires, Pragma')
120+
->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-SDK-Version, Cache-Control, Expires, Pragma')
121121
->addHeader('Access-Control-Expose-Headers', 'X-Fallback-Cookies')
122122
->addHeader('Access-Control-Allow-Origin', $refDomain)
123123
->addHeader('Access-Control-Allow-Credentials', 'true')
@@ -237,7 +237,7 @@
237237
$response
238238
->addHeader('Server', 'Appwrite')
239239
->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE')
240-
->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-SDK-Version, Cache-Control, Expires, Pragma, X-Fallback-Cookies')
240+
->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-SDK-Version, Cache-Control, Expires, Pragma, X-Fallback-Cookies')
241241
->addHeader('Access-Control-Expose-Headers', 'X-Fallback-Cookies')
242242
->addHeader('Access-Control-Allow-Origin', $origin)
243243
->addHeader('Access-Control-Allow-Credentials', 'true')

‎app/init.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
const APP_MODE_ADMIN = 'admin';
4141
const APP_PAGING_LIMIT = 12;
4242
const APP_CACHE_BUSTER = 144;
43-
const APP_VERSION_STABLE = '0.7.0';
43+
const APP_VERSION_STABLE = '0.7.1';
4444
const APP_STORAGE_UPLOADS = '/storage/uploads';
4545
const APP_STORAGE_FUNCTIONS = '/storage/functions';
4646
const APP_STORAGE_CACHE = '/storage/cache';

‎app/preload.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,9 @@
2828
realpath(__DIR__ . '/../vendor/felixfbecker'),
2929
realpath(__DIR__ . '/../vendor/twig/twig'),
3030
realpath(__DIR__ . '/../vendor/guzzlehttp/guzzle'),
31-
realpath(__DIR__ . '/../vendor/domnikl'),
32-
realpath(__DIR__ . '/../vendor/domnikl'),
31+
realpath(__DIR__ . '/../vendor/slickdeals'),
3332
realpath(__DIR__ . '/../vendor/psr/log'),
34-
realpath(__DIR__ . '/../vendor/piwik'),
33+
realpath(__DIR__ . '/../vendor/matomo'),
3534
realpath(__DIR__ . '/../vendor/symfony'),
3635
] as $key => $value) {
3736
if($value !== false) {

‎app/tasks/sdks.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,16 @@ function getSSLPage($url)
9696
$config = new CLI();
9797
$config->setComposerVendor('appwrite');
9898
$config->setComposerPackage('cli');
99+
$config->setExecutableName('appwrite');
100+
$config->setExecutableName('appwrite');
101+
$config->setLogo("
102+
_ _ _ ___ __ _____
103+
/_\ _ __ _ ____ ___ __(_) |_ ___ / __\ / / \_ \
104+
//_\\| '_ \| '_ \ \ /\ / / '__| | __/ _ \ / / / / / /\/
105+
/ _ \ |_) | |_) \ V V /| | | | || __/ / /___/ /___/\/ /_
106+
\_/ \_/ .__/| .__/ \_/\_/ |_| |_|\__\___| \____/\____/\____/
107+
|_| |_|
108+
");
99109
break;
100110
case 'php':
101111
$config = new PHP();

0 commit comments

Comments
 (0)