1
0
Fork 0
mirror of synced 2024-08-31 01:41:15 +12:00
Commit graph

4954 commits

Author SHA1 Message Date
Bishwajeet Parhi
cccda2a46c fix: Don't set target attribute if no existing Target found 2024-06-05 23:34:01 +05:30
Matej Bačo
8dd883a312 Add comments 2024-05-24 13:04:30 +02:00
Jake Barnby
9bb9f1eee7
Merge remote-tracking branch 'origin/refactor-usage-sn' into fix-setting-secrets
# Conflicts:
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-05-23 15:37:13 +12:00
Christy Jacob
aa76862692 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-with-1.5.x 2024-05-22 19:43:31 +00:00
Jake Barnby
680cd5194d
Fix returning hashed secrets 2024-05-22 14:11:06 +12:00
Jake Barnby
c7106b9147
Merge remote-tracking branch 'origin/refactor-usage-sn' into fix-setting-secrets 2024-05-22 12:50:58 +12:00
loks0n
ff1cabdbf7 chore: refactor finally clause 2024-05-20 22:35:40 +01:00
Steven Nguyen
47ed708293
Merge branch 'main' into chore-sync-with-main 2024-05-20 19:03:54 +00:00
Steven Nguyen
91748b1bd5
Merge branch 'main' into fix-5516-in-team-membership-allow-adding-user-over-limit-from-console-or-apikey 2024-05-20 11:40:58 -07:00
Steven Nguyen
722f3291fa
Merge branch 'main' into chore-sync-with-main 2024-05-20 18:33:52 +00:00
loks0n
6bd407eae9 chore: refactor finally block 2024-05-20 18:55:15 +01:00
Christy Jacob
d258240f08 Merge pull request #8152 from appwrite/fix-improve-cold-start-error
fix: improve cold start error
2024-05-20 17:26:58 +01:00
loks0n
b3c00c4d32 chore: create doc 2024-05-20 11:46:41 +01:00
loks0n
863a2ce0a9 chore: matej review 2024-05-20 11:44:08 +01:00
Jake Barnby
5b82716986
Change from 1 in 20 to 1 in 5 projects on shared tables DB 2024-05-20 14:00:48 +12:00
Christy Jacob
10722aa736 chore: cleanup obsolete tasks and workers 2024-05-16 07:11:00 +00:00
Ketan Baitule
894f001c7a
Update app/controllers/api/teams.php
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
2024-05-16 08:00:46 +05:30
Steven Nguyen
03fd62cc04
Merge branch 'main' into 1.5.x 2024-05-15 11:36:15 -07:00
Ketan Baitule
6ff3fc5c6b fix: Allow Adding User Over Limit From Console In Team Membership 2024-05-15 15:03:46 +05:30
Torsten Dittmann
0365f4818b
Merge pull request #8102 from appwrite/fix-7268-oauth-apple-name
Fix email used for name when user is created via Apple OAuth2
2024-05-14 11:40:45 +02:00
Steven Nguyen
1626168d37
fix(project): set limit to retrieve all stats for the usage range
Because limit was not passed for the find() query, the limit defaulted to 25. As such, when requesting stats for the last 30 days, only the last 25 were retrieved.
2024-05-13 21:23:47 +00:00
Steven Nguyen
c76e29077c
feat(auth): try to get user name from request param if not from oauth2
This is only applicable for Apple OAuth2 because this is the only
provider that does not return user name from an API call and only
returns the name in the callback URL.

