4164 Commits

Author SHA1 Message Date
82ea3dc11a
Merge branch 'master' into login_call_unsecureLogin 2021-11-22 16:26:08 +01:00
Moriz Wahl
4fc0af06c0
Merge pull request #1045 from gradido/setup-admin-interface
feat: Setup Admin Interface
2021-11-22 16:25:51 +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
5cd65190e7
Merge branch 'master' into setup-admin-interface 2021-11-19 02:52:34 +01:00
640c5ec88d
Merge pull request #1084 from gradido/login_call_updateUserInfos
login_call_updateUserInfos
2021-11-18 01:48:24 +01:00
68fc7bab1b
Merge branch 'master' into login_call_updateUserInfos 2021-11-17 17:02:35 +01:00
Moriz Wahl
9745433e4c
Merge pull request #1079 from gradido/await-backaned-tests
fix: Await Resolved Promises in Backend Unit Tests
2021-11-17 14:18:24 +01:00
Moriz Wahl
a528be6a77
Merge branch 'master' into await-backaned-tests 2021-11-17 13:43:27 +01:00
Moriz Wahl
be937680cc Merge branch 'master' into await-backaned-tests 2021-11-17 13:33:18 +01:00
Moriz Wahl
7576fe3e0e
Merge pull request #1102 from gradido/raise-coverage-frontend
feat: Raise Test Coverage Frontend
2021-11-17 13:26:58 +01:00
Moriz Wahl
a3e8ca49e5 diable authentication 2021-11-17 13:26:18 +01:00
Moriz Wahl
990aabfd0c Merge branch 'master' into setup-admin-interface 2021-11-17 13:04:56 +01:00
Moriz Wahl
fd994936d5
Update frontend/src/views/Pages/SendOverview/GddSend/QrCode.vue
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2021-11-17 12:58: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
Moriz Wahl
259a663f05 test global components 2021-11-16 13:27:52 +01:00
Moriz Wahl
e8859544f7 feat: Raise Test Coverage Frontend 2021-11-16 13:06:53 +01:00
b54558fa68
Merge pull request #1096 from gradido/login_call_logout
login_call_logout
2021-11-15 23:51:48 +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
elweyn
e97798d73c Withdrew comments. 2021-11-11 06:42:27 +01:00
elweyn
e976c6854d Adding hasElopage and publisherId logic, hasElopage is called and checks if in ElopageBuys their is a user with this email, if hasElopage and publisherId is filled store it in the user table. 2021-11-11 06:41:56 +01:00
elweyn
1baf756c08 HasElopage has been called, search loginUser catch instead of if no user, context get's the pubKey at the end of the login call instead of the start. 2021-11-11 06:31:00 +01:00
elweyn
7655a647fe Implementation of the LoginElopageBuys repository. 2021-11-11 06:15:21 +01:00
elweyn
3b79bae488 Merge branch 'master' into login_call_unsecureLogin 2021-11-11 06:06:27 +01:00
d7c5154912
removed unused context
corrected comment
removed unused code-comment
2021-11-11 00:30:00 +01:00
e896759e1e
"implemented" logout call 2021-11-11 00:14:03 +01:00
d8835e37da
removed coverage 2021-11-11 00:01:40 +01:00
61786d9e5d
another (unrelated) lint fix 2021-11-10 23:52:44 +01:00
dc8091b60b
lint fix 2021-11-10 23:50:58 +01:00
8b0c1feb3e
change password and reencrypt private key when doing so. 2021-11-10 23:47:37 +01:00
7205eb2fae
transaction for coinanimation 2021-11-10 20:34:14 +01:00
f797017c9a
have language check for changing language 2021-11-10 20:23:47 +01:00
4ffa2b4ee1
we will not implement disable here - it does not make sense that an user disables himself 2021-11-10 20:18:49 +01:00
fe7d7dc5f8
implemented most of updateUserInfos on Apollo
also removed publisherId from updateUserInfos since this is now part of the login call.
2021-11-10 20:18:49 +01:00
6ab381a6b1
Merge pull request #1083 from gradido/login_call_hasElopage
login_call_hasElopage
2021-11-10 18:32:59 +01:00
1865e42f83
just some cleanups, mostly to trigger another build 2021-11-10 18:20:47 +01:00
248622f3be
hasElopage is now implemented on apollo
- requires authorization now
2021-11-10 18:20:47 +01:00
5d7241da14
LoginElopageBuys Entity model 2021-11-10 18:19:10 +01:00
elweyn
5d886a9360 LoginUserRepository import has droped out put it in again. 2021-11-10 11:28:35 +01:00
elweyn
fabcbca5a5 Merge master in this branch. 2021-11-10 10:38:15 +01:00