@ricado/api-client 1.3.0 → 2.0.1

package/src/Models/UserAccountModel.js

@@ -28,213 +28,81 @@ class UserAccountModel extends BaseModel
          * The User Account ID
          * 
          * @type {string}
-         * @private
+         * @public
          */
-        this._id = undefined;
+        this.id = undefined;
         
         /**
          * The User's Email Address
          * 
          * @type {string}
-         * @private
+         * @public
          */
-        this._email = undefined;
+        this.email = undefined;
         
         /**
          * The User's First Name
          * 
          * @type {?string}
-         * @private
+         * @public
          */
-        this._firstName = undefined;
+        this.firstName = undefined;
         
         /**
          * The User's Last Name
          * 
          * @type {?string}
-         * @private
+         * @public
          */
-        this._lastName = undefined;
+        this.lastName = undefined;
         
         /**
          * The Company this User belongs to
          * 
          * @type {string}
-         * @private
+         * @public
          */
-        this._companyId = undefined;
+        this.companyId = undefined;
         
         /**
          * The Policies that apply to this User Account
          * 
          * @type {string[]}
-         * @private
+         * @public
          */
-        this._policies = undefined;
+        this.policies = undefined;
         
         /**
          * Whether a Password has been Set for the User Account
          * 
          * @type {boolean}
-         * @private
+         * @public
          */
-        this._hasPassword = undefined;
+        this.hasPassword = undefined;
         
         /**
          * Whether a Pin Code has been Set for the User Account
          * 
          * @type {boolean}
-         * @private
+         * @public
          */
-        this._hasPinCode = undefined;
+        this.hasPinCode = undefined;
         
         /**
          * Whether the User Account has been deleted
          * 
          * @type {boolean}
-         * @private
+         * @public
          */
-        this._deleted = undefined;
+        this.deleted = undefined;
         
         /**
          * When the User Account was last updated
          * 
          * @type {Date}
-         * @private
+         * @public
          */
