cronapi-js 3.2.1 → 4.0.1

package/cronapi.js

@@ -935,15 +935,24 @@ function cronapi() {
       'timezone': moment().utcOffset()
     };
 
-    var resultData = $.ajax({
-      type: 'POST',
+    // Make the POST request via $http
+    http({
+      method: 'POST',
       url: finalUrl,
-      dataType: 'html',
-      data : contentData,
+      data: contentData,
+      responseType: 'text',
       headers: headerValues,
-      success : callbackSuccess,
-      error : callbackError
-    });
+      transformResponse: (value) => value
+    }).then(
+      function successCallback(response) {
+        // response.data will contain the server response
+        callbackSuccess(response.data);
+      },
+      function errorCallback(response) {
+        // Handle error; response might contain status and data
+        callbackError(response.data, response.status);
+      }
+    );
 
   };
   /**
@@ -1314,14 +1323,24 @@ function cronapi() {
 
     var header = Object.create(headers);
     header["Content-Type"] = contentType;
-    // Angular has a .run that inject X-AUTH-TOKEN, so we use JQuery
-    $.ajax({
-      method : method,
-      url : url,
-      data: params,
-      headers: header
-    }).done(this.cronapi.util.handleCallback(success).bind(this)).fail(this.cronapi.util.handleCallback(error.bind(this)));
 
+    this.cronapi.$scope.http({
+      method: method,
+      url: url,
+      data: params,
+      headers: header,
+      transformResponse: (value) => value
+    }).then(
+      function success(response) {
+        this.cronapi.util.handleCallback(success)
+          .bind(this)(response.data, response);
+      }.bind(this),
+
+      function error(response) {
+        this.cronapi.util.handleCallback(error)
+          .bind(this)(response.data, response);
+      }.bind(this)
+    );
   };
 
 
@@ -6493,42 +6512,7 @@ function cronapi() {
   }
 
   this.cronapi.social.login = function (username, password, options) {
-    var item;
-    var baseUrl = this.cronapi.screen.getHostapp() ? `${this.cronapi.screen.getHostapp()}\auth` : `\auth`;
-    if (window.cordova && !this.cronapi.screen.getHostapp()) {
-      this.cronapi.screen.notify('error', 'HostApp is Required');
-      return;
-    }
-    this.cronapi.screen.showLoading();
-    this.cronapi.util.getURLFromOthers('POST',
-       'application/x-www-form-urlencoded',
-        baseUrl,
-        this.cronapi.object.createObjectFromString(['{ \"username\": \"', username, '\" , \"password\": \"', password, '\" } '].join('')),
-        this.cronapi.object.createObjectFromString(['{ \"X-AUTH-TOKEN\": \"', options, '\" } '].join('')),
-        async (sender_item) => {
-            item = sender_item;
-            if (window.isUsingCookie()) {
-              delete item.token;
-            }
-            this.cronapi.screen.hide();
-            this.cronapi.util.setLocalStorage('_u', this.cronapi.object.serializeObject(item));
-            try {
-              if (this.cronapi.blockly.js.blockly.auth.Home.change) {
-                (await this.cronapi.client('blockly.js.blockly.auth.Home.change').run());
-              }
-            } catch (error) {
-              this.cronapi.screen.changeView("#/app/logged/home", []);
-            }
-        }, (sender_item) => {
-            item = sender_item;
-            if (this.cronapi.object.getProperty(item, 'status') == '403' || this.cronapi.object.getProperty(item, 'status') == '401') {
-              var messageLogin = this.cronapi.$translate.instant('Login.view.invalidPassword');
-              this.cronapi.screen.notify('error', messageLogin);
-            } else {
-              this.cronapi.screen.notify('error', this.cronapi.object.getProperty(item, 'responseJSON.message'));
-            }
-            this.cronapi.screen.hide();
-        });
+    this.cronapi.$scope.login(username, password, options);
   }
 
   /**
@@ -6570,9 +6554,20 @@ function cronapi() {
   this.cronapi.social.ssoLogin = async function () {
     let scope = this.cronapi.$scope;
 
+    let config = {
+      method: "GET",
+      url: this.cronapi.internal.getAddressWithHostApp("authproviders")
+    };
+
+    let providers = await this.$http(config);
+
     let future = new Promise((resolve, reject) => {
+      let nextPage = "login";
+      if (providers.data && providers.data.length == 1) {
+        nextPage = providers.data[0].loginURL;
+      }
       if (window.cordova && cordova.InAppBrowser) {
-        const ref = cordova.InAppBrowser.open(window.hostApp + 'login', '_blank', 'location=no,footer=yes,zoom=no,enableViewportScale=yes,hidenavigationbuttons=yes');
+        const ref = cordova.InAppBrowser.open(this.cronapi.internal.getAddressWithHostApp(nextPage), '_blank', 'location=no,footer=yes,zoom=no,enableViewportScale=yes,hidenavigationbuttons=yes');
         const handlerChange = (event) => {
           const url = new URL(event.url);
           const urlParams = new URLSearchParams(url.search);
@@ -6584,7 +6579,7 @@ function cronapi() {
             ref.close();
 
             // If the page is reloaded the blockly sequence is interrupted
-            scope.login("#OAUTH#", "#OAUTH#", urlParams.get('_ctk'));
+            scope.loginWithToken(urlParams.get('_ctk'));
             resolve();
 
           } else {
@@ -6594,24 +6589,9 @@ function cronapi() {
 
         ref.addEventListener('loadstart', handlerChange);
 
-      } else {
-        window.ssoWindow = window.open(this.cronapi.internal.getAddressWithHostApp("login"));
-
-        window.addEventListener('message', function (e) {
-          if (e.data && e.data.type === 'sso_user') {
-
-            // close sso window
-            if (window.ssoWindow) {
-              window.ssoWindow.close();
-            }
-
-            // If the page is reloaded the blockly sequence is interrupted
-            scope.login("#OAUTH#", "#OAUTH#", e.data._ctk);
-            resolve();
-
-          }
-        }, false);
-      }
+        } else {
+          window.location.href = this.cronapi.internal.getAddressWithHostApp(nextPage);
+        }
     });
 
     return future;
@@ -7709,7 +7689,7 @@ function cronapi() {
    * @returns {ObjectType.VOID}
    */
   this.cronapi.authentication.login = function(/** @type {ObjectType.STRING} **/ username,/** @type {ObjectType.STRING} **/ password, /** @type {ObjectType.OBJECT} **/options) {
-    this.cronapi.social.login(username, password, options);
+    this.cronapi.$scope.login(username, password, options);
   }
 
   /**
@@ -8271,7 +8251,27 @@ function cronapi() {
 
     const audioRecorded = await mediaPromise;
     return audioRecorded;
-  };  
+  };
+
+  /**
+   * @type function
+   * @name {{getLastDayOfMonth}}
+   * @nameTags lastDayOfMonth|day
+   * @description {{functionToNewDate}}
+   * @param {ObjectType.LONG} month {{month}}
+   * @param {ObjectType.LONG} year {{year}}
+   * @returns {ObjectType.DATETIME}
+   */
+  this.cronapi.dateTime.getLastDayOfMonth = function(month, year) {
+    if (month < 1 || month > 12) return "invalid month";
+    if (year < 1) return "invalid year";
+    let date = new Date();
+    date.setYear(year);
+    date.setDate(1);
+    date.setMonth(month);
+    date.setDate(date.getDate()-1)
+    return date.getDate();
+  };
 }
 
 (cronapi).bind(window)();