Richard
0dc553f31d
Merge branch 'main' into docs-clarify-optional-url
2024-06-18 09:12:32 -04:00
Damodar Lohani
a93dcfa1b3
Update storage.php
2024-06-18 11:46:31 +05:45
Steven Nguyen
4b24848f22
Merge pull request #8236 from 2002Bishwajeet/fix-user-model
...
Fix: Don't set the target field if the existing target document is false
2024-06-17 17:11:27 -07:00
Damodar Lohani
3dcd1314f5
fix file size multiplier
2024-06-17 04:50:22 +00:00
choir27
84d9b4befe
docs: fix hyperlink in storage code snippet
2024-06-13 09:59:20 -04:00
shimon
4bedb2f52a
Update Expires header via cache shared api
2024-06-13 09:40:36 +03:00
shimon
3f42b03f8e
Update Expires header via cache shared api
2024-06-13 09:40:03 +03:00
shimon
d2a2caedbd
Update Expires header via cache shared api
2024-06-12 18:42:04 +03:00
choir27
897ae1c859
docs: update text description in request table
2024-06-12 10:47:48 -04:00
Bishwajeet Parhi
190560b8ef
chore: append attributes instead of replace
2024-06-11 21:17:25 +05:30
Bradley Schofield
d8b893c7c9
Small fixes
2024-06-11 14:52:21 +09:00
Bradley Schofield
83d093805f
Implement deploymentsStorage metric for projects API
2024-06-11 14:14:38 +09:00
Jake Barnby
a4c1275764
Add abuse limit for update password
2024-06-10 18:09:30 +12:00
Jake Barnby
3c123d372a
Merge pull request #8244 from appwrite/1.5.x
...
Sync 1.5.x into refactor-usage-sn
2024-06-10 12:22:16 +12:00
Steven Nguyen
a09a09a7a9
fix(auth): fix MFA verification for OAuth2 sessions
...
Before this, users who only signed in with OAuth2 were not able to
verify their sessions with MFA because their session already used an
email factor and they couldn't use an additional email factor.
This commit changes the OAuth2 session to include 2 factors: email and
oauth2. This second special factor is used to bypass MFA checks. It is
fine to bypass MFA checks because OAuth2 is supposed to handle the
entire authentication process, verifying who the user is and we, as the
resource provider, only need to trust the OAuth2 provider.
2024-06-07 16:45:14 -07:00
Jake Barnby
9e487b8ccf
Revert "Merge pull request #8237 from appwrite/revert-8193-feat-remove-random-shared-tables"
...
This reverts commit 930ae6ded01f6417b156
2024-06-06 20:11:19 +12:00
Christy Jacob
ff6efc2855
Revert "Feat remove random shared tables"
2024-06-06 00:11:56 +05:30
Bishwajeet Parhi
cccda2a46c
fix: Don't set target attribute if no existing Target found
2024-06-05 23:34:01 +05:30
Jake Barnby
f459a5c458
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-remove-random-shared-tables
...
# Conflicts:
# docker-compose.yml
2024-06-04 17:43:14 +12:00
Damodar Lohani
66ac96580b
Merge branch 'main' into feat-security-emails
2024-06-04 06:51:24 +05:45
Bradley Schofield
d4db55ab77
Fix failed queue param in failed jobs
2024-05-29 18:11:58 +09:00
Christy Jacob
1c79ccd231
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-with-1.5.x
2024-05-27 11:26:32 +00:00
Damodar Lohani
2b8bf3b252
Merge pull request #8120 from appwrite/chore-error-requests-count
...
Chore:usage requests count on error
2024-05-26 07:04:33 +05:45
loks0n
d73a9e75cd
refactor: remove version format const
2024-05-24 16:27:13 +01:00
loks0n
ad3cc4e68f
fix: typo
2024-05-24 16:16:57 +01:00
Luke B. Silver
a92713d3a2
Merge branch '1.5.x' into feat-add-version-header
2024-05-24 16:08:11 +01:00
loks0n
cb4c15ce0a
ui: improve warning message
2024-05-24 16:07:22 +01:00
Christy Jacob
e55f0adab2
Merge pull request #8185 from ItzNotABug/fix-robots-txt
...
Fix: Don't Override `robots.txt` for Other Domains
2024-05-24 17:15:34 +04:00
Matej Bačo
8dd883a312
Add comments
2024-05-24 13:04:30 +02:00
Jake Barnby
bbb4b0bc12
Remove shared table headers
2024-05-24 20:29:25 +12:00
Jake Barnby
e19b465ce2
Move shared tables db to env var from const
2024-05-24 20:10:47 +12:00
Jake Barnby
074b807d8d
Merge remote-tracking branch 'origin/refactor-usage-sn' into sync-1.5.x-with-cloud
2024-05-24 16:56:57 +12:00
Jake Barnby
4ed125f7c8
Remove random shared tables assignment in preparation of setting as override instead
2024-05-24 16:53:09 +12:00
Jake Barnby
a895ce4270
Remove redundant backup checks
2024-05-24 16:51:29 +12:00
Christy Jacob
4a4d5109e2
Merge branch '1.5.x' into sync-1.5.x-with-cloud
2024-05-23 23:36:13 +04:00
shimon
a2ef77f0f5
lint
2024-05-23 16:47:37 +03:00
shimon
c996dbcdc9
lint
2024-05-23 16:39:23 +03:00
shimon
a22d98296c
lint
2024-05-23 16:33:40 +03:00
ItzNotABug
81e8502a78
fix: dont override humans.txt too.
2024-05-23 15:54:12 +05:30
ItzNotABug
5462b83d3c
fix: don't override robots.txt for other domains.
2024-05-23 14:47:59 +05:30
shimon
2414438ded
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into chore-error-requests-count
...
Conflicts:
app/controllers/shared/api.php
composer.json
2024-05-23 11:01:28 +03:00
shimon
87cf7776df
lint
2024-05-23 10:59:19 +03: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
Steven Nguyen
9db92698dc
fix(cache): use the same cache key when loading and saving files
2024-05-22 23:23:16 +00: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
Steven Nguyen
8d5583f0c6
fix(cache): fix invalid cache document id
...
The document ID should not have special characters like "*" or it will
cause problems with things like cursor based pagination which is done
in migrations.
We did have the cache buster inside the md5 call before, but when the
usage code was reverted and whatnot, the change wasn't added back
properly.
Related: https://github.com/appwrite/appwrite/issues/7887
2024-05-22 19:16:34 +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
shimon
8aabb92fda
adding requests count on error
2024-05-19 13:50:25 +03:00
Luke B. Silver
ae321268b5
Merge branch 'main' into fix-improve-cold-start-error
2024-05-18 13:53:02 +01:00
loks0n
3d119ad1a6
fix: improve cold start error
2024-05-17 18:16:10 +01:00
Bradley Schofield
deacaa2d6f
Multiple Changes, See Desc
...
- Update Logger from 0.3.* to 0.5.*
- Add old sentry syntax conversion
- Add sampler for experiment logger, and set it to 4%
2024-05-17 18:01:33 +09:00
shimon
dae9cb995c
adding requests count on error
2024-05-16 21:21:21 +03: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
shimon
12e4f49cba
adding requests count on error
2024-05-15 20:25:29 +03:00
loks0n
e73b4b8573
feat: generic approach
2024-05-15 10:46:31 +01:00
Ketan Baitule
6ff3fc5c6b
fix: Allow Adding User Over Limit From Console In Team Membership
2024-05-15 15:03:46 +05:30
Luke B. Silver
8ff98bcb41
Merge branch '1.5.x' into feat-add-version-header
2024-05-15 10:30:36 +01:00
shimon
c38a598d3a
adding requests count on error
2024-05-15 09:52:05 +03:00
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
loks0n
91ee67d69f
Revert "Merge branch 'main' of https://github.com/appwrite/appwrite into feat-add-version-header"
...
This reverts commit 824309e4e62d09a3a17b
2024-05-08 10:09:28 +01:00
loks0n
0aadda9605
chore: steven review
2024-05-08 10:07:10 +01:00
Jake Barnby
f01922daf9
Fix syntax error
2024-05-08 21:06:30 +12:00
loks0n
824309e4e6
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-add-version-header
2024-05-08 10:05:23 +01:00
Jake Barnby
6e3dee4e1f
Fix shared tables db queue name
2024-05-08 16:25:12 +12:00
Jake Barnby
f7cd1e2361
Ensure namespace is set if override equals shared tables
2024-05-08 16:04:28 +12:00
Torsten Dittmann
239a0b4dde
Merge pull request #8081 from appwrite/fix-dont-kick-after-enabling-mfa
...
Don't kick user and require verification after enabling MFA
2024-05-07 17:49:18 +02: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
0e9838d290
Remove logging and test files
2024-05-07 15:48:20 +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
Damodar Lohani
14a0dd3166
Merge remote-tracking branch 'origin/main' into feat-security-emails
2024-05-06 01:04:44 +00: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
loks0n
c746fb40f8
chore: better name
2024-05-03 12:03:01 +01:00
