cordova-plugin-unvired-universal-sdk 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-unvired-universal-sdk",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Unvired Cordova Plugin",
   "scripts": {
     "build": "webpack -c webpack.config.js",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-unvired-universal-sdk" version="1.0.4" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="cordova-plugin-unvired-universal-sdk" version="1.0.6" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
   <name>UnviredSDK</name>
   <dependency id="cordova-plugin-device" version="^3.0.0" />
   <dependency id="cordova-plugin-unvired-electron-db" version="0.0.14" />

package/src/browser/UnviredPluginProxy.js

@@ -74,7 +74,7 @@ var printLogs = false;
 /**
  * This gets updated during the build time. Check the build.xml file for the details.
  */
-var PACKAGE_NUMBER = "1.0.4"
+var PACKAGE_NUMBER = "1.0.6"
 
 //#endregion
 

package/www/authenticationService.ts

@@ -403,7 +403,8 @@ export class AuthenticationService {
                     return;
                 }
             } else {
-                if (FrameworkHelper.getPlatform() !== "browser") {
+                // The Browser check is commented out for SAML2 login type.Because it should always call the activate rest api.
+                // if (FrameworkHelper.getPlatform() !== "browser") {
                     // Call activate rest api
                     const activationResponse = await HttpConnection.activateUser(loginParameters);
 
@@ -412,6 +413,7 @@ export class AuthenticationService {
                     if (activationResponse.status === Status.created) {
                         frameworkSettings = activationResponseObject;
                         loginParameters.frontendId = frameworkSettings[ServiceConstants.KeySettings]["frontendId"];
+                        loginParameters.feUserId = frameworkSettings[ServiceConstants.KeySettings]["feUser"];
                         loginParameters.activationId = frameworkSettings[ServiceConstants.KeySettings]["activationId"];
                         const unviredId = UserSettingsFields[UserSettingsFields.unviredId];
                         userSettings[unviredId] = loginParameters.username;
@@ -431,16 +433,19 @@ export class AuthenticationService {
                         resolve(unviredResult);
                         return;
                     }
-                } else {
-                    const unviredId = UserSettingsFields[UserSettingsFields.unviredId];
-                    userSettings[unviredId] = loginParameters.username;
-                    const unviredUserId = UserSettingsFields[UserSettingsFields.unviredUserId];
-                    userSettings[unviredUserId] = frameworkSettings[unviredId];
-                    const unviredPwd = UserSettingsFields[UserSettingsFields.unviredPassword];
-                    userSettings[unviredPwd] = FrameworkHelper.getMD5String(loginParameters.password);
-                    // added this to save the settings in the DB
-                    frameworkSettings = {"settings": frameworkSettings}
-                }
+
+                // } else {
+                //     const unviredId = UserSettingsFields[UserSettingsFields.unviredId];
+                //     userSettings[unviredId] = loginParameters.username;
+                //     const unviredUserId = UserSettingsFields[UserSettingsFields.unviredUserId];
+                //     userSettings[unviredUserId] = frameworkSettings[unviredId];
+                //     const unviredPwd = UserSettingsFields[UserSettingsFields.unviredPassword];
+                //     userSettings[unviredPwd] = FrameworkHelper.getMD5String(loginParameters.password);
+                //     // added this to save the settings in the DB
+                //     frameworkSettings = {"settings": frameworkSettings}
+                // }
+
+
                 // NOTE: This is not required as the jwt token is already available in the loginParameters.
                 // // Get jwt token from rest api
                 // const jwtResponse = await HttpConnection.getJwtToken(loginParameters);

package/www/kernel.js

@@ -373,7 +373,7 @@ UMP.prototype.userSettings = async function (success, fail) {
     const unviredPassword = await UserSettingsManager.getInstance().getFieldValue(UserSettingsFields.unviredPassword);
     const userSettings = {
       "UNVIRED_ID": unviredUserId,
-      "USER_ID": AuthenticationService.loginParameters.username, 
+      "USER_ID": AuthenticationService.loginParameters.username || unviredUserId, 
       "FULL_NAME": "",
       "EMAIL": "",
       "SERVER_URL": AuthenticationService.loginParameters.url,  
@@ -438,10 +438,14 @@ UMP.prototype.clearData = async function (success, fail) {
 /**
  * Check for Internet connection
  */
-UMP.prototype.hasInternet = function (success, fail) {
+UMP.prototype.hasInternet = async function (success, fail) {
   try {
     // TODO: Implement this SettingsPlugin
-    success(true)
+    if (!(await isServerReachable(AuthenticationService.instance.loginParameters.url))) {
+      success(false)
+    } else {
+      success(true)
+    }
   } catch (error) {
     fail(error)
   }
@@ -693,9 +697,10 @@ UMP.prototype.dbEndTransaction = async function () {
 /**
  * dbSaveWebData - Save Web Database
  */
-UMP.prototype.dbSaveWebData = function (success, fail) {
+UMP.prototype.dbSaveWebData = async function (success, fail) {
   try {
     // TODO: Implement this SettingsPlugin
+    await DatabaseManager.getInstance().saveWebData();
     success(true)
   } catch (error) {
     fail(error)