-        this._updateTimestamp = undefined;
-    }
-
-    /**
-     * The User Account ID
-     * 
-     * @public
-     * @type {string}
-     */
-    get id()
-    {
-        return this._id;
-    }
-
-    /**
-     * The User's Email Address
-     * 
-     * @public
-     * @type {string}
-     */
-    get email()
-    {
-        return this._email;
-    }
-
-    /**
-     * The User's First Name
-     * 
-     * @public
-     * @type {?string}
-     */
-    get firstName()
-    {
-        return this._firstName;
-    }
-
-    /**
-     * The User's Last Name
-     * 
-     * @public
-     * @type {?string}
-     */
-    get lastName()
-    {
-        return this._lastName;
-    }
-
-    /**
-     * The Company this User belongs to
-     * 
-     * @public
-     * @type {string}
-     */
-    get companyId()
-    {
-        return this._companyId;
-    }
-
-    /**
-     * The Policies that apply to this User Account
-     * 
-     * @public
-     * @type {string[]}
-     */
-    get policies()
-    {
-        return this._policies;
-    }
-
-    /**
-     * Whether a Password has been Set for the User Account
-     * 
-     * @public
-     * @type {boolean}
-     */
-    get hasPassword()
-    {
-        return this._hasPassword;
-    }
-
-    /**
-     * Whether a Pin Code has been Set for the User Account
-     * 
-     * @public
-     * @type {boolean}
-     */
-    get hasPinCode()
-    {
-        return this._hasPinCode;
-    }
-
-    /**
-     * Whether the User Account has been deleted
-     * 
-     * @public
-     * @type {boolean}
-     */
-    get deleted()
-    {
-        return this._deleted;
-    }
-
-    /**
-     * When the User Account was last updated
-     * 
-     * @public
-     * @type {Date}
-     */
-    get updateTimestamp()
-    {
-        return this._updateTimestamp;
-    }
-
-    /**
-     * Convert this **UserAccountModel** to a JSON Object
-     * 
-     * @public
-     * @return {Object<string, any>}
-     */
-    toJSON()
-    {
-        return {
-            id: this._id,
-            email: this._email,
-            firstName: this._firstName,
-            lastName: this._lastName,
-            companyId: this._companyId,
-            policies: this._policies,
-            hasPassword: this._hasPassword,
-            hasPinCode: this._hasPinCode,
-            deleted: this._deleted,
-            updateTimestamp: this._updateTimestamp
-        };
+        this.updateTimestamp = undefined;
     }
 
     /**
@@ -267,7 +135,7 @@ class UserAccountModel extends BaseModel
         
         if('id' in jsonObject)
         {
-            model._id = (function(){
+            model.id = (function(){
                 if(typeof jsonObject['id'] !== 'string')
                 {
                     return String(jsonObject['id']);
@@ -279,7 +147,7 @@ class UserAccountModel extends BaseModel
         
         if('email' in jsonObject)
         {
-            model._email = (function(){
+            model.email = (function(){
                 if(typeof jsonObject['email'] !== 'string')
                 {
                     return String(jsonObject['email']);
@@ -291,7 +159,7 @@ class UserAccountModel extends BaseModel
         
         if('firstName' in jsonObject)
         {
-            model._firstName = (function(){
+            model.firstName = (function(){
                 if(jsonObject['firstName'] === null)
                 {
                     return null;
@@ -308,7 +176,7 @@ class UserAccountModel extends BaseModel
         
         if('lastName' in jsonObject)
         {
-            model._lastName = (function(){
+            model.lastName = (function(){
                 if(jsonObject['lastName'] === null)
                 {
                     return null;
@@ -325,7 +193,7 @@ class UserAccountModel extends BaseModel
         
         if('companyId' in jsonObject)
         {
-            model._companyId = (function(){
+            model.companyId = (function(){
                 if(typeof jsonObject['companyId'] !== 'string')
                 {
                     return String(jsonObject['companyId']);
@@ -337,7 +205,7 @@ class UserAccountModel extends BaseModel
         
         if('policies' in jsonObject)
         {
-            model._policies = (function(){
+            model.policies = (function(){
                 if(Array.isArray(jsonObject['policies']) !== true)
                 {
                     return [];
@@ -358,7 +226,7 @@ class UserAccountModel extends BaseModel
         
         if('hasPassword' in jsonObject)
         {
-            model._hasPassword = (function(){
+            model.hasPassword = (function(){
                 if(typeof jsonObject['hasPassword'] !== 'boolean')
                 {
                     return Boolean(jsonObject['hasPassword']);
@@ -370,7 +238,7 @@ class UserAccountModel extends BaseModel
         
         if('hasPinCode' in jsonObject)
         {
-            model._hasPinCode = (function(){
+            model.hasPinCode = (function(){
                 if(typeof jsonObject['hasPinCode'] !== 'boolean')
                 {
                     return Boolean(jsonObject['hasPinCode']);
@@ -382,7 +250,7 @@ class UserAccountModel extends BaseModel
         
         if('deleted' in jsonObject)
         {
-            model._deleted = (function(){
+            model.deleted = (function(){
                 if(typeof jsonObject['deleted'] !== 'boolean')
                 {
                     return Boolean(jsonObject['deleted']);
@@ -394,7 +262,7 @@ class UserAccountModel extends BaseModel
         
         if('updateTimestamp' in jsonObject)
         {
-            model._updateTimestamp = (function(){
+            model.updateTimestamp = (function(){
                 if(typeof jsonObject['updateTimestamp'] !== 'string')
                 {
                     return new Date(String(jsonObject['updateTimestamp']));

package/src/PackageVersion.js

@@ -1,2 +1,2 @@
 // generated by genversion
-export const version = '1.3.0';
+export const version = '2.0.1';

package/src/index.js

@@ -10,7 +10,7 @@ import NoAuthPaths from './NoAuthPaths';
 import Controllers from './Controllers/index';
 import Errors from './Errors/index';
 import Models from './Models/index';
-import { parseJwtToken as jwtValid } from 'is-jwt-valid';
+import { decode as base64Decode } from 'js-base64';
 
 /**
  * Determines if a Variable has been Defined
@@ -55,7 +55,7 @@ export function getToken()
  */
 export function setToken(jwt)
 {
-    if(jwtValid(jwt))
+    if(isJwtValid(jwt))
     {
         JWT = jwt;
     }
@@ -74,7 +74,7 @@ export function setToken(jwt)
  */
 export function hasToken()
 {
-    return isDefined(JWT) && jwtValid(JWT);
+    return isDefined(JWT) && isJwtValid(JWT);
 }
 
 /**
@@ -405,6 +405,38 @@ export function ping() {
     });
 }
 
+/**
+ * 
+ * @param {string} jwt The JWT Token
+ * @return {boolean}
+ */
+function isJwtValid(jwt)
+{
+    if(jwt === null || typeof jwt !== 'string')
+    {
+        return false;
+    }
+
+    let jwtSegments = jwt.split('.');
+
+    if(jwtSegments.length !== 3)
+    {
+        return false;
+    }
+
+    try
+    {
+        JSON.parse(base64Decode(jwtSegments[0]));
+        JSON.parse(base64Decode(jwtSegments[1]));
+        
+        return true;
+    }
+    catch
+    {
+        return false;
+    }
+}
+
 /**
  * The Library Version
  * 

package/lib/Models/Site/BaseSiteModel.js

@@ -1,58 +0,0 @@
-"use strict";
-
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _BaseModel2 = _interopRequireDefault(require("../../Models/BaseModel"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
-
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
-/**
- * The Abstract **BaseSiteModel** Class
- * 
- * @class
- * @abstract
- * @hideconstructor
- * @extends BaseModel
- */
-var BaseSiteModel = /*#__PURE__*/function (_BaseModel) {
-  _inherits(BaseSiteModel, _BaseModel);
-
-  var _super = _createSuper(BaseSiteModel);
-
-  /**
-   * BaseSiteModel Constructor
-   * 
-   * @protected
-   */
-  function BaseSiteModel() {
-    _classCallCheck(this, BaseSiteModel);
-
-    return _super.call(this);
-  }
-
-  return BaseSiteModel;
-}(_BaseModel2.default);
-
-var _default = BaseSiteModel;
-exports.default = _default;

package/src/Models/Site/BaseSiteModel.js

@@ -1,30 +0,0 @@
-/**
- * File Auto-Generated by the RICADO Gen 4 PHP API Project
- * 
- * Do Not Edit this File Manually!
- */
-
-import BaseModel from '../../Models/BaseModel';
-
-/**
- * The Abstract **BaseSiteModel** Class
- * 
- * @class
- * @abstract
- * @hideconstructor
- * @extends BaseModel
- */
-class BaseSiteModel extends BaseModel
-{
-    /**
-     * BaseSiteModel Constructor
-     * 
-     * @protected
-     */
-    constructor()
-    {
-        super();
-    }
-}
-
-export default BaseSiteModel;