IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

finish format of email in admin user password reset

Browse Source
This commit is contained in:
Dario 2020-04-22 15:40:40 +02:00
parent 6962f8b154
commit 8b9614cb00
5 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cpp/HTTPInterface/AdminUserPasswordReset.cpp
View File

@ -235,18 +235,22 @@ void AdminUserPasswordReset::handleRequest(Poco::Net::HTTPServerRequest& request
responseStream << "Bitte schreibe sie dir auf und packe sie gut weg.\n";
responseStream << "\n";
#line 105 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminUserPasswordReset.cpsp"
responseStream << ( userBackup->getPassphrase(ServerConfig::Mnemonic_Types::MNEMONIC_GRADIDO_BOOK_GERMAN_RANDOM_ORDER) );
responseStream << ( controller::UserBackups::formatPassphrase(userBackup->getPassphrase(ServerConfig::Mnemonic_Types::MNEMONIC_GRADIDO_BOOK_GERMAN_RANDOM_ORDER)) );
responseStream << "\n";
responseStream << " \n";
responseStream << "\n";
responseStream << "Unter diesem Link kannst du dir mit hilfe der Passphrase ein neues Passwort setzen:\n";
#line 109 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminUserPasswordReset.cpsp"
#line 110 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminUserPasswordReset.cpsp"
responseStream << ( code->getLink() );
responseStream << "\n";
responseStream << " \n";
responseStream << "\n";
responseStream << "Liebe Grüße\n";
responseStream << "Dario, Softwareentwickler bei Gradido\n";
responseStream << "</pre>\n";
responseStream << "\t\t</fieldset>\n";
responseStream << "\t";
#line 116 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminUserPasswordReset.cpsp"
#line 117 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminUserPasswordReset.cpsp"
} responseStream << "\n";
responseStream << "</div>\n";
// begin include footer.cpsp

2
src/cpp/controller/User.cpp
View File

@ -96,7 +96,7 @@ namespace controller {
{
std::stringstream ss;
auto model = getModel();
ss << model->getFirstName() << " " << model->getLastName() << "<" << model->getEmail() << ">";
ss << model->getFirstName() << " " << model->getLastName() << "&lt;" << model->getEmail() << "&gt;";
return ss.str();
}

16
src/cpp/controller/UserBackups.cpp
View File

@ -84,4 +84,20 @@ namespace controller {
}
}
std::string UserBackups::formatPassphrase(std::string passphrase, int targetLinesCount/* = 5*/)
{
int count = passphrase.size();
int charPerLine = count / (targetLinesCount);
int cursor = 0;
for (int i = 1; i < targetLinesCount; i++) {
cursor = charPerLine * i;
while (cursor < count && passphrase.at(cursor) != ' ') {
cursor++;
}
if (cursor >= (count-2)) break;
passphrase.replace(cursor, 1, 1, '\n');
}
return passphrase;
}
}

3
src/cpp/controller/UserBackups.h
View File

@ -25,6 +25,9 @@ namespace controller {
//! \return create keyPair from passphrase if not exist, else return existing pointer
Poco::SharedPtr<KeyPair> getKeyPair();
//! \brief adding newlines to make block format
static std::string formatPassphrase(std::string passphrase, int targetLinesCount = 5);
std::string getPassphrase(ServerConfig::Mnemonic_Types type);
protected:

5
src/cpsp/adminUserPasswordReset.cpsp
View File

@ -102,12 +102,13 @@ enum PageState
hier findst du deine Passphrase mit dessen Hilfe du dir ein neues Passwort einstellen kannst.
Bitte schreibe sie dir auf und packe sie gut weg.
<%= userBackup->getPassphrase(ServerConfig::Mnemonic_Types::MNEMONIC_GRADIDO_BOOK_GERMAN_RANDOM_ORDER) %>
<%= controller::UserBackups::formatPassphrase(userBackup->getPassphrase(ServerConfig::Mnemonic_Types::MNEMONIC_GRADIDO_BOOK_GERMAN_RANDOM_ORDER)) %>
Unter diesem Link kannst du dir mit hilfe der Passphrase ein neues Passwort setzen:
<%= code->getLink() %>
Liebe Grüße
Dario, Softwareentwickler bei Gradido