Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-01 18:38:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
31586 commits 1160 branches 493 tags 508 MiB
Commit graph

1495 commits

Author SHA1 Message Date
fogelito
ace75b0786 parseQueries 2024-02-12 18:02:04 +02:00
Jake Barnby
f5aebe6673
Merge pull request #7559 from Souptik2001/fix-7109-user-activity-log 
Fix missing user activity logs
 2024-02-12 23:04:20 +13:00
fogelito
e5bada0493 typo 2024-02-12 12:03:31 +02:00
fogelito
2ef59134a0 Merge branch '1.5.x' of github.com:appwrite/appwrite into attributes-query-fix 2024-02-12 12:00:26 +02:00
Jake Barnby
e26230cc34
Disallow creating a session if one already exists 2024-02-12 22:59:49 +13:00
fogelito
adbe11fd50 fix Indexes 2024-02-12 11:55:45 +02:00
Jake Barnby
8ed2b1f3a5
Fix tests 2024-02-12 18:35:05 +13:00
Jake Barnby
18f7168160
Merge main 2024-02-12 14:18:19 +13:00
Christy Jacob
be92aa92e5 chore: rename files 2024-02-11 20:28:05 +05:30
Christy Jacob
89dcc34453 feat: initial commit 2024-02-11 20:21:19 +05:30
Christy Jacob
e2baefe8c6
Merge pull request #7500 from appwrite/fix-account-delete 
PEA-233-prevent console user deletion before deleting their team
 2024-02-11 14:52:24 +05:30
Damodar Lohani
681688e252
fix rename 2024-02-11 14:52:54 +05:45
Damodar Lohani
c8720805c7
Update app/controllers/api/account.php 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2024-02-11 14:41:19 +05:45
Souptik Datta
e6a97bb36a
Merge branch 'master' into fix-7109-user-activity-log 2024-02-09 00:40:36 +05:30
Souptik Datta
f42a78ef9c
fix: Fix account activity logs total count 
Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>
 2024-02-09 00:14:37 +05:30
Christy Jacob
ba4f708137
Apply suggestions from code review 
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
 2024-02-08 23:26:43 +05:30
