@fleetbase/ember-core 0.2.17 → 0.2.19

package/addon/services/current-user.js

@@ -32,6 +32,8 @@ export default class CurrentUserService extends Service.extend(Evented) {
     @alias('user.is_admin') isAdmin;
     @alias('user.company_uuid') companyId;
     @alias('user.company_name') companyName;
+    @alias('user.role_name') roleName;
+    @alias('user.role') role;
 
     @computed('id') get optionsPrefix() {
         return `${this.id}:`;
@@ -94,8 +96,18 @@ export default class CurrentUserService extends Service.extend(Evented) {
             // Set environment from user option
             this.theme.setEnvironment();
 
-            // Load user preferces
-            await this.loadPreferences();
+            // Set locale
+            if (user.locale) {
+                this.setLocale(user.locale);
+            } else {
+                await this.loadLocale();
+            }
+
+            // Load user whois data
+            await this.loadWhois();
+
+            // Load user organizations
+            await this.loadOrganizations();
 
             // Optional callback
             if (typeof options?.onUserResolved === 'function') {
@@ -118,9 +130,7 @@ export default class CurrentUserService extends Service.extend(Evented) {
     async loadLocale() {
         try {
             const { locale } = await this.fetch.get('users/locale');
-            this.setOption('locale', locale);
-            this.intl.setLocale(locale);
-            this.locale = locale;
+            this.setLocale(locale);
 
             return locale;
         } catch (error) {
@@ -207,6 +217,14 @@ export default class CurrentUserService extends Service.extend(Evented) {
         return this.getWhoisProperty(key);
     }
 
+    setLocale(locale) {
+        this.setOption('locale', locale);
+        this.intl.setLocale(locale);
+        this.locale = locale;
+
+        return this;
+    }
+
     setOption(key, value) {
         key = `${this.optionsPrefix}${dasherize(key)}`;
 

package/addon/services/fetch.js

@@ -360,6 +360,7 @@ export default class FetchService extends Service {
         const pathKeyVersion = new Date().toISOString();
 
         const request = () => {
+            delete options.fromCache;
             return this.get(path, query, options).then((response) => {
                 // cache the response
                 this.localCache.set(pathKey, response);
@@ -392,7 +393,7 @@ export default class FetchService extends Service {
                 // if the version is older than 3 days clear it
                 if (!version || shouldExpire || options.clearData === true) {
                     this.flushRequestCache(path);
-                    return request();
+                    return request().then(resolve);
                 }
 
                 if (options.normalizeToEmberData) {
@@ -408,6 +409,11 @@ export default class FetchService extends Service {
         return request();
     }
 
+    /**
+     * Flushes the local cache for a specific path by setting its value and version to undefined.
+     *
+     * @param {string} path - The path for which the cache should be flushed.
+     */
     flushRequestCache(path) {
         const pathKey = dasherize(path);
 
@@ -415,6 +421,11 @@ export default class FetchService extends Service {
         this.localCache.set(`${pathKey}-version`, undefined);
     }
 
+    /**
+     * Determines whether the cache should be reset by comparing the current version
+     * of the console with the cached version. If they differ, the cache is cleared
+     * and the new version is saved.
+     */
     shouldResetCache() {
         const consoleVersion = this.localCache.get('console-version');
 

package/addon/services/session.js

@@ -2,12 +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 {
     @service router;
     @service currentUser;
     @service fetch;
+    @service notifications;
 
     /**
      * Set where to transition to
@@ -52,10 +54,7 @@ export default class SessionService extends SimpleAuthSessionService {
         }
 
         const loaderNode = this.showLoader('Starting session...');
-        this.isLoaderNodeOpen = true;
-
-        try {
-            await this.router.transitionTo(this.redirectTo);
+        const removeLoaderNode = () => {
             later(
                 this,
                 () => {
@@ -63,11 +62,18 @@ export default class SessionService extends SimpleAuthSessionService {
                     document.body.removeChild(loaderNode);
                     this.isLoaderNodeOpen = false;
                 },
-                600 * 6
+                600 * 3
             );
+        };
+        this.isLoaderNodeOpen = true;
+
+        try {
+            await this.router.transitionTo(this.redirectTo);
         } catch (error) {
-            this.notifications.serverError(error);
+            debug(`Session's handleAuthentication() failed to transition: ${error.message}`);
         }
+
+        removeLoaderNode();
     }
 
     /**
@@ -114,6 +120,7 @@ export default class SessionService extends SimpleAuthSessionService {
             if (transition) {
                 transition.abort();
             }
+
             await invalidateWithLoader(error.message ?? 'Session authentication failed...');
             throw error;
         }
@@ -154,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;
     }