Reference:
* https://developer.apple.com/documentation/sign_in_with_apple/sign_in_with_apple_js/incorporating_sign_in_with_apple_into_other_platforms#3332115
2024-05-08 16:35:17 -07:00
Steven Nguyen
df064adce3
feat(auth): forward OAuth2 callback params
The only place Apple includes the user's name is in the params so we
need to forward the params to the redirect endpoint so they can be used
when creating the user.
2024-05-08 17:36:46 +00:00
Jake Barnby
f01922daf9
Fix syntax error 2024-05-08 21:06:30 +12:00
Jake Barnby
f7cd1e2361
Ensure namespace is set if override equals shared tables 2024-05-08 16:04:28 +12:00
Jake Barnby
921eb2b900
App::getEnv -> System::getEnv 2024-05-07 22:08:00 +12:00
Matej Bačo
08bf5aace4 Mark email verified after email OTP 2024-05-07 09:01:57 +00:00
Jake Barnby
e9bac08de0
Fix header test 2024-05-07 17:59:24 +12:00
Jake Barnby
356d155df2
Add shared tables enabled flag for quick toggle 2024-05-07 17:29:12 +12:00
Jake Barnby
74a147f3b2
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-shared-tables
# Conflicts:
#	tests/e2e/Services/Projects/ProjectsCustomServerTest.php
2024-05-07 15:53:58 +12:00
Jake Barnby
912e3b01dc
Add clarifying comments 2024-05-07 14:07:04 +12:00
Steven Nguyen
5b5505cf97
fix(auth): ensure session factors don't contain duplicates 2024-05-06 17:48:44 -07:00
Steven Nguyen
7e07f6b958
feat(auth): ensure user isn't kicked out after enabling MFA
User's were kicked out and forced to verify their session after enabling
MFA if they already had factors enabled. This change ensures that they
are not kicked out of their current session after MFA is enabled by
adding all relevant factors to the session.
2024-05-06 17:48:08 -07:00
Steven Nguyen
98d18ecc47
refactor(auth): remove auth duration from Auth::sessionVerify() calls
The paramter was removed from the method so we don't need to pass it
in anymore.
2024-05-06 17:16:56 -07:00
Jake Barnby
52c52fa519
Add scheme to DSN on fail 2024-05-06 18:13:41 +12:00
Jake Barnby
db94070162
Use DSN for project database 2024-05-06 17:33:36 +12:00
shimon
8e291f3700 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into fix-file-size-limit
 Conflicts:
	app/controllers/api/storage.php
	composer.lock
2024-05-05 11:52:49 +03:00
Eldad A. Fux
b2c57e2d8b
Merge pull request #7934 from appwrite/fix-custom-domain
Prevent functions domain to be used as custom domain
2024-05-05 06:53:29 +01:00
Damodar Lohani
74264582cc
Update proxy.php 2024-05-05 11:07:59 +05:45
Damodar Lohani
1094238820 add test 2024-05-05 04:56:49 +00:00
Damodar Lohani
9b0bacb1a2 Merge remote-tracking branch 'origin/refactor-usage-sn' into pea-699 2024-05-05 04:06:25 +00:00
Jake Barnby
c4deb0ba93
Allow shared tables namespace override 2024-05-03 21:30:38 +12:00
Jake Barnby
99d05b3d8c
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-shared-tables 2024-05-03 14:24:57 +12:00
Khushboo Verma
ce5dd899a5 Remove unnecessary code 2024-05-02 20:48:36 +05:30
Khushboo Verma
abcd74d224 Remove logger code from avatars.php 2024-05-02 19:49:55 +05:30
Jake Barnby
b2e956a14d
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes
# Conflicts:
#	.gitignore
#	app/cli.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/projects.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	app/init.php
#	app/realtime.php
#	app/worker.php
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
#	src/Appwrite/Platform/Tasks/GetMigrationStats.php
#	src/Appwrite/Platform/Workers/Databases.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Hamster.php
#	tests/e2e/General/HTTPTest.php
#	tests/e2e/Services/Databases/DatabasesCustomServerTest.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-04-30 19:40:47 +12:00
ItzNotABug
02ece2637f fix: use resourceInternalId. 2024-04-29 15:54:22 +05:30
Matej Bačo
9616de7576 Merge branch 'main' into refactor-usage-sn-1.5.x 2024-04-26 13:11:21 +02:00
Christy Jacob
92c41954af Merge branch 'main' of https://github.com/appwrite/appwrite into refactor-usage-sn-1.5.x 2024-04-26 09:19:09 +00:00
Damodar Lohani
fbdaf7616c
Fix response code label 2024-04-25 07:19:02 +05:45