Steven Nguyen
4ace8ed027
Replace catching \Exception with \Throwable 
\Exception doesn't work as a catch-all because not everything extends
\Exception. For example, there was a problem where the messaging worker
didn't catch an exception here:

} catch (\Exception $e) {
    $deliveryErrors[] = 'Failed sending to targets ' . $batchIndex + 1 . '-' . \count($batch) . ' with error: ' . $e->getMessage();
} finally {

As such, $deliveryErrors stayed as an empty array. In this case, the
$adapter->send() threw a TypeError which extends Error which implements
Throwable. Updating the catch to catch \Throwable ensures the error is
caught and $deliveryErrors gets updated.
 2024-02-08 01:17:54 +00:00
Jake Barnby
0a72b37b3e
Fix session response model 2024-02-06 02:17:04 +13:00
Khushboo Verma
e8523e38f7 Merge branch '1.5.x' into feat-block-countries 2024-02-05 13:26:52 +05:30
Jake Barnby
bb9947bfd3
Remove invalid injection 2024-02-04 04:15:16 +13:00
Jake Barnby
3816870e19
Fix duplicate routes 2024-02-03 03:26:04 +13:00
Jake Barnby
874e483fb5
Trigger delete of targets associated with sessions when sessions are deleted 2024-02-03 03:06:36 +13:00
Khushboo Verma
7b4f334f31 Update error message 2024-02-02 19:30:54 +05:30
Torsten Dittmann
b462eee183 chore: run formatter 2024-02-02 13:50:41 +01:00
Torsten Dittmann
a77526cab1 fix: backup codes 2024-02-02 13:50:18 +01:00
Torsten Dittmann
db321db0fb fix: code review 2024-02-02 13:42:15 +01:00
Torsten Dittmann
75fc59931a Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-02-02 13:30:11 +01:00
Khushboo Verma
d96d84201e Add auth group to create email token endpoint 2024-02-02 14:03:20 +05:30
Jake Barnby
d1bad7c3cd
Remove redundant usage labels 2024-02-02 17:16:31 +13:00
Eldad A. Fux
321a998947
Merge pull request #7533 from appwrite/feat-rename-security-phrases 
Feat: Rename security phrases
 2024-02-01 15:45:15 +01:00
Matej Bačo
ef3f7878dc PR review changes 2024-02-01 14:13:30 +00:00
Torsten Dittmann
ceb868c9d7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-02-01 11:57:32 +01:00
loks0n
5e26f01ecd chore: fix account get ssr 2024-02-01 10:41:41 +00:00
Matej Bačo
a47a4240ed Rename security phrases 2024-02-01 10:41:01 +00:00
Christy Jacob
8d7705a2e3 chore: update rate limits 2024-01-30 15:28:48 +00:00
Torsten Dittmann
3f688a2aa7 fix: remove some leftovers 2024-01-30 16:09:58 +01:00
Matej Bačo
738a696ca9 Add proejct ID abuse protection 2024-01-29 20:38:01 +00:00
Matej Bačo
7acdaa5978 PR review changes 2024-01-29 20:24:21 +00:00
Matej Bačo
bc88197e0d Add more abuse keys 2024-01-29 20:11:44 +00:00
Matej Bačo
0a518cd47e Fix failing tests 2024-01-29 20:03:14 +00:00
Christy Jacob
af21b44125 chore: revert abuse key 2024-01-29 17:25:56 +00:00
Christy Jacob
62246b5a2c chore: add auth label to phone endpoint 2024-01-29 17:24:10 +00:00
Christy Jacob
d849aa1ed2 chore: add logs 2024-01-29 16:47:12 +00:00
Christy Jacob
94c423c429 chore: add project details to messaging worker 2024-01-29 13:27:03 +00:00
Damodar Lohani
9b7a5f55b7 fix linter 2024-01-28 03:01:34 +00:00
Damodar Lohani
e5dfed0aa3 fix, check only for confirmed membership 2024-01-28 02:47:23 +00:00
Damodar Lohani
215a139e87 prevent console user deletion before deleting their team 2024-01-28 02:10:14 +00:00
fogelito
998c4d282d Fix failing tests 2024-01-25 18:53:51 +02:00
fogelito
a782e20315 Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing 
 Conflicts:
	app/controllers/api/account.php
	composer.json
	composer.lock
	src/Appwrite/Platform/Tasks/CalcTierStats.php
	tests/e2e/Services/Account/AccountBase.php
 2024-01-25 17:44:05 +02:00
Torsten Dittmann
b6d85b5a24 fix: email factor for otp 2024-01-24 17:50:16 +01:00
Torsten Dittmann
9070dce6ac Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 16:32:12 +01:00
Torsten Dittmann
62e459c581 fix: workers 2024-01-24 12:29:36 +01:00
Torsten Dittmann
9f5a0312cf Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 11:24:59 +01:00
Torsten Dittmann
f1293d2636 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-22 18:32:22 +01:00
Torsten Dittmann
a9f1e4d78d
feat: delete account (#7392) 
* feat: delete account

* fix: new endpoint only for console sdk

* fix: hide endpoint from public sdks

* fix: account delete scope
 2024-01-22 18:29:10 +01:00
Christy Jacob
cfc25288b5
Merge pull request #7422 from appwrite/feat-email-otp 
Feat: Email OTP
 2024-01-22 19:18:39 +04:00
Matej Bačo
fc3fa8f1d7 PR review changes 2024-01-22 15:02:33 +00:00
Torsten Dittmann
185e4258df Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-22 14:45:07 +01:00
Matej Bačo
3bf89a931d PR review changes 2024-01-22 13:20:48 +00:00
Matej Bačo
9ad5aa79d0 Fix failing tests 2024-01-22 11:20:33 +00:00
Matej Bačo
32cc186ea6 Merge remote-tracking branch 'origin/1.5.x' into feat-session-renewal 2024-01-22 08:17:52 +00:00
Matej Bačo
fc186c69a1 PR review changes 2024-01-22 08:13:46 +00:00
Matej Bačo
df9bc6df56 Implement OTP email endpoint + tests 2024-01-19 13:42:26 +00:00
Matej Bačo
31a67a7667 Merge remote-tracking branch 'origin/1.5.x' into feat-email-otp 2024-01-19 12:12:07 +00:00
Jake Barnby
38d0185c88
Merge pull request #7461 from appwrite/fix-create-push-target 
Fix create/update push target routes
 2024-01-19 18:49:12 +13:00
Jake Barnby
a3096bc209
Merge remote-tracking branch 'origin/1.5.x' into feat-message-scheduling 
# Conflicts:
#	app/controllers/api/messaging.php
 2024-01-19 15:54:21 +13:00
Torsten Dittmann
057496dbaa feat: mfa users endpoints 2024-01-18 14:56:58 +01:00
Jake Barnby
f1c1e4b208
Merge branch 'fix-create-push-target' of github.com:appwrite/appwrite into fix-create-push-target 2024-01-19 02:06:21 +13:00
Jake Barnby
7b9bee9a2a
Fix missing scope for push target create/update 2024-01-19 02:04:54 +13:00
Torsten Dittmann
86f5bd20fb style: run formatter 2024-01-18 13:45:48 +01:00
Torsten Dittmann
d802e86593 fix: merge conflicts 2024-01-18 13:43:49 +01:00
shimon
a0b38a5a7c Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn 2024-01-18 14:19:19 +02:00
Torsten Dittmann
1ab3dc2236 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-18 13:10:15 +01:00
Jake Barnby
3159d505ea
Update app/controllers/api/account.php 
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
 2024-01-18 20:55:40 +13:00
Matej Bačo
240f20b2cf PR review changes 2024-01-17 13:20:47 +00:00
loks0n
a9b42c63bf chore: remove var dumps 2024-01-17 13:05:14 +00:00
Jake Barnby
a92d526125
Remove docs label, fix throw on no provider 2024-01-18 01:50:09 +13:00
loks0n
f1664c1cd7 fix: remove token auth.type 2024-01-17 12:09:15 +00:00
loks0n
498ddbf14c test: add create email session test for server 2024-01-17 11:58:40 +00:00
loks0n
39a351adc1 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-17 11:22:45 +00:00
loks0n
0092af7ac6 chore: rename new scopes 2024-01-17 11:17:03 +00:00
loks0n
bc1858c516 chore: do not auto create accounts in users endpoints 2024-01-17 11:03:04 +00:00
Jake Barnby
58f87ef27f
Fix account target route not added to specs 2024-01-17 22:21:15 +13:00
loks0n
d488cadee4 docs: verb noun desc file pattern 2024-01-16 10:33:54 +00:00
Matej Bačo
12a0596c6e Implement session renewal test 2024-01-15 20:04:36 +00:00
Matej Bačo
39997c817f Fix failing tests 2024-01-15 14:37:47 +00:00
Matej Bačo
4f5755e7d0 Implement session renewal 2024-01-15 13:43:21 +00:00
Jake Barnby
4d9fb1d687
Merge remote-tracking branch 'origin/1.5.x' into feat-message-scheduling 
# Conflicts:
#	src/Appwrite/Platform/Workers/Messaging.php
 2024-01-15 20:07:01 +13:00
loks0n
0a0479f4c5 chore: fmt 2024-01-13 10:11:25 +00:00
loks0n
521cb963a5 fix: hide oauth in specs 2024-01-13 10:09:02 +00:00
loks0n
56fe939713 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-13 09:55:44 +00:00
loks0n
d2ff3f6bb8 docs: standardise account md names 2024-01-13 09:32:03 +00:00
loks0n
642582c283 docs: fix links to create email password session 2024-01-12 17:39:44 +00:00
loks0n
ca511bd459 chore: use customId validators 2024-01-12 17:26:01 +00:00
Matej Bačo
e9de0332cc
Remove passwordAgain (#7441) 2024-01-12 14:33:10 +01:00
Torsten Dittmann
0a4c62085c chore: run linter 2024-01-12 14:06:52 +01:00
Torsten Dittmann
e2a0c2d825 sync: with 1.5.x 2024-01-12 14:04:31 +01:00
loks0n
2bbcdf61dd Merge branch 'feat-ssr' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-12 12:14:28 +00:00
Matej Bačo
b8b9fe383d Fix token param 2024-01-12 13:12:28 +01:00
loks0n
487376afd6 chore: oauth token param before scopes 2024-01-12 12:08:45 +00:00
Torsten Dittmann
78f7b1897e
fix: hotfix for redirect param in custom templates (#7437) 
* fix: hotfix for redirect param in custom templates
* fix: redirect param variables
* fix: variable typo
* chore: update comments for template variables
 2024-01-11 21:36:05 +01:00
Torsten Dittmann
99259ebf2b fix: enable mfa in console 2024-01-11 20:24:37 +01:00
Khushboo Verma
807d295303 Resolve merge conflicts 2024-01-11 22:49:33 +05:30
Khushboo Verma
74b9324001 Use strip_tags in post request too 2024-01-11 21:58:21 +05:30
Khushboo Verma
d922feb4c7 Use strip_tags to remove <p> tag 2024-01-11 18:54:08 +05:30
Khushboo Verma
dc0b0c8ab7 Merge branch '1.5.x' into fix-otp-template 2024-01-11 18:24:45 +05:30
Khushboo Verma
c84af966df Make OTP template more contextual 2024-01-11 18:20:01 +05:30
loks0n
136faf9630 docs: improve exchange endpoint desc 2024-01-11 10:54:41 +00:00
loks0n
032ce1ec0c feat: standardise token length 2024-01-11 10:51:26 +00:00
Matej Bačo
539bee8850
Update app/controllers/api/account.php 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2024-01-11 10:20:51 +01:00
Jake Barnby
513ed9de05
Merge remote-tracking branch 'origin/1.5.x' into scheduling-temp 
# Conflicts:
#	app/controllers/api/messaging.php
#	tests/e2e/Services/Messaging/MessagingBase.php
 2024-01-11 13:06:15 +13:00
Torsten Dittmann
07f44593c0 feat: delete authenticator endpoint 2024-01-10 17:22:32 +01:00
Matej Bačo
2d204d593a code formatting 2024-01-10 15:10:05 +00:00
Matej Bačo
bf14d1d97d Add random security phrases 2024-01-10 15:09:39 +00:00
Matej Bačo
931efe24a9 Added security phrase to magic URL 2024-01-10 14:52:32 +00:00
Matej Bačo
788fa04606 Improve magic URL design 2024-01-10 11:33:55 +01:00
loks0n
94e45da5c7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-10 10:15:29 +00:00
loks0n
9a34c92fac Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-09 16:42:00 +00:00
loks0n
ded48cb618 chore: fmt 2024-01-09 16:41:42 +00:00
loks0n
d9b25a3167 feat: add token param to oath 2024-01-09 16:38:29 +00:00
loks0n
de2a4e754a feat: alias PUT token methods for backwards compat 2024-01-09 15:56:01 +00:00
Torsten Dittmann
cb25d5209e fix: di 2024-01-09 16:30:18 +01:00
Matej Bačo
86158838a1 Magic URL improvements 2024-01-09 12:23:13 +00:00
Torsten Dittmann
d344ba46c4
feat: account delete (#7415) 
* feat: account delete

* chore: run specs

* release: console sdk

* chore: run formatter

* tests: fix project tests
 2024-01-09 12:58:36 +01:00
Jake Barnby
af019369e9
Merge branch 'main' into 1.5.x 2024-01-09 22:03:35 +13:00
Eldad A. Fux
b0a8aac0b7
Merge pull request #7348 from appwrite/fix-delete-identity-event 
Update the delete identity endpoints to set the params and payload
 2024-01-09 07:52:08 +01:00
Jake Barnby
51b2019ab6
Merge remote-tracking branch 'origin/1.5.x' into json-parsing 
# Conflicts:
#	composer.lock
 2024-01-09 13:56:01 +13:00
Torsten Dittmann
9ba2eafa83
fix: escape html in email params (#7409) 
* fix: escape html in email params

* revert: phpunit stop on failure

* chore: fix linter
 2024-01-08 18:08:17 +01:00
loks0n
5c803f6eff Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-08 11:41:55 +00:00
Torsten Dittmann
bbf6480c15 fix: merge conflicts 2024-01-08 12:31:46 +01:00
Torsten Dittmann
208abe17e7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-08 12:20:08 +01:00
Matej Bačo
e5f0e00742 Apply password validation to all places 2024-01-05 12:31:38 +01:00
Matej Bačo
0a2be34ceb Fix PHP refference bug 2024-01-05 12:07:41 +01:00
Matej Bačo
ba32170f72 Improve password validator hook 2024-01-04 16:26:15 +01:00
Damodar Lohani
640ab7bf87 Merge branch 'main' into to-sync-with-main 2024-01-03 00:11:42 +00:00
Matej Bačo
554e9f93b6 Implement max password length 2024-01-02 10:59:35 +00:00
shimon
99f1543f1b Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn 
 Conflicts:
	.gitmodules
	Dockerfile
	app/console
	app/init.php
	composer.lock
	src/Appwrite/Platform/Services/Workers.php
	src/Appwrite/Platform/Tasks/Hamster.php
 2024-01-02 11:49:23 +02:00
Steven Nguyen
f1ba7b08ab
Update the delete identity endpoints to set the params and payload 
Because no payload was set, the event params (userId and identityId)
wasn't picked up automatically. This updates the endpoints so that the
payload is set, but also makes sure to set the userId and identityId
params since the identityId param's key doesn't match the key in the
payload.
 2023-12-27 23:35:32 +00:00
Matej Bačo
a0b2443a8b Rename email endpoint 2023-12-22 09:38:52 +00:00
Matej Bačo
3f1faa44ad Rename form exchange to create 2023-12-22 09:31:19 +00:00
loks0n
1b6a833bed fix: encode session for ssr clients 2023-12-19 15:45:44 +00:00
Damodar Lohani
1f558442d9 linter fix 2023-12-18 10:18:40 +00:00
Matej Bačo
8c1363529e Add Hooks 2023-12-15 23:19:43 +01:00
Jake Barnby
fc101b7c05
Update lock 2023-12-15 18:24:37 +13:00
Jake Barnby
9c79e6bc23
Fix cache purge 2023-12-15 17:45:25 +13:00
fogelito
4ce312560b Connection problem 2023-12-14 18:17:19 +02:00
fogelito
cc5ae73f57 purgeCached changes 2023-12-14 15:32:06 +02:00
Steven Nguyen
92a307c164
Fix user identity attaching to wrong user 
Suppose a user has 2 accounts on Appwrite:

1. joe@example.com
2. joe@gmail.com

Prior to this PR, if joe@example.com created a Google OAuth2 session
using his joe@gmail.com email, a new joe@gmail.com identity would be
created linked to joe@example.com.

This is especially problematic because if the user tried to create a
Google OAuth2 session using joe@gmail.com, Appwrite would lookup the
user via email and find the joe@gmail.com user, but then find an
identity from joe@example.com. This mismatching user ID would then
cause an error.

This PR prevents an identity from being created if the email from the
OAuth2 provider matches another user's email.
 2023-12-13 18:45:05 +00:00
Luke B. Silver
60a0fefe56
Merge branch '1.4.x' into feat-ssr 2023-12-13 10:32:13 +00:00
德华 刘
f334168f90 fix: remove expired cookie 2023-12-13 08:45:47 +00:00
loks0n
fda9df069a feat: enable array sdk.method 2023-12-12 11:24:50 +00:00
loks0n
fe695314a9 fix: tests 2023-12-11 19:41:58 +00:00
loks0n
7ee4ad5ba9 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr 2023-12-11 16:52:14 +00:00
loks0n
f0d7312bd3 feat: create session method 2023-12-11 16:24:24 +00:00
Christy Jacob
951a749b50 fix: revert files 2023-12-09 01:19:36 +01:00
Christy Jacob
9dca3c4300 fix: linter 2023-12-08 20:38:55 +01:00
Christy Jacob
5d121c1887 fix: reset the legacy cookie 2023-12-08 20:36:22 +01:00
Christy Jacob
eb61d5c25c chore: reset old cookie 2023-12-08 20:24:07 +01:00
Christy Jacob
f5c2c8d8f7 chore: reset old cookie 2023-12-08 20:23:04 +01:00
Prateek Banga
b8aa2faa7b adds scheduling commit, still need to resolve pools error 2023-12-07 11:25:19 +01:00
Torsten Dittmann
83c411e5fd fix: some fixes 2023-12-07 10:05:37 +01:00
fogelito
2fe50717d1 TYPE_CURSOR_AFTER TYPE_CURSOR_BEFORE 2023-12-06 15:10:40 +01:00
loks0n
4471b93a3a tests: fix 2023-12-05 12:00:26 +01:00
loks0n
54c6709a48 fix: verification scopes 2023-12-04 16:17:22 +01:00
loks0n
63b2363556 feat: workaround backwards compat 2023-12-04 15:38:12 +01:00
loks0n
8ea9706174 feat: Matej renaming plan 2023-11-30 11:35:52 +00:00
prateek banga
739cc36fdc updated providerType wherever left to update 2023-11-29 15:22:26 +05:30
prateek banga
fa8dc133b4 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-message-provider-type 2023-11-29 15:01:47 +05:30
Jake Barnby
4bc23afc65
Add constants for message types 2023-11-29 17:05:37 +13:00
prateek banga
ee4c2d0e0d adds target when creating user via server endpoint 2023-11-28 18:42:34 +05:30
shimon
21895e3ac0 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn 
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	app/controllers/api/storage.php
	app/init.php
	composer.lock
	src/Appwrite/Migration/Migration.php
	src/Appwrite/Platform/Services/Tasks.php
	src/Appwrite/Usage/Calculators/TimeSeries.php
 2023-11-26 10:28:17 +02:00
loks0n
88aa4d726c Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr 2023-11-21 14:54:57 +00:00
Jake Barnby
0b01f7140f
Merge remote-tracking branch 'origin/main' into 1.5.x 
# Conflicts:
#	app/config/errors.php
#	composer.lock
#	src/Appwrite/Extend/Exception.php
 2023-11-21 00:19:17 +13:00
prateek banga
7536d8eb0f review changes 2023-11-16 17:09:08 +05:30
prateek banga
bf95736da0 review changes 2023-11-16 16:47:36 +05:30
prateek banga
f854622705 review changes 2023-11-16 16:26:36 +05:30
prateek banga
a282ab38a6 adds target endpoint in account controller for push tokensl 2023-11-16 02:12:06 +05:30
prateek banga
c24664f5d9 removes internal provider 2023-11-16 01:30:47 +05:30
loks0n
830544e245 fix: logged in ssr cases 2023-11-15 11:57:27 +00:00
prateek banga
2aa8391c5e review fixes 2023-11-15 12:52:27 +05:30
prateek banga
fdca55b0de fix test cases 2023-11-15 01:24:55 +05:30
prateek banga
adc76c5797 adds target when account is created or email or phone is updated 2023-11-14 22:46:20 +05:30
prateek banga
7ae614fe13 adds provider type in target 2023-11-14 18:14:07 +05:30
Prateek Banga
3ade88897c Merge branch 'main' of https://github.com/appwrite/appwrite into chore-sync-main-1.5.x 2023-11-10 12:49:05 +05:30
Steven Nguyen
0c264a107a
Merge branch '1.4.x' into fix-4797-verified-user-getting-email-verifications 2023-11-08 17:37:43 -08:00
shimon
f64d0ab8a8 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn 
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	composer.lock
	src/Appwrite/Migration/Migration.php
 2023-11-05 17:03:13 +02:00
loks0n
df0271c56a chore: rename to 'custom' sessions 2023-11-02 13:22:10 +00:00
loks0n
af0d689aff feat: sessions scope 2023-10-31 15:05:02 +00:00
loks0n
4559cf77e9 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-31 12:08:48 +00:00
prateek banga
06daa544e8 review changes 2023-10-30 23:37:57 +05:30
Steven Nguyen
836ce852ed
Refactor email templates 
Update the mails worker to only be responsible for building the final
email using the base (layout) template and the user, team, project, and
redirect variables.

It is the responsibility of the controller to perform localization and
determine whether a custom or default email template should be used.
If the default one is used, it has to be rendered using the hello,
footer, thanks, and signature variables so that it matches the custom
template. Then, it can be sent to the worker.
 2023-10-26 16:47:14 -07:00
Steven Nguyen
70a3820009
Remove unused mail vars 2023-10-26 16:23:58 -07:00
Prateek Banga
5a9b1f0c24 removes provider from topics 2023-10-26 19:44:06 +05:30
loks0n
49425fb8fc test: fix 2023-10-26 15:04:47 +01:00
prateek banga
fd4a81c4fc made review changes 2023-10-25 23:03:23 +05:30
loks0n
3a9202a46b chore: christy feedback 2023-10-25 13:20:29 +01:00
shimon
4c6976488c clean up 2023-10-25 15:06:54 +03:00
shimon
b7675df9b9 usage workers 2023-10-25 11:38:44 +03:00
shimon
9fad9dca88 usage sync 2023-10-25 10:39:59 +03:00
loks0n
1343d4851a Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-23 09:10:57 +01:00
prateek banga
161bbfb822 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-10-20 14:55:17 +05:30
shimon
593e5ab316 some fixes 2023-10-17 22:08:01 +03:00
shimon
94178f8eaf rollback to Usage 2023-10-15 20:41:09 +03:00
Yatharth Verma
96f389cee5 merge 1.4.x changes to my branch 2023-10-14 11:57:40 +05:30
loks0n
250e9ae9f7 chore: cleanup pr 2023-10-13 16:10:55 +01:00
loks0n
63d3a2bc73 chore: revert abuse-key changes 2023-10-13 11:08:25 +01:00
loks0n
81c4a9bbd5 chore: fmt 2023-10-13 11:05:14 +01:00
loks0n
8ab429b92f feat: replace session confirmation endpoints 2023-10-12 14:38:32 +01:00
loks0n
b299ed056e chore: rename $sessionSecret 2023-10-11 17:07:02 +01:00
loks0n
f9d6ebd3a0 docs: add descriptions to universal token endpoints 2023-10-11 16:31:32 +01:00
loks0n
e41fab769f fix: edge cases 2023-10-11 13:20:25 +01:00
loks0n
c343d7550f chore: fmt 2023-10-10 14:41:02 +01:00
loks0n
c30c024805 test: fix magic url assertions 2023-10-10 14:36:53 +01:00
loks0n
a88175fc46 fix: unhash session responses 2023-10-10 13:30:42 +01:00
loks0n
c4e82e4191 fix: edge cases 2023-10-09 14:49:07 +01:00
Prateek Banga
d842191cc6 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-10-06 03:53:16 +05:30
Prateek Banga
d5cc214546 Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x 2023-10-06 03:44:36 +05:30
Prateek Banga
22d445587e review changes 2023-10-05 16:57:48 +05:30
loks0n
e94631f730 fix: token verification 2023-10-05 11:18:19 +01:00
Prateek Banga
48b91e39a8 review changes 2023-10-04 16:15:59 +05:30
shimon
429dabaaee sync with 1.4 2023-10-03 19:50:48 +03:00
shimon
2bb4d8fb89 sync with 1.4 2023-10-02 17:02:48 +03:00
shimon
b02d51c794 migrations worker 2023-10-01 20:39:26 +03:00
loks0n
739be813e0 feat: oauth ssr token flow 2023-09-28 13:45:52 +01:00
loks0n
5ed2da4cf1 feat: add userId to abuse-keys 2023-09-28 11:33:01 +01:00
loks0n
b8f2c1deec chore: revert oauth workaround 2023-09-28 11:26:44 +01:00
loks0n
ef93c59698 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-09-28 11:21:26 +01:00
shimon
dcf0107a79 sync with master 2023-09-27 20:10:21 +03:00
shimon
c4bd6e008e Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers 
 Conflicts:
	.env
	app/cli.php
	app/config/collections.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/databases.php
	app/controllers/api/functions.php
	app/controllers/api/projects.php
	app/controllers/api/storage.php
	app/controllers/api/teams.php
	app/controllers/api/users.php
	app/controllers/general.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/audits.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/databases.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	bin/worker-usage
	composer.json
	composer.lock
	docker-compose.yml
	src/Appwrite/Event/Delete.php
	src/Appwrite/Event/Mail.php
	src/Appwrite/Platform/Tasks/Maintenance.php
 2023-09-27 18:51:17 +03:00
Vincent (Wen Yu) Ge
86f0e6008c
Merge branch 'master' into sentence-case 2023-09-27 11:11:58 -04:00
Prateek Banga
234f7f003b updated test cases for msg91 provider, moves worker to use provider from settings 2023-09-27 18:58:00 +05:30
Yatharth Verma
6b47999120 fix conflicts 2023-09-22 22:56:07 +05:30
Yatharth Verma
f07f246f8d fix conflicts 2023-09-22 22:53:41 +05:30
Prateek Banga
06a05a3358 adds param messageId in send an email endpoint, tokenId as messageId in create phone session, membershipId as messageId in create team membership 2023-09-21 21:17:15 +05:30
Prateek Banga
975b444761 fix test cases and bug fix in messaging worker 2023-09-20 20:51:03 +05:30
Prateek Banga
a2e34b5b64 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-20 16:59:07 +05:30
Prateek Banga
350549db7d Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models 2023-09-14 02:17:34 +05:30
Prateek Banga
15dd6863dd removes comments 2023-09-14 01:07:30 +05:30
Prateek Banga
f8c9c2f39b fixes manual internal id insertion 2023-09-14 00:48:50 +05:30
prateek banga
38d81c058b lint fix 2023-09-05 23:10:33 +05:30
prateek banga
78a53aee37 adds messaging event and updates messaging worker 2023-09-05 22:40:48 +05:30
Steven
62065a1c33 Fix create phone session abuse key 
Create phone session doesn't have anything to do with email. The key
name should be email just for clarity (even though, technically, it
doesn't matter).
 2023-09-03 21:37:02 +00:00
prateek banga
e104e6d0f2 Merge branch 'feat-add-messaging-collections-in-config' into feat-add-messaging-providers 2023-08-31 18:16:48 +05:30
Christy Jacob
5dbec3d406 chore: remove redundant attribute 2023-08-30 18:43:09 -04:00
Christy Jacob
861921526e fix: remove redundant name property 2023-08-30 18:34:20 -04:00
Christy Jacob
74012158b3 fix: variable names 2023-08-30 17:54:26 -04:00
Christy Jacob
05615d1449 fix: missing variable in email templates 2023-08-30 17:52:55 -04:00
Christy Jacob
75e957ed4a fix: missing variable in email templates 2023-08-30 17:48:25 -04:00
Jake Barnby
3d0ae4b9d9
Remove invites codes 2023-08-30 00:31:38 -04:00
Jake Barnby
a1d0b67c6b
Fix SMTP 2023-08-30 00:30:44 -04:00
Matej Bačo
c98d5bd3cd Fix SMTP after QA 2023-08-29 11:40:30 +02:00
Matej Bačo
89c9f8da6a Implement proper behaviour for SMTP sender 2023-08-28 14:19:37 +02:00
Bradley Schofield
82f400d177 Add more HTML back 2023-08-28 09:03:55 +01:00
Bradley Schofield
1be5f58fd9 Update account.php 2023-08-28 06:14:43 +01:00
Bradley Schofield
ee0563c46f Cover other routes and cleanup code 2023-08-28 06:09:28 +01:00
Bradley Schofield
608b6b3847
Continue work 2023-08-27 23:45:37 +01:00
Matej Bačo
596e59f2cc response format fix, smtp QA fixes 2023-08-25 17:13:25 +02:00
Jake Barnby
55deaec8b2
Fix missing env 2023-08-23 17:53:24 -04:00
Matej Bačo
43b1c196e0 Merge branch 'feat-git-integration' into feat-git-integration-copy 2023-08-23 10:16:23 +02:00
Jake Barnby
a84e669a1f
Add missing accessedAt values when creating users 2023-08-22 21:34:23 -04:00
Vincent (Wen Yu) Ge
31b8c77b5c Fix typos, improve a few errors 2023-08-22 20:30:00 +00:00
Vincent (Wen Yu) Ge
07a7a710ee Improve error and copy in params/models 2023-08-22 20:11:33 +00:00
Jake Barnby
b48a64d1ad
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration 
# Conflicts:
#	app/controllers/api/functions.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
 2023-08-22 00:59:36 -04:00
Jake Barnby
942705b5f3
Fix database upgrade 2023-08-21 23:25:55 -04:00
shimon
8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
Jake Barnby
a3895b041a
Apply suggestions from code review 2023-08-17 21:48:21 -04:00
prateek banga
92e587769a resolve merge conflicts 2023-08-16 15:16:45 +05:30
Steven Nguyen
09254aeae0
Add description for the delete account identity's identityId param 2023-08-09 09:25:29 -07:00
Steven Nguyen
5801a2cc39
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x 2023-08-09 09:01:29 -07:00
Christy Jacob
c009a12a25 Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into 1.4.x 2023-08-08 20:51:31 +00:00
Christy Jacob
82a206d808 Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data 2023-08-08 16:48:59 +00:00
Steven Nguyen
f3fa7922d4
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x 2023-08-08 08:34:01 -07:00
Eldad A. Fux
4b7cd5c372
Merge pull request #5715 from appwrite/fix-phone-abuse-param 
fix: abuse label for creating phone session
 2023-08-07 15:16:40 +03:00
prateek banga
9057a50a10 rename provider param in config 2023-08-07 15:54:00 +05:30
Steven Nguyen
d960f85da6
Merge branch '1.4.x' into cloud-1.4.x 2023-08-04 18:07:33 -07:00
Steven Nguyen
aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2 2023-08-04 13:55:07 -07:00
Steven Nguyen
b8e22151f6
Remove identity status 
Until we have a clearer picture of why we need it, it would be best to
remove it since it's easier to add it later than to remove it after it's
released.
 2023-08-02 15:37:22 -07:00
Steven Nguyen
b9c2b9322f
Don't set password when oauth2 creates a user 
Setting a password can cause problems with other APIs that expect the
password to be null. In addition, it doesn't match the implementation
for the other APIs that create a user without a password (Create Magic
URL Session, Create Phone Session, Create Anonymous Session, etc).
 2023-08-02 15:36:06 -07:00
Steven Nguyen
a235024268
Separate OAuth2 info from Sessions into Identities 
This allows us to retain the OAuth2 info even if the session is
deleted. This also provides a foundation for allowing multiple emails,
phone numbers, etc, not from an OAuth2 provider.
 2023-08-02 15:36:06 -07:00
Eldad A. Fux
05a316bf48
Merge pull request #5895 from appwrite/feat-2591-improve-oauth2-error-handling 
Improve OAuth2 error handling
 2023-08-01 22:55:58 +03:00
Dakshi
12228ccef4 converted desc to sentence case 2023-08-01 20:56:48 +05:30
Eldad A. Fux
be4660a4a0
Merge pull request #5884 from appwrite/fix-oauth-endpoint 
Remove the OAuth2 Callback endpoints from api group
 2023-07-28 10:09:29 +03:00
Steven Nguyen
2621c08c4a
Update OAuth2 params 
1. Make code optional so we can show the error via redirect
2. Capture error and error_description params from the OAuth2 provider
 2023-07-27 17:19:49 -07:00
Steven Nguyen
a7c9e4bb7e
Improve OAuth2 Error Handling 
Update the OAuth2 class to throw an exception if an API call to the
OAuth2 provider fails and update the endpoint to redirect to the
failure url with the information from the OAuth2 provider.
 2023-07-27 17:19:49 -07:00
Steven Nguyen
611524476b
Merge branch 'master' into feat-master-to-1.4.x 2023-07-26 13:33:49 -07:00
Steven Nguyen
25016b4cc0
Remove the OAuth2 Callback endpoints from api group 
Prevent missing project ID error.
 2023-07-26 11:32:28 -07:00
Christy Jacob
882698d6e4 chore: update specs 2023-07-20 17:41:28 +04:00
Christy Jacob
c26194e189 Merge branch '1.4.x' of github.com:appwrite/appwrite into disallow-personal-data 2023-07-20 17:19:18 +04:00
Steven Nguyen
9908a9021f
Update get logs by user to pass user internal id 
The userId in audit is actually the userInternalId.
 2023-07-19 22:49:51 -07:00
Steven Nguyen
2befa60350
Track a user's last activity 
A user will have an accessedAt timestamp that will update at most once
per day if they make some API call. This timestamp can then be used
find active users and calculate daily, weekly, and monthly active users.

To ensure consistent updates to the user the $user from the resource
is always updated to the user making the request, including requests
like Create Account, Update Team Membership Status, and Create Phone
Session (confirmation). This ensures the shutdown can update the
accessedAt timestamp if there was a $user set.
 2023-07-19 22:22:58 -07:00
Eldad A. Fux
66fee90af9
Merge pull request #5199 from appwrite/feat-custom-smtp 
[FEAT] Custom SMTP and Template support
 2023-07-20 07:09:11 +03:00
Christy Jacob
4c8608b49c chore: update naming conventions 2023-07-20 02:24:32 +04:00
Christy Jacob
e493551f8a Merge branch '1.4.x' of github.com:appwrite/appwrite into disallow-personal-data 2023-07-20 01:44:25 +04:00
Christy Jacob
257776a54e fix: failing tests 2023-07-20 01:34:27 +04:00
Torsten Dittmann
978007ca98 fix: run formatter 2023-07-19 14:43:23 +02:00
Torsten Dittmann
500cfdb4c9 fix: remove hotp support for now 2023-07-19 14:40:59 +02:00
Damodar Lohani
4fd5c72f34 Merge branch 'master' into feat-1.4.x-with-1.3.x-master 2023-07-19 07:39:37 +00:00
Damodar Lohani
8dc5c2cb4c Merge remote-tracking branch 'origin/1.4.x' into feat-custom-smtp 2023-07-19 07:24:58 +00:00
Eldad A. Fux
9fafd39fef
Merge pull request #5211 from Pranav2612000/fix-5095-trigger-email-subscription-on-email-verification 
fix: trigger account subscription event on email verification
 2023-07-19 00:24:33 +03:00
Eldad A. Fux
7a2c789c6b
Merge pull request #5745 from vaibhavagarwal220/fix-5220-handle-null-name 
fixed null $name error for anonymous user
 2023-07-19 00:21:09 +03:00
Eldad A. Fux
b2b1b6e2e4
Merge pull request #5562 from fanatic75/fix-4846-added-expiry-value-to-account-sessions 
fix expire field in list account sessions api
 2023-07-19 00:17:53 +03:00
Eldad A. Fux
50f258b6db
Merge pull request #5740 from appwrite/fix-create-phone-verification 
Fix phone verification secret in events & payload
 2023-07-18 23:18:16 +03:00
Eldad A. Fux
9cdf124a81
Merge pull request #5739 from appwrite/fix-anonymous-user 
Fix anonymous user
 2023-07-18 23:07:52 +03:00
Eldad A. Fux
6f499cfa26
Merge pull request #5567 from fanatic75/fix-4982-expire-sessions-format-for-multiple-api 
fixed expire format for phone session, anonymous session, oauth session
 2023-07-18 22:57:10 +03:00
Eldad A. Fux
d4ed77b5e8
Merge pull request #5568 from fanatic75/fix-5429-expire-format-fix-for-get-session 
fix: expire format for get session api
 2023-07-18 22:56:47 +03:00
Eldad A. Fux
3a17f30374
Merge pull request #5566 from fanatic75/fix-5428-fixed-expire-format-for-magic-url-sessions 
fix: expire format in magic url sessions
 2023-07-18 22:56:35 +03:00
Torsten Dittmann
74308b445e
Merge pull request #5587 from appwrite/feat-user-labels 
Add a new labels attribute to the Users collection
 2023-07-18 14:59:18 +02:00
Damodar Lohani
8d106a39b0 null safe 2023-07-18 07:05:09 +00:00
Steven Nguyen
ca6e9a7f1e
Update get logs by user to pass user internal id 
The userId in audit is actually the userInternalId.
 2023-07-12 10:56:24 -07:00
Christy Jacob
e0aa3db21e Merge branch '1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data 2023-07-11 19:36:37 +00:00
loks0n
074e974481 chore: include secret instead of encoded 2023-07-10 11:14:23 +01:00
Damodar Lohani
f59d3563f4 Merge remote-tracking branch 'origin/feat-db-pools-master' into feat-db-pools-db-pools-master-sync 2023-07-10 03:06:48 +00:00
loks0n
7cee36ac5a feat: poc oauth2 ssr 2023-07-06 21:10:52 +01:00
loks0n
f384fc01f8 feat: return encodedSecret in session body 2023-07-06 16:20:56 +01:00
Steven Nguyen
8258d70b78
Update user's search attribute using database filter 
Using a database filter is the cleanest approach because it ensures
the logic is applied whenever the user is updated regardless of
whichever endpoint was used.
 2023-07-05 12:17:47 -07:00
vaibhavagarwal220
fecde6bdba fixed null $name error for anonymous user 2023-06-24 13:57:02 +05:30
Steven Nguyen
5d385c9a9d
Fix phone verification secret in events & payload 
The secret in events & payload should match the secret sent to
messaging.
 2023-06-22 17:54:09 -07:00
Steven Nguyen
37ad61933c
Set email & name after OAuth if they're empty 
The logic before was incorrect. Really, email and name should only be
set if they're empty.
 2023-06-22 17:46:09 -07:00
Torsten Dittmann
1f46d03e8c feat: initial mfa implementation 2023-06-22 15:35:49 +02:00
Torsten Dittmann
fd154f04d3 fix: abuse phone param 2023-06-16 12:42:24 +02:00
Jake Barnby
d3e7830620
Update changes 2023-06-16 14:16:19 +12:00
Jake Barnby
031f8270ff
Merge remote-tracking branch 'origin/1.4.x' into validator-mv 
# Conflicts:
#	composer.lock
 2023-06-15 12:28:32 +12:00
Christy Jacob
a9e2eca8a4
Merge pull request #5683 from appwrite/master 
Update 1.4.x from Master
 2023-06-12 13:20:26 +05:30
shimon
57bc7d0584 functions/builds/deletes worker 2023-06-11 17:08:48 +03:00
Steven Nguyen
b3c9a34e5e
Make users searchable by label 2023-06-09 10:19:57 -07:00
Prateek Banga
1475497ffb Merge branch 'master' of https://github.com/fanatic75/appwrite into fix-4846-added-expiry-value-to-account-sessions 2023-06-02 14:53:26 +05:30
Steven Nguyen
5afc49784e
Update the Update Phone API to also set the password 
This is to ensure the behavior matches the Update Email endpoint.
 2023-05-31 13:52:05 -07:00
Steven Nguyen
5ef3162cee
Don't rely on isAnonymousUser to check whether to verify password 
It's possible for a user to not be anonymous and not have a password.
Using passwordUpdate is a better indicator as to whether the user has
set a password or not.
 2023-05-30 17:17:20 -07:00
Steven Nguyen
7dec6c7321
Fix 500 error when a passwordless user creates an email session 2023-05-30 16:59:55 -07:00
shimon
f1466c05cf refactor workers 2023-05-29 16:58:45 +03:00
Steven Nguyen
9d13d72c71
Update the Update Account Status API to clear the cookie 
After a user updates their status, their session no longer works
however, the cookie may still exist in their browser, preventing other
API calls from completing successfully.
 2023-05-23 10:40:31 -07:00
Prateek Banga
977279b679 fix: expire format for get session api 2023-05-22 18:34:51 +05:30
Prateek Banga
249bec5124 fixed expire format for phone session, anonymous session, oauth session 2023-05-22 18:18:52 +05:30
Prateek Banga
8673df4ac5 fix: expire format in magic url sessions 2023-05-22 17:52:25 +05:30
Prateek Banga
19a3db69f8 fix updated expire format to iso format 2023-05-20 21:09:48 +05:30
Prateek Banga
5cb9cc9dfd fix expire field in list account sessions api 2023-05-20 02:36:45 +05:30
Steven Nguyen
9961609d71
Update the Update Account Status API to clear the cookie 
After a user updates their status, their session no longer works
however, the cookie may still exist in their browser, preventing other
API calls from completing successfully.
 2023-05-19 11:58:17 -07:00
fogelito
f6153b7626 Use array instead of variadic 2023-05-16 15:56:20 +03:00
Matej Bačo
6885e6ea0e linter fix 2023-05-01 17:51:31 +02:00
Matej Bačo
70b5281a0b Improve GitHub oauth email discovery 2023-05-01 15:54:33 +02:00
fogelito
9dcf4c0984 validations changes 2023-04-25 14:35:49 +03:00
Damodar Lohani
ac9f434c85 more fixes and reset endpoints 2023-04-19 08:44:22 +00:00
Damodar Lohani
0177ddccb3 use custom templates to send email when enabled 2023-04-19 08:29:29 +00:00
Christy Jacob
0fb34433b9 feat: personal data filters to enhance password protection 2023-04-14 00:20:03 +04:00
Christy Jacob
8a5a3db082 Merge branch 'master' of github.com:appwrite/appwrite into disallow-personal-data 2023-04-13 12:55:49 +04:00
Damodar Lohani
d394715b56 Merge remote-tracking branch 'origin/master' into feat-custom-smtp 2023-04-13 01:35:56 +00:00
Torsten Dittmann
52d7dcf082 fix: update prefs endpoints to not fallback to stdClass 2023-04-12 18:02:43 +02:00
Christy Jacob
9ca700f04a Merge branch 'master' of github.com:appwrite/appwrite into disallow-personal-data 2023-04-12 15:12:06 +04:00
Christy Jacob
8690c57a7c feat: initial commit 2023-04-12 03:01:50 +04:00
Jake Barnby
5cbb08d6f1
Fix response model types for update password + update status 2023-04-11 20:41:24 +12:00
Jake Barnby
7f8f34793e
Merge remote-tracking branch 'origin/1.3.x' into doc-db-relationships 
# Conflicts:
#	composer.lock
 2023-04-11 15:57:35 +12:00
Damodar Lohani
41d22fb50b Merge remote-tracking branch 'origin' into feat-db-pools-master-sync-2 2023-03-30 08:02:31 +00:00
Vincent (Wen Yu) Ge
19d5ea03b9 Updates links for query page 2023-03-29 19:38:39 +00:00
Damodar Lohani
7764073bdd fix typo 2023-03-17 00:58:21 +00:00
Damodar Lohani
893d305453 fix template issues 2023-03-17 00:55:00 +00:00
Matej Bačo
c01fcb130c Merge branch 'feat-db-pools-master' into feat-db-pools-sync 2023-03-14 12:58:54 +01:00
Damodar Lohani
c633eda501 return default template 2023-03-14 09:09:34 +00:00
Damodar Lohani
c7db44b45f default sms template 2023-03-14 09:07:42 +00:00
Damodar Lohani
82498459db update project smtp using hook 2023-03-13 09:21:16 +00:00
Damodar Lohani
07010a5192 set SMTP config from project 2023-03-12 02:14:03 +00:00
Pranav2612000
c97a4868b1 fix: trigger account subscription event on email verification 2023-03-11 00:23:49 +05:30
Damodar Lohani
ad8ae92a6d
Merge branch '1.3.x' into feat-reset-sdk-account-model 2023-03-09 07:06:24 +05:45
Steven Nguyen
85a2d623a6
Update APIs to check X-Appwrite-Timestamp header 
Appwrite will refer to the X-Appwrite-Timestamp header for when the
request was originally sent and reject the request if the Timestamp
is older than the updatedAt timestamp of the document.
 2023-03-07 10:54:52 -08:00
Torsten Dittmann
ae32536be2 Merge branch 'master' of https://github.com/appwrite/appwrite into chore-release-1-3-console-sdk 2023-02-28 14:45:34 +05:30
Damodar Lohani
dd9eab65c8
Merge branch 'master' into feat-reset-sdk-account-model 2023-02-26 10:46:07 +05:45
Torsten Dittmann
8b7dd6eaa6
Merge pull request #5083 from singhbhaskar/fix-5070-session-create-event-doesnt-show-in-Appwrite-Console-user-activity-for-OAuth-Sessions 
Adding missing audits.userId to routes
 2023-02-24 15:29:21 +05:30
Torsten Dittmann
dacb713450
Merge branch 'master' into fix-4982-email-session-expire-string-formattz 2023-02-24 15:23:33 +05:30
Steven Nguyen
c5ebcbab2b
Add offline support labels on endpoints 2023-02-23 14:47:45 -08:00
Christy Jacob
10b7503d62 feat: support case insensitive emails 2023-02-22 17:09:22 +05:30
Damodar Lohani
6b6f9edbd6
Merge branch '1.3.x' into feat-13x-master-sync 2023-02-21 07:38:46 +05:45
Damodar Lohani
104d99e636 fix default value error 2023-02-20 07:08:27 +00:00
Damodar Lohani
81add700c6 fix error 2023-02-20 04:01:08 +00:00
Damodar Lohani
9f3e815167
Merge branch 'feat-password-history' into feat-password-dictionary 2023-02-20 07:56:17 +05:45
Damodar Lohani
4e1a4b961c update attribute errors 2023-02-20 01:51:56 +00:00
Damodar Lohani
7e055c585d formatting fix 2023-02-20 01:37:33 +00:00
Damodar Lohani
452ee5c086 update dictonary validator 2023-02-20 01:34:05 +00:00
Eldad A. Fux
6696373d28
Merge pull request #4974 from appwrite/lohanidamodar-patch-3 
Oauth2 check if provider is enabled
 2023-02-19 08:53:41 +02:00
Damodar Lohani
5acd78463a Merge remote-tracking branch 'origin/feat-db-pools' into feat-db-pools-master-sync 2023-02-16 00:44:29 +00:00
Damodar Lohani
171f30adb1 Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-02-16 00:29:37 +00:00
Damodar Lohani
2d702b62b2 switch SDK response model from account to user 2023-02-15 00:10:54 +00:00
Damodar Lohani
71d2c45a92 Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-02-14 04:35:19 +00:00
Jake Barnby
f6fc9a8d8c
Merge remote-tracking branch 'origin/master' into feat-technical-debt-2 
# Conflicts:
#	composer.lock
 2023-02-14 14:22:08 +13:00
shimon
5850a454e0 addressing comments 2023-02-05 22:07:46 +02:00
Bhaskar Singh
e9d53cbc46 Adding missing audits.userId to routes 2023-02-05 12:32:56 +05:30
munyoudoum
ff5c5c7138 fix(api/account): formatTz for expire property in POST email sessions 2023-01-30 00:32:05 +07:00
Damodar Lohani
31b4c73b16
use variable 2023-01-29 15:30:39 +05:45
Christy Jacob
e5a6db6133
Merge pull request #4890 from appwrite/doc-clarify-permission 
Update permission and ID param descriptions for grammar and clarity.
 2023-01-28 04:15:20 +05:30
Vincent (Wen Yu) Ge
b25dc38a63 clarify custom ID vs unique ID 2023-01-20 22:22:16 +00:00
Christy Jacob
4142ffdb70 feat: update account codes 2023-01-19 17:26:41 +05:30
fogelito
c4ae047833 Merge branch 'master' of github.com:appwrite/appwrite into feat-technical-debt-2 
 Conflicts:
	app/init.php
	composer.json
	composer.lock
 2023-01-16 10:24:37 +02:00
Damodar Lohani
4f35353289 Merge branch 'feat-password-history' of https://github.com/appwrite/appwrite into feat-password-dictionary 2023-01-16 05:09:55 +00:00
Damodar Lohani
fe472e5b36 Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-password-history 2023-01-16 05:04:13 +00:00
shimon
a852672bff Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-new-usage-stats 2023-01-15 17:18:32 +02:00
Vincent (Wen Yu) Ge
45aea5b941 Update branch with master 2023-01-13 14:53:54 -05:00
Vincent (Wen Yu) Ge
92a384e31c Fix descriptions for ID and regen 1.2.x specs 2023-01-13 14:27:08 -05:00
Bradley Schofield
31b718d829 Replace Appwrite Validators with backported Utopia ones 
+ Updated Utopia Framework to 0.26.0
+ Replaced Appwrite Validators with Utopia ones
 2023-01-13 15:28:04 +00:00
Damodar Lohani
f41e3b1e8f Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-01-12 07:25:23 +00:00
Eldad A. Fux
f0bb8dcc33
Merge pull request #4859 from appwrite/refactor-mails-next 
refactor: make mails event and worker general
 2023-01-12 09:07:43 +02:00
Christy Jacob
837bad59a4 feat: add tests 2023-01-11 18:10:49 +05:30
Christy Jacob
71150ced1a feat: add tests 2023-01-11 18:05:07 +05:30
Christy Jacob
2bc85e4708 feat: linter fixes 2023-01-11 17:12:29 +05:30
Christy Jacob
9f9daf900a feat: review comments 2023-01-11 17:11:33 +05:30
Christy Jacob
e3a2135515 feat: linter fixes 2023-01-10 20:18:45 +05:30
Christy Jacob
59adaff541 feat: linter fixes 2023-01-10 14:23:08 +05:30
Damodar Lohani
d2ca803753 add provider enabled check in the redirect 2023-01-10 04:52:21 +00:00
Christy Jacob
3f992b316e feat: add code to account creation endpoint 2023-01-09 22:52:15 +05:30
Christy Jacob
b751af6db9 feat: add code to account creation endpoint 2023-01-09 22:46:02 +05:30
Christy Jacob
78a057ebf9 feat: add code to account creation endpoint 2023-01-09 22:39:58 +05:30
Damodar Lohani
b238a1ef2d fix format 2023-01-09 10:44:28 +00:00
Damodar Lohani
87c7e76a16
Oauth2 check if provider is enabled 2023-01-09 16:20:03 +05:45
Damodar Lohani
8927c71b69 fix formatting 2022-12-26 10:34:41 +00:00
Damodar Lohani
0760ea90d6 use dictionary validator 2022-12-26 10:22:49 +00:00
Damodar Lohani
a9078cded5 rename resource 2022-12-26 09:24:51 +00:00
Damodar Lohani
276032b3f7 error fix 2022-12-26 05:55:02 +00:00
Damodar Lohani
574ffa4d4b check dictionary is enabled before checking password 2022-12-26 05:52:49 +00:00
Damodar Lohani
e9710bdb76 formatting fix 2022-12-26 05:47:20 +00:00
Damodar Lohani
1ff8ce2382 check against passwords dictionary 2022-12-26 05:24:26 +00:00
Damodar Lohani
2603f91a6a use password history on account create and update password 2022-12-23 07:19:35 +00:00
Bradley Schofield
c0daed3644 Refactor names and cleanup code 2022-12-20 16:11:30 +00:00
Bradley Schofield
886a1a2abb Port Deletes and Builds worker 2022-12-20 12:22:58 +00:00
Damodar Lohani
5b1c54c440 fix suggestions 2022-12-19 05:07:41 +00:00
Damodar Lohani
30ece2d36a validator for password history 2022-12-18 09:08:51 +00:00
Damodar Lohani
f7dd37a9d1 format fix 2022-12-18 08:54:53 +00:00
Damodar Lohani
d098c8c698 use array slice 2022-12-18 08:47:02 +00:00
Damodar Lohani
4abc30eed1 refactor: fix formatting issues 2022-12-18 06:31:14 +00:00
Damodar Lohani
0eae73e7b8 fix: password comparison 2022-12-18 06:27:41 +00:00
Damodar Lohani
51ad9c6479 fix: get history limit before adding password to history 2022-12-18 04:38:27 +00:00
Damodar Lohani
0b1b7b8170 feat: check history limit 2022-12-16 10:47:08 +00:00
Damodar Lohani
61e03eeedf add new password to the history 2022-12-16 10:29:20 +00:00
Damodar Lohani
8e7b89ec03 feat: check password history 2022-12-16 10:22:39 +00:00
Damodar Lohani
12302d5b3d refactor: remove empty param 2022-12-16 06:34:03 +00:00
Damodar Lohani
495da1bfd4 fix: template path 2022-12-16 06:11:12 +00:00
Damodar Lohani
5d195659bd refactor: mails refactor 2022-12-15 09:22:05 +00:00
fogelito
8ade726932 Changing Role + Permissions namespace 2022-12-14 18:04:06 +02:00
fogelito
f96128e14f Changing Id 2022-12-14 17:42:25 +02:00
Damodar Lohani
5741a960c7 refactor: use refactored maile event and worker 2022-12-14 06:35:04 +00:00
Damodar Lohani
e0be09ded6 refactor: use session group for session limit 2022-12-11 08:33:52 +00:00
shimon
d3bc4da15c Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-new-usage-stats 2022-12-04 10:35:56 +02:00
Christy Jacob
f239296059 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-db-pools 2022-11-23 19:05:19 +00:00
Steven Nguyen
01556184c7
Fix the default oauth paths to match the route 2022-11-23 09:57:49 -08:00
Eldad Fux
95e835a902 Deprecated Usage stats 2022-11-23 19:08:42 +02:00
gepd
64ba896738
bug fix: failure status shoudn't be nulled 2022-11-22 17:05:04 -03:00
Matej Baco
5ec548cc06 Fix more failing tests 2022-11-18 14:13:33 +01:00
Bradley Schofield
0b883df5ec Fix Tests 2022-11-14 09:42:18 +00:00
Bradley Schofield
66b805829c Move authDuration into auths attribute in project 2022-11-14 09:30:45 +00:00
Bradley Schofield
4dfafd1169 Merge branch 'master' into feat-implement-session-length-api 2022-11-04 16:11:38 +00:00
Bradley Schofield
e1f9a8e0ce Clean up a couple things and fix tests 2022-11-04 14:48:29 +00:00
Bradley Schofield
4cfc3b3a7f Update authDuration fallback value 2022-11-04 10:12:02 +00:00
Bradley Schofield
94676a6c16 Alter sessionVerify to remove expire 2022-11-04 09:50:59 +00:00
Eldad A. Fux
44ca7d9459
Merge pull request #4631 from appwrite/feat-fix-account-naming 
Updated titles on account routes
 2022-11-03 18:19:41 +02:00
Eldad Fux
103469928e Updated routes 2022-11-03 17:24:32 +02:00
Bradley Schofield
4b8287c097 Remove 'expire' from sessions 2022-11-03 15:03:39 +00:00
Bradley Schofield
cddacfbb78 Handle Eldad's Comments 2022-11-01 14:43:18 +00:00
Bradley Schofield
5dc8a2dee0 Add Tests and fix bugs 2022-11-01 11:15:45 +00:00
Bradley Schofield
d34359fd49 Implement Variable Session Duration 2022-10-31 14:54:15 +00:00
Vincent (Wen Yu) Ge
4cee87273c
Merge branch 'master' into doc-unique-id 2022-10-04 10:51:38 -04:00
Vincent (Wen Yu) Ge
ae2100244f Update unique() to be ID.unique() 2022-10-03 20:22:28 +00:00
Torsten Dittmann
0c1222f0f5 Merge branch 'master' of https://github.com/appwrite/appwrite into 1.0.x 2022-09-30 14:23:06 +02:00
Matej Bačo
46c91899e7
Merge branch '0.16.x' into feat-improve-sms-e2e-tests 2022-09-23 08:23:29 +02:00
Christy Jacob
7abb426e3f fix: hash phone auth code 2022-09-23 03:55:17 +05:30
Matej Bačo
a983e792d8 Refactor required param values 2022-09-19 10:05:42 +00:00
Matej Bačo
6e8a4cc97b Update sms mock to use request catcher 2022-09-19 08:09:48 +00:00
Christy Jacob
626e4b1b8a feat: update getSessions to listSessions in users and accounts API 2022-09-14 03:43:04 +05:30
Christy Jacob
937674a373 feat: update getLogs to listLogs in users and account API 2022-09-14 02:35:03 +05:30
shimon
342c4a3253 audits.resource label update 2022-09-08 16:06:16 +03:00
shimon
834e4e03e3 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label-desc-decoupling 
 Conflicts:
	app/controllers/api/storage.php
 2022-09-08 15:13:22 +03:00
Eldad Fux
01fb4045bd Sync with 0.16 2022-09-07 14:11:10 +03:00
Eldad Fux
1f17fb34e4 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into fix-response-syntax 2022-09-07 14:07:40 +03:00
Eldad Fux
0895a25615 Fixed response syntax with new FW version 2022-09-07 14:02:36 +03:00
shimon
1362902082 audit event name reformation 2022-09-05 11:00:08 +03:00
shimon
db715f3e7d decouple audits log from events 2022-09-04 13:31:38 +03:00
shimon
8e1dc84a48 account labels 2022-09-04 10:32:56 +03:00
Matej Bačo
63c02677a0
PR review changes 2022-08-30 13:55:23 +02:00
Matej Bačo
889eaff418 Merge remote-tracking branch 'origin/feat-list-users-queries' into feat-list-endpoints-queries 2022-08-29 08:52:28 +00:00
Jake Barnby
82bea82d94 Update passwordUpdate check 2022-08-27 15:17:48 +12:00
Matej Bačo
c85363f355 Fix bugs after merge 2022-08-25 09:59:28 +00:00
Matej Baco
fd1068a600 Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries 2022-08-25 10:56:06 +02:00
Jake Barnby
625608804e Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix 
# 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/api/storage.php
#	app/workers/builds.php
#	src/Appwrite/Stats/Usage.php
#	src/Appwrite/Usage/Calculators/Database.php
 2022-08-25 18:21:15 +12:00
Matej Bačo
2d82eed4be Linter fix 2022-08-23 13:10:27 +00:00
Matej Bačo
b1348dbdd8 Upgrade account logs queries 2022-08-23 13:06:59 +00:00
Damodar Lohani
6af467398b update usage labels 2022-08-21 02:04:52 +00:00
Jake Barnby
24875e352d Merge fixes 2022-08-19 17:05:39 +12:00
Jake Barnby
cb6fc7f618 Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix 
# Conflicts:
#	.gitignore
#	app/config/collections.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/api/users.php
#	composer.lock
#	tests/e2e/Services/Account/AccountCustomClientTest.php
 2022-08-19 16:49:34 +12:00
Jake Barnby
5f990ecb6d Fix imports 2022-08-19 16:28:40 +12:00
Jake Barnby
7019be987c Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes 
# 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/account.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/workers/deletes.php
#	composer.lock
#	docker-compose.yml
#	phpunit.xml
#	src/Appwrite/Event/Delete.php
 2022-08-19 16:20:19 +12:00
Jake Barnby
66539bbe3a Review updates for role helper usage 2022-08-19 16:04:33 +12:00
Damodar Lohani
db9faebcc9
Update app/controllers/api/account.php 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2022-08-18 16:04:19 +05:45
Damodar Lohani
4d482ebb81 fix accounts PR 2022-08-18 00:31:56 +00:00
Damodar Lohani
a1e6f7bdf4 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 09:34:40 +00:00
shimon
cc887beae9 sync with 0.16 2022-08-17 10:32:42 +03:00
shimon
2dc8fba40a Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label 
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/users.php
	composer.json
	composer.lock
 2022-08-17 10:05:37 +03:00
Damodar Lohani
3bc0aa8dca fix merge issues 2022-08-17 02:35:55 +00:00
Damodar Lohani
80dfa85c82 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 00:45:07 +00:00
shimon
7ad7d1807e fill gaps from merge 2022-08-16 17:56:05 +03:00
shimon
5d284b8c27 fill gaps from merge 2022-08-16 16:20:35 +03:00
Matej Bačo
1e96f8c3d9 Revert changes regarding AccountAPI createAccount 2022-08-16 12:05:46 +00:00
shimon
de42895096 fill gaps from merge 2022-08-16 14:27:50 +03:00
shimon
923a741c5a Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label 
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/functions.php
	app/controllers/api/users.php
 2022-08-16 12:47:51 +03:00
Jake Barnby
326220762e Exception fixes 2022-08-16 21:07:30 +12:00
shimon
8f8f033d1a fill gaps from merge 2022-08-16 12:00:28 +03:00