Commit Graph

197 Commits

Author SHA1 Message Date
Kim 4eedb913c5 Merge branch 'new_S3_API'
# Conflicts:
#	csharp/App/VrmGrabber/Controller.cs
2023-10-09 14:26:18 +02:00
Kim 2a5f9a0cc6 Rewrote Backend.csproj to use new S3Utils.csproj, Testing needed 2023-10-09 14:23:31 +02:00
Kim 965a85ba81 Merge remote-tracking branch 'origin/main' 2023-10-02 15:40:06 +02:00
ig 2f5622e26c S3 Utils 2023-10-02 15:37:27 +02:00
ig b7cda31b58 minor 2023-10-02 15:10:01 +02:00
Kim d04b431c9f Merge branch 'marios' 2023-09-18 15:51:47 +02:00
Kim 651f2974c4 added deploy scripts for backend and frontend (use in the folder and while in the vpn) 2023-09-18 15:43:07 +02:00
Kim b727ef765a Checking for loops in foldertree, getting only unique children now.
Small Stability changes to VrmGrabber
2023-09-18 13:21:39 +02:00
Kim 731587ac77 Merge branch 'marios'
# Conflicts:
#	csharp/App/S3Explorer/Program.cs
2023-09-15 17:00:51 +02:00
Kim 40535cf0f1 Small changes cleanup for release 2023-09-15 16:59:59 +02:00
Kim a33c78ffe9 wip 2023-09-15 16:45:00 +02:00
Kim 128063165d No / in token! 2023-09-15 16:39:01 +02:00
Kim 13a2f22e36 Refactored Mailer out of backend into lib. 2023-09-15 16:30:41 +02:00
Kim 875d00d8a9 small typo 2023-09-15 14:29:48 +02:00
Kim 9686fed805 WIP password reset 2023-09-15 14:23:22 +02:00
Noe 637c8ae4ba Updated backend 2023-09-15 13:34:28 +02:00
Kim 908238244f null passwords for new users 2023-09-08 16:13:36 +02:00
ig 4791b139b8 Do not crash when file is not available 2023-09-08 15:22:39 +02:00
Kim d9548f6207 oops revert 2023-09-08 12:00:19 +02:00
Kim 47c8d438d1 Added keys to S3Cmd.cs 2023-09-08 11:52:49 +02:00
Kim 3484d4bca3 Threw out "deleted" Backups as we backup our db after each transaction. 2023-09-08 10:27:09 +02:00
Kim 50e01e6c8c fixed deletion 2023-09-08 09:45:56 +02:00
Kim 2f403a9819 email must be unique 2023-08-29 11:17:34 +02:00
Kim d93eb2c987 Added checkmarks for must reset password 2023-08-29 10:47:35 +02:00
Kim 107a439e44 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	typescript/Frontend/src/config/axiosConfig.tsx
2023-08-23 11:31:42 +02:00
Kim 5e320941bd multiple fixes 2023-08-23 11:31:30 +02:00
Kim Baumgartner 21a0603309 Started to rewrite vrmgrabber in rust. 2023-07-27 16:51:57 +02:00
Kim 22e2561f14 updates to backend and 10.2.0.1 2023-07-27 13:23:17 +02:00
Kim c23149c5cc fixed some small bugs uncovered by testing 2023-07-20 13:57:12 +02:00
Kim 7ff1d05708 Added S3Explorer a cmdline tool to grab and display data from our s3 buckets 2023-07-13 16:17:58 +02:00
Kim 8db786f965 In-Memory Database with automatic versioning Backups. When starting the server the newest backup is loaded into memory. 2023-07-13 13:23:05 +02:00
Kim 2aae717859 refactoring 2023-07-13 10:18:34 +02:00
Kim b5b7f65384 catching moves to same parent 2023-07-13 10:16:31 +02:00
Kim a070891e7e Set bucket cors on creation of new installation 2023-07-13 10:01:30 +02:00
Kim be18b291af Merge remote-tracking branch 'origin/main' 2023-07-13 09:40:10 +02:00
Kim e92d5a507c Included Write keys for s3 2023-07-13 09:40:04 +02:00
ig b361959f53 Properly parametrize deploy script 2023-07-10 10:39:03 +02:00
Sina Blattmann 4b873306e3 bugfix login 2023-07-06 11:42:52 +02:00
Sina Blattmann 6628e57861 kims work 2023-07-06 11:16:00 +02:00
Kim fc3ad1806c changed name to email 2023-07-06 11:09:16 +02:00
Kim c738804b1c made password nullable in login function 2023-07-06 11:06:55 +02:00
Kim a0dc85b57b changed db to real data 2023-07-06 10:57:57 +02:00
ig 9068f183d6 Use separate S3 data fields as in S3Config (cs & ts) 2023-07-05 15:13:44 +02:00
ig 3a10e4cb20 Split S3KeySecret into S3Key and S3Secret 2023-07-05 15:10:08 +02:00
ig 25450aecee Extract ExoCmd into own file 2023-07-05 15:09:28 +02:00
ig 395d5a89b2 Change S3 keys format; add correct S3 key for SalimaxPrototype 2023-07-05 14:31:53 +02:00
ig e80cc2fbd0 remove spurious propertygroup from projects 2023-07-04 09:09:50 +02:00
atef e31c40b659 Add Rootnamespace property in project files 2023-07-03 14:59:59 +02:00
Noe f2c04e2ccc Version Bleu 2023-06-30 16:13:09 +02:00
Noe 9e9a899f8e fix merge conflict 2023-06-30 09:00:44 +02:00
Noe 7cb055bc7b styling of website 2023-06-30 08:58:50 +02:00
Sina Blattmann 531c296a15 Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk 2023-06-29 08:41:03 +02:00
Sina Blattmann 4ee1709386 [WIP] fix graph bugs 2023-06-29 08:40:28 +02:00
ig 7f97ab8e14 make use of "required" with "init" (.net 7) 2023-06-27 13:14:17 +02:00
Sina Blattmann b256e9bd75 add db 2023-06-26 11:34:17 +02:00
Ivo Graber 4736657375 Delete Sqlite Db from backend
suspecting it to be the cause of a git error (too big)
2023-06-13 11:52:13 +00:00
Kim fa9d06192d added Grafana 2023-05-11 10:20:47 +02:00
Kim d1fb0a8ac2 added VrmGrabber to replicate VRM installations in memory (to run run the server.py file with flask run) FLASK_APP=server.py 2023-05-04 13:59:47 +02:00
Sina Blattmann 6fc414a2c0 Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk 2023-04-24 09:36:18 +02:00
Sina Blattmann 39b414d0f0 add datacache (ivos code), first working version with diagrams, only sample data 2023-04-24 09:35:01 +02:00
Kim f5515c110a changed signed urls for keysecret pairs in installations 2023-04-20 15:30:11 +02:00
Kim 5682d2893f Todo check different return methods and choose one @ig 2023-04-13 16:24:00 +02:00
Kim b8fc04a90c Testing new error messages in Backend, fixing small bugs, possibly breaking BMSTunnel, fixed tests 2023-04-13 14:30:01 +02:00
Sina Blattmann e84c10607f add Graphs, simple version 2023-04-13 11:40:57 +02:00
Kim 171d290e36 python gui fixed for reference 2023-04-06 14:28:35 +02:00
Kim 184fc8c10e Implemented mailer for new users, creation fails on invalid email address 2023-04-06 10:36:42 +02:00
Kim b6fbeb48b5 fixing bug in updating user 2023-04-06 08:32:47 +02:00
Kim 1021bb852a fixed bug in creating user and returning parents of installations/folders 2023-04-06 08:05:05 +02:00
ig 005da7fbcb Subscribe Cleanup on TaskPoolScheduler, should make Backend startup faster 2023-04-04 10:39:42 +02:00
ig 79ccad37c5 Move Controller to src root 2023-04-04 10:24:37 +02:00
Kim b290ded0a9 Fill Order Numbers everywhere where installations are given back 2023-03-30 09:28:44 +02:00
Kim e1305126ee Shifted sanitizing outputs into Controller.cs
Now Hiding Parents
2023-03-30 09:27:18 +02:00
Kim 50036daa78 typo 2023-03-23 15:46:19 +01:00
Kim c2d10b63d2 rewrote getchildusers 2023-03-23 15:45:40 +01:00
Kim 55628e2186 updating installations with new order numbers automatically updates the ordernumber2installation relation table 2023-03-23 14:58:59 +01:00
Kim b07991e75d added Ordernumber to installation relation and automatically filled installation order relations on get calls 2023-03-23 14:23:03 +01:00
Kim 7c385bc51c added smtpconfig class and put smtp config data into resources json file 2023-03-23 13:37:35 +01:00
Kim 432189f461 simplify s3 keys from json 2023-03-23 13:28:55 +01:00
Kim cc234cad97 added foldernames to inherited folder calls 2023-03-23 12:53:14 +01:00
Kim 7d4309f3af Added deletedFolders/installations/users for archive purposes, login is now possible without pw if no pw is set and you need to reset your pw, user hased pws should no longer be given out by the backend, moving folders and installations now have their own calls, loading s3 keys from disk on use 2023-03-23 12:47:25 +01:00
Kim 656b671962 split users with direct and inherited access to folders call 2023-03-23 08:27:29 +01:00
Kim c751cb8e8f added method to get all child users, split get user with access to installation to direct and inherited 2023-03-23 08:23:36 +01:00
ig abcec0ae10 remove HeaderFilter.cs, no longer needed 2023-03-21 11:56:34 +01:00
ig 381df5f38d fix handling of relative roots 2023-03-21 11:49:17 +01:00
ig 9098ac81b5 prevent rider from automatically opening swagger on each launch 2023-03-21 11:46:38 +01:00
ig 8d7f0cd8bf Use users name instead of email for login (https://softwareengineering.stackexchange.com/a/30087) 2023-03-21 11:45:50 +01:00
ig 1b5baf90ae Fix bug where properties were missing in json of installations and folders (were serialized as TreeNodes) 2023-03-21 11:42:49 +01:00
ig e25de16f65 Run CleanUp on TaskPool 2023-03-21 11:40:23 +01:00
ig 28a0ef5530 put back cors, apparently it's still necessary, sigh 2023-03-20 15:17:52 +01:00
ig e70ab41bc0 backslashes are the worstest 2023-03-20 13:28:52 +01:00
ig 3613199917 tentatively remove cors (we don't need it) 2023-03-20 10:31:24 +01:00
ig 5ef49de742 simplify WebApplication builder 2023-03-20 10:20:56 +01:00
ig e025b8cd11 Make Controller less magic. 2023-03-20 08:33:44 +01:00
ig 9454fbf878 Use InstallationAccess/FolderAccess as arguments to GrantUserAccessTo* RevokeUserAccessTo* 2023-03-19 17:53:00 +01:00
ig 0541918beb RevokeAccessTo => RevokeUserAccessTo, BucketPrefix => S3Prefix 2023-03-19 17:02:18 +01:00
ig ed7c65be2c group S3 related functions into S3 namespace 2023-03-19 16:09:45 +01:00
ig 44e183a9f1 Fix AccessibleFolders 2023-03-17 09:11:26 +01:00
Kim 4a19ebd49c various small comments 2023-03-16 16:53:36 +01:00
Kim 91a1c47328 various small comments 2023-03-16 16:52:20 +01:00
Kim df65b48c8f creating new folders and installations now gives you access to the new folder/installation 2023-03-16 16:45:25 +01:00