Matej Bačo
899bc38069
Merge branch 'cl-1.4.x' into feat-git-integration
2023-08-10 01:12:09 +02: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
Matej Bačo
93735ac4a7
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
2023-08-09 12:30:45 +02: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
Steven Nguyen
073b9963d2
Merge branch 'feat-git-integration' into feat-user-identities-git-integration
2023-08-07 14:46:00 -07:00
Damodar Lohani
a6109a0341
Merge remote-tracking branch 'origin/1.4.x' into feat-framework-router-v2
2023-08-07 08:42:04 +00:00
Matej Bačo
e60456cfda
QA after merge with 1.4
2023-08-06 10:51:53 +02:00
Steven Nguyen
d960f85da6
Merge branch '1.4.x' into cloud-1.4.x
2023-08-04 18:07:33 -07:00
Steven Nguyen
27e212553d
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-04 15:07:36 -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
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
Dakshi
12228ccef4
converted desc to sentence case
2023-08-01 20:56:48 +05:30
Steven Nguyen
eb7526601d
Delete duplicate 'Update Email Verification' endpoint
2023-07-31 11:00:30 -07:00
Damodar Lohani
fa8fab184b
fix remove duplicate endpoints
2023-07-30 09:23:12 +00:00
Steven Nguyen
611524476b
Merge branch 'master' into feat-master-to-1.4.x
2023-07-26 13:33:49 -07: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
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
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
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
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
Steven Nguyen
b3c9a34e5e
Make users searchable by label
2023-06-09 10:19:57 -07:00
Steven Nguyen
8400394857
Add an endpoint to update user labels
2023-06-09 10:18:51 -07:00
shimon
432ee72071
Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into refactor-workers
...
Conflicts:
app/cli.php
app/console
app/controllers/api/account.php
app/controllers/api/functions.php
app/controllers/api/teams.php
app/controllers/shared/api.php
app/init.php
app/worker.php
app/workers/builds.php
app/workers/certificates.php
app/workers/deletes.php
app/workers/functions.php
app/workers/mails.php
src/Appwrite/Event/Event.php
src/Appwrite/Event/Mail.php
2023-05-22 18:41:24 +03:00
fogelito
f6153b7626
Use array instead of variadic
2023-05-16 15:56:20 +03:00
fogelito
d55dc7a5b2
Merge branch 'master' of github.com:appwrite/appwrite into validator-mv
2023-05-07 12:23:02 +03:00
Christy Jacob
60f51580a7
Merge pull request #5246 from singhbhaskar/fix-4960-Database-usage-screen-shows-500-error-when_APP_USAGE_STATS-is-disabled
...
Fix: Updated error when _APP_USAGE_STATS is disabled
2023-05-04 20:47:50 +05:30
fogelito
5e4ff01568
getByType
2023-05-01 12:18:50 +03:00
fogelito
9dcf4c0984
validations changes
2023-04-25 14:35:49 +03:00
Bhaskar Singh
3865f48d32
Moved check for _APP_USAGE_STATS
...
to create init hook for App
2023-04-21 23:09:01 +05:30
Christy Jacob
0fb34433b9
feat: personal data filters to enhance password protection
2023-04-14 00:20:03 +04:00
Torsten Dittmann
52d7dcf082
fix: update prefs endpoints to not fallback to stdClass
2023-04-12 18:02:43 +02: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
Vincent (Wen Yu) Ge
19d5ea03b9
Updates links for query page
2023-03-29 19:38:39 +00:00
Bhaskar Singh
ac2085ffa8
Updated error when _APP_USAGE_STATS is disabled
...
for usage
2023-03-18 22:12:36 +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
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
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
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
Vincent (Wen Yu) Ge
b25dc38a63
clarify custom ID vs unique ID
2023-01-20 22:22:16 +00:00
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
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
shimon
9a2f734d3a
compose.lock
2023-01-12 18:06:20 +02:00
Matej Bačo
ccc9432219
Merge branch 'master' into fix-1.2.x-conflicts
2022-12-27 08:29:10 +01:00
Damodar Lohani
a0a08b3588
fix make password optional
2022-12-27 07:13:39 +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
Bradley Schofield
c0daed3644
Refactor names and cleanup code
2022-12-20 16:11:30 +00:00
Christy Jacob
cb0a927e34
Merge pull request #4050 from geisterfurz007/fix-3916-empty-payload-returned-as-object
...
fix: empty payload returned as list
2022-12-20 13:37:24 +05:30
Christy Jacob
6b31edfdef
Merge pull request #4506 from karniv00l/user-not-found-exception
...
Fix User not found exception
2022-12-20 13:25:35 +05:30
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
6612e6edf0
fix: password verify
2022-12-18 06:28:19 +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
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
shimon
961c408885
metric negative / positive values in worker
2022-12-14 09:34:04 +02:00
shimon
52c2cefdb5
users usage
2022-12-11 11:06:19 +02:00
Eldad Fux
95e835a902
Deprecated Usage stats
2022-11-23 19:08:42 +02:00
Jake Barnby
f9d2976c1d
Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support
...
# Conflicts:
# CHANGES.md
# 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/init.php
# app/tasks/sdks.php
# composer.lock
# docker-compose.yml
2022-11-16 19:37:35 +13:00
Bradley Schofield
3c71164741
Merge branch '1.1.x' into feat-implement-session-length-api
2022-11-14 15:30:38 +00:00
Jake Barnby
a47bfe71bf
Merge remote-tracking branch 'origin/1.2.x' into feat-graphql-support
...
# Conflicts:
# CHANGES.md
# composer.json
# composer.lock
# tests/e2e/Services/Functions/FunctionsCustomServerTest.php
2022-11-04 21:32:57 +13:00
geisterfurz007
e891424c17
fix: empty payload deleting single user session
2022-10-31 21:01:49 +01:00
Vincent (Wen Yu) Ge
9a1f54baf1
Merge branch 'master' into doc-unique-id
2022-10-21 17:43:52 -04:00
Damodar Lohani
dfa35e0a0b
fix periods on usage endpoints
2022-10-21 05:45:25 +00:00
Jake Barnby
a2b1941a47
Merge remote-tracking branch 'origin/master' into feat-graphql-support
...
# Conflicts:
# CONTRIBUTING.md
# composer.json
# composer.lock
# docs/references/teams/list-teams.md
2022-10-19 13:17:56 +13:00
Piotr Rogowski
833e3f8ce1
Fix User not found exception
2022-10-14 18:17:00 +02:00
Jake Barnby
fd8d4f4a1b
Add type property to hash algorithms to allow resolving union type implementation
2022-10-11 12:27:03 +13:00
Akshay Rana
da9133ae85
fixed: wrong error message show on adding duplicate number to a user
2022-10-04 23:48:15 +05:30
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
Jake Barnby
69d42fc980
Fix create scrypt user route param defaults types
2022-09-29 16:52:57 +13:00
Christy Jacob
ba0be549e3
Merge pull request #3881 from appwrite/fix-null-required-param
...
Fix: Null required ID params
2022-09-23 00:37:17 +05:30
Matej Bačo
a983e792d8
Refactor required param values
2022-09-19 10:05:42 +00:00
Steven Nguyen
00a4929301
Fix date format for usage APIs
2022-09-15 23:48:09 +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
Christy Jacob
183bb2e92d
feat: update getMemberships to listMemberships in Users API
2022-09-14 02:28:28 +05:30
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
5d16c39d5f
account labels
2022-09-04 11:13:44 +03:00
Jake Barnby
b9148d380b
Fix only variables can passed by reference errors
2022-08-31 11:31:43 +12:00
Matej Bačo
63c02677a0
PR review changes
2022-08-30 13:55:23 +02:00
Matej Bačo
2b3dc48bf1
PR review changes
2022-08-30 08:21:34 +00:00
Matej Bačo
281eb2fafe
Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-list-users-queries
2022-08-26 07:40:35 +00:00
Steven
60a4563908
Fix usage tests
2022-08-25 22:15:11 +00:00
Matej Bačo
bc73b7bbf0
Fix bugs after merge
2022-08-25 10:28:13 +00:00
Matej Bačo
f15f8e7bf0
Linter fix
2022-08-25 09:34:36 +00:00
Matej Baco
c6e614d896
Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries
2022-08-25 10:38:43 +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
Steven
66ff297103
Refactor Queries Validation
2022-08-22 19:16:20 +00:00
Damodar Lohani
2205ecd9c6
null safety checks
2022-08-20 11:20:31 +00:00
Steven
3890dea35b
Add additional Validators for Queries
2022-08-19 23:20:22 +00:00
Steven
a5bc07c9e4
Merge branch 'feat-list-users-queries' into feat-list-user-logs-queries
2022-08-19 22:00:54 +00:00
Steven
c1cdad5566
Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries
2022-08-19 14:50:50 +00: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
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
Steven
27f69e3c09
Consolidate List User Logs API params
...
Replace limit and offset params with a single queries param since the
Queries V2 change now allows for different types of queries.
2022-08-19 00:09:34 +00:00
Steven
f0d66985f7
Consolidate List Users API params
...
Replace search, limit, offset, cursor, cursorDirection, and orderType
params with a single queries param since the Queries V2 change now
allows for different types of queries.
2022-08-18 19:30:39 +00:00
Damodar Lohani
d4f02402bd
Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates
2022-08-17 10:38:16 +00:00
shimon
e94c7eba83
more audit labels on users new routes
2022-08-17 13:01:16 +03: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
88f6a67802
sync with 0.16
2022-08-17 10:36:38 +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
Matej Bačo
7a1dfbfb8d
Fix passwordUpdate time for non-pass users
2022-08-16 15:56:54 +00:00
Matej Bačo
2814a6f680
Linter fix
2022-08-16 13:03:38 +00:00
Matej Bačo
3088535806
Added phone number to UsersAPI createUser + tests
2022-08-16 13:02:28 +00:00
shimon
de42895096
fill gaps from merge
2022-08-16 14:27:50 +03:00
shimon
beaad6c49d
fill gaps from merge
2022-08-16 13:19:38 +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
shimon
8f8f033d1a
fill gaps from merge
2022-08-16 12:00:28 +03:00
Jake Barnby
bbf7f8d8c3
Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix
...
# Conflicts:
# app/controllers/api/databases.php
# app/controllers/api/storage.php
# src/Appwrite/Extend/Exception.php
2022-08-16 20:30:00 +12:00
Jake Barnby
fb34ecfa7d
Merge remote-tracking branch 'origin/0.16.x' into datetime-attributes-merge
...
# Conflicts:
# 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
2022-08-16 19:20:26 +12:00
Christy Jacob
5b7b39a300
Revert "Fix Endpoint Order"
2022-08-16 12:29:03 +05:30
shimon
9770f10a8c
fill gaps from merge
2022-08-15 20:33:44 +03:00
shimon
f091774afd
fill gaps from merge
2022-08-15 20:04:23 +03:00
shimon
590c1467bc
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-15 18:19:59 +03:00
Christy Jacob
7723c633a0
feat: fix tests
2022-08-15 13:24:54 +05:30
Christy Jacob
509f9083c9
Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-reorder-endpoints-2
2022-08-15 12:43:24 +05:30
Eldad A. Fux
340cfb0104
Update app/controllers/api/users.php
2022-08-14 20:01:32 +03:00
Eldad Fux
7d83f9d644
Removed import path
2022-08-14 19:29:07 +03:00
Eldad Fux
98fc8669e1
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-password-hash-algos
2022-08-14 19:23:30 +03:00
Jake Barnby
613a0f8006
ID and test fixes
2022-08-15 02:22:38 +12:00
Eldad A. Fux
d641fbb635
Merge pull request #3588 from appwrite/feat-simplify-exceptions
...
Simplify Exception Creation
2022-08-14 15:27:52 +03:00