almost done

coders-school · Aug 30, 2024 · ca87e11 · ca87e11
1 parent 6cf3023
commit ca87e11
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/homework/password-check/validation.cpp b/homework/password-check/validation.cpp
@@ -25,26 +25,26 @@ bool checkSpecialChar(std::string& pass) {
     return pass.find_first_of(special_chars) != std::string::npos;
 }
 
-int checkPasswordRules(std::string& pass) {
+ErrorCode checkPasswordRules(std::string pass) {
     if (std::none_of(pass.begin(), pass.end(), ::isupper)) {
-        return (static_cast<int>(ErrorCode::PasswordNeedsAtLeastOneUppercaseLetter));
+        return ErrorCode::PasswordNeedsAtLeastOneUppercaseLetter;
     } else if (std::none_of(pass.begin(), pass.end(), ::isdigit)) {
-        return (static_cast<int>(ErrorCode::PasswordNeedsAtLeastOneNumber));
+        return ErrorCode::PasswordNeedsAtLeastOneNumber;
     } else if (!checkSpecialChar(pass)) {
-        return (static_cast<int>(ErrorCode::PasswordNeedsAtLeastOneSpecialCharacter));
+        return ErrorCode::PasswordNeedsAtLeastOneSpecialCharacter;
     } else if (pass.length() < 9) {
-        return (static_cast<int>(ErrorCode::PasswordNeedsAtLeastNineCharacters));
+        return ErrorCode::PasswordNeedsAtLeastNineCharacters;
     } else {
-        return (static_cast<int>(ErrorCode::Ok));
+        return ErrorCode::Ok;
     }
 }
 
-int checkPassword(std::string& pass, std::string& repPass){
+ErrorCode checkPassword(std::string pass, std::string repPass){
     if (doPasswordsMatch(pass, repPass)){
         return checkPasswordRules(pass);
     }
     else{
-        return (static_cast<int> (ErrorCode::PasswordsDoNotMatch));
+        return ErrorCode::PasswordsDoNotMatch;
     }
 }
 

diff --git a/homework/password-check/validation.hpp b/homework/password-check/validation.hpp
@@ -3,9 +3,16 @@
 // TODO: I'm empty :) Put enum and function headers here.
 // Don't forget the header guard - #pragma once
 
-enum class ErrorCode;
+enum class ErrorCode{
+    Ok,
+    PasswordNeedsAtLeastNineCharacters,
+    PasswordNeedsAtLeastOneNumber,
+    PasswordNeedsAtLeastOneSpecialCharacter,
+    PasswordNeedsAtLeastOneUppercaseLetter,
+    PasswordsDoNotMatch
+};
 std::string getErrorMessage(int errorNum);
 bool doPasswordsMatch(std::string& pass1, std::string& pass2);
-int checkPasswordRules(std::string& pass);
-int checkPassword(std::string& pass, std::string repPass);
+ErrorCode checkPasswordRules(std::string pass);
+ErrorCode checkPassword(std::string pass, std::string repPass);
 bool checkSpecialChar(std::string& pass);