diff --git a/community_server b/community_server index 164e8faee..36ddbba58 160000 --- a/community_server +++ b/community_server @@ -1 +1 @@ -Subproject commit 164e8faee95b3e0ec4e494e11c8f623a52e197a1 +Subproject commit 36ddbba5815435575b2d3c1270d738ccabc9eb54 diff --git a/configs/community_server/app.php b/configs/community_server/app.php index c862a8d9a..84bc93228 100644 --- a/configs/community_server/app.php +++ b/configs/community_server/app.php @@ -397,6 +397,12 @@ return [ 'host' => 'http://login-server', 'port' => 1201 ], + 'API' => [ + 'allowedCaller' => ['login-server'] + ], + 'ServerAdminEmail' => 'info@gradido.net', + 'noReplyEmail' => 'no-reply@gradido.net', + 'disableEmail' => true, 'GroupNode' => false ]; diff --git a/configs/login_server/grd_login.properties b/configs/login_server/grd_login.properties index 76b4b2d10..a181c6eee 100644 --- a/configs/login_server/grd_login.properties +++ b/configs/login_server/grd_login.properties @@ -12,8 +12,7 @@ crypto.app_secret = 21ffbbc616fe # phpServer.url = http://localhost/ -phpServer.host = community-server -phpServer.port = 80 +phpServer.host = nginx loginServer.path = http://localhost/account loginServer.default_locale = de diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 918f9b96a..5ef8ac8f3 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -39,7 +39,6 @@ services: - mariadb networks: - internal-net - - external-net ports: - 1200:1200 - 1201:1201 diff --git a/docu/login_server.api.md b/docu/login_server.api.md index c4eb123eb..c78d56a24 100644 --- a/docu/login_server.api.md +++ b/docu/login_server.api.md @@ -33,37 +33,11 @@ data: {"email": "max.musterman@gmail.de", "password": "123abcDE&"} Wenn alles okay ist erhältst du zum Beispiel: ```json -{"state":"success", "session_id": -127182, "clientIP":"52.68.96.58", - "user": { - "created": 1293872400, - "disabled": false, - "email": "max.musterman@gmail.de", - "email_checked": true, - "first_name": "Max", - "group_alias": "gdd1", - "ident_hash": 1829912, - "public_hex": "c6e7d6a697fa74d6c247580edf1546989d43487575e21e398abe3cc2094bd63e", - "last_name": "Musterman", - "role": "none", - "username": "", - "balance": 174500, - "id": 1, - "errorCount": 0 -}} +{"state":"success", "session_id": -127182, "clientIP":"52.68.96.58"} ``` - clientIP: should be the same as where the js-client is running, else maybe a man-in-the-middle attacks is happening or nginx was wrong configured. - session_id: can be also negative -- created: unix timestamp in seconds -- disabled: if set to true, login and every transaction must fail. Currently used if use would like to have there account deleted. -- email_checked: true if user has already clicked on email verification code link in his emails, needed for tranactions -- ident_hash: string hash from email, used for speed up creation validation -- public_hex: hexadecimal representation of 32 Byte public key of user [0-9a-f] -- role: not intended for future use, just ignore, login-server admin will be independently from community-server admin -- username: for later use -- balance: Gradido Cent, 4 Nachkommastellen (2 Reserve), 174500 = 17,45 GDD -- id: login-server user id, only needed for debugging -- errorCount: errors occured in this session, should be normally 0 Anmelden Registrieren kannst du einen neuen Benutzer mit: diff --git a/login_server b/login_server index 9b9115290..2a033c34e 160000 --- a/login_server +++ b/login_server @@ -1 +1 @@ -Subproject commit 9b9115290c8d2ead756d64b70ae63a6571aa4693 +Subproject commit 2a033c34e4657e84a4387ecfda1cd6102032e95e