diff --git a/Mohem/config.xml b/Mohem/config.xml deleted file mode 100644 index 5ad4f1b7..00000000 --- a/Mohem/config.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - MOHEMM - an app created by cloud Solutions - Cloud Solutions - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Mohem/package.json b/Mohem/package.json deleted file mode 100644 index 5acd1d9f..00000000 --- a/Mohem/package.json +++ /dev/null @@ -1,251 +0,0 @@ -{ - "name": "MOHEM", - "version": "0.0.1", - "author": "Cloud Solutions", - "homepage": "http://www.cloudsolution-sa.com/", - "private": true, - "scripts": { - "ng": "ng", - "start": "ng serve", - "build": "ng build", - "test": "ng test", - "lint": "ng lint", - "e2e": "ng e2e" - }, - "dependencies": { - "@angular/animations": "^7.2.15", - "@angular/common": "^7.2.2", - "@angular/core": "^7.2.2", - "@angular/forms": "^7.2.2", - "@angular/http": "^7.2.2", - "@angular/platform-browser": "^7.2.2", - "@angular/platform-browser-dynamic": "^7.2.2", - "@angular/router": "^7.2.2", - "@ionic-native/android-permissions": "^5.18.0", - "@ionic-native/app-availability": "^5.18.0", - "@ionic-native/app-rate": "^5.18.0", - "@ionic-native/background-geolocation": "^5.30.0", - "@ionic-native/badge": "^5.18.0", - "@ionic-native/barcode-scanner": "^5.18.0", - "@ionic-native/base64": "^5.18.0", - "@ionic-native/ble": "^5.18.0", - "@ionic-native/camera": "^5.18.0", - "@ionic-native/core": "^5.8.0", - "@ionic-native/date-picker": "^5.10.0", - "@ionic-native/device": "^5.18.0", - "@ionic-native/diagnostic": "^5.18.0", - "@ionic-native/file": "^5.18.0", - "@ionic-native/file-opener": "^5.36.0", - "@ionic-native/file-path": "^5.18.0", - "@ionic-native/fingerprint-aio": "^5.18.0", - "@ionic-native/firebase-x": "^5.34.0", - "@ionic-native/geolocation": "^5.10.0", - "@ionic-native/globalization": "^5.18.0", - "@ionic-native/health": "^5.4.0", - "@ionic-native/in-app-browser": "^5.17.0", - "@ionic-native/keyboard": "^5.17.0", - "@ionic-native/launch-navigator": "^5.17.0", - "@ionic-native/local-notifications": "^5.17.0", - "@ionic-native/native-storage": "^5.17.0", - "@ionic-native/nfc": "^5.30.0", - "@ionic-native/open-native-settings": "^5.14.0", - "@ionic-native/sms-retriever": "^5.36.0", - "@ionic-native/social-sharing": "^5.34.0", - "@ionic-native/splash-screen": "^5.0.0", - "@ionic-native/sqlite": "^5.18.0", - "@ionic-native/status-bar": "^5.0.0", - "@ionic-native/themeable-browser": "^5.18.0", - "@ionic-native/wifi-wizard-2": "^5.31.1", - "@ionic-native/zbar": "^5.10.0", - "@ionic/angular": "^4.1.0", - "@ng-bootstrap/ng-bootstrap": "^4.2.2", - "@swimlane/ngx-charts": "^10.1.0", - "angular-calendar": "^0.26.11", - "app": "0.1.0", - "chart.js": "^2.9.3", - "com-badrit-base64": "^0.2.0", - "cordova-android": "^8.1.0", - "cordova-android-support-gradle-release": "^3.0.1", - "cordova-open-native-settings": "^1.5.2", - "cordova-opentok-android-permissions": "^1.0.1", - "cordova-plugin-actionsheet": "^2.3.3", - "cordova-plugin-add-swift-support": "^2.0.2", - "cordova-plugin-android-permissions": "^1.0.2", - "cordova-plugin-androidx": "^1.0.2", - "cordova-plugin-androidx-adapter": "^1.1.0", - "cordova-plugin-appavailability": "^0.4.2", - "cordova-plugin-apprate": "^1.4.0", - "cordova-plugin-badge": "^0.8.8", - "cordova-plugin-ble-central": "^1.2.4", - "cordova-plugin-camera": "^4.1.0", - "cordova-plugin-datepicker": "^0.9.3", - "cordova-plugin-device": "^2.0.3", - "cordova-plugin-dialogs": "^2.0.2", - "cordova-plugin-file": "^6.0.2", - "cordova-plugin-file-opener2": "^3.0.5", - "cordova-plugin-filepath": "^1.5.6", - "cordova-plugin-fingerprint-aio": "^3.0.0", - "cordova-plugin-firebasex": "^13.0.0", - "cordova-plugin-geolocation": "^4.0.2", - "cordova-plugin-globalization": "^1.11.0", - "cordova-plugin-inappbrowser": "^3.1.0", - "cordova-plugin-ionic-keyboard": "^2.2.0", - "cordova-plugin-ionic-webview": "^4.1.0", - "cordova-plugin-local-notification": "^0.9.0-beta.2", - "cordova-plugin-nativestorage": "^2.3.2", - "cordova-plugin-sms-retriever-manager": "^1.0.3", - "cordova-plugin-splashscreen": "^5.0.3", - "cordova-plugin-statusbar": "^2.4.3", - "cordova-plugin-themeablebrowser": "^0.2.18", - "cordova-plugin-whitelist": "^1.3.4", - "cordova-plugin-wifiwizard2": "^3.1.1", - "cordova-plugin-x-socialsharing": "^6.0.3", - "cordova-sqlite-storage": "^3.4.0", - "cordova-support-google-services": "^1.3.2", - "cordova.plugins.diagnostic": "^5.0.1", - "core-js": "^2.5.4", - "date-fns": "^1.30.1", - "es6-promise-plugin": "^4.1.0", - "ionic2-calendar": "^0.5.8", - "ionic4-rating": "^1.0.9", - "ng-circle-progress": "^1.5.1", - "ng2-file-upload": "^1.3.0", - "ng2-pdf-viewer": "^5.3.2", - "ngx-gauge": "^1.0.0-beta.10", - "npm": "^6.14.11", - "phonegap-nfc": "^1.2.0", - "phonegap-plugin-barcodescanner": "^8.1.0", - "phonegap-plugin-multidex": "^1.0.0", - "primeicons": "^1.0.0", - "primeng": "^7.1.3", - "run": "1.4.0", - "rxjs": "~6.3.3", - "tslib": "^1.10.0", - "uk.co.workingedge.phonegap.plugin.launchnavigator": "^3.2.2", - "xlsx": "^0.14.3", - "zone.js": "~0.8.29" - }, - "devDependencies": { - "@angular-devkit/architect": "~0.12.3", - "@angular-devkit/build-angular": "^0.13.9", - "@angular-devkit/core": "~7.2.3", - "@angular-devkit/schematics": "~7.2.3", - "@angular/cli": "^7.3.6", - "@angular/compiler": "~7.2.2", - "@angular/compiler-cli": "~7.2.2", - "@angular/language-service": "~7.2.2", - "@ionic/angular-toolkit": "~1.4.0", - "@ionic/lab": "3.1.2", - "@types/jasmine": "~2.8.8", - "@types/jasminewd2": "~2.0.3", - "@types/node": "~10.12.0", - "codelyzer": "~4.5.0", - "com.huawei.cordovahmsgmscheckplugin": "file:CordovaHMSPlugin/CordovaHMSGMSCheckPlugin", - "com.huawei.cordovahmslocationplugin": "file:CordovaHMSPlugin/CordovaHMSLocationPlugin", - "cordova-ios": "^6.2.0", - "cordova-plugin-wifiwizard2": "^3.1.1", - "es6-promise-plugin": "^4.1.0", - "jasmine-core": "~2.99.1", - "jasmine-spec-reporter": "~4.2.1", - "karma": "^4.0.1", - "karma-chrome-launcher": "~2.2.0", - "karma-coverage-istanbul-reporter": "~2.0.1", - "karma-jasmine": "~1.1.2", - "karma-jasmine-html-reporter": "^0.2.2", - "node-sass": "^4.13.1", - "protractor": "^5.4.3", - "ts-node": "~8.0.0", - "tslint": "~5.12.0", - "typescript": "3.1.6" - }, - "description": "An Ionic project", - "cordova": { - "plugins": { - "cordova-plugin-whitelist": {}, - "cordova-plugin-statusbar": {}, - "cordova-plugin-device": {}, - "cordova-plugin-splashscreen": {}, - "cordova-plugin-nativestorage": {}, - "cordova-plugin-globalization": {}, - "cordova-plugin-android-permissions": {}, - "cordova-plugin-badge": {}, - "cordova-plugin-ionic-keyboard": {}, - "cordova-plugin-datepicker": {}, - "cordova-plugin-geolocation": {}, - "phonegap-plugin-barcodescanner": { - "ANDROID_SUPPORT_V4_VERSION": "27.+" - }, - "cordova-plugin-ionic-webview": { - "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" - }, - "cordova.plugins.diagnostic": { - "ANDROID_SUPPORT_VERSION": "28.+" - }, - "cordova-open-native-settings": {}, - "cordova-plugin-camera": { - "ANDROID_SUPPORT_V4_VERSION": "27.+" - }, - "cordova-plugin-file": {}, - "cordova-plugin-filepath": {}, - "com-badrit-base64": {}, - "cordova-sqlite-storage": {}, - "cordova-plugin-ble-central": {}, - "uk.co.workingedge.phonegap.plugin.launchnavigator": {}, - "cordova-plugin-themeablebrowser": {}, - "cordova-plugin-inappbrowser": {}, - "cordova-plugin-local-notification": {}, - "cordova-opentok-android-permissions": {}, - "cordova-plugin-appavailability": {}, - "cordova-plugin-apprate": {}, - "cordova-plugin-fingerprint-aio": { - "FACEID_USAGE_DESCRIPTION": "User Authentication" - }, - "cordova-plugin-androidx": {}, - "cordova-plugin-androidx-adapter": {}, - "cordova-plugin-background-geolocation": { - "GOOGLE_PLAY_SERVICES_VERSION": "+" - }, - "phonegap-nfc": {}, - "wifiwizard2": {}, - "com.huawei.cordovahmsgmscheckplugin": {}, - "com.huawei.cordovahmslocationplugin": {}, - "cordova-plugin-x-socialsharing": {}, - "cordova-plugin-firebasex": { - "FIREBASE_ANALYTICS_COLLECTION_ENABLED": "true", - "FIREBASE_PERFORMANCE_COLLECTION_ENABLED": "true", - "FIREBASE_CRASHLYTICS_COLLECTION_ENABLED": "true", - "ANDROID_ICON_ACCENT": "#FF00FFFF", - "ANDROID_FIREBASE_PERFORMANCE_MONITORING": "false", - "ANDROID_PLAY_SERVICES_TAGMANAGER_VERSION": "17.0.0", - "ANDROID_PLAY_SERVICES_AUTH_VERSION": "19.0.0", - "ANDROID_FIREBASE_ANALYTICS_VERSION": "19.0.0", - "ANDROID_FIREBASE_MESSAGING_VERSION": "22.0.0", - "ANDROID_FIREBASE_CONFIG_VERSION": "21.0.0", - "ANDROID_FIREBASE_PERF_VERSION": "20.0.1", - "ANDROID_FIREBASE_AUTH_VERSION": "21.0.1", - "ANDROID_FIREBASE_INAPPMESSAGING_VERSION": "20.0.0", - "ANDROID_FIREBASE_FIRESTORE_VERSION": "23.0.1", - "ANDROID_FIREBASE_FUNCTIONS_VERSION": "20.0.0", - "ANDROID_FIREBASE_IID_VERSION": "21.1.0", - "ANDROID_FIREBASE_INSTALLATIONS_VERSION": "17.0.0", - "ANDROID_FIREBASE_CRASHLYTICS_VERSION": "18.0.1", - "ANDROID_FIREBASE_CRASHLYTICS_NDK_VERSION": "18.0.1", - "ANDROID_GSON_VERSION": "2.8.7", - "ANDROID_FIREBASE_PERF_GRADLE_PLUGIN_VERSION": "1.4.0" - }, - "cordova-android-support-gradle-release": { - "ANDROID_SUPPORT_VERSION": "27.+" - }, - "cordova-plugin-sms-retriever-manager": { - "PLAY_SERVICES_VERSION": "15.0.1" - }, - "cordova-plugin-file-opener2": { - "ANDROID_SUPPORT_V4_VERSION": "27.+" - } - }, - "platforms": [ - "android", - "ios" - ] - } -} \ No newline at end of file diff --git a/Mohem/src/app/authentication/change-password/change-password.component.html b/Mohem/src/app/authentication/change-password/change-password.component.html index 15f9d25c..8b221303 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.html +++ b/Mohem/src/app/authentication/change-password/change-password.component.html @@ -46,13 +46,17 @@

{{recentPasswordNote.text}}

- + + + +

{{isLetterCase.text}}

@@ -74,6 +78,10 @@

{{confirmMatchNew.text}}

+ + +

{{userNameMatchNew.text}}

+
diff --git a/Mohem/src/app/authentication/change-password/change-password.component.ts b/Mohem/src/app/authentication/change-password/change-password.component.ts index e4c5ba83..3abfc214 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.ts +++ b/Mohem/src/app/authentication/change-password/change-password.component.ts @@ -53,6 +53,13 @@ export class ChangePasswordComponent implements OnInit { text: 'At least one uppdercase', isMatch: false }; + public isLetterCase = { + blankImg: '../assets/icon/blank.svg', + greenImg: '../assets/icon/green.svg', + redImg: '../assets/imgs/close.svg', + text: 'At least one Letter', + isMatch: false + }; public isHasDigit = { blankImg: '../assets/icon/blank.svg', greenImg: '../assets/icon/green.svg', @@ -88,6 +95,14 @@ export class ChangePasswordComponent implements OnInit { text: 'Confirm Password does not match.', isMatch: false }; + public userNameMatchNew = { + blankImg: '../assets/icon/blank.svg', + greenImg: '../assets/icon/green.svg', + redImg: '../assets/imgs/close.svg', + text: 'password should not contain the username.', + isMatch: false + }; + public userId: string; constructor( public cs: CommonService, @@ -230,9 +245,7 @@ export class ChangePasswordComponent implements OnInit { if (this.P_NEW_PASSWORD === '') { switch (val) { case 1: - return this.isLowerCase.blankImg; - case 2: - return this.isUpperCase.blankImg; + return this.isLetterCase.blankImg; case 3: return this.isHasDigit.blankImg; case 4: @@ -243,72 +256,90 @@ export class ChangePasswordComponent implements OnInit { return this.isContainSpecialChar.blankImg; case 7: return this.confirmMatchNew.blankImg; + case 8: + return this.userNameMatchNew.blankImg; } } else { switch (val) { + // case 1: + // if (/[a-z]/.test(this.P_NEW_PASSWORD)) { + // this.isLowerCase.isMatch = true; + // return this.isLowerCase.greenImg; + // } else { + // this.isLowerCase.isMatch = false; + // return this.isLowerCase.redImg; + // } + // case 2: + // if (/[A-Z]/.test(this.P_NEW_PASSWORD)) { + // this.isUpperCase.isMatch = true; + // return this.isUpperCase.greenImg; + // } else { + // this.isUpperCase.isMatch = false; + // return this.isUpperCase.redImg; + // } case 1: - if (/[a-z]/.test(this.P_NEW_PASSWORD)) { - this.isLowerCase.isMatch = true; - return this.isLowerCase.greenImg; - } else { - this.isLowerCase.isMatch = false; - return this.isLowerCase.redImg; - } - case 2: - if (/[A-Z]/.test(this.P_NEW_PASSWORD)) { - this.isUpperCase.isMatch = true; - return this.isUpperCase.greenImg; - } else { - this.isUpperCase.isMatch = false; - return this.isUpperCase.redImg; - } + if (/[a-zA-Z]/.test(this.P_NEW_PASSWORD)) { + this.isLetterCase.isMatch = true; + return this.isLetterCase.greenImg; + } else { + this.isLetterCase.isMatch = false; + return this.isLetterCase.redImg; + } case 3: - if (/[0-9]/.test(this.P_NEW_PASSWORD)) { - this.isHasDigit.isMatch = true; - return this.isHasDigit.greenImg; - } else { - this.isHasDigit.isMatch = false; - return this.isHasDigit.redImg; - } + if (/[0-9]/.test(this.P_NEW_PASSWORD)) { + this.isHasDigit.isMatch = true; + return this.isHasDigit.greenImg; + } else { + this.isHasDigit.isMatch = false; + return this.isHasDigit.redImg; + } case 4: - if (this.P_NEW_PASSWORD.length >= 8) { - this.isMinLength.isMatch = true; - return this.isMinLength.greenImg; - } else { - this.isMinLength.isMatch = false; - return this.isMinLength.redImg; - } + if (this.P_NEW_PASSWORD.length >= 8) { + this.isMinLength.isMatch = true; + return this.isMinLength.greenImg; + } else { + this.isMinLength.isMatch = false; + return this.isMinLength.redImg; + } case 5: - if (/([a-z])\1/i.test(this.P_NEW_PASSWORD)) { - this.isRepeatedLetter.isMatch = false; - return this.isRepeatedLetter.redImg; - } else { - this.isRepeatedLetter.isMatch = true; - return this.isRepeatedLetter.greenImg; - } + if (/([a-z])\1/i.test(this.P_NEW_PASSWORD)) { + this.isRepeatedLetter.isMatch = false; + return this.isRepeatedLetter.redImg; + } else { + this.isRepeatedLetter.isMatch = true; + return this.isRepeatedLetter.greenImg; + } case 6: - if (/[ `!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?~]/.test(this.P_NEW_PASSWORD)) { - this.isContainSpecialChar.isMatch = true; - return this.isContainSpecialChar.greenImg; - } else { - this.isContainSpecialChar.isMatch = false; - return this.isContainSpecialChar.redImg; - } + if (/[ `!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?~]/.test(this.P_NEW_PASSWORD)) { + this.isContainSpecialChar.isMatch = true; + return this.isContainSpecialChar.greenImg; + } else { + this.isContainSpecialChar.isMatch = false; + return this.isContainSpecialChar.redImg; + } case 7: - if (this.P_NEW_PASSWORD !== this.P_Confirm_NEW_PASSWORD) { - this.confirmMatchNew.isMatch = false; - return this.confirmMatchNew.redImg; - } else { - this.confirmMatchNew.isMatch = true; - return this.confirmMatchNew.greenImg; - } - } + if (this.P_NEW_PASSWORD !== this.P_Confirm_NEW_PASSWORD) { + this.confirmMatchNew.isMatch = false; + return this.confirmMatchNew.redImg; + } else { + this.confirmMatchNew.isMatch = true; + return this.confirmMatchNew.greenImg; + } + case 8: + if (!this.P_NEW_PASSWORD.includes(this.P_USER_NAME)) { + this.userNameMatchNew.isMatch = true; + return this.userNameMatchNew.greenImg; + } else { + this.userNameMatchNew.isMatch = false; + return this.userNameMatchNew.redImg; + } + } } } disabledSubmitBtn() { - if (this.isLowerCase.isMatch && this.isUpperCase.isMatch && this.isHasDigit.isMatch && this.isMinLength.isMatch + if (this.isLetterCase.isMatch && this.isHasDigit.isMatch && this.isMinLength.isMatch && this.isRepeatedLetter.isMatch && this.P_NEW_PASSWORD !== '' && this.NEW_PASSWORD && this.Confirm_NEW_PASSWORD && this.OLD_PASSWORD && this.isContainSpecialChar.isMatch && this.confirmMatchNew.isMatch) { return false; diff --git a/Mohem/src/app/authentication/forgot/forgot.component.html b/Mohem/src/app/authentication/forgot/forgot.component.html index 4c0ba8c2..6ac97810 100644 --- a/Mohem/src/app/authentication/forgot/forgot.component.html +++ b/Mohem/src/app/authentication/forgot/forgot.component.html @@ -44,13 +44,17 @@

{{recentPasswordNote.text}}

- + + + +

{{isLetterCase.text}}

@@ -72,6 +76,10 @@

{{confirmMatchNew.text}}

+ + +

{{userNameMatchNew.text}}

+
diff --git a/Mohem/src/app/authentication/forgot/forgot.component.ts b/Mohem/src/app/authentication/forgot/forgot.component.ts index 7038792a..77c57c5c 100644 --- a/Mohem/src/app/authentication/forgot/forgot.component.ts +++ b/Mohem/src/app/authentication/forgot/forgot.component.ts @@ -9,7 +9,6 @@ import { SmsReaderService } from 'src/app/hmg-common/services/sms/sms-reader.ser import { ForgetPassword } from '../models/forget.password'; import { LoginModel } from '../models/LoginModel'; import { SharedDataService } from 'src/app/hmg-common/services/shared-data-service/shared-data.service'; -import { LoginComponent } from "src/app/authentication/login/login.component"; @Component({ selector: 'app-forgot', templateUrl: './forgot.component.html', @@ -18,10 +17,11 @@ import { LoginComponent } from "src/app/authentication/login/login.component"; export class ForgotComponent implements OnInit { private loginData = new LoginModel(); - public P_NEW_PASSWORD: string = ''; - public P_Confirm_NEW_PASSWORD: string = ''; + public P_NEW_PASSWORD = ''; + // tslint:disable-next-line: variable-name + public P_Confirm_NEW_PASSWORD = ''; public P_USER_NAME: string; - public logo = "assets/icon/login/lock.png"; + public logo = 'assets/icon/login/lock.png'; public recentPasswordNote = { yellowImg: '../assets/imgs/mohemm-action/info.png', text: 'Do not user recent password' @@ -40,6 +40,13 @@ export class ForgotComponent implements OnInit { text: 'At least one uppdercase', isMatch: false }; + public isLetterCase = { + blankImg: '../assets/icon/blank.svg', + greenImg: '../assets/icon/green.svg', + redImg: '../assets/imgs/close.svg', + text: 'At least one Letter', + isMatch: false + }; public isHasDigit = { blankImg: '../assets/icon/blank.svg', greenImg: '../assets/icon/green.svg', @@ -75,6 +82,14 @@ export class ForgotComponent implements OnInit { text: 'Confirm Password does not match.', isMatch: false }; + public userNameMatchNew = { + blankImg: '../assets/icon/blank.svg', + greenImg: '../assets/icon/green.svg', + redImg: '../assets/imgs/close.svg', + text: 'password should not contain the username.', + isMatch: false + }; + public userId: string; constructor( public cs: CommonService, @@ -88,16 +103,22 @@ export class ForgotComponent implements OnInit { ) { } - ngOnInit() { } + ngOnInit() { + console.log('ENAD >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>'); + this.userId = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false).P_USER_NAME; + console.log(this.userId); + } public onForgot() { this.sendSMSForForgotPassword(); } + // tslint:disable-next-line: member-ordering private checkUserResult: CheckUserAuthenticationResponse; private sendSMSForForgotPassword() { const request = new ForgetPassword(); + console.log(request); this.authService.sendForgetPassword( request, () => { @@ -117,7 +138,7 @@ export class ForgotComponent implements OnInit { forgetPasswordTokenID = forgetPasswordTokenResult.ForgetPasswordTokenID; } this.loginData.P_USER_NAME = this.P_USER_NAME; - let request: any = {}; + const request: any = {}; request.P_Confirm_NEW_PASSWORD = this.P_NEW_PASSWORD; request.P_NEW_PASSWORD = this.P_Confirm_NEW_PASSWORD; request.P_USER_NAME = data.P_USER_NAME; @@ -126,12 +147,11 @@ export class ForgotComponent implements OnInit { this.authService.submitForgetPassword( request, () => { - //this.sendSMSForForgotPassword(); }, this.ts.trPK('general', 'ok')).subscribe((result: CheckUserAuthenticationResponse) => { if (this.cs.validResponse(result)) { this.checkUserResult = result; console.log(result); - this.cs.toastPK("changePassword", "successChange"); + this.cs.toastPK('changePassword', 'successChange'); this.cs.openLogin(); } }); @@ -141,10 +161,12 @@ export class ForgotComponent implements OnInit { checkerFuncation(val) { if (this.P_NEW_PASSWORD === '') { switch (val) { + // case 1: + // return this.isLowerCase.blankImg; + // case 2: + // return this.isUpperCase.blankImg; case 1: - return this.isLowerCase.blankImg; - case 2: - return this.isUpperCase.blankImg; + return this.isLetterCase.blankImg; case 3: return this.isHasDigit.blankImg; case 4: @@ -155,24 +177,34 @@ export class ForgotComponent implements OnInit { return this.isContainSpecialChar.blankImg; case 7: return this.confirmMatchNew.blankImg; + case 8: + return this.userNameMatchNew.blankImg; } } else { switch (val) { + // case 1: + // if (/[a-z]/.test(this.P_NEW_PASSWORD)) { + // this.isLowerCase.isMatch = true; + // return this.isLowerCase.greenImg; + // } else { + // this.isLowerCase.isMatch = false; + // return this.isLowerCase.redImg; + // } + // case 2: + // if (/[A-Z]/.test(this.P_NEW_PASSWORD)) { + // this.isUpperCase.isMatch = true; + // return this.isUpperCase.greenImg; + // } else { + // this.isUpperCase.isMatch = false; + // return this.isUpperCase.redImg; + // } case 1: - if (/[a-z]/.test(this.P_NEW_PASSWORD)) { - this.isLowerCase.isMatch = true; - return this.isLowerCase.greenImg; + if (/[a-zA-Z]/.test(this.P_NEW_PASSWORD)) { + this.isLetterCase.isMatch = true; + return this.isLetterCase.greenImg; } else { - this.isLowerCase.isMatch = false; - return this.isLowerCase.redImg; - } - case 2: - if (/[A-Z]/.test(this.P_NEW_PASSWORD)) { - this.isUpperCase.isMatch = true; - return this.isUpperCase.greenImg; - } else { - this.isUpperCase.isMatch = false; - return this.isUpperCase.redImg; + this.isLetterCase.isMatch = false; + return this.isLetterCase.redImg; } case 3: if (/[0-9]/.test(this.P_NEW_PASSWORD)) { @@ -214,12 +246,20 @@ export class ForgotComponent implements OnInit { this.confirmMatchNew.isMatch = true; return this.confirmMatchNew.greenImg; } + case 8: + if (!this.P_NEW_PASSWORD.includes(this.userId)) { + this.userNameMatchNew.isMatch = true; + return this.userNameMatchNew.greenImg; + } else { + this.userNameMatchNew.isMatch = false; + return this.userNameMatchNew.redImg; + } } } } disabledSubmitBtn() { - if (this.isLowerCase.isMatch && this.isUpperCase.isMatch && this.isHasDigit.isMatch && this.isMinLength.isMatch + if (this.isLetterCase.isMatch && this.isHasDigit.isMatch && this.isMinLength.isMatch && this.isRepeatedLetter.isMatch && this.P_NEW_PASSWORD !== '' && this.P_NEW_PASSWORD && this.P_Confirm_NEW_PASSWORD && this.isContainSpecialChar && this.confirmMatchNew.isMatch) { return false;