Issue #SB-000 merge: Merge branch 'release-2.6.5' into release-2.7.0

buildConfig/data/staging/form/form-config_webview_version_get.json

@@ -0,0 +1,32 @@
+{
+    "id": "api.form.read",
+    "params": {
+        "resmsgid": "cc557f06-5fcf-4feb-919d-627944163857",
+        "msgid": "f0dcdf53-4949-431c-b804-2dbf21886153",
+        "status": "successful"
+    },
+    "responseCode": "OK",
+    "result": {
+        "form": {
+            "type": "config",
+            "subtype": "webview_version",
+            "action": "get",
+            "component": "*",
+            "framework": "*",
+            "data": {
+                "templateName": "webview_version",
+                "action": "get",
+                "fields": [
+                    {
+                        "version": "54"
+                    }
+                ]
+            },
+            "created_on": "2020-01-07T10:51:43.203Z",
+            "last_modified_on": null,
+            "rootOrgId": "*"
+        }
+    },
+    "ts": "2020-01-07T10:52:04.924Z",
+    "ver": "1.0"
+}

build_config

@@ -10,19 +10,20 @@ cordova-plugin=cordova-plugin-file-transfer
 cordova-plugin=cordova-plugin-inappbrowser
 cordova-plugin=cordova-plugin-network-information
 cordova-plugin=cordova-plugin-statusbar
+cordova-plugin=cordova-plugin-webview-checker
 cordova-plugin=https://github.com/adriano-di-giovanni/cordova-plugin-shared-preferences.git
 cordova-plugin=https://github.com/katzer/cordova-plugin-local-notifications.git
 cordova-plugin=https://github.com/swayangjit/cordova-plugin-fcm-with-dependecy-updated.git#release-2.6.0
 cordova-plugin=cordova-plugin-advanced-http
 cordova-plugin=cordova-plugin-android-permissions
 cordova-plugin=cordova-plugin-media
 cordova-plugin=cordova.plugins.diagnostic
-cordova-plugin=https://github.com/swayangjit/cordova-plugin-buildconfig-reader.git
+cordova-plugin=https://github.com/swayangjit/cordova-plugin-buildconfig-reader.git#release-2.6.5
 cordova-plugin=https://github.com/swayangjit/cordova-plugin-android-downloadmanager.git
 cordova-plugin=https://github.com/swayangjit/sb-cordova-plugin-db.git
 cordova-plugin=cordova-android-support-gradle-release --variable ANDROID_SUPPORT_VERSION=28.0.0
 cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-customtabs.git --variable URL_SCHEME=@string/custom_scheme_url --variable URL_HOST=mobile
 sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-openrap.git
 sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-qr-scanner.git
 sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-sunbirdsplash.git#release-2.6.5
-sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-file-support.git
+sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-file-support.git#release-2.6.5

config.xml

@@ -140,5 +140,6 @@
     <plugin name="cordova-plugin-qr-scanner" spec="https://github.com/project-sunbird/cordova-plugin-qr-scanner.git" />
     <plugin name="cordova-plugin-sunbirdsplash" spec="https://github.com/project-sunbird/cordova-plugin-sunbirdsplash.git#release-2.3.0" />
     <plugin name="cordova-plugin-file-support" spec="https://github.com/project-sunbird/cordova-plugin-file-support.git" />
+    <plugin name="cordova-plugin-webview-checker" spec="^1.0.1" />
     <engine name="android" spec="^8.1.0" />
 </widget>

package.json

@@ -93,7 +93,7 @@
     "rxjs": "^6.5.3",
     "sb-cordova-plugin-customtabs": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-customtabs.git",
     "sb-cordova-plugin-db": "git+https://github.com/swayangjit/sb-cordova-plugin-db.git",
-    "sunbird-sdk": "git+https://github.com/Sunbird-Ed/sunbird-mobile-sdk.git#v2.7.5",
+    "sunbird-sdk": "git+https://github.com/Sunbird-Ed/sunbird-mobile-sdk.git#v2.7.7",
     "tslib": "^1.10.0",
     "x2js": "^3.3.0",
     "zone.js": "~0.8.29"
@@ -180,7 +180,8 @@
       "cordova-android-support-gradle-release": {
         "ANDROID_SUPPORT_VERSION": "28.0.0"
       },
