Commit Graph

1323 Commits

Author SHA1 Message Date
Jake Barnby d32da05f92 Merge remote-tracking branch 'origin/main' into 1.7.x
# Conflicts:
#	app/config/specs/open-api3-1.7.x-console.json
#	app/config/specs/open-api3-1.7.x-server.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-1.7.x-console.json
#	app/config/specs/swagger2-1.7.x-server.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	app/init/constants.php
#	composer.lock
#	docs/references/databases/upsert-documents.md
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2025-07-21 19:22:15 +12:00
Steven Nguyen 477682e062 fix: prevent injected $user from being shadowed 2025-07-14 16:05:58 -07:00
Steven Nguyen 100aea337f fix: update OAuth2 redirect URLs
1. handle non-standard ports if the request came in on a non-standard port
2. use the _APP_CONSOLE_DOMAIN env var to handle cases where the Console domain may not be the endpoint domain such as on Appwrite Cloud
3. use the _APP_OPTIONS_FORCE_HTTPS env var to determine the protocol to be consistent with the rest of the codebase
2025-07-10 15:51:13 -07:00
Steven Nguyen 11332ed1f9 chore: fix deprecation warning from passing null into json_decode 2025-07-09 22:10:17 -07:00
Steven Nguyen 53086fe975 fix: success validation in oauth2 redirect
We switched to using the Redirect class for validating redirect URLs to cover additional cases like react native expo scheme, but we missed this validation.
2025-07-09 15:11:30 -07:00
Chirag Aggarwal 043cead66b chore: fix logging 2025-06-26 19:32:15 +05:30
Chirag Aggarwal dbc58655b2 Merge branch '1.7.x' into feat-exp-scheme 2025-06-25 07:53:28 +05:30
Steven Nguyen ffc7f4c7ae Merge pull request #9590 from appwrite/fix-templates
Fix template to use button
2025-06-21 09:33:06 -07:00
Jake Barnby 89f0c28e26 Merge remote-tracking branch 'origin/1.7.x' into 1.8.x
# Conflicts:
#	.coderabbit.yaml
2025-06-16 11:37:50 -04:00
Darshan 3be1aa3801 Merge branch '1.7.x' into fix-templates 2025-06-15 11:21:33 +05:30
Steven Nguyen 160c937dc2 fix: prevent 'Attribute "factors" must be an array' error
Because array_unique() preserves keys, the $factors can go from:

[
    0 => 'password',
    1 => 'totp',
    2 => 'totp',
    3 => 'email'
]

to:

[
    0 => 'password',
    1 => 'totp',
    3 => 'email'
]

and because this is not an array list, the validation fails.

Using array_values() after array_unique() will reset the keys to be sequential, resulting in:

[
    0 => 'password',
    1 => 'totp',
    2 => 'email'
]
2025-06-13 09:17:05 -07:00
Steven Nguyen 623369e426 Merge pull request #9600 from jmastr/fix-4982-expire-sessions-format-for-multiple-api
fix: expire format account recovery, verification, phone and mfa
2025-05-31 09:23:55 -07:00
Jake Barnby 3158c15111 Merge remote-tracking branch 'origin/1.7.x' into 1.8.x
# Conflicts:
#	app/controllers/api/functions.php
#	app/controllers/api/project.php
#	app/controllers/api/proxy.php
#	app/controllers/api/storage.php
#	app/controllers/api/vcs.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	app/init/database/filters.php
#	composer.json
#	composer.lock
#	src/Appwrite/Migration/Migration.php
#	src/Appwrite/Migration/Version/V15.php
#	src/Appwrite/Migration/Version/V16.php
#	src/Appwrite/Migration/Version/V17.php
#	src/Appwrite/Migration/Version/V18.php
#	src/Appwrite/Migration/Version/V19.php
#	src/Appwrite/Migration/Version/V20.php
#	src/Appwrite/Migration/Version/V21.php
#	src/Appwrite/Platform/Tasks/Migrate.php
#	src/Appwrite/Platform/Workers/Builds.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Functions.php
#	src/Appwrite/Platform/Workers/StatsResources.php
#	src/Appwrite/Platform/Workers/StatsUsage.php
2025-05-27 13:36:23 +12:00
Jake Barnby 86f7489640 Internal ID -> sequence 2025-05-26 17:42:11 +12:00
Christy Jacob 28d2ed1baa Revert "Feat sequence" 2025-05-23 21:39:56 +04:00
Jake Barnby 71e3446498 Change internal ID to sequence 2025-05-23 02:55:29 +12:00
Darshan b302b5416d Merge branch '1.7.x' into fix-templates 2025-05-13 17:52:57 +05:30
Matej Bačo af0c872999 Merge branch '1.6.x' into 1.7.x 2025-05-13 10:11:39 +02:00
Chirag Aggarwal 21273c8336 fix: undefined classname 2025-05-09 10:57:45 +00:00
Chirag Aggarwal f91ec238b9 chore: introduce class attribute to oauth2 config 2025-05-09 10:09:16 +00:00
Jake Barnby f7d7b8d3dd Merge remote-tracking branch 'origin/1.6.x' into feat-bulk-operations 2025-05-07 15:14:13 +12:00
Chirag Aggarwal f905c10acc chore: add harden create email token endpoint 2025-05-06 07:18:23 +00:00
Darshan f13a28cf6d Merge branch '1.7.x' into fix-templates 2025-05-04 19:08:06 +05:30
Jake Barnby 27ac5cbb2a Remove redundant withTimestamp 2025-04-30 17:40:47 +12:00
Jake Barnby 2238f6d822 Merge remote-tracking branch 'origin/1.6.x' into feat-bulk-operations
# Conflicts:
#	app/config/specs/open-api3-1.6.x-client.json
#	app/config/specs/open-api3-1.6.x-console.json
#	app/config/specs/open-api3-1.6.x-server.json
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-1.6.x-client.json
#	app/config/specs/swagger2-1.6.x-console.json
#	app/config/specs/swagger2-1.6.x-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	composer.lock
#	src/Appwrite/Specification/Format/Swagger2.php
2025-04-30 10:45:18 +12:00
Matej Bačo d8103cb57e Merge branch '1.7.x' into 1.6.x 2025-04-25 12:18:04 +02:00
Christy Jacob 6b4ecbcd23 fix: ensure all 4xx errors in OAuth redirect lead to the failure URL 2025-04-23 18:39:55 +04:00
Christy Jacob 4228bc9b63 Merge pull request #9574 from appwrite/chore-sensitive-check
chore: abstract token secret hiding to response model
2025-04-22 17:18:11 +04:00
Christy Jacob f4e8d72593 Merge branch '1.6.x' into feat-group 2025-04-17 18:25:47 +04:00
ArnabChatterjee20k b2f7ed48dd Simplify constructor usage by inlining message; limit try/catch to DB operations 2025-04-17 10:16:26 +05:30
arnab 8d3070416a added order exception in rest of the controllers 2025-04-16 17:29:36 +05:30
Chirag Aggarwal 3ed87a8ab9 chore: update endpoint descriptions to follow CRUD naming 2025-04-14 18:40:48 +00:00
loks0n 944624f13a chore: fmt 2025-04-14 12:59:39 +01:00
loks0n 0a4c430ae7 feat: exp scheme 2025-04-14 12:56:42 +01:00
Chirag Aggarwal b3c9e6181f chore: update groups 2025-04-12 06:50:02 +00:00
Julian Strobl 0da3602426 fix: expire format account recovery, verification, phone and mfa
closes: #4982

Signed-off-by: Julian Strobl <jmastr@mailbox.org>
2025-04-01 18:29:32 +02:00
Chirag Aggarwal abcaf6cd73 feat: sdk group attribute 2025-03-31 05:48:17 +00:00
Darshan 57c06f1e5b update: use buttons instead of links for inner-base template. 2025-03-28 16:44:44 +05:30
Chirag Aggarwal 7b8f25696c chore: added showSensitve wrapper instead of param 2025-03-26 14:37:35 +00:00
Chirag Aggarwal e93010c5fe chore: add showSensitive attribute 2025-03-24 14:26:56 +00:00
Chirag Aggarwal d677b8ed88 fix: webhook tests 2025-03-24 14:06:36 +00:00
Chirag Aggarwal 3399308ee3 Merge branch '1.6.x' into chore-sensitive-check 2025-03-24 12:28:54 +00:00
Jake Barnby 94f9d0140b Merge branch '1.6.x' into feat-bulk-operations
# Conflicts:
#	app/config/specs/open-api3-1.6.x-client.json
#	app/config/specs/open-api3-1.6.x-console.json
#	app/config/specs/open-api3-1.6.x-server.json
#	app/config/specs/swagger2-1.6.x-client.json
#	app/config/specs/swagger2-1.6.x-console.json
#	app/config/specs/swagger2-1.6.x-server.json
#	app/init.php
#	composer.json
#	composer.lock
2025-03-17 20:44:08 +13:00
Chirag Aggarwal afabd5b87a Merge branch '1.6.x' into feat-development-keys 2025-03-14 17:20:47 +05:30
Chirag Aggarwal 0ce4555f70 chore: added auth group to create phone token 2025-03-05 17:42:43 +00:00
Jake Barnby a5c4fe0a2d Merge remote-tracking branch 'origin/1.6.x' into feat-bulk-operations
# Conflicts:
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	app/controllers/api/databases.php
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
#	docs/references/databases/create-document.md
2025-03-05 12:44:39 +13:00
Chirag Aggarwal c05ef9121f Merge branch '1.6.x' into feat-development-keys 2025-02-28 12:56:26 +00:00
Jake Barnby 6e82bfe8e7 Update date 2025-02-26 14:00:16 +13:00
Jake Barnby 3a2babc906 Update date 2025-02-25 21:34:46 +13:00
Jake Barnby 03f0e382f4 Fix dates 2025-02-25 21:03:37 +13:00