@fleetbase/ember-core 0.1.9 → 0.2.1

package/addon/adapters/application.js

@@ -95,7 +95,9 @@ export default class ApplicationAdapter extends RESTAdapter {
             const localStorageSession = JSON.parse(window.localStorage.getItem('ember_simple_auth-session'));
             if (localStorageSession) {
                 const { authenticated } = localStorageSession;
-                token = authenticated.token;
+                if (authenticated) {
+                    token = authenticated.token;
+                }
 
                 // Check isAuthenticated again
                 isAuthenticated = !!token;

package/addon/authenticators/fleetbase.js

@@ -1,5 +1,17 @@
 import Base from 'ember-simple-auth/authenticators/base';
 import { inject as service } from '@ember/service';
+import getWithDefault from '../utils/get-with-default';
+
+export class AuthenticationError extends Error {
+    constructor(message, code) {
+        super(message);
+        this.code = code;
+    }
+
+    getCode() {
+        return this.code;
+    }
+}
 
 export default class FleetbaseAuthenticator extends Base {
     /**
@@ -35,7 +47,7 @@ export default class FleetbaseAuthenticator extends Base {
             )
             .then((response) => {
                 if (response.restore === false) {
-                    return Promise.reject(new Error(response.error));
+                    return Promise.reject(new AuthenticationError(response.error));
                 }
 
                 return response;
@@ -52,7 +64,10 @@ export default class FleetbaseAuthenticator extends Base {
     authenticate(credentials = {}, remember = false, path = 'auth/login') {
         return this.fetch.post(path, { ...credentials, remember }).then((response) => {
             if (response.errors) {
-                return Promise.reject(new Error(response.errors.firstObject ?? 'Authentication failed!'));
+                const errorMessage = getWithDefault(response.errors, '0', 'Authentication failed!');
+                const errorCode = getWithDefault(response, 'code');
+
+                return Promise.reject(new AuthenticationError(errorMessage, errorCode));
             }
 
             return response;

package/addon/services/fetch.js

@@ -546,16 +546,24 @@ export default class FetchService extends Service {
                 .then((response) => response.json())
                 .catch((error) => {
                     this.notifications.serverError(error, 'File upload failed.');
+
+                    if (typeof errorCallback === 'function') {
+                        errorCallback(error);
+                    }
                 });
 
-            const model = this.store.push(this.store.normalize('file', upload.file));
-            set(file, 'model', model);
+            if (upload) {
+                const model = this.store.push(this.store.normalize('file', upload.file));
+                set(file, 'model', model);
+
+                if (typeof callback === 'function') {
+                    callback(model);
+                }
 
-            if (typeof callback === 'function') {
-                callback(model);
+                return model;
             }
 
-            return model;
+            return null;
         } catch (error) {
             queue.remove(file);
             this.notifications.serverError(error, 'File upload failed.');

package/addon/services/notifications.js

@@ -16,7 +16,11 @@ export default class NotificationsService extends EmberNotificationsService {
             return this.error(errorMessage, options);
         }
 
-        return this.error(error ?? fallbackMessage, options);
+        if (typeof error === 'string') {
+            return this.error(error, options);
+        }
+
+        return this.error(fallbackMessage, options);
     }
 
     invoke(type, message, ...params) {

package/addon/services/session.js

@@ -2,6 +2,7 @@ import SimpleAuthSessionService from 'ember-simple-auth/services/session';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { later } from '@ember/runloop';
+import getWithDefault from '../utils/get-with-default';
 
 export default class SessionService extends SimpleAuthSessionService {
     /**
@@ -97,12 +98,12 @@ export default class SessionService extends SimpleAuthSessionService {
             const user = await this.currentUser.load();
 
             if (!user) {
-                return this.invalidateWithLoader(`Session authentication failed...`);
+                return this.invalidateWithLoader('Session authentication failed...');
             }
 
             return user;
         } catch (error) {
-            await this.invalidateWithLoader(error.message ?? `Session authentication failed...`);
+            await this.invalidateWithLoader(getWithDefault(error, 'message', 'Session authentication failed...'));
         }
     }
 
@@ -124,7 +125,7 @@ export default class SessionService extends SimpleAuthSessionService {
                             transition.abort();
                         }
 
-                        reject(invalidateWithLoader(`Session authentication failed...`));
+                        reject(invalidateWithLoader('Session authentication failed...'));
                     }
 
                     resolve(user);
@@ -218,4 +219,17 @@ export default class SessionService extends SimpleAuthSessionService {
 
         return Math.round((now - date) / 1000);
     }
+
+    /**
+     * Checks for the presence of two-factor authentication for a given user identity.
+     *
+     * @param {String} identity
+     * @return {Promise}
+     * @throws {Error}
+     */
+    checkForTwoFactor(identity) {
+        return this.fetch.get('two-fa/check', { identity }).catch((error) => {
+            throw new Error(error.message);
+        });
+    }
 }

package/addon/services/universe.js

@@ -759,6 +759,12 @@ export default class UniverseService extends Service.extend(Evented) {
         const index = this._getOption(options, 'index', 0);
         const onClick = this._getOption(options, 'onClick', null);
         const section = this._getOption(options, 'section', null);
+        const iconSize = this._getOption(options, 'iconSize', null);
+        const iconClass = this._getOption(options, 'iconClass', null);
+        const itemClass = this._getOption(options, 'class', null);
+        const inlineClass = this._getOption(options, 'inlineClass', null);
+        const wrapperClass = this._getOption(options, 'wrapperClass', null);
+        const overwriteWrapperClass = this._getOption(options, 'overwriteWrapperClass', false);
 
         // dasherize route segments
         if (typeof route === 'string') {
@@ -784,6 +790,12 @@ export default class UniverseService extends Service.extend(Evented) {
             index,
             section,
             onClick,
+            iconSize,
+            iconClass,
+            class: itemClass,
+            inlineClass,
+            wrapperClass,
+            overwriteWrapperClass,
         };
 
         return menuItem;

package/addon/utils/get-resource-name-from-transition.js

@@ -1,10 +1,16 @@
-export default function getResourceNameFromTransition(transition) {
+import humanize from './humanize';
+
+export default function getResourceNameFromTransition(transition, options = {}) {
     const { to } = transition;
 
     if (typeof to.name === 'string') {
         let routePathSegments = to.name.split('.');
         let resourceName = routePathSegments[3];
 
+        if (options.humanize === true) {
+            return humanize(resourceName);
+        }
+
         return resourceName;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fleetbase/ember-core",
-  "version": "0.1.9",
+  "version": "0.2.1",
   "description": "Provides all the core services, decorators and utilities for building a Fleetbase extension for the Console.",
   "keywords": [
     "fleetbase-core",

package/addon/utils/extract-latitude.js

@@ -1,28 +0,0 @@
-/* eslint-disable no-unused-vars */
-import extractCoordinates from './extract-coordinates';
-import Terraformer from 'terraformer';
-import { isArray } from '@ember/array';
-
-export default function extractLatitude(position) {
-    let latitude, longitude;
-
-    if (!position) {
-        return 0;
-    }
-
-    if (position instanceof Terraformer.Point || isArray(position.coordinates)) {
-        [latitude, longitude] = extractCoordinates(position.coordinates);
-
-        return latitude;
-    }
-
-    if (typeof position === 'object') {
-        let latitude = position['lat'] || position['latitude'] || position['x'];
-
-        return latitude;
-    }
-
-    [latitude, longitude] = extractCoordinates(position);
-
-    return latitude;
-}

package/addon/utils/extract-longitude.js

@@ -1,28 +0,0 @@
-/* eslint-disable no-unused-vars */
-import extractCoordinates from './extract-coordinates';
-import Terraformer from 'terraformer';
-import { isArray } from '@ember/array';
-
-export default function extractLongitude(position) {
-    let latitude, longitude;
-
-    if (!position) {
-        return 0;
-    }
-
-    if (position instanceof Terraformer.Point || isArray(position.coordinates)) {
-        [latitude, longitude] = extractCoordinates(position.coordinates);
-
-        return longitude;
-    }
-
-    if (typeof position === 'object') {
-        let longitude = position['lng'] || position['longitude'] || position['lon'] || position['y'];
-
-        return longitude;
-    }
-
-    [latitude, longitude] = extractCoordinates(position);
-
-    return longitude;
-}

package/app/utils/extract-latitude.js

@@ -1 +0,0 @@
-export { default } from '@fleetbase/ember-core/utils/extract-latitude';

package/app/utils/extract-longitude.js

@@ -1 +0,0 @@
-export { default } from '@fleetbase/ember-core/utils/extract-longitude';