From c02c47efcb00782feb1461534923023a711d4f15 Mon Sep 17 00:00:00 2001 From: sowgro Date: Sun, 2 Mar 2025 11:22:48 -0500 Subject: First attempt at an authentication system. --- ufund-api/data/cupboard.json | 9 ++++++++- ufund-api/data/userAuths.json | 7 +++++++ ufund-api/data/users.json | 13 ++++++++++++- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 ufund-api/data/userAuths.json (limited to 'ufund-api/data') diff --git a/ufund-api/data/cupboard.json b/ufund-api/data/cupboard.json index bb7ec03..abba017 100644 --- a/ufund-api/data/cupboard.json +++ b/ufund-api/data/cupboard.json @@ -1,3 +1,10 @@ [ - {"name":"Money for coral","id":1,"maxGoal":100.0,"type":"MONETARY","filterAttributes":null,"Current":0.0} + { + "name": "Money for coral", + "id": 1, + "maxGoal": 100.0, + "type": "MONETARY", + "filterAttributes": null, + "Current": 0.0 + } ] \ No newline at end of file diff --git a/ufund-api/data/userAuths.json b/ufund-api/data/userAuths.json new file mode 100644 index 0000000..e451862 --- /dev/null +++ b/ufund-api/data/userAuths.json @@ -0,0 +1,7 @@ +[ + { + "key": "eeea7b02-7265-4a26-96de-a8ad1860c533", + "username": "phil", + "expiration": "2025-03-31T23:04:47.455490668" + } +] \ No newline at end of file diff --git a/ufund-api/data/users.json b/ufund-api/data/users.json index 4e98a14..ae575b1 100644 --- a/ufund-api/data/users.json +++ b/ufund-api/data/users.json @@ -1 +1,12 @@ -[{"name":"steve","password":null}] \ No newline at end of file +[ + { + "username": "phil", + "passwordHash": -1054080181, + "basket": [] + }, + { + "username": "tbone", + "passwordHash": 97526364, + "basket": [] + } +] \ No newline at end of file -- cgit v1.2.3 From bb9ce55cb5b55a6aaed2399e39a01d68f2491ce3 Mon Sep 17 00:00:00 2001 From: sowgro Date: Thu, 6 Mar 2025 21:41:39 -0500 Subject: Push current changes (working on documentation and tests) --- ufund-api/data/userAuths.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'ufund-api/data') diff --git a/ufund-api/data/userAuths.json b/ufund-api/data/userAuths.json index e451862..41ff472 100644 --- a/ufund-api/data/userAuths.json +++ b/ufund-api/data/userAuths.json @@ -1,7 +1 @@ -[ - { - "key": "eeea7b02-7265-4a26-96de-a8ad1860c533", - "username": "phil", - "expiration": "2025-03-31T23:04:47.455490668" - } -] \ No newline at end of file +[{"key":"a07ae51f-f80b-4001-95f1-48c11d4917a4","username":"phil","expiration":"2025-04-05T15:04:30.900359001"},{"key":"e14f8ee5-5780-4b9b-bf34-7a41c2bbfcb4","username":"phil","expiration":"2025-04-05T13:46:10.90733016"},{"key":"d7cef571-0f76-49fe-941f-ecbeae69557a","username":"phil","expiration":"2025-04-05T15:14:00.363201102"},{"key":"eeea7b02-7265-4a26-96de-a8ad1860c533","username":"phil","expiration":"2025-03-31T23:04:47.455490668"}] \ No newline at end of file -- cgit v1.2.3 From 34a3f63ffb9f33a4817ea6d247499df5743b816a Mon Sep 17 00:00:00 2001 From: sowgro Date: Sun, 16 Mar 2025 23:11:58 -0400 Subject: fix warning --- ufund-api/data/userAuths.json | 2 +- ufund-api/data/users.json | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) (limited to 'ufund-api/data') diff --git a/ufund-api/data/userAuths.json b/ufund-api/data/userAuths.json index 41ff472..fea8a6f 100644 --- a/ufund-api/data/userAuths.json +++ b/ufund-api/data/userAuths.json @@ -1 +1 @@ -[{"key":"a07ae51f-f80b-4001-95f1-48c11d4917a4","username":"phil","expiration":"2025-04-05T15:04:30.900359001"},{"key":"e14f8ee5-5780-4b9b-bf34-7a41c2bbfcb4","username":"phil","expiration":"2025-04-05T13:46:10.90733016"},{"key":"d7cef571-0f76-49fe-941f-ecbeae69557a","username":"phil","expiration":"2025-04-05T15:14:00.363201102"},{"key":"eeea7b02-7265-4a26-96de-a8ad1860c533","username":"phil","expiration":"2025-03-31T23:04:47.455490668"}] \ No newline at end of file +[{"key":"e48872fa-b89f-494a-b681-11a809d32ff4","username":"phil","expiration":"2025-04-14T17:20:23.265745224"},{"key":"31fcbc15-9902-41d2-8d6f-5b0e40ebddd2","username":"phil","expiration":"2025-04-14T16:45:41.082560826"},{"key":"3fdd4e7e-bc59-4e3a-ba5c-177d0833022a","username":"sowgro","expiration":"2025-04-14T18:35:26.42935739"},{"key":"13d12a6d-6825-4c1d-8b22-ba960de140b8","username":"phil","expiration":"2025-04-14T17:20:58.531711142"},{"key":"a07ae51f-f80b-4001-95f1-48c11d4917a4","username":"phil","expiration":"2025-04-05T15:04:30.900359001"},{"key":"cc49c007-fd36-4828-b8fa-f5b85ad0676d","username":"phil","expiration":"2025-04-14T16:46:12.80566798"},{"key":"da61796e-402a-4a80-88ae-7607a37989a4","username":"phil","expiration":"2025-04-14T17:07:10.618039573"},{"key":"e14f8ee5-5780-4b9b-bf34-7a41c2bbfcb4","username":"phil","expiration":"2025-04-05T13:46:10.90733016"},{"key":"d7cef571-0f76-49fe-941f-ecbeae69557a","username":"phil","expiration":"2025-04-05T15:14:00.363201102"},{"key":"125a4847-3a1c-4834-961f-7f96e997f92e","username":"sowgro","expiration":"2025-04-14T18:35:38.922687686"},{"key":"3fc557b6-0306-4779-9b74-b7292a5cf1cc","username":"phil","expiration":"2025-04-14T16:06:08.564069822"},{"key":"77392d17-6e0c-45ec-857d-6595a55ddd97","username":"phil","expiration":"2025-04-14T16:06:48.335542315"},{"key":"eeea7b02-7265-4a26-96de-a8ad1860c533","username":"phil","expiration":"2025-03-31T23:04:47.455490668"},{"key":"e121c7c6-e534-4fde-8a78-4f175e9db9c8","username":"phil","expiration":"2025-04-14T17:23:23.218442063"},{"key":"af38add5-b100-4b96-9ffb-5afaccd59979","username":"adf","expiration":"2025-04-14T18:18:47.670506361"},{"key":"2aeaab28-99c9-4b45-bdef-82096c70945e","username":"phil","expiration":"2025-04-14T17:19:48.552121268"},{"key":"58e4e2a2-3a36-4fd6-8bb1-ad0831664d01","username":"phil","expiration":"2025-04-12T23:17:42.638952959"},{"key":"4df8bb43-f597-49ca-863a-6e0da5280d79","username":"phil","expiration":"2025-04-14T01:13:53.799331844"},{"key":"ad6d92d4-c496-407c-823a-edaa386e67ed","username":"phil","expiration":"2025-04-14T17:07:36.032623002"},{"key":"718be1e2-cfc7-44a6-b3c6-965684d1d0a9","username":"adf","expiration":"2025-04-14T18:35:58.888847176"},{"key":"85319427-4603-4a16-af33-2e9525dda8c0","username":"phil","expiration":"2025-04-14T00:39:34.952183453"},{"key":"f5f53053-ef5e-4850-93a0-3dc20646f78b","username":"sowgro","expiration":"2025-04-14T18:11:29.438554549"},{"key":"efc531fb-ab24-4d5a-a2f5-7f4ede74819f","username":"phil","expiration":"2025-04-13T19:41:51.017327545"},{"key":"f1d6a110-4232-4ef3-b6ec-9a2962664158","username":"phil","expiration":"2025-04-14T17:23:40.834526839"}] \ No newline at end of file diff --git a/ufund-api/data/users.json b/ufund-api/data/users.json index ae575b1..106f11e 100644 --- a/ufund-api/data/users.json +++ b/ufund-api/data/users.json @@ -1,12 +1 @@ -[ - { - "username": "phil", - "passwordHash": -1054080181, - "basket": [] - }, - { - "username": "tbone", - "passwordHash": 97526364, - "basket": [] - } -] \ No newline at end of file +[{"username":"adf","passwordHash":96419,"basket":[]},{"username":"tbone","passwordHash":97526364,"basket":[]},{"username":"sowgro","passwordHash":389416948,"basket":[]},{"username":"phil","passwordHash":-1054080181,"basket":[]}] \ No newline at end of file -- cgit v1.2.3 From 59119fb799ea27d4bffcf793f768538ad202cd85 Mon Sep 17 00:00:00 2001 From: benal01 Date: Mon, 17 Mar 2025 18:22:13 -0400 Subject: testing search's inner delete method --- ufund-api/data/cupboard.json | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'ufund-api/data') diff --git a/ufund-api/data/cupboard.json b/ufund-api/data/cupboard.json index abba017..cc85335 100644 --- a/ufund-api/data/cupboard.json +++ b/ufund-api/data/cupboard.json @@ -1,10 +1 @@ -[ - { - "name": "Money for coral", - "id": 1, - "maxGoal": 100.0, - "type": "MONETARY", - "filterAttributes": null, - "Current": 0.0 - } -] \ No newline at end of file +[{"name":"Jellyfish Hats","id":26,"maxGoal":10.0,"type":"MONETARY","filterAttributes":[],"Current":0.0},{"name":"Pollution Re-Filtering","id":27,"maxGoal":1.0E7,"type":"MONETARY","filterAttributes":[],"Current":0.0},{"name":"Coral re-re-habilitation","id":28,"maxGoal":10000.0,"type":"MONETARY","filterAttributes":[],"Current":0.0}] \ No newline at end of file -- cgit v1.2.3 From 54876363de44791ba65b6c43b795f8d0c3548ecc Mon Sep 17 00:00:00 2001 From: sowgro Date: Mon, 17 Mar 2025 21:45:31 -0400 Subject: Fix tests --- ufund-api/data/users.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'ufund-api/data') diff --git a/ufund-api/data/users.json b/ufund-api/data/users.json index 106f11e..8543a55 100644 --- a/ufund-api/data/users.json +++ b/ufund-api/data/users.json @@ -1 +1,14 @@ -[{"username":"adf","passwordHash":96419,"basket":[]},{"username":"tbone","passwordHash":97526364,"basket":[]},{"username":"sowgro","passwordHash":389416948,"basket":[]},{"username":"phil","passwordHash":-1054080181,"basket":[]}] \ No newline at end of file +[ + { + "username": "phil", + "passwordHash": -1054080181, + "basket": [], + "type": "HELPER" + }, + { + "username": "admin", + "passwordHash": 92668751, + "basket": [], + "type": "MANAGER" + } +] \ No newline at end of file -- cgit v1.2.3 From b5797b53eddf5a52ea9bbd8f3c638edd678407ab Mon Sep 17 00:00:00 2001 From: Akash Keshav <112591754+domesticchores@users.noreply.github.com> Date: Mon, 17 Mar 2025 22:56:19 -0400 Subject: please work, i backmerged and everything. -ak --- ufund-api/data/cupboard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ufund-api/data') diff --git a/ufund-api/data/cupboard.json b/ufund-api/data/cupboard.json index cc85335..abc2293 100644 --- a/ufund-api/data/cupboard.json +++ b/ufund-api/data/cupboard.json @@ -1 +1 @@ -[{"name":"Jellyfish Hats","id":26,"maxGoal":10.0,"type":"MONETARY","filterAttributes":[],"Current":0.0},{"name":"Pollution Re-Filtering","id":27,"maxGoal":1.0E7,"type":"MONETARY","filterAttributes":[],"Current":0.0},{"name":"Coral re-re-habilitation","id":28,"maxGoal":10000.0,"type":"MONETARY","filterAttributes":[],"Current":0.0}] \ No newline at end of file +[{"name":"Jellyfish Hats","id":26,"maxGoal":10.0,"type":"MONETARY","filterAttributes":["#savethejellyfish","Clothing","Storefront"],"current":0.0},{"name":"Pollution Re-Filtering","id":27,"maxGoal":1.0E7,"type":"MONETARY","filterAttributes":["Cleanup","Donations","Third-Party"],"current":0.0},{"name":"Coral re-re-habilitation","id":28,"maxGoal":10000.0,"type":"MONETARY","filterAttributes":["Preservation","#savethecoral","#helloPhil"],"current":0.0}] \ No newline at end of file -- cgit v1.2.3