-      "cordova-plugin-openrap": {}
+      "cordova-plugin-openrap": {},
+      "cordova-plugin-webview-checker": {}
     },
     "platforms": [
       "android"
@@ -231,4 +232,4 @@
     },
     "transformIgnorePatterns": []
   }
-}
+}

src/app/app.component.html

@@ -39,4 +39,26 @@
       </ion-row>
     </ion-grid>
   </div>
+
+  <div id="update-webview-container"
+  style="position: fixed;top: 0;left: 0;right: 0;bottom: 0;z-index: 10;background-color: rgba(0, 0, 0, 0.59);opacity: 1;display: none;">
+    <div id="update-webview-content" 
+      style="position: fixed;top: 0;left: 0;right: 0;bottom: 0;z-index: 11;width: 80%;height: 195px;background-color: #eee; margin: auto;">
+      <div style="height:195px;position: relative;">
+        <div>
+          <h3 
+            style="text-align: center;background-color: #024f9d; color: #fff;margin: 0;padding: 8px; font-size: 18px;">
+            {{'UPDATE_REQUIRED' | translate}}
+          </h3>
+        </div>
+        <div style="padding: 15px 0; font-size: 16px; color: #333;width:80%;margin: auto;">
+          <p style="margin: 0;">{{'WEBVIEW_UPDATE_TEXT' | translate}}</p>
+        </div>
+        <div style="position: absolute; width: 100%; bottom: 15px;text-align: center;">
+          <button (click)="openPlaystore()" style="color: #fff;background: #024f9d;padding: 10px;width: 80%;margin: auto;">{{'DOWNLOAD_NOW' | translate}}</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
 </ion-app>

src/app/app.component.ts

@@ -132,9 +132,43 @@ export class AppComponent implements OnInit, AfterViewInit {
       this.appRatingService.checkInitialDate();
       this.getUtmParameter();
       this.checkForCodeUpdates();
+      this.checkAndroidWebViewVersion();
     });
   }
 
