@fleetbase/ember-core 0.2.16 → 0.2.18

package/addon/services/current-user.js

@@ -3,119 +3,36 @@ import Evented from '@ember/object/evented';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { dasherize } from '@ember/string';
-import { computed, get, action } from '@ember/object';
+import { computed, get } from '@ember/object';
 import { isBlank } from '@ember/utils';
 import { alias } from '@ember/object/computed';
 import { storageFor } from 'ember-local-storage';
 
 export default class CurrentUserService extends Service.extend(Evented) {
-    /**
-     * Inject the `session` service
-     *
-     * @var {Service}
-     */
     @service session;
-
-    /**
-     * Inject the `store` service
-     *
-     * @var {Service}
-     */
     @service store;
-
-    /**
-     * Inject the `fetch` service
-     *
-     * @var {Service}
-     */
     @service fetch;
-
-    /**
-     * Inject the `theme` service
-     *
-     * @var {Service}
-     */
     @service theme;
-
-    /**
-     * Inject the `notifications` service
-     *
-     * @var {Service}
-     */
     @service notifications;
+    @service intl;
 
-    /**
-     * Property to hold loaded user.
-     *
-     * @var {UserModel|Object}
-     * @memberof CurrentUserService
-     */
-    @tracked user = {
-        id: 'anon',
-    };
-
-    /**
-     * The current users permissions.
-     *
-     * @memberof CurrentUserService
-     */
+    @tracked user = { id: 'anon' };
+    @tracked company = {};
     @tracked permissions = [];
+    @tracked organizations = [];
+    @tracked whoisData = {};
+    @tracked locale = 'en-us';
 
-    /**
-     * User options in localStorage
-     *
-     * @var StorageObject
-     */
     @storageFor('user-options') options;
-
-    /**
-     * Alias for current user id
-     *
-     * @var {String}
-     */
     @alias('user.id') id;
-
-    /**
-     * Alias for current user name
-     *
-     * @var {String}
-     */
     @alias('user.name') name;
-
-    /**
-     * Alias for current user phone
-     *
-     * @var {String}
-     */
     @alias('user.phone') phone;
-
-    /**
-     * Alias for current user phone
-     *
-     * @var {String}
-     */
     @alias('user.email') email;
-
-    /**
-     * Alias for current user's company id
-     *
-     * @var {String}
-     */
-    @alias('user.company_uuid') companyId;
-
-    /**
-     * Alias for if user is admin.
-     *
-     * @var {Boolean}
-     * @memberof CurrentUserService
-     */
+    @alias('user.avatar_url') avatarUrl;
     @alias('user.is_admin') isAdmin;
+    @alias('user.company_uuid') companyId;
+    @alias('user.company_name') companyName;
 
-    /**
-     * The prefix for this user options
-     *
-     * @var {String}
-     */
     @computed('id') get optionsPrefix() {
         return `${this.id}:`;
     }
@@ -140,71 +57,115 @@ export default class CurrentUserService extends Service.extend(Evented) {
         return this.whois('country_code');
     }
 
-    /**
-     * Loads the current authenticated user
-     *
-     * @return Promise<UserModel>|null
-     */
     async load() {
         if (this.session.isAuthenticated) {
-            let user = await this.store.findRecord('user', 'me');
+            const user = await this.store.findRecord('user', 'me');
             this.set('user', user);
             this.trigger('user.loaded', user);
 
             // Set permissions
             this.permissions = this.getUserPermissions(user);
 
+            // Load preferences
+            await this.loadPreferences();
+
             return user;
         }
 
         return null;
     }
 
-    /**
-     * Resolves a user model.
-     *
-     * @return {Promise<User>}
-     */
-    @action promiseUser(options = {}) {
+    async promiseUser(options = {}) {
         const NoUserAuthenticatedError = new Error('Failed to authenticate user.');
+        if (!this.session.isAuthenticated) {
+            throw NoUserAuthenticatedError;
+        }
 
-        return new Promise((resolve, reject) => {
-            if (this.session.isAuthenticated) {
-                try {
-                    this.store.queryRecord('user', { me: true }).then((user) => {
-                        // set the `current user`
-                        this.set('user', user);
-                        this.trigger('user.loaded', user);
-
-                        // Set permissions
-                        this.permissions = this.getUserPermissions(user);
-
-                        // set environment from user option
-                        this.theme.setEnvironment();
-
-                        // @TODO Create an event dispatch for when an authenticated user is resolved from the server
-                        if (typeof options?.onUserResolved === 'function') {
-                            options.onUserResolved(user);
-                        }
-
-                        resolve(user);
-                    });
-                } catch (error) {
-                    reject(NoUserAuthenticatedError);
-                }
-            } else {
-                reject(NoUserAuthenticatedError);
+        try {
+            const user = await this.store.queryRecord('user', { me: true });
+
+            // Set current user
+            this.set('user', user);
+            this.trigger('user.loaded', user);
+
+            // Set permissions
+            this.permissions = this.getUserPermissions(user);
+
+            // Set environment from user option
+            this.theme.setEnvironment();
+
+            // Load user preferces
+            await this.loadPreferences();
+
+            // Optional callback
+            if (typeof options?.onUserResolved === 'function') {
+                options.onUserResolved(user);
             }
-        });
+
+            return user;
+        } catch (error) {
+            console.log(error.message);
+            throw error;
+        }
+    }
+
+    async loadPreferences() {
+        await this.loadLocale();
+        await this.loadWhois();
+        await this.loadOrganizations();
+    }
+
+    async loadLocale() {
+        try {
+            const { locale } = await this.fetch.get('users/locale');
+            this.setOption('locale', locale);
+            this.intl.setLocale(locale);
+            this.locale = locale;
+
+            return locale;
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    async loadOrganizations() {
+        try {
+            const organizations = await this.fetch.get('auth/organizations', {}, { normalizeToEmberData: true, normalizeModelType: 'company' });
+            this.setOption('organizations', organizations);
+            this.organizations = organizations;
+
+            return organizations;
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    async loadWhois() {
+        this.fetch.shouldResetCache();
+
+        try {
+            const whois = await this.fetch.cachedGet(
+                'lookup/whois',
+                {},
+                {
+                    expirationInterval: 60,
+                    expirationIntervalUnit: 'minutes',
+                }
+            );
+            this.setOption('whois', whois);
+            this.whoisData = whois;
+
+            return whois;
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    getCompany() {
+        this.company = this.store.peekRecord('company', this.user.company_uuid);
+        return this.company;
     }
 
-    /**
-     * Gets all user permissions.
-     *
-     * @param {UserModel} user
-     * @return {Array}
-     * @memberof CurrentUserService
-     */
     getUserPermissions(user) {
         const permissions = [];
 
@@ -242,25 +203,11 @@ export default class CurrentUserService extends Service.extend(Evented) {
         return permissions;
     }
 
-    /**
-     * Alias to get a user's whois property
-     *
-     * @param {String} key
-     * @return {Mixed}
-     * @memberof CurrentUserService
-     */
-    @action whois(key) {
+    whois(key) {
         return this.getWhoisProperty(key);
     }
 
-    /**
-     * Sets a user's option in local storage
-     *
-     * @param {String} key
-     * @param {Mixed} value
-     * @return {CurrentUserService}
-     */
-    @action setOption(key, value) {
+    setOption(key, value) {
         key = `${this.optionsPrefix}${dasherize(key)}`;
 
         this.options.set(key, value);
@@ -268,26 +215,14 @@ export default class CurrentUserService extends Service.extend(Evented) {
         return this;
     }
 
-    /**
-     * Retrieves a user option from local storage
-     *
-     * @param {String} key
-     * @return {Mixed}
-     */
-    @action getOption(key, defaultValue = null) {
+    getOption(key, defaultValue = null) {
         key = `${this.optionsPrefix}${dasherize(key)}`;
 
         const value = this.options.get(key);
         return value !== undefined ? value : defaultValue;
     }
 
-    /**
-     * Retrieves a user option from local storage
-     *
-     * @param {String} key
-     * @return {Mixed}
-     */
-    @action getWhoisProperty(prop) {
+    getWhoisProperty(prop) {
         const whois = this.getOption('whois');
 
         if (!whois || typeof whois !== 'object') {
@@ -297,23 +232,11 @@ export default class CurrentUserService extends Service.extend(Evented) {
         return get(whois, prop);
     }
 
-    /**
-     * Checks if an option exists in users local storage
-     *
-     * @param {String} key
-     * @return {Boolean}
-     */
-    @action hasOption(key) {
+    hasOption(key) {
         return this.getOption(key) !== undefined;
     }
 
-    /**
-     * Checks if an option exists in users local storage
-     *
-     * @param {String} key
-     * @return {Boolean}
-     */
-    @action filledOption(key) {
+    filledOption(key) {
         return !isBlank(this.getOption(key));
     }
 }

package/addon/services/session.js

@@ -2,29 +2,14 @@ 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 { debug } from '@ember/debug';
 import getWithDefault from '../utils/get-with-default';
 
 export default class SessionService extends SimpleAuthSessionService {
-    /**
-     * Inject the router service
-     *
-     * @var {Service}
-     */
     @service router;
-
-    /**
-     * Inject the current user service
-     *
-     * @var {Service}
-     */
     @service currentUser;
-
-    /**
-     * Inject the current user service
-     *
-     * @var {Service}
-     */
     @service fetch;
+    @service notifications;
 
     /**
      * Set where to transition to
@@ -69,23 +54,26 @@ export default class SessionService extends SimpleAuthSessionService {
         }
 
         const loaderNode = this.showLoader('Starting session...');
-
+        const removeLoaderNode = () => {
+            later(
+                this,
+                () => {
+                    // remove node from body
+                    document.body.removeChild(loaderNode);
+                    this.isLoaderNodeOpen = false;
+                },
+                600 * 3
+            );
+        };
         this.isLoaderNodeOpen = true;
 
-        this.router
-            .transitionTo(this.redirectTo)
-            .finally(() => {
-                later(
-                    this,
-                    () => {
-                        // remove node from body
-                        document.body.removeChild(loaderNode);
-                        this.isLoaderNodeOpen = false;
-                    },
-                    600 * 6
-                );
-            })
-            .catch((error) => console.log(error));
+        try {
+            await this.router.transitionTo(this.redirectTo);
+        } catch (error) {
+            debug(`Session's handleAuthentication() failed to transition: ${error.message}`);
+        }
+
+        removeLoaderNode();
     }
 
     /**
@@ -113,31 +101,29 @@ export default class SessionService extends SimpleAuthSessionService {
      * @param {Transition} transition
      * @void
      */
-    promiseCurrentUser(transition = null) {
+    async promiseCurrentUser(transition = null) {
         const invalidateWithLoader = this.invalidateWithLoader.bind(this);
 
-        return new Promise((resolve, reject) => {
-            return this.currentUser
-                .promiseUser()
-                .then((user) => {
-                    if (!user) {
-                        if (transition !== null) {
-                            transition.abort();
-                        }
-
-                        reject(invalidateWithLoader('Session authentication failed...'));
-                    }
-
-                    resolve(user);
-                })
-                .catch((error) => {
-                    if (transition !== null) {
-                        transition.abort();
-                    }
-
-                    reject(invalidateWithLoader(error.message ?? `Session authentication failed...`));
-                });
-        });
+        try {
+            const user = await this.currentUser.promiseUser();
+            if (!user) {
+                if (transition) {
+                    transition.abort();
+                }
+
+                await invalidateWithLoader('Session authentication failed...');
+                throw new Error('Session authentication failed...');
+            }
+
+            return user;
+        } catch (error) {
+            if (transition) {
+                transition.abort();
+            }
+
+            await invalidateWithLoader(error.message ?? 'Session authentication failed...');
+            throw error;
+        }
     }
 
     /**
@@ -175,8 +161,7 @@ export default class SessionService extends SimpleAuthSessionService {
         }
 
         const loaderNode = this.showLoader(loadingMessage);
-
-        this.isLoaderNodeOpen = false;
+        this.isLoaderNodeOpen = true;
 
         return this.session.invalidate().then(() => {
             later(

package/addon/services/theme.js

@@ -15,7 +15,7 @@ export default class ThemeService extends Service {
      */
     get router() {
         const owner = getOwner(this);
-        const router = owner.lookup('service:router');
+        const router = owner.lookup('router:main');
 
         return router;
     }
@@ -213,7 +213,7 @@ export default class ThemeService extends Service {
      * @void
      */
     setEnvironment() {
-        const isSandbox = this.currentUser.getOption('sandbox') || false;
+        const isSandbox = this.currentUser.getOption('sandbox', false);
 
         if (isSandbox) {
             document.body.classList.add('sandbox-console');