@afeefa/vue-app 0.0.108 → 0.0.109

package/.afeefa/package/release/version.txt

@@ -1 +1 @@
-0.0.108
+0.0.109

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afeefa/vue-app",
-  "version": "0.0.108",
+  "version": "0.0.109",
   "description": "",
   "author": "Afeefa Kollektiv <kollektiv@afeefa.de>",
   "license": "MIT",

package/src-admin/bootstrap.js

@@ -2,7 +2,7 @@ import './config/event-bus'
 import './config/components'
 import './directives'
 
-import { hasRightsPlugin } from '@a-admin/plugins/translation/HasRightsPlugin'
+import { authPlugin } from '@a-admin/plugins/AuthPlugin'
 import { translationPlugin } from '@a-admin/plugins/translation/TranslationPlugin'
 import { apiResourcesPlugin } from '@a-vue/plugins/api-resources/ApiResourcesPlugin'
 import { hasOptionsPlugin } from '@a-vue/plugins/has-options/HasOptionsPlugin'
@@ -20,12 +20,18 @@ Vue.use(translationPlugin)
 Vue.config.productionTip = false
 
 export async function bootstrap ({ apis, models, routing, authService, getTranslations, app, components }) {
-  apiResourcesPlugin.register(models, apis)
-
   appConfig.authService = authService
   appConfig.app = app
   appConfig.components = components
 
+  if (authService) {
+    const authenticated = await authService.authenticate()
+    if (!authenticated) {
+      return
+    }
+    Vue.use(authPlugin)
+  }
+
   const splash = new Vue({
     vuetify,
     el: '#splash',
@@ -35,8 +41,15 @@ export async function bootstrap ({ apis, models, routing, authService, getTransl
     }
   })
 
+  if (authService) {
+    await authService.init()
+  }
+
+  apiResourcesPlugin.register(models, apis)
+
   routing(routeConfigPlugin)
   const router = await routeConfigPlugin.getRouter()
+
   await apiResourcesPlugin.schemasLoaded()
 
   if (getTranslations) {
@@ -44,12 +57,6 @@ export async function bootstrap ({ apis, models, routing, authService, getTransl
     translationPlugin.setTranslations(translations.models)
   }
 
-  if (authService) {
-    Vue.use(hasRightsPlugin)
-
-    authService.initApp(router)
-  }
-
   // routeConfigPlugin.dumpRoutes()
   // routeConfigPlugin.dumbBreadcrumbs()
 

package/src-admin/components/App.vue

@@ -143,16 +143,10 @@ import '../styles.scss'
 export default class App extends Vue {
   drawer = true
   isLoading = false
-  account = null
 
   created () {
     this.$events.on(LoadingEvent.START_LOADING, this.startLoading)
     this.$events.on(LoadingEvent.STOP_LOADING, this.stopLoading)
-
-    if (this.hasAuthService) {
-      this.account = appConfig.authService.getAccount()
-    }
-
     this.$emit('appLoaded')
   }
 
@@ -164,6 +158,13 @@ export default class App extends Vue {
     return appConfig.app.logo
   }
 
+  get account () {
+    if (this.hasAuthService) {
+      return this.$auth.account
+    }
+    return null
+  }
+
   get title () {
     return appConfig.app.title
   }
@@ -189,11 +190,11 @@ export default class App extends Vue {
   }
 
   get hasAuthService () {
-    return !!appConfig.authService
+    return !!this.$auth
   }
 
   logout () {
-    appConfig.authService.forwardToLogoutEndpoint()
+    this.$auth.logout()
   }
 }
 </script>

package/src-admin/components/routes/DataRouteMixin.js

@@ -1,4 +1,4 @@
-import { Component, Watch, Vue } from '@a-vue'
+import { Component, Vue, Watch } from '@a-vue'
 
 Component.registerHooks([
   'beforeRouteEnter',
@@ -50,7 +50,7 @@ export class DataRouteMixin extends Vue {
 
   // watches (if defined) route idKey and reloads data if changed
   @Watch('drm_id')
-  async routeParamsChanged () {
+  async drm_routeParamsChanged () {
     if (routerHookCalled) {
       return
     }

package/src-admin/plugins/AuthPlugin.js

@@ -0,0 +1,21 @@
+import { appConfig } from '../config/AppConfig'
+
+class AuthPlugin {
+  install (Vue) {
+    const authService = appConfig.authService
+    const $auth = {
+      account: authService.getCurrentAccount(),
+
+      hasRight: name => authService.currentAccountHasRight(name),
+
+      hasRole: name => authService.currentAccountHasRole(name),
+
+      logout: () => authService.forwardToLogoutEndpoint()
+    }
+
+    Vue.prototype.$auth = $auth
+    Vue.$auth = $auth
+  }
+}
+
+export const authPlugin = new AuthPlugin()

package/src-admin/plugins/translation/HasRightsPlugin.js

@@ -1,15 +0,0 @@
-import { authService } from '@k-vue/auth/AuthService'
-
-class HasRightsPlugin {
-  install (Vue) {
-    Vue.mixin({
-      created () {
-        this.$hasRight = name => {
-          return authService.currentAccountHasRight(name)
-        }
-      }
-    })
-  }
-}
-
-export const hasRightsPlugin = new HasRightsPlugin()