537 Commits

Author SHA1 Message Date
a24c6119a6
check rights on all resolvers 2021-11-24 19:41:26 +01:00
44365bccf1
refactored isAuthorized & implemented a new role & rights based system 2021-11-24 19:40:49 +01:00
963bff1c0b
refactored jwt 2021-11-24 19:38:42 +01:00
cefc963780
implemented isAdmin from backend 2021-11-24 19:38:42 +01:00
Moriz Wahl
fa717e7046 Merge branch 'master' into ADMINBEREICH-first-step 2021-11-24 18:03:38 +01:00
87059a6588
Merge branch 'master' into login_hook_elopage 2021-11-24 09:08:14 +01:00
dc1715eea0
Merge branch 'master' into ADMINBEREICH-first-step 2021-11-24 08:50:54 +01:00
ogerly
d6e8d0cc6b unused import KlickTip and Int in type-graphql remove 2021-11-23 13:27:39 +01:00
ogerly
52aa7e437e Added creation to useradmin model, adding call to apollo in backend. 2021-11-23 13:12:11 +01:00
9ea1edb010
Merge branch 'master' into login_hook_elopage 2021-11-23 12:43:24 +01:00
ogerly
05c9449e0e yarn lint fix 2021-11-23 12:16:46 +01:00
ogerly
dc1cf1fbcb Implemented the graphql AdminResolver method getUsers. 2021-11-23 12:15:24 +01:00
ogerly
c9d6b88dd0 Created a UserAdmin model that represents the Users for the Admin area. 2021-11-23 12:14:20 +01:00
ogerly
2e7c35aab6 Implemented a search LoginUser like on firstName, lastName and email. 2021-11-23 12:13:29 +01:00
ogerly
1697c69e8c WiP getUsers for Admin. 2021-11-23 11:20:50 +01:00
elweyn
8479975425 Since we don't make a request to the login_server we need to catch if user email has been activated. 2021-11-23 08:05:52 +01:00
635c7b6e51
Merge branch 'master' into bugfix_coinanimation_update_only_send_for_true 2021-11-22 23:48:53 +01:00
Hannes Heine
ed01bca12b
Update backend/src/graphql/resolver/UserResolver.ts 2021-11-22 23:35:02 +01:00
Hannes Heine
49db3d37fc
Update backend/src/typeorm/repository/UserSettingRepository.ts 2021-11-22 23:33:04 +01:00
elweyn
fccc7b4434 Changed the Auto increment so that it is done after the rollback and not in the finally block. 2021-11-22 23:17:11 +01:00
6dab777005
use correct pubKey, use hex instead of buffer 2021-11-22 22:00:57 +01:00
Hannes Heine
1d9042ca4b
Update backend/src/graphql/resolver/UserResolver.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2021-11-22 21:42:09 +01:00
0fd2110fa1
removed duplicate import 2021-11-22 16:06:48 +01:00
8eb5c74ba8
encode buffer to hex when decoding the jwt, not everytime we use it 2021-11-22 15:55:57 +01:00
0341ae0d13
Merge branch 'master' into login_call_unsecureLogin 2021-11-22 15:54:37 +01:00
a6e4e84c9b
do not generate a password for a user, but change the process to set the password later. 2021-11-19 01:51:13 +01:00
f6f6314eb1
save price as integer 2021-11-19 01:22:24 +01:00
ad82cda489
remove unused fields comments to reduce file lengrh 2021-11-19 01:12:01 +01:00
a44a3ee6d0
make language an optional parameter for createUser and do not set it on the elopage webhook 2021-11-19 01:08:53 +01:00
2aba37e60c
replace map with foreach since we don't need a return - thanks moriz 2021-11-19 01:00:55 +01:00
elweyn
d8def24e0c Their was an error in the UserResolver due to a check undefined and false would fall out of the update change it to !== undefined. 2021-11-18 10:28:54 +01:00
5335d12802
catch error on createUser and log them 2021-11-17 19:37:35 +01:00
68fc7bab1b
Merge branch 'master' into login_call_updateUserInfos 2021-11-17 17:02:35 +01:00
87606d8b2e
Merge branch 'master' into login_hook_elopage 2021-11-17 17:02:17 +01:00
52b6026ed8
missing .env.dist value 2021-11-17 16:58:04 +01:00
e68f22ade0
implement the webhook 2021-11-17 16:57:04 +01:00
33670f1575
WEBHOOK_ELOPAGE_SECRET 2021-11-17 16:56:32 +01:00
f362032b38
add body parser 2021-11-17 16:56:13 +01:00
Moriz Wahl
be937680cc Merge branch 'master' into await-backaned-tests 2021-11-17 13:33:18 +01:00
415b9254e4
Merge branch 'login_call_getUserInfos' into login_call_updateUserInfos
# Conflicts:
#	backend/src/graphql/resolver/TransactionResolver.ts
2021-11-17 00:50:18 +01:00
f09c3b4964
replace implementation of getPublicKey to no longer require the sessionId. Furthermore the call now no longer calls getUserInfos on the login_server but just queries the database itself 2021-11-17 00:40:16 +01:00
540cbd0e1f
reimplement publisherId on updateUserInfos 2021-11-17 00:20:43 +01:00
4fccc19b68
missing import 2021-11-17 00:13:44 +01:00
f0bfe7a7a1
Merge branch 'apollo_jwt_withdrawSessionId' into login_call_updateUserInfos 2021-11-17 00:12:12 +01:00
c9f167d07b
Update backend/src/graphql/resolver/UserResolver.ts
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2021-11-17 00:10:16 +01:00
eb06b9a528
Update backend/src/graphql/resolver/UserResolver.ts
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2021-11-17 00:09:30 +01:00
1f5c740359
Merge branch 'master' into apollo_jwt_withdrawSessionId 2021-11-17 00:06:09 +01:00
elweyn
cbc6570d65 Encode doesn't need sessionId anymore. 2021-11-11 12:32:37 +01:00
elweyn
e76646b327 Withdrew the sessionId from the JWT. 2021-11-11 12:10:14 +01:00
elweyn
a73a36b971 Withdrew the JWT changes and store the Buffer again instead of the hex key. 2021-11-11 10:09:08 +01:00