Proyectos de Subversion Iphone Microlearning - Inconcert

Rev

Rev 1 | Mostrar el archivo completo | | | Autoría | Ultima modificación | Ver Log |

Rev 1 Rev 19
Línea 8... Línea 8...
8 
import Foundation
 8 
import Foundation
Línea 9... Línea 9...
9 
 
 9 
 
10 
 
 10 
 
- 
 
 11 
class Validator
11 
class Validator
 12 
{
- 
 
 13
- 
 
 14 
    public  static func checkEmail(email : String) -> Bool {
- 
 
 15 
        let emailTrimming = email.trimmingCharacters(in: .whitespaces)
- 
 
 16
12 
{
 17 
        print("email : \(email)")
Línea 13... Línea 18...
13 
    public static func checkEmail(email : String) -> Bool {
 18 
        print("emailTrimming: \(emailTrimming)")
14 
        let regex = #"^[a-zA-Z0-9_\-\.~]{2,}@[a-zA-Z0-9_\-\.~]{2,}\.[a-zA-Z]{2,}$"#
 19 
        let regex = #"^[a-zA-Z0-9_\-\.~]{2,}@[a-zA-Z0-9_\-\.~]{2,}\.[a-zA-Z]{2,}$"#
15 
 
 20 
 
16 
        let predicate = NSPredicate(format: "SELF MATCHES %@", regex)
 - 
 
17 
        return predicate.evaluate(with: email) ? true : false;
 - 
 
18 
    }
 - 
 
19
- 
 
20 
     public static func checkPassword(password : String) -> Bool {
 - 
 
21
- 
 
22 
        /*
 - 
 
23 
         let regexOld = #"^(?=.*\d+)(?=.*[a-z])(?=.*[A-Z])[0-9a-zA-Z]{6,16}$"#
 - 
 
24 
         let regexNew = #"^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[\#\?\!\@\$\^\%\*\-]).{6,16}$"#
 - 
 
Línea -... Línea 21...
- 
 
 21 
        let predicate = NSPredicate(format: "SELF MATCHES %@", regex)
25 
         */
 22 
        return predicate.evaluate(with: emailTrimming) ? true : false;
- 
 
 23 
    }
- 
 
 24 
 
- 
 
 25 
    public static  func checkPassword(password : String) -> Bool {
- 
 
 26 
        let passwordTrimming = password.trimmingCharacters(in: .whitespaces)
- 
 
 27
Línea -... Línea 28...
- 
 
 28 
        print("password: [\(password)]")
- 
 
 29 
        print("passwordTrimming: [\(passwordTrimming)]")
26
30 
        let regexOld = #"^(?=.*\d+)(?=.*[a-z])(?=.*[A-Z])[0-9a-zA-Z]{6,16}$"#
- 
 
 31 
        let regexNew = #"^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[\#\?\!\@\$\^\%\*\-]).{6,16}$"#
- 
 
 32 
 
27 
         let regexPassword =  #"(^(?=.*\d+)(?=.*[a-z])(?=.*[A-Z])[0-9a-zA-Z]{6,16}$|^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[\#\?\!\@\$\^\%\*\-]).{6,16}$)"#
 33 
        let predicateNew = NSPredicate(format: "SELF MATCHES %@", regexNew)
28 
 
 - 
 
29 
        let predicate = NSPredicate(format: "SELF MATCHES %@", regexPassword)
 34 
        let predicateOld = NSPredicate(format: "SELF MATCHES %@", regexOld)
30 
 
 35 
        if(predicateOld.evaluate(with: passwordTrimming)) {
31 
        if(predicate.evaluate(with: password)) {
 36 
            return true
32 
            return true
 37 
        } else  if(predicateNew.evaluate(with: passwordTrimming)) {
- 
 
 38 
            return true
33
39 
        } else {