+  checkAndroidWebViewVersion() {
+    var that = this;
+    plugins['webViewChecker'].getCurrentWebViewPackageInfo()
+    .then(function(packageInfo) {
+      that.formAndFrameworkUtilService.getWebviewConfig().then(function(webviewVersion) {
+        if (parseInt(packageInfo.versionName.split('.')[0], 10) <= webviewVersion) {
+          document.getElementById('update-webview-container').style.display = 'block';
+          this.telemetryGeneratorService.generateImpressionTelemetry(
+            ImpressionType.VIEW, '',
+            PageId.UPDATE_WEBVIEW_POPUP,
+            Environment.HOME);
+        }
+      }).catch(function(err) {
+        if (parseInt(packageInfo.versionName.split('.')[0], 10) <= 54) {
+          document.getElementById('update-webview-container').style.display = 'block';
+        }
+      });
+    })
+    .catch(function(error) { });
+  }
+
+  openPlaystore() {
+    plugins['webViewChecker'].openGooglePlayPage()
+    .then(function() { })
+    .catch(function(error) { });
+
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH,
+      InteractSubtype.UPDATE_WEBVIEW_CLICKED,
+      Environment.HOME,
+      PageId.UPDATE_WEBVIEW_POPUP);
+  }
+
   getSystemConfig() {
     const getSystemSettingsRequest: GetSystemSettingsRequest = {
       id: SystemSettingsIds.COURSE_FRAMEWORK_ID
@@ -739,10 +773,7 @@ export class AppComponent implements OnInit, AfterViewInit {
       && !(await this.commonUtilService.isIpLocationAvailable())) {
       this.deviceRegisterService.getDeviceProfile().toPromise().then(async (response) => {
         if (response.userDeclaredLocation) {
-          const locationMap = new Map();
-          locationMap['state'] = response.userDeclaredLocation.state;
-          locationMap['district'] = response.userDeclaredLocation.district;
-          await this.preferences.putString(PreferenceKey.DEVICE_LOCATION, JSON.stringify(locationMap)).toPromise();
+          await this.preferences.putString(PreferenceKey.DEVICE_LOCATION, JSON.stringify(response.userDeclaredLocation)).toPromise();
         } else if (response.ipLocation) {
           const ipLocationMap = new Map();
           if (response.ipLocation.state) {

src/app/components/popups/account-recovery-id/account-recovery-id-popup.component.spec.ts

@@ -0,0 +1,211 @@
+import { AccountRecoveryInfoComponent } from './account-recovery-id-popup.component';
+import { CommonUtilService, TelemetryGeneratorService, AppGlobalService } from '../../../../services';
+import { PopoverController, Platform, MenuController } from '@ionic/angular';
+import { ImpressionType, Environment, PageId } from '@app/services/telemetry-constants';
+import { of, throwError } from 'rxjs';
+import { ProfileService } from 'sunbird-sdk';
+
+describe('AccountRecoveryInfoComponent', () => {
+    let accountRecoveryInfoComponent: AccountRecoveryInfoComponent;
+
+    const serverProfileResponse = { response: 'SUCCESS' } as any;
+    const mockProfileService: Partial<ProfileService> = {
+        updateServerProfile: jest.fn(() => of(serverProfileResponse)),
+    };
+
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateImpressionTelemetry: jest.fn(),
+        generateInteractTelemetry: jest.fn()
+    };
+
+    const profile = { uid: '0123456789' } as any;
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        getCurrentUser: jest.fn(() => profile)
+    };
+
+    const mockPlatform: Partial<Platform> = {
+    };
+
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        showToast: jest.fn(() => { })
+    };
+    const dismissFn = jest.fn(() => Promise.resolve());
+    const presentFn = jest.fn(() => Promise.resolve());
+    mockCommonUtilService.getLoader = jest.fn(() => ({
+        present: presentFn,
+        dismiss: dismissFn,
+    }));
+
+    const mockPopoverCtrl: Partial<PopoverController> = {
+        dismiss: jest.fn()
+    };
+
+    const mockMenuController: Partial<MenuController> = {
+        enable: jest.fn()
+    };
+
+    beforeAll(() => {
+        accountRecoveryInfoComponent = new AccountRecoveryInfoComponent(
+            mockProfileService as ProfileService,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockAppGlobalService as AppGlobalService,
+            mockCommonUtilService as CommonUtilService,
+            mockPopoverCtrl as PopoverController,
+            mockPlatform as Platform,
+            mockMenuController as MenuController,
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should be create a instance of EditContactDetailsPopupComponent', () => {
+        expect(accountRecoveryInfoComponent).toBeTruthy();
+    });
+
+    it('should generate IMPRESSION telemtry on ngOnInit', () => {
+        // arrange
+        accountRecoveryInfoComponent.recoveryPhone = 'phone';
+        // act
+        accountRecoveryInfoComponent.ngOnInit();
+        // assert
+        expect(accountRecoveryInfoComponent.profile).toEqual({ uid: '0123456789' });
+        expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+            ImpressionType.VIEW, '',
+            PageId.RECOVERY_ACCOUNT_ID_POPUP,
+            Environment.USER
+        );
+        expect(mockMenuController.enable).toHaveBeenCalledWith(false);
+    });
+
+    it('should  handle the back button in ionViewWillEnter ', () => {
+        // arrange
+        const subscribeWithPriorityData = jest.fn((_, fn) => fn());
+        mockPlatform.backButton = {
+            subscribeWithPriority: subscribeWithPriorityData,
+
+        } as any;
+
+        accountRecoveryInfoComponent.unregisterBackButton = {
+            unsubscribe: jest.fn(),
+        } as any;
+
+        // act
+        accountRecoveryInfoComponent.ionViewWillEnter();
+        // assert
+        expect(mockPopoverCtrl.dismiss).toHaveBeenCalled();
+    });
+
+    it('should enable MenuDrawer and unsubscribe back function', () => {
+        // arrange
+        accountRecoveryInfoComponent.unregisterBackButton = {
+            unsubscribe: jest.fn(),
+
+        } as any;
+        // act
+        accountRecoveryInfoComponent.ionViewWillLeave();
+        // assert
+        expect(mockMenuController.enable).toHaveBeenCalledWith(true);
+        expect(accountRecoveryInfoComponent.unregisterBackButton.unsubscribe).toHaveBeenCalled();
+    });
+
+    it('should update the server profile successfully', (done) => {
+        // arrange
+        accountRecoveryInfoComponent.recoveryPhone = '';
+        mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+        accountRecoveryInfoComponent.recoveryEmailForm = { value: { email: '[email protected]' } } as any;
+        // act
+        accountRecoveryInfoComponent.submitRecoveryId(accountRecoveryInfoComponent.RecoveryType.EMAIL);
+        // assert
+        setTimeout(() => {
+            expect(mockPopoverCtrl.dismiss).toHaveBeenCalledWith({ isEdited: true });
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+            done();
+        }, 1);
+    });
+
+    it('should handle the error scenario incase of API failure while updating email', (done) => {
+        // arrange
+        accountRecoveryInfoComponent.recoveryPhone = '';
+        mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+        accountRecoveryInfoComponent.recoveryEmailForm = { value: { email: '[email protected]' } } as any;
+        mockProfileService.updateServerProfile = jest.fn(() => throwError(
+            { response: { body: { params: { err: 'RECOVERY_PARAM_MATCH_EXCEPTION' } } } }));
+        // act
+        accountRecoveryInfoComponent.submitRecoveryId(accountRecoveryInfoComponent.RecoveryType.EMAIL);
+        // assert
+        setTimeout(() => {
+            expect(accountRecoveryInfoComponent.sameEmailErr).toBeTruthy();
+            done();
+        }, 1);
+    });
+
+
+    it('should handle the error scenario incase of API failure while updating phone', (done) => {
+        // arrange
+        accountRecoveryInfoComponent.recoveryPhone = 'phone';
+        mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+        accountRecoveryInfoComponent.recoveryEmailForm = { value: { phone: '0123456789' } } as any;
+        mockProfileService.updateServerProfile = jest.fn(() => throwError(
+            { response: { body: { params: { err: 'RECOVERY_PARAM_MATCH_EXCEPTION' } } } }));
+        // act
+        accountRecoveryInfoComponent.submitRecoveryId(accountRecoveryInfoComponent.RecoveryType.PHONE);
+        // assert
+        setTimeout(() => {
+            expect(accountRecoveryInfoComponent.samePhoneErr).toBeTruthy();
+            done();
+        }, 1);
+    });
+
+    it('should show TOAST in case of unexpected error scenario incase of API failure while updating phone', (done) => {
+        // arrange
+        accountRecoveryInfoComponent.recoveryPhone = 'phone';
+        mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+        accountRecoveryInfoComponent.recoveryEmailForm = { value: { phone: '0123456789' } } as any;
+        mockProfileService.updateServerProfile = jest.fn(() => throwError(
+            { response: { body: { params: { err: 'ANY_OTHER_ERROR' } } } }));
+        // act
+        accountRecoveryInfoComponent.submitRecoveryId(accountRecoveryInfoComponent.RecoveryType.PHONE);
+        // assert
+        setTimeout(() => {
+            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('SOMETHING_WENT_WRONG');
+            done();
+        }, 1);
+    });
+
+    it('should show NETWORK ERROR popup in case of no network connection', () => {
+        // arrange
+        mockCommonUtilService.networkInfo = { isNetworkAvailable: false };
+        // act
+        accountRecoveryInfoComponent.submitRecoveryId(accountRecoveryInfoComponent.RecoveryType.PHONE);
+        // assert
+        expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('INTERNET_CONNECTIVITY_NEEDED');
+    });
+
+    it('should dismiss the popup when cancel is clicked', () => {
+        // arrange
+        // act
+        accountRecoveryInfoComponent.cancel();
+        // assert
+        expect(mockPopoverCtrl.dismiss).toHaveBeenCalledWith({ isEdited: false });
+    });
+
+    it('should reset the error properties', () => {
+        // arrange
+        accountRecoveryInfoComponent.sameEmailErr = true;
+        // act
+        accountRecoveryInfoComponent.removeSameRecoveryIdErr(accountRecoveryInfoComponent.RecoveryType.EMAIL);
+        // assert
+        expect(accountRecoveryInfoComponent.sameEmailErr).toBeFalsy();
+
+        // arrange
+        accountRecoveryInfoComponent.samePhoneErr = true;
+        // act
+        accountRecoveryInfoComponent.removeSameRecoveryIdErr(accountRecoveryInfoComponent.RecoveryType.PHONE);
+        // assert
+        expect(accountRecoveryInfoComponent.samePhoneErr).toBeFalsy();
+    });
+
+
+});

src/app/components/popups/account-recovery-id/account-recovery-id-popup.component.ts

@@ -120,9 +120,7 @@ export class AccountRecoveryInfoComponent implements OnInit {
     this.telemetryGeneratorService.generateImpressionTelemetry(
       ImpressionType.VIEW, '',
       PageId.RECOVERY_ACCOUNT_ID_POPUP,
-      Environment.USER, '', '', '',
-      undefined,
-      undefined
+      Environment.USER
     );
   }