287 Commits

Author SHA1 Message Date
elweyn
58182d73c6 Added the publisherId to the login & createUser calls, adjusted the tests to the new code. 2021-10-13 13:26:46 +02:00
elweyn
5a14161284 Adding the publisherId to the login call and that it stores it to the user profile. 2021-10-13 12:07:23 +02:00
elweyn
a1b54e592e Changed the logic to catch error send by Klicktipp. 2021-10-13 11:32:00 +02:00
elweyn
3fdb503ea6 Merge branch 'master' into 804-elopage-registration 2021-10-12 17:08:06 +02:00
einhornimmond
29de8e224f
Merge pull request #960 from gradido/add_autocorrect_keys
Add autocorrect keys
2021-10-12 17:00:36 +02:00
elweyn
d3198b037e Fixe model for User and adding hasElopage to User Object. 2021-10-12 16:50:07 +02:00
einhornimmond
4464611759
Merge pull request #949 from gradido/login_checkForElopage
check for elopage account
2021-10-12 16:25:03 +02:00
einhornimmond
3ecf960ab6 fix lint 2021-10-12 15:56:02 +02:00
einhornimmond
0640eb24d5 remove copy user disabled field 2021-10-12 15:42:48 +02:00
einhornimmond
1486476571 add auto correct keys to apollo, copy also disabled field of user 2021-10-12 15:24:14 +02:00
einhornimmond
ff75bbd558
Merge pull request #958 from gradido/gdt_checkForPid
check pid on gdt server
2021-10-12 12:07:29 +02:00
Einhornimmond
cceca9d517 change query name 2021-10-11 13:12:26 +02:00
Einhornimmond
3a5aa25fec update variable names 2021-10-11 13:11:50 +02:00
Einhornimmond
660e1e4b68 add call for checkpid on gdt server 2021-10-10 17:27:42 +02:00
Einhornimmond
2c90bbe314 add check for empty user list 2021-10-10 16:37:07 +02:00
einhornimmond
909c7e3a9a fix lint 2021-10-10 15:31:28 +02:00
einhornimmond
546d371139 check always for hasElopage
- put check into async task to let it run at the same time as the password check
2021-10-10 15:25:01 +02:00
einhornimmond
93532004d5 add option in login call to check also for elopage account 2021-10-08 10:26:09 +02:00
einhornimmond
e6c8fbed59 fix linting 2021-10-07 16:32:17 +02:00
einhornimmond
cc8a4fcd5b add api call to check is user has an elopage account to login-server and to apollo-server 2021-10-07 16:08:14 +02:00
einhornimmond
ad167fc051
Merge pull request #915 from gradido/apollo_saveUserOnCreate
Add User on createUser to community server db
2021-10-07 14:37:20 +02:00
einhornimmond
a5bb75f702 fix linting 2021-10-06 12:35:25 +02:00
einhornimmond
a531b4671f Merge branch 'master' into apollo_saveUserOnCreate 2021-10-06 12:15:20 +02:00
einhornimmond
c40441dec4 Merge branch 'apollo_saveUserOnCreate' of github.com:gradido/gradido into apollo_saveUserOnCreate 2021-10-06 12:08:40 +02:00
einhornimmond
3112f5b7ea fix rebase error 2021-10-06 11:59:19 +02:00
einhornimmond
f6776ca3fc exchange qlUser with dbUser 2021-10-06 11:57:23 +02:00
einhorn_b
936162e0ac use pubkey from context 2021-10-06 11:57:23 +02:00
8c9707927e repository use Order Enum 2021-10-06 11:57:23 +02:00
562ad9ae31 resolvers 2021-10-06 11:57:23 +02:00
d791c0da03 models 2021-10-06 11:57:23 +02:00
8ab542a28a deleted inputs (now args) 2021-10-06 11:57:23 +02:00
32372fe4b5 enums 2021-10-06 11:57:23 +02:00
3ba38f09b7 args types 2021-10-06 11:57:23 +02:00
6ba5bc790e resolvers 2021-10-06 11:57:23 +02:00
cdd336cfbb Decay Model + Utils 2021-10-06 11:57:22 +02:00
e49b17f2ad removed group model 2021-10-06 11:57:22 +02:00
ab202824e1 UserTransaction Model 2021-10-06 11:57:22 +02:00
62a28f0a57 Transaction Model 2021-10-06 11:57:22 +02:00
00871b97da User model 2021-10-06 11:57:22 +02:00
ffb7334eae Balance Model 2021-10-06 11:57:22 +02:00
Moriz Wahl
592a095544 try to get the backend building again 2021-10-06 11:57:22 +02:00
Moriz Wahl
f0ddb3e3f9 get the tests working again (skipped) 2021-10-06 11:57:22 +02:00
einhornimmond
de15dac786 Update backend/src/util/decay.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2021-10-06 11:57:21 +02:00
einhorn_b
db028d1d78 fixed decay and missing user data bugs 2021-10-06 11:57:21 +02:00
einhorn_b
f72164be13 change datatype for timestamps to string 2021-10-06 11:57:21 +02:00
einhorn_b
4e01d64126 fix linting 2021-10-06 11:57:18 +02:00
Einhornimmond
68fb3ec653 debugging stuff 2021-10-06 11:53:28 +02:00
Einhornimmond
68a3056177 fix what don't work 2021-10-06 11:53:27 +02:00
Einhornimmond
11d61dde2e implement listTransactions and neccessary changes for it 2021-10-06 11:53:25 +02:00
Einhornimmond
b02c38d635 work on implementing 2021-10-06 11:52:48 +02:00