From ab57109671a151077592e3a602965278fed03895 Mon Sep 17 00:00:00 2001 From: Jonas Cosandey Date: Thu, 5 Jul 2018 12:55:52 +0200 Subject: [PATCH 1/6] add new access type to frontend and rename sysupport to timed --- backend/config-test.js | 2 +- backend/config.example.js | 3 + backend/src/app.js | 2 +- backend/src/login/index.js | 8 +-- backend/src/services.js | 4 +- backend/src/{sysupport => timed}/custom.js | 0 backend/src/{sysupport => timed}/proxy.js | 9 ++- backend/src/{sysupport => timed}/token.js | 0 backend/src/user/model.js | 14 ++++- frontend/app/adapters/application.js | 2 +- frontend/app/gitlab/route.js | 5 +- frontend/app/helpers/format-duration.js | 4 +- frontend/app/locales/de/translations.js | 10 ++-- frontend/app/locales/en/translations.js | 10 ++-- frontend/app/mixins/route-access-mixin.js | 13 ++++- frontend/app/models/user.js | 8 ++- frontend/app/protected/template.hbs | 24 ++++---- frontend/app/router.js | 4 +- .../confirm-subscriptions/route.js | 6 +- .../confirm-subscriptions/template.hbs | 10 ++-- .../detail/controller.js | 11 +++- .../detail/route.js | 0 .../detail/template.hbs | 34 +++++------ .../index/controller.js | 14 ++--- .../index/route.js | 2 +- .../index/template.hbs | 4 +- .../route.js | 5 +- .../template.hbs | 0 .../detail/index/route.js | 2 +- .../detail/index/template.hbs | 18 +++--- .../detail/reload/controller.js | 6 +- .../detail/reload/route.js | 4 +- .../detail/reload/template.hbs | 6 +- .../detail/route.js | 0 .../index/route.js | 2 +- .../index/template.hbs | 16 +++--- .../route.js | 5 +- .../template.hbs | 0 frontend/config/environment.js | 11 ++-- frontend/mirage/config.js | 30 ++++------ frontend/mirage/factories/user.js | 11 +++- frontend/mirage/scenarios/default.js | 3 +- ...port-admin-test.js => timed-admin-test.js} | 20 +++---- .../timed-subscription-project-detail-test.js | 12 ++-- .../unit/helpers/service-enabled-test.js | 2 +- .../unit/mixins/route-access-mixin-test.js | 18 ++++-- .../confirm-subscriptions/route-test.js | 11 ---- .../detail/reload/route-test.js | 11 ---- .../confirm-subscriptions}/route-test.js | 4 +- .../detail/controller-test.js | 12 ++-- .../detail}/route-test.js | 4 +- .../index/controller-test.js | 4 +- .../index/route-test.js | 4 +- .../route-test.js | 4 +- .../detail/index/route-test.js | 11 ++++ .../detail/reload/route-test.js | 11 ++++ .../index}/route-test.js | 4 +- tools/docker/ldap/ldap.ldif/default.ldif | 56 ++++++++++++++++--- tools/docker/postgres/timed-test-data.sql | 6 +- tools/docker/ucs/scripts/create-new-admin.sh | 4 +- yarn.lock | 4 ++ 61 files changed, 314 insertions(+), 210 deletions(-) rename backend/src/{sysupport => timed}/custom.js (100%) rename backend/src/{sysupport => timed}/proxy.js (94%) rename backend/src/{sysupport => timed}/token.js (100%) rename frontend/app/{sysupport-admin => timed-admin}/confirm-subscriptions/route.js (77%) rename frontend/app/{sysupport-admin => timed-admin}/confirm-subscriptions/template.hbs (83%) rename frontend/app/{sysupport-admin => timed-admin}/detail/controller.js (89%) rename frontend/app/{sysupport-admin => timed-admin}/detail/route.js (100%) rename frontend/app/{sysupport-admin => timed-admin}/detail/template.hbs (84%) rename frontend/app/{sysupport-admin => timed-admin}/index/controller.js (78%) rename frontend/app/{sysupport-admin => timed-admin}/index/route.js (88%) rename frontend/app/{sysupport-admin => timed-admin}/index/template.hbs (93%) rename frontend/app/{sysupport-subscriptions => timed-admin}/route.js (66%) rename frontend/app/{sysupport-admin => timed-admin}/template.hbs (100%) rename frontend/app/{sysupport-subscriptions => timed-subscriptions}/detail/index/route.js (84%) rename frontend/app/{sysupport-subscriptions => timed-subscriptions}/detail/index/template.hbs (79%) rename frontend/app/{sysupport-subscriptions => timed-subscriptions}/detail/reload/controller.js (78%) rename frontend/app/{sysupport-subscriptions => timed-subscriptions}/detail/reload/route.js (77%) rename frontend/app/{sysupport-subscriptions => timed-subscriptions}/detail/reload/template.hbs (90%) rename frontend/app/{sysupport-subscriptions => timed-subscriptions}/detail/route.js (100%) rename frontend/app/{sysupport-subscriptions => timed-subscriptions}/index/route.js (84%) rename frontend/app/{sysupport-subscriptions => timed-subscriptions}/index/template.hbs (63%) rename frontend/app/{sysupport-admin => timed-subscriptions}/route.js (68%) rename frontend/app/{sysupport-subscriptions => timed-subscriptions}/template.hbs (100%) rename frontend/tests/acceptance/{sysupport-admin-test.js => timed-admin-test.js} (86%) delete mode 100644 frontend/tests/unit/sysupport-admin/confirm-subscriptions/route-test.js delete mode 100644 frontend/tests/unit/sysupport-subscriptions/detail/reload/route-test.js rename frontend/tests/unit/{sysupport-subscriptions/detail/index => timed-admin/confirm-subscriptions}/route-test.js (51%) rename frontend/tests/unit/{sysupport-admin => timed-admin}/detail/controller-test.js (87%) rename frontend/tests/unit/{sysupport-admin/index => timed-admin/detail}/route-test.js (56%) rename frontend/tests/unit/{sysupport-admin => timed-admin}/index/controller-test.js (87%) rename frontend/tests/unit/{sysupport-subscriptions => timed-admin}/index/route-test.js (55%) rename frontend/tests/unit/{sysupport-admin => timed-admin}/route-test.js (58%) create mode 100644 frontend/tests/unit/timed-subscriptions/detail/index/route-test.js create mode 100644 frontend/tests/unit/timed-subscriptions/detail/reload/route-test.js rename frontend/tests/unit/{sysupport-admin/detail => timed-subscriptions/index}/route-test.js (55%) create mode 100644 yarn.lock diff --git a/backend/config-test.js b/backend/config-test.js index 756610bc..88edc36f 100644 --- a/backend/config-test.js +++ b/backend/config-test.js @@ -86,7 +86,7 @@ module.exports = { timed: { type: 'timed', host: 'http://timedbackend', - user: 'sysupport_api', + user: 'timed_api', password: 'hallo123', prefix: '/api/v1', authPath: '/auth/login', diff --git a/backend/config.example.js b/backend/config.example.js index b3a63758..72ed4237 100644 --- a/backend/config.example.js +++ b/backend/config.example.js @@ -12,6 +12,9 @@ module.exports = { cert: '/path/to/root_ca_cert.crt' }, login: { + adminRole: 'some-role', + internRole: 'some-other-role', + ldap: { // Further information how to configure LDAP under: // https://github.com/vesse/passport-ldapauth diff --git a/backend/src/app.js b/backend/src/app.js index 369a18e9..0c9f60af 100644 --- a/backend/src/app.js +++ b/backend/src/app.js @@ -10,7 +10,7 @@ import passwordreset from './password-reset' import services from './services' import userRoute from './user/route' import vaultTokenRenewer from './vault/vault-token' -import { timedTokenRenew } from './sysupport/token' +import { timedTokenRenew } from './timed/token' import config from './config' const app = express() diff --git a/backend/src/login/index.js b/backend/src/login/index.js index c58803e5..25b94b72 100644 --- a/backend/src/login/index.js +++ b/backend/src/login/index.js @@ -5,8 +5,8 @@ import passport from 'passport' import LdapStrategy from 'passport-ldapauth' import User from '../user/model' import config from '../config' -import { timedLogin } from '../sysupport/token' -import { getCustomer as getTimedCustomer } from '../sysupport/custom' +import { timedLogin } from '../timed/token' +import { getCustomer as getTimedCustomer } from '../timed/custom' passport.use( 'ldapauth-user', @@ -115,8 +115,8 @@ function loginSuccessful(req, res, next, ldapUser) { ) } - // If user is in the sysupport group, get timed token - if (isMember('sysupport')) { + // If user is in the timed group, get timed token + if (isMember('timed')) { req.session = await addTimedTokenToSession( req.session, users.get(ldapUser) diff --git a/backend/src/services.js b/backend/src/services.js index 1d9287f1..f2fddf8e 100644 --- a/backend/src/services.js +++ b/backend/src/services.js @@ -1,7 +1,7 @@ import express from 'express' import VaultProxy from './vault/vault-proxy' import vaultCustom from './vault/vault-custom' -import SysupportProxy from './sysupport/proxy' +import TimedProxy from './timed/proxy' import gitlabProxy from './gitlab/proxy' import config from './config' @@ -12,7 +12,7 @@ const { vault, timed, gitlab } = config.services router.use('/vault', vaultCustom(vault)) router.use('/proxy/vault', VaultProxy.createProxy(vault)) -router.use('/proxy/sysupport', SysupportProxy.createProxy(timed)) +router.use('/proxy/timed', TimedProxy.createProxy(timed)) router.use('/proxy/gitlab', gitlabProxy(gitlab)) diff --git a/backend/src/sysupport/custom.js b/backend/src/timed/custom.js similarity index 100% rename from backend/src/sysupport/custom.js rename to backend/src/timed/custom.js diff --git a/backend/src/sysupport/proxy.js b/backend/src/timed/proxy.js similarity index 94% rename from backend/src/sysupport/proxy.js rename to backend/src/timed/proxy.js index 02359469..247b6fbc 100644 --- a/backend/src/sysupport/proxy.js +++ b/backend/src/timed/proxy.js @@ -6,6 +6,7 @@ const routes = { path: /^\/subscription-projects(\/[1-9][0-9]*|)$/, access: { admin: ['GET'], + user: ['GET'], customer: ['GET'] } }, @@ -19,13 +20,15 @@ const routes = { path: /^\/subscription-orders$/, access: { admin: ['GET', 'DELETE', 'POST'], + user: ['GET', 'DELETE'], customer: ['GET', 'POST'] } }, subscriptionOrder: { path: /^\/subscription-orders\/[1-9][0-9]*$/, access: { - admin: ['DELETE'] + admin: ['DELETE'], + user: ['DELETE'] } }, subscriptionOrderConfirm: { @@ -38,13 +41,15 @@ const routes = { path: /^\/reports$/, access: { admin: ['GET'], + user: ['GET'], customer: ['GET'] } }, customer: { path: /^\/customers(\/[1-9][0-9]*|)$/, access: { - admin: ['GET'] + admin: ['GET'], + user: ['GET'] } } } diff --git a/backend/src/sysupport/token.js b/backend/src/timed/token.js similarity index 100% rename from backend/src/sysupport/token.js rename to backend/src/timed/token.js diff --git a/backend/src/user/model.js b/backend/src/user/model.js index 6cd9a567..e1c4a337 100644 --- a/backend/src/user/model.js +++ b/backend/src/user/model.js @@ -6,8 +6,7 @@ const { isArray } = Array const bookshelf = new Bookshelf(knex(config.database)) /** - * User model - * + * User model * * @class User * @public */ @@ -71,6 +70,17 @@ export default bookshelf.Model.extend( return this.getGroupNames().includes(config.login.adminRole) }, + /** + * Check if user is inter + * + * @returns {boolean} + * @public + * @author Jonas Cosandey (jonas.cosandey@adfinis-sygroup.ch) + */ + isAdsyUser() { + return this.getGroupNames().includes(config.login.internRole) + }, + /** * Does this user have redmine access? * diff --git a/frontend/app/adapters/application.js b/frontend/app/adapters/application.js index 79197e2b..a481a8e5 100644 --- a/frontend/app/adapters/application.js +++ b/frontend/app/adapters/application.js @@ -2,7 +2,7 @@ import DS from 'ember-data' import DataAdapterMixin from 'ember-simple-auth/mixins/data-adapter-mixin' export default DS.JSONAPIAdapter.extend(DataAdapterMixin, { - namespace: '/api/proxy/sysupport', + namespace: '/api/proxy/timed', authorize(xhr) { if (this.get('session.data.authenticated.data.token')) { xhr.setRequestHeader( diff --git a/frontend/app/gitlab/route.js b/frontend/app/gitlab/route.js index 26283d4f..904eb068 100644 --- a/frontend/app/gitlab/route.js +++ b/frontend/app/gitlab/route.js @@ -6,7 +6,10 @@ import { computed } from '@ember/object' export default Route.extend(RouteAccessMixin, { //specify which groups have access to this route. - groups: computed(() => ['adsy-customer', 'gitlab']), + groups: computed(() => ({ + requireAll: ['gitlab'], + requireOne: ['adsy-customer'] + })), i18n: service(), session: service(), diff --git a/frontend/app/helpers/format-duration.js b/frontend/app/helpers/format-duration.js index 2866c7a8..593d09e5 100644 --- a/frontend/app/helpers/format-duration.js +++ b/frontend/app/helpers/format-duration.js @@ -12,8 +12,8 @@ export default Helper.extend({ hoursCount: 0, minutesCount: 0, - hoursTranslation: t('sysupport.durations.hour', { count: 'hoursCount' }), - minutesTranslation: t('sysupport.durations.minute', { + hoursTranslation: t('timed.durations.hour', { count: 'hoursCount' }), + minutesTranslation: t('timed.durations.minute', { count: 'minutesCount' }), diff --git a/frontend/app/locales/de/translations.js b/frontend/app/locales/de/translations.js index 9e90c58b..806688a7 100644 --- a/frontend/app/locales/de/translations.js +++ b/frontend/app/locales/de/translations.js @@ -57,8 +57,8 @@ export default { symonitoring: 'SyMonitoring', 'symonitoring.description': 'Überwachung von Server und Diensten', - sysupport: 'SySupport', - 'sysupport.description': 'Support Abonnemente', + timed: 'Credits / Reports', + 'timed.description': 'Support Abonnemente', ppa: 'PPA', 'ppa.description': 'Verwaltung ihrer Webhostings', @@ -74,7 +74,7 @@ export default { nav: { dashboard: 'Übersicht', vault: 'Vault', - sysupport: 'SySupport', + timed: 'Credits / Reports', gitlab: 'Projekte', settings: 'Einstellungen', logout: 'Logout' @@ -92,7 +92,7 @@ export default { 'Das Passwort konnte nicht in die Zwischenablage kopiert werden.' }, - sysupport: { + timed: { breadcrumbs: { reload: 'Aufladen', overview: 'Übersicht' @@ -120,7 +120,7 @@ export default { }, index: { - title: 'Sysupport Abonnements', + title: 'Abonnements', charge: 'Aufladen', details: 'Details' }, diff --git a/frontend/app/locales/en/translations.js b/frontend/app/locales/en/translations.js index f6d0f4ed..401ac795 100644 --- a/frontend/app/locales/en/translations.js +++ b/frontend/app/locales/en/translations.js @@ -57,8 +57,8 @@ export default { symonitoring: 'SyMonitoring', 'symonitoring.description': 'Monitoring of servers and services', - sysupport: 'SySupport', - 'sysupport.description': 'Support subscriptions', + timed: 'Credits / Reports', + 'timed.description': 'Support subscriptions', ppa: 'PPA', 'ppa.description': 'Manage your web-hostings', @@ -74,7 +74,7 @@ export default { nav: { dashboard: 'Dashboard', vault: 'Vault', - sysupport: 'SySupport', + timed: 'Credits / Reports', gitlab: 'Projects', settings: 'Settings', logout: 'Sign out' @@ -91,7 +91,7 @@ export default { 'clipboard-error': 'The secret could not be saved to your clipboard.' }, - sysupport: { + timed: { breadcrumbs: { reload: 'Reload', overview: 'Overview' @@ -118,7 +118,7 @@ export default { } }, index: { - title: 'Sysupport Subscriptions', + title: 'Credits / Reports', charge: 'Reload', details: 'Details' }, diff --git a/frontend/app/mixins/route-access-mixin.js b/frontend/app/mixins/route-access-mixin.js index a6b4387b..224a743a 100644 --- a/frontend/app/mixins/route-access-mixin.js +++ b/frontend/app/mixins/route-access-mixin.js @@ -12,8 +12,17 @@ export default Mixin.create({ }, _hasPermissions(user) { - return this.groups.every( - role => user.get(role) || user.get('groups').includes(role) + return ( + (this.groups.requireAll + ? this.groups.requireAll.every( + role => user.get(role) || user.get('groups').includes(role) + ) + : true) && + (this.groups.requireAll + ? this.groups.requireOne.some( + role => user.get(role) || user.get('groups').includes(role) + ) + : true) ) } }) diff --git a/frontend/app/models/user.js b/frontend/app/models/user.js index 024fba8c..dddbf561 100644 --- a/frontend/app/models/user.js +++ b/frontend/app/models/user.js @@ -29,8 +29,8 @@ export default Model.extend({ return this._checkGroup('vault') }), - sysupport: computed('groups.[]', function() { - return this._checkGroup('sysupport') + timed: computed('groups.[]', function() { + return this._checkGroup('timed') }), gitlab: computed('groups.[]', function() { @@ -64,6 +64,10 @@ export default Model.extend({ return this._checkGroup(ENV.APP.adminGroup) }), + adsyUser: computed('groups.[]', function() { + return this._checkGroup(ENV.APP.adsyUserGroup) + }), + _checkGroup(name) { return this.groups.find(g => g.endsWith(name)) } diff --git a/frontend/app/protected/template.hbs b/frontend/app/protected/template.hbs index 144c4a69..a222ccc5 100644 --- a/frontend/app/protected/template.hbs +++ b/frontend/app/protected/template.hbs @@ -35,18 +35,20 @@ {{#list.item 'gitlab'}}{{t 'nav.gitlab'}}{{/list.item}} {{/if}} - {{#if (and (service-enabled 'sysupport') model.sysupport)}} - {{#if model.admin}} - {{#list.item 'sysupport-admin' }}{{t 'nav.sysupport'}}{{/list.item}} - + {{#if (and (service-enabled 'timed') model.timed)}} + {{#if (or model.adsyUser model.admin)}} + {{#list.item 'timed-admin' }}{{t 'nav.timed'}}{{/list.item}} + {{#if model.admin}} + + {{/if}} {{else}} - {{#list.item 'sysupport-subscriptions' }}{{t 'nav.sysupport'}}{{/list.item}} + {{#list.item 'timed-subscriptions' }}{{t 'nav.timed'}}{{/list.item}} {{/if}} {{/if}} {{/nav.list}} diff --git a/frontend/app/router.js b/frontend/app/router.js index 8ba8cda4..ce351f92 100644 --- a/frontend/app/router.js +++ b/frontend/app/router.js @@ -18,12 +18,12 @@ Router.map(function() { this.route('vault', { resetNamespace: true }, function() { this.route('edit', { path: '/*path' }) }) - this.route('sysupport-subscriptions', { resetNamespace: true }, function() { + this.route('timed-subscriptions', { resetNamespace: true }, function() { this.route('detail', { path: ':project_id' }, function() { this.route('reload') }) }) - this.route('sysupport-admin', { resetNamespace: true }, function() { + this.route('timed-admin', { resetNamespace: true }, function() { this.route('detail', { path: ':project' }) this.route('confirm-subscriptions') }) diff --git a/frontend/app/sysupport-admin/confirm-subscriptions/route.js b/frontend/app/timed-admin/confirm-subscriptions/route.js similarity index 77% rename from frontend/app/sysupport-admin/confirm-subscriptions/route.js rename to frontend/app/timed-admin/confirm-subscriptions/route.js index 9c26904c..986103b5 100644 --- a/frontend/app/sysupport-admin/confirm-subscriptions/route.js +++ b/frontend/app/timed-admin/confirm-subscriptions/route.js @@ -8,7 +8,7 @@ export default Route.extend({ init() { this._super(...arguments) this.set('breadCrumb', { - title: this.i18n.t('sysupport.admin.confirm-subscription') + title: this.i18n.t('timed.admin.confirm-subscription') }) }, @@ -34,14 +34,14 @@ export default Route.extend({ order.confirm() order.unloadRecord() this.notify.info( - this.i18n.t('sysupport.admin.confirmSuccess', order.get('project.name')) + this.i18n.t('timed.admin.confirmSuccess', order.get('project.name')) ) }, _deny(order) { order.destroyRecord() this.notify.info( - this.i18n.t('sysupport.admin.confirmDeny', order.get('project.name')) + this.i18n.t('timed.admin.confirmDeny', order.get('project.name')) ) } }) diff --git a/frontend/app/sysupport-admin/confirm-subscriptions/template.hbs b/frontend/app/timed-admin/confirm-subscriptions/template.hbs similarity index 83% rename from frontend/app/sysupport-admin/confirm-subscriptions/template.hbs rename to frontend/app/timed-admin/confirm-subscriptions/template.hbs index 87053122..9c76d523 100644 --- a/frontend/app/sysupport-admin/confirm-subscriptions/template.hbs +++ b/frontend/app/timed-admin/confirm-subscriptions/template.hbs @@ -1,11 +1,11 @@ -

{{t 'sysupport.admin.confirm-subscription'}}

+

{{t 'timed.admin.confirm-subscription'}}

- - - - + + + + diff --git a/frontend/app/sysupport-admin/detail/controller.js b/frontend/app/timed-admin/detail/controller.js similarity index 89% rename from frontend/app/sysupport-admin/detail/controller.js rename to frontend/app/timed-admin/detail/controller.js index 783bbcc6..dbf1aadc 100644 --- a/frontend/app/sysupport-admin/detail/controller.js +++ b/frontend/app/timed-admin/detail/controller.js @@ -10,6 +10,7 @@ import UIkit from 'UIkit' export default Controller.extend({ i18n: service(), notify: service(), + session: service(), duration: computed('validation.{hour,minute}', 'hour', 'minute', function() { if (this.get('validation.hour') || this.get('validation.minute')) { @@ -27,6 +28,10 @@ export default Controller.extend({ ) }), + isAdmin: computed('session', async function() { + return await this.get('session.user').isAdmin + }), + orders: computed('fetchModels.lastSuccessful.value', function() { return ( this.get('fetchModels.lastSuccessful.value.orders') || @@ -82,7 +87,7 @@ export default Controller.extend({ ) }) } catch (e) { - this.notify.error(this.i18n.t('sysupport.reload.error-loading')) + this.notify.error(this.i18n.t('timed.reload.error-loading')) } }).drop(), @@ -95,11 +100,11 @@ export default Controller.extend({ }) yield order.save() - this.notify.success(this.i18n.t('sysupport.reload.success')) + this.notify.success(this.i18n.t('timed.reload.success')) UIkit.accordion('[data-reload-acc]').toggle() this.setProperties({ hour: null, minute: null }) } catch (e) { - this.notify.error(this.i18n.t('sysupport.reload.error')) + this.notify.error(this.i18n.t('timed.reload.error')) } finally { this.fetchModels.perform() this.set('preview', false) diff --git a/frontend/app/sysupport-admin/detail/route.js b/frontend/app/timed-admin/detail/route.js similarity index 100% rename from frontend/app/sysupport-admin/detail/route.js rename to frontend/app/timed-admin/detail/route.js diff --git a/frontend/app/sysupport-admin/detail/template.hbs b/frontend/app/timed-admin/detail/template.hbs similarity index 84% rename from frontend/app/sysupport-admin/detail/template.hbs rename to frontend/app/timed-admin/detail/template.hbs index cea0c75f..df26a044 100644 --- a/frontend/app/sysupport-admin/detail/template.hbs +++ b/frontend/app/timed-admin/detail/template.hbs @@ -1,11 +1,12 @@ +{{#if (get (await session.user) 'admin')}}
+{{/if}}
@@ -46,19 +48,19 @@
-
{{t 'sysupport.admin.customer'}}:
+
{{t 'timed.admin.customer'}}:
{{project.customer.name}}
-
{{t 'sysupport.admin.billingType'}}:
+
{{t 'timed.admin.billingType'}}:
{{project.billingType.name}}
-
{{t 'sysupport.time.total'}}:
+
{{t 'timed.time.total'}}:
{{format-duration (if (and duration preview) previewDuration project.totalTime) }}
-
{{t 'sysupport.time.unconfirmed'}}:
+
{{t 'timed.time.unconfirmed'}}:
{{format-duration project.unconfirmedTime}}
@@ -70,16 +72,16 @@ {{#uk-card as |card|}} {{#card.header}} {{#card.title}} - {{t 'sysupport.detail.charges'}} + {{t 'timed.detail.charges'}} {{/card.title}} {{/card.header}} {{#card.body}}
{{t 'sysupport.admin.customer'}}{{t 'sysupport.admin.project'}}{{t 'sysupport.hours'}}{{t 'sysupport.date'}}{{t 'timed.admin.customer'}}{{t 'timed.admin.project'}}{{t 'timed.hours'}}{{t 'timed.date'}}
- - - + + + @@ -106,17 +108,17 @@ {{#uk-card as |card|}} {{#card.header}} {{#card.title}} - {{t 'sysupport.detail.expense'}} + {{t 'timed.detail.expense'}} {{/card.title}} {{/card.header}} {{#card.body}}
{{t 'sysupport.date'}}{{t 'sysupport.detail.amount'}}{{t 'sysupport.detail.acknowledged'}}{{t 'timed.date'}}{{t 'timed.detail.amount'}}{{t 'timed.detail.acknowledged'}}
- - - - + + + + diff --git a/frontend/app/sysupport-admin/index/controller.js b/frontend/app/timed-admin/index/controller.js similarity index 78% rename from frontend/app/sysupport-admin/index/controller.js rename to frontend/app/timed-admin/index/controller.js index 0247ae48..f55f2f44 100644 --- a/frontend/app/sysupport-admin/index/controller.js +++ b/frontend/app/timed-admin/index/controller.js @@ -6,40 +6,40 @@ export default Controller.extend({ return [ { type: 'search', - title: 'sysupport.admin.project', + title: 'timed.admin.project', attr: 'name' }, { type: 'search', - title: 'sysupport.admin.customer', + title: 'timed.admin.customer', attr: 'customer.name' }, { type: 'search', - title: 'sysupport.admin.billingType', + title: 'timed.admin.billingType', attr: 'billingType.name' }, { type: 'sort', - title: 'sysupport.time.ordered', + title: 'timed.time.ordered', attr: 'purchasedTime', customFilter: this._sortDurations }, { type: 'sort', - title: 'sysupport.time.used', + title: 'timed.time.used', attr: 'spentTime', customFilter: this._sortDurations }, { type: 'sort', - title: 'sysupport.time.total', + title: 'timed.time.total', attr: 'totalTime', customFilter: this._sortDurations }, { type: 'sort', - title: 'sysupport.time.unconfirmed', + title: 'timed.time.unconfirmed', attr: 'unconfirmedTime', customFilter: this._sortDurations } diff --git a/frontend/app/sysupport-admin/index/route.js b/frontend/app/timed-admin/index/route.js similarity index 88% rename from frontend/app/sysupport-admin/index/route.js rename to frontend/app/timed-admin/index/route.js index 969ed3f3..fcae7b50 100644 --- a/frontend/app/sysupport-admin/index/route.js +++ b/frontend/app/timed-admin/index/route.js @@ -7,7 +7,7 @@ export default Route.extend({ init() { this._super(...arguments) this.set('breadCrumb', { - title: this.i18n.t('sysupport.admin.admin') + title: this.i18n.t('timed.admin.admin') }) }, diff --git a/frontend/app/sysupport-admin/index/template.hbs b/frontend/app/timed-admin/index/template.hbs similarity index 93% rename from frontend/app/sysupport-admin/index/template.hbs rename to frontend/app/timed-admin/index/template.hbs index 7a98d0c9..cc60d4c2 100644 --- a/frontend/app/sysupport-admin/index/template.hbs +++ b/frontend/app/timed-admin/index/template.hbs @@ -1,9 +1,9 @@ -

{{t 'sysupport.admin.projects'}}

+

{{t 'timed.admin.projects'}}

{{#cc-data-table headers=headers model=model as |results|}} {{#each results as |project index|}} - {{#link-to "sysupport-admin.detail" project.id + {{#link-to "timed-admin.detail" project.id data-test-project=index class=(concat "uk-link-reset pointer " (if project.isTimeAlmostConsumed "highlight-left")) diff --git a/frontend/app/sysupport-subscriptions/route.js b/frontend/app/timed-admin/route.js similarity index 66% rename from frontend/app/sysupport-subscriptions/route.js rename to frontend/app/timed-admin/route.js index 988289b1..b755280d 100644 --- a/frontend/app/sysupport-subscriptions/route.js +++ b/frontend/app/timed-admin/route.js @@ -3,5 +3,8 @@ import { computed } from '@ember/object' import RouteAccessMixin from 'customer-center/mixins/route-access-mixin' export default Route.extend(RouteAccessMixin, { - groups: computed(() => ['sysupport', 'adsy-customer']) + groups: computed(() => ({ + requireAll: ['timed'], + requireOne: ['adsy-user', 'adsy-admin'] + })) }) diff --git a/frontend/app/sysupport-admin/template.hbs b/frontend/app/timed-admin/template.hbs similarity index 100% rename from frontend/app/sysupport-admin/template.hbs rename to frontend/app/timed-admin/template.hbs diff --git a/frontend/app/sysupport-subscriptions/detail/index/route.js b/frontend/app/timed-subscriptions/detail/index/route.js similarity index 84% rename from frontend/app/sysupport-subscriptions/detail/index/route.js rename to frontend/app/timed-subscriptions/detail/index/route.js index cca715ad..aa79baf7 100644 --- a/frontend/app/sysupport-subscriptions/detail/index/route.js +++ b/frontend/app/timed-subscriptions/detail/index/route.js @@ -3,7 +3,7 @@ import { hash } from 'rsvp' export default Route.extend({ model() { - let project = this.modelFor('sysupport-subscriptions.detail').id + let project = this.modelFor('timed-subscriptions.detail').id return hash({ reports: this.store.query('timed-report', { project, diff --git a/frontend/app/sysupport-subscriptions/detail/index/template.hbs b/frontend/app/timed-subscriptions/detail/index/template.hbs similarity index 79% rename from frontend/app/sysupport-subscriptions/detail/index/template.hbs rename to frontend/app/timed-subscriptions/detail/index/template.hbs index 8132281a..8e2f444c 100644 --- a/frontend/app/sysupport-subscriptions/detail/index/template.hbs +++ b/frontend/app/timed-subscriptions/detail/index/template.hbs @@ -3,17 +3,17 @@ {{#uk-card as |card|}} {{#card.header}} {{#card.title}} - {{t 'sysupport.detail.expense'}} + {{t 'timed.detail.expense'}} {{/card.title}} {{/card.header}} {{#card.body}}
{{t 'sysupport.date'}}{{t 'sysupport.detail.effort'}}{{t 'sysupport.detail.employee'}}{{t 'sysupport.detail.description'}}{{t 'timed.date'}}{{t 'timed.detail.effort'}}{{t 'timed.detail.employee'}}{{t 'timed.detail.description'}}
- - - - + + + + @@ -34,16 +34,16 @@ {{#uk-card as |card|}} {{#card.header}} {{#card.title}} - {{t 'sysupport.detail.charges'}} + {{t 'timed.detail.charges'}} {{/card.title}} {{/card.header}} {{#card.body}}
{{t 'sysupport.date'}}{{t 'sysupport.detail.effort'}}{{t 'sysupport.detail.employee'}}{{t 'sysupport.detail.description'}}{{t 'timed.date'}}{{t 'timed.detail.effort'}}{{t 'timed.detail.employee'}}{{t 'timed.detail.description'}}
- - - + + + diff --git a/frontend/app/sysupport-subscriptions/detail/reload/controller.js b/frontend/app/timed-subscriptions/detail/reload/controller.js similarity index 78% rename from frontend/app/sysupport-subscriptions/detail/reload/controller.js rename to frontend/app/timed-subscriptions/detail/reload/controller.js index a024d53d..60af9403 100644 --- a/frontend/app/sysupport-subscriptions/detail/reload/controller.js +++ b/frontend/app/timed-subscriptions/detail/reload/controller.js @@ -14,14 +14,14 @@ export default Controller.extend({ .createRecord('timed-subscription-order', order) .save() .then(() => { - this.notify.success(this.i18n.t('sysupport.reload.success')) + this.notify.success(this.i18n.t('timed.reload.success')) this.transitionToRoute( - 'sysupport-subscriptions.detail.index', + 'timed-subscriptions.detail.index', this.get('model.project') ) }) .catch(() => { - this.notify.error(this.i18n.t('sysupport.reload.error')) + this.notify.error(this.i18n.t('timed.reload.error')) }) }, diff --git a/frontend/app/sysupport-subscriptions/detail/reload/route.js b/frontend/app/timed-subscriptions/detail/reload/route.js similarity index 77% rename from frontend/app/sysupport-subscriptions/detail/reload/route.js rename to frontend/app/timed-subscriptions/detail/reload/route.js index a8de45be..6b716b55 100644 --- a/frontend/app/sysupport-subscriptions/detail/reload/route.js +++ b/frontend/app/timed-subscriptions/detail/reload/route.js @@ -8,12 +8,12 @@ export default Route.extend({ init() { this._super(...arguments) this.set('breadCrumb', { - title: this.i18n.t('sysupport.breadcrumbs.reload') + title: this.i18n.t('timed.breadcrumbs.reload') }) }, async model() { - let project = await this.modelFor('sysupport-subscriptions.detail') + let project = await this.modelFor('timed-subscriptions.detail') return RSVP.hash({ project, packages: this.store.findAll('timed-subscription-package', { diff --git a/frontend/app/sysupport-subscriptions/detail/reload/template.hbs b/frontend/app/timed-subscriptions/detail/reload/template.hbs similarity index 90% rename from frontend/app/sysupport-subscriptions/detail/reload/template.hbs rename to frontend/app/timed-subscriptions/detail/reload/template.hbs index 4eaa3621..7fc5630f 100644 --- a/frontend/app/sysupport-subscriptions/detail/reload/template.hbs +++ b/frontend/app/timed-subscriptions/detail/reload/template.hbs @@ -1,4 +1,4 @@ -

{{t 'sysupport.reload.select'}}

+

{{t 'timed.reload.select'}}

{{#each model.packages as |package index|}}
@@ -8,13 +8,13 @@ {{/card.header}} {{#card.body}}
-
{{t 'sysupport.reload.price'}}:
+
{{t 'timed.reload.price'}}:
{{package.price}}
{{/card.body}} {{#card.footer}} {{#uk-button data-test-project-reload=index class='uk-align-center' color='primary' on-click=(action "subscribe" package)}} - {{t 'sysupport.reload.charge'}} + {{t 'timed.reload.charge'}} {{/uk-button}} {{/card.footer}} {{/uk-card}} diff --git a/frontend/app/sysupport-subscriptions/detail/route.js b/frontend/app/timed-subscriptions/detail/route.js similarity index 100% rename from frontend/app/sysupport-subscriptions/detail/route.js rename to frontend/app/timed-subscriptions/detail/route.js diff --git a/frontend/app/sysupport-subscriptions/index/route.js b/frontend/app/timed-subscriptions/index/route.js similarity index 84% rename from frontend/app/sysupport-subscriptions/index/route.js rename to frontend/app/timed-subscriptions/index/route.js index 5e05bbdb..95bc4c71 100644 --- a/frontend/app/sysupport-subscriptions/index/route.js +++ b/frontend/app/timed-subscriptions/index/route.js @@ -7,7 +7,7 @@ export default Route.extend({ init() { this._super(...arguments) this.set('breadCrumb', { - title: this.i18n.t('sysupport.breadcrumbs.overview') + title: this.i18n.t('timed.breadcrumbs.overview') }) }, diff --git a/frontend/app/sysupport-subscriptions/index/template.hbs b/frontend/app/timed-subscriptions/index/template.hbs similarity index 63% rename from frontend/app/sysupport-subscriptions/index/template.hbs rename to frontend/app/timed-subscriptions/index/template.hbs index 6b64b874..77430124 100644 --- a/frontend/app/sysupport-subscriptions/index/template.hbs +++ b/frontend/app/timed-subscriptions/index/template.hbs @@ -1,4 +1,4 @@ -

{{t 'sysupport.index.title'}}

+

{{t 'timed.index.title'}}

{{#each model as |project index|}}
@@ -8,20 +8,20 @@ {{/card.header}} {{#card.body}}
-
{{t 'sysupport.time.ordered'}}:
+
{{t 'timed.time.ordered'}}:
{{format-duration project.purchasedTime}}
-
{{t 'sysupport.time.used'}}:
+
{{t 'timed.time.used'}}:
{{format-duration project.spentTime}}
-
{{t 'sysupport.time.total'}}:
+
{{t 'timed.time.total'}}:
{{format-duration project.totalTime}}
{{/card.body}} {{#card.footer}} - {{#link-to 'sysupport-subscriptions.detail.reload' project.id class="uk-link-reset"}} - {{uk-button data-test-reload-link=index color='primary' size='large' fill=true label=(t 'sysupport.index.charge') }} + {{#link-to 'timed-subscriptions.detail.reload' project.id class="uk-link-reset"}} + {{uk-button data-test-reload-link=index color='primary' size='large' fill=true label=(t 'timed.index.charge') }} {{/link-to}} - {{#link-to "sysupport-subscriptions.detail.index" project.id class="uk-link-reset"}} - {{uk-button data-test-detail-link=index color='default' size='large' fill=true label=(t 'sysupport.index.details') }} + {{#link-to "timed-subscriptions.detail.index" project.id class="uk-link-reset"}} + {{uk-button data-test-detail-link=index color='default' size='large' fill=true label=(t 'timed.index.details') }} {{/link-to}} {{/card.footer}} {{/uk-card}} diff --git a/frontend/app/sysupport-admin/route.js b/frontend/app/timed-subscriptions/route.js similarity index 68% rename from frontend/app/sysupport-admin/route.js rename to frontend/app/timed-subscriptions/route.js index 2ac00b5e..da43ff8e 100644 --- a/frontend/app/sysupport-admin/route.js +++ b/frontend/app/timed-subscriptions/route.js @@ -3,5 +3,8 @@ import { computed } from '@ember/object' import RouteAccessMixin from 'customer-center/mixins/route-access-mixin' export default Route.extend(RouteAccessMixin, { - groups: computed(() => ['adsy-user', 'sysupport']) + groups: computed(() => ({ + requireAll: ['timed'], + requireOne: ['adsy-customer'] + })) }) diff --git a/frontend/app/sysupport-subscriptions/template.hbs b/frontend/app/timed-subscriptions/template.hbs similarity index 100% rename from frontend/app/sysupport-subscriptions/template.hbs rename to frontend/app/timed-subscriptions/template.hbs diff --git a/frontend/config/environment.js b/frontend/config/environment.js index a850cd00..e133a616 100644 --- a/frontend/config/environment.js +++ b/frontend/config/environment.js @@ -29,9 +29,10 @@ module.exports = function(environment) { mail: 'support@adfinis-sygroup.ch' }, // Define admin group - adminGroup: 'adsy-user', - // Services : redmine, mon, sysupport, wiki, rt, vault - enabledServices: ['vault', 'sysupport', 'gitlab'], + adminGroup: 'adsy-admin', + adsyUserGroup: 'adsy-user', + // Services : redmine, mon, timed, wiki, rt, vault + enabledServices: ['vault', 'timed', 'gitlab'], // Define alertTime in hours // When total time comes close to alertTime, text color changes alertTime: 60 @@ -63,8 +64,8 @@ module.exports = function(environment) { } if (environment === 'production') { - // Services : redmine, mon, sysupport, wiki, rt, vault - ENV.APP.enabledServices = ['vault', 'sysupport'] + // Services : redmine, mon, timed, wiki, rt, vault + ENV.APP.enabledServices = ['vault', 'timed'] } return ENV diff --git a/frontend/mirage/config.js b/frontend/mirage/config.js index d1c87a8c..f91ff720 100644 --- a/frontend/mirage/config.js +++ b/frontend/mirage/config.js @@ -91,10 +91,10 @@ export default function() { return new Response(201, JSON.parse(requestBody)) }) - // Sysupport + // timed this.get( - '/proxy/sysupport/subscription-projects', + '/proxy/timed/subscription-projects', ({ timedSubscriptionProjects }, request) => { if (request.queryParams.include) { let includes = request.queryParams.include.split(',') @@ -109,7 +109,7 @@ export default function() { ) this.get( - '/proxy/sysupport/subscription-projects/:id', + '/proxy/timed/subscription-projects/:id', ({ timedSubscriptionProjects }, request) => { if (request.queryParams.include) { let includes = request.queryParams.include.split(',') @@ -123,10 +123,10 @@ export default function() { } ) - this.get('/proxy/sysupport/reports', 'timed-reports') + this.get('/proxy/timed/reports', 'timed-reports') this.get( - '/proxy/sysupport/subscription-orders', + '/proxy/timed/subscription-orders', ({ timedSubscriptionOrders }, request) => { let blacklist = ['ordering', 'include', 'project'] let queryParams = JSON.parse(JSON.stringify(request.queryParams)) @@ -151,17 +151,14 @@ export default function() { return timedSubscriptionOrders.where(queryParams) } ) - this.post('/proxy/sysupport/subscription-orders', 'timed-subscription-orders') - this.get( - '/proxy/sysupport/subscription-orders/:id', - 'timed-subscription-orders' - ) + this.post('/proxy/timed/subscription-orders', 'timed-subscription-orders') + this.get('/proxy/timed/subscription-orders/:id', 'timed-subscription-orders') this.delete( - '/proxy/sysupport/subscription-orders/:id', + '/proxy/timed/subscription-orders/:id', 'timed-subscription-orders' ) this.post( - '/proxy/sysupport/subscription-orders/:id/confirm', + '/proxy/timed/subscription-orders/:id/confirm', ({ timedSubscriptionOrders }, request) => { let order = timedSubscriptionOrders.find(request.params.id) order.update({ acknowledged: true }) @@ -170,13 +167,10 @@ export default function() { } ) - this.get( - '/proxy/sysupport/subscription-packages', - 'timed-subscription-packages' - ) + this.get('/proxy/timed/subscription-packages', 'timed-subscription-packages') - this.get('/proxy/sysupport/billing-types', 'timed-billing-types') - this.get('/proxy/sysupport/billing-types/:id', 'timed-billing-types') + this.get('/proxy/timed/billing-types', 'timed-billing-types') + this.get('/proxy/timed/billing-types/:id', 'timed-billing-types') this.get('/proxy/gitlab/groups/:group/', (scheme, req) => { let group = req.params.group diff --git a/frontend/mirage/factories/user.js b/frontend/mirage/factories/user.js index 1df53e76..c2d150c6 100644 --- a/frontend/mirage/factories/user.js +++ b/frontend/mirage/factories/user.js @@ -5,7 +5,6 @@ export default Mirage.Factory.extend({ firstName: faker.name.firstName, lastName: faker.name.lastName, language: 'en', - sysupport: 'adsy', email() { return `${faker.name.firstName()}@${this.shortname}.com` }, @@ -22,7 +21,13 @@ export default Mirage.Factory.extend({ admin: trait({ username: 'admin', groups() { - return ['sysupport', 'adsy-user', 'adsy-vault'] + return ['timed', 'adsy-admin', 'adsy-vault'] + } + }), + intern: trait({ + username: 'intern', + groups() { + return ['timed', 'adsy-user', 'adsy-vault'] } }), customer: trait({ @@ -30,7 +35,7 @@ export default Mirage.Factory.extend({ groups() { return [ `${this.shortname}-vault`, - `${this.shortname}-sysupport`, + `${this.shortname}-timed`, `test1-gitlab`, `test2-gitlab`, `test3-gitlab`, diff --git a/frontend/mirage/scenarios/default.js b/frontend/mirage/scenarios/default.js index 4b8b19fb..26dd6427 100644 --- a/frontend/mirage/scenarios/default.js +++ b/frontend/mirage/scenarios/default.js @@ -1,8 +1,9 @@ export default function(server) { server.createList('user', 1, 'customer') + server.createList('user', 1, 'intern') server.createList('user', 1, 'admin') - // Sysupport + // timed server.createList('timed-subscription-package', 3) server.createList('timed-subscription-project', 10) } diff --git a/frontend/tests/acceptance/sysupport-admin-test.js b/frontend/tests/acceptance/timed-admin-test.js similarity index 86% rename from frontend/tests/acceptance/sysupport-admin-test.js rename to frontend/tests/acceptance/timed-admin-test.js index af7c3d13..918b3f7a 100644 --- a/frontend/tests/acceptance/sysupport-admin-test.js +++ b/frontend/tests/acceptance/timed-admin-test.js @@ -11,7 +11,7 @@ import { module, test } from 'qunit' import DjangoDurationTransform from 'customer-center/transforms/django-duration' -module('Acceptance | Sysupport Admin', function(hooks) { +module('Acceptance | Timed Admin', function(hooks) { setupApplicationTest(hooks) setupMirage(hooks) @@ -26,17 +26,17 @@ module('Acceptance | Sysupport Admin', function(hooks) { test('subscription-admin index', async function(assert) { this.server.createList('timed-subscription-project', 5) - await visit('/sysupport-admin') + await visit('/timed-admin') assert.dom('[data-test-project]').exists({ count: 5 }) }) test('subscription-admin detail', async function(assert) { let project = this.server.create('timed-subscription-project') - await visit('/sysupport-admin') + await visit('/timed-admin') await click('[data-test-project="0"]') - assert.equal(currentURL(), `/sysupport-admin/${project.id}`) + assert.equal(currentURL(), `/timed-admin/${project.id}`) assert .dom(`[data-test-customer-name="${project.id}"]`) .hasText(project.customer.name) @@ -57,10 +57,10 @@ module('Acceptance | Sysupport Admin', function(hooks) { ) }) - await visit('/sysupport-admin') + await visit('/timed-admin') await click('[data-test-project="0"]') - assert.equal(currentURL(), `/sysupport-admin/${project.id}`) + assert.equal(currentURL(), `/timed-admin/${project.id}`) assert.dom('[data-test-project-total-time]').hasText('5 Hours') @@ -88,23 +88,23 @@ module('Acceptance | Sysupport Admin', function(hooks) { test('subscription-admin confirm-subscriptions accept', async function(assert) { let project = this.server.create('timed-subscription-project') - await visit('/sysupport-admin/confirm-subscriptions') + await visit('/timed-admin/confirm-subscriptions') assert.dom('[data-test-order]').exists({ count: 5 }) await click('[data-test-accept="0"]') assert.dom('[data-test-order]').exists({ count: 4 }) - await visit(`/sysupport-admin/${project.id}`) + await visit(`/timed-admin/${project.id}`) assert.dom('[data-test-acknowledged]').exists({ count: 6 }) }) test('subscription-admin confirm-subscriptions deny', async function(assert) { let project = this.server.create('timed-subscription-project') - await visit('/sysupport-admin/confirm-subscriptions') + await visit('/timed-admin/confirm-subscriptions') assert.dom('[data-test-order]').exists({ count: 5 }) await click('[data-test-deny="0"]') assert.dom('[data-test-order]').exists({ count: 4 }) - await visit(`/sysupport-admin/${project.id}`) + await visit(`/timed-admin/${project.id}`) assert.dom('[data-test-unconfirmed]').exists({ count: 4 }) }) }) diff --git a/frontend/tests/acceptance/timed-subscription-project-detail-test.js b/frontend/tests/acceptance/timed-subscription-project-detail-test.js index c652baa0..f8662441 100644 --- a/frontend/tests/acceptance/timed-subscription-project-detail-test.js +++ b/frontend/tests/acceptance/timed-subscription-project-detail-test.js @@ -7,7 +7,7 @@ import { } from 'ember-simple-auth/test-support' import setupMirage from 'ember-cli-mirage/test-support/setup-mirage' -module('Acceptance | Sysupport Subscriptions', function(hooks) { +module('Acceptance | Timed Subscriptions', function(hooks) { setupApplicationTest(hooks) setupMirage(hooks) @@ -22,10 +22,10 @@ module('Acceptance | Sysupport Subscriptions', function(hooks) { test('subscription-project detail', async function(assert) { server.create('timed-subscription-project') - await visit('/sysupport-subscriptions') + await visit('/timed-subscriptions') await click('[data-test-detail-link="0"]') - assert.equal(currentURL(), '/sysupport-subscriptions/1') + assert.equal(currentURL(), '/timed-subscriptions/1') assert.dom('[data-test-project-report]').exists({ count: 5 }) assert.dom('[data-test-project-order]').exists({ count: 10 }) }) @@ -33,12 +33,12 @@ module('Acceptance | Sysupport Subscriptions', function(hooks) { test('subscription-project reload', async function(assert) { this.server.create('timed-subscription-project') this.server.create('timed-subscription-package') - await visit('/sysupport-subscriptions') + await visit('/timed-subscriptions') await click('[data-test-reload-link="0"]') - assert.equal(currentURL(), '/sysupport-subscriptions/1/reload') + assert.equal(currentURL(), '/timed-subscriptions/1/reload') await click('[data-test-project-reload="0"]') - assert.equal(currentURL(), '/sysupport-subscriptions/1') + assert.equal(currentURL(), '/timed-subscriptions/1') assert.dom('[data-test-project-order]').exists({ count: 11 }) }) diff --git a/frontend/tests/unit/helpers/service-enabled-test.js b/frontend/tests/unit/helpers/service-enabled-test.js index ede7bb6e..b35dfefe 100644 --- a/frontend/tests/unit/helpers/service-enabled-test.js +++ b/frontend/tests/unit/helpers/service-enabled-test.js @@ -3,7 +3,7 @@ import { serviceEnabled } from 'customer-center/helpers/service-enabled' module('Unit | Helper | service enabled', function() { test('is service enabled', function(assert) { - assert.ok(serviceEnabled(['sysupport'])) + assert.ok(serviceEnabled(['timed'])) assert.notOk(serviceEnabled(['servicexyz'])) }) }) diff --git a/frontend/tests/unit/mixins/route-access-mixin-test.js b/frontend/tests/unit/mixins/route-access-mixin-test.js index 0388802e..e3938a3f 100644 --- a/frontend/tests/unit/mixins/route-access-mixin-test.js +++ b/frontend/tests/unit/mixins/route-access-mixin-test.js @@ -9,20 +9,30 @@ module('Unit | Mixin | route access mixin', function(hooks) { test('access mixin positive', async function(assert) { assert.expect(1) let mixin = EmberObject.extend(RouteAccessMixinMixin).create({ - groups: ['adsy-user'] + groups: { + requireAll: ['timed'], + requireOne: ['adsy-customer', 'adsy-user'] + } }) assert.ok( - mixin._hasPermissions(EmberObject.create({ groups: ['adsy-user'] })) + mixin._hasPermissions( + EmberObject.create({ groups: ['timed', 'adsy-user'] }) + ) ) }) test('access mixin negative', async function(assert) { assert.expect(1) let mixin = EmberObject.extend(RouteAccessMixinMixin).create({ - groups: ['adsy-user'] + groups: { + requireAll: ['timed', 'adsy-admin'], + requireOne: ['adsy-customer', 'adsy-user'] + } }) assert.notOk( - mixin._hasPermissions(EmberObject.create({ groups: ['adsy-customer'] })) + mixin._hasPermissions( + EmberObject.create({ groups: ['timed', 'adsy-customer'] }) + ) ) }) }) diff --git a/frontend/tests/unit/sysupport-admin/confirm-subscriptions/route-test.js b/frontend/tests/unit/sysupport-admin/confirm-subscriptions/route-test.js deleted file mode 100644 index 6633faa1..00000000 --- a/frontend/tests/unit/sysupport-admin/confirm-subscriptions/route-test.js +++ /dev/null @@ -1,11 +0,0 @@ -import { module, test } from 'qunit' -import { setupTest } from 'ember-qunit' - -module('Unit | Route | sysupport-admin/confirm-subscriptions', function(hooks) { - setupTest(hooks) - - test('it exists', function(assert) { - let route = this.owner.lookup('route:sysupport-admin/confirm-subscriptions') - assert.ok(route) - }) -}) diff --git a/frontend/tests/unit/sysupport-subscriptions/detail/reload/route-test.js b/frontend/tests/unit/sysupport-subscriptions/detail/reload/route-test.js deleted file mode 100644 index 9c605109..00000000 --- a/frontend/tests/unit/sysupport-subscriptions/detail/reload/route-test.js +++ /dev/null @@ -1,11 +0,0 @@ -import { module, test } from 'qunit' -import { setupTest } from 'ember-qunit' - -module('Unit | Route | sysupport/detail/reload', function(hooks) { - setupTest(hooks) - - test('it exists', function(assert) { - let route = this.owner.lookup('route:sysupport-subscriptions/detail/reload') - assert.ok(route) - }) -}) diff --git a/frontend/tests/unit/sysupport-subscriptions/detail/index/route-test.js b/frontend/tests/unit/timed-admin/confirm-subscriptions/route-test.js similarity index 51% rename from frontend/tests/unit/sysupport-subscriptions/detail/index/route-test.js rename to frontend/tests/unit/timed-admin/confirm-subscriptions/route-test.js index 6d8cef1a..c0f8d044 100644 --- a/frontend/tests/unit/sysupport-subscriptions/detail/index/route-test.js +++ b/frontend/tests/unit/timed-admin/confirm-subscriptions/route-test.js @@ -1,11 +1,11 @@ import { module, test } from 'qunit' import { setupTest } from 'ember-qunit' -module('Unit | Route | sysupport/detail/index', function(hooks) { +module('Unit | Route | timed-admin/confirm-subscriptions', function(hooks) { setupTest(hooks) test('it exists', function(assert) { - let route = this.owner.lookup('route:sysupport-subscriptions/detail/index') + let route = this.owner.lookup('route:timed-admin/confirm-subscriptions') assert.ok(route) }) }) diff --git a/frontend/tests/unit/sysupport-admin/detail/controller-test.js b/frontend/tests/unit/timed-admin/detail/controller-test.js similarity index 87% rename from frontend/tests/unit/sysupport-admin/detail/controller-test.js rename to frontend/tests/unit/timed-admin/detail/controller-test.js index d9beb182..38df67c4 100644 --- a/frontend/tests/unit/sysupport-admin/detail/controller-test.js +++ b/frontend/tests/unit/timed-admin/detail/controller-test.js @@ -3,13 +3,13 @@ import { setupTest } from 'ember-qunit' import moment from 'moment' -module('Unit | Controller | sysupport-admin/detail', function(hooks) { +module('Unit | Controller | timed-admin/detail', function(hooks) { setupTest(hooks) test('duration', function(assert) { assert.expect(10) - let controller = this.owner.lookup('controller:sysupport-admin/detail') + let controller = this.owner.lookup('controller:timed-admin/detail') controller.setProperties({ hour: 1, minute: 1 }) assert.equal(controller.duration.hours(), 1) @@ -39,7 +39,7 @@ module('Unit | Controller | sysupport-admin/detail', function(hooks) { test('error', function(assert) { assert.expect(7) - let controller = this.owner.lookup('controller:sysupport-admin/detail') + let controller = this.owner.lookup('controller:timed-admin/detail') controller.setProperties({ hour: 1, minute: 1 }) assert.notOk(controller.error) @@ -64,7 +64,7 @@ module('Unit | Controller | sysupport-admin/detail', function(hooks) { }) test('orders and project model', function(assert) { - let controller = this.owner.lookup('controller:sysupport-admin/detail') + let controller = this.owner.lookup('controller:timed-admin/detail') controller.set('fetchModels', { lastSuccessful: { @@ -84,7 +84,7 @@ module('Unit | Controller | sysupport-admin/detail', function(hooks) { }) test('previewDuration', function(assert) { - let controller = this.owner.lookup('controller:sysupport-admin/detail') + let controller = this.owner.lookup('controller:timed-admin/detail') controller.set('preview', true) controller.setProperties({ hour: 1, minute: 30 }) controller.set('model', { @@ -99,7 +99,7 @@ module('Unit | Controller | sysupport-admin/detail', function(hooks) { }) test('validation', function(assert) { - let controller = this.owner.lookup('controller:sysupport-admin/detail') + let controller = this.owner.lookup('controller:timed-admin/detail') controller.set('preview', false) controller.setProperties({ hour: 1, minute: 'sdf' }) diff --git a/frontend/tests/unit/sysupport-admin/index/route-test.js b/frontend/tests/unit/timed-admin/detail/route-test.js similarity index 56% rename from frontend/tests/unit/sysupport-admin/index/route-test.js rename to frontend/tests/unit/timed-admin/detail/route-test.js index 0e155e46..c542c131 100644 --- a/frontend/tests/unit/sysupport-admin/index/route-test.js +++ b/frontend/tests/unit/timed-admin/detail/route-test.js @@ -1,11 +1,11 @@ import { module, test } from 'qunit' import { setupTest } from 'ember-qunit' -module('Unit | Route | sysupport-admin/index', function(hooks) { +module('Unit | Route | timed-admin/detail', function(hooks) { setupTest(hooks) test('it exists', function(assert) { - let route = this.owner.lookup('route:sysupport-admin/index') + let route = this.owner.lookup('route:timed-admin/detail') assert.ok(route) }) }) diff --git a/frontend/tests/unit/sysupport-admin/index/controller-test.js b/frontend/tests/unit/timed-admin/index/controller-test.js similarity index 87% rename from frontend/tests/unit/sysupport-admin/index/controller-test.js rename to frontend/tests/unit/timed-admin/index/controller-test.js index e168372a..9831e4d4 100644 --- a/frontend/tests/unit/sysupport-admin/index/controller-test.js +++ b/frontend/tests/unit/timed-admin/index/controller-test.js @@ -3,11 +3,11 @@ import { setupTest } from 'ember-qunit' import EmberObject from '@ember/object' import moment from 'moment' -module('Unit | Controller | sysupport-admin/index', function(hooks) { +module('Unit | Controller | timed-admin/index', function(hooks) { setupTest(hooks) test('controller', function(assert) { - let controller = this.owner.lookup('controller:sysupport-admin/index') + let controller = this.owner.lookup('controller:timed-admin/index') let models = [ EmberObject.extend({ id: 1, diff --git a/frontend/tests/unit/sysupport-subscriptions/index/route-test.js b/frontend/tests/unit/timed-admin/index/route-test.js similarity index 55% rename from frontend/tests/unit/sysupport-subscriptions/index/route-test.js rename to frontend/tests/unit/timed-admin/index/route-test.js index 2878420c..619e0dd8 100644 --- a/frontend/tests/unit/sysupport-subscriptions/index/route-test.js +++ b/frontend/tests/unit/timed-admin/index/route-test.js @@ -1,11 +1,11 @@ import { module, test } from 'qunit' import { setupTest } from 'ember-qunit' -module('Unit | Route | sysupport/index', function(hooks) { +module('Unit | Route | timed-admin/index', function(hooks) { setupTest(hooks) test('it exists', function(assert) { - let route = this.owner.lookup('route:sysupport-subscriptions/index') + let route = this.owner.lookup('route:timed-admin/index') assert.ok(route) }) }) diff --git a/frontend/tests/unit/sysupport-admin/route-test.js b/frontend/tests/unit/timed-admin/route-test.js similarity index 58% rename from frontend/tests/unit/sysupport-admin/route-test.js rename to frontend/tests/unit/timed-admin/route-test.js index 5932b4eb..4c8eb98e 100644 --- a/frontend/tests/unit/sysupport-admin/route-test.js +++ b/frontend/tests/unit/timed-admin/route-test.js @@ -1,11 +1,11 @@ import { module, test } from 'qunit' import { setupTest } from 'ember-qunit' -module('Unit | Route | sysupport-admin', function(hooks) { +module('Unit | Route | timed-admin', function(hooks) { setupTest(hooks) test('it exists', function(assert) { - let route = this.owner.lookup('route:sysupport-admin') + let route = this.owner.lookup('route:timed-admin') assert.ok(route) }) }) diff --git a/frontend/tests/unit/timed-subscriptions/detail/index/route-test.js b/frontend/tests/unit/timed-subscriptions/detail/index/route-test.js new file mode 100644 index 00000000..9f4c04e0 --- /dev/null +++ b/frontend/tests/unit/timed-subscriptions/detail/index/route-test.js @@ -0,0 +1,11 @@ +import { module, test } from 'qunit' +import { setupTest } from 'ember-qunit' + +module('Unit | Route | timed/detail/index', function(hooks) { + setupTest(hooks) + + test('it exists', function(assert) { + let route = this.owner.lookup('route:timed-subscriptions/detail/index') + assert.ok(route) + }) +}) diff --git a/frontend/tests/unit/timed-subscriptions/detail/reload/route-test.js b/frontend/tests/unit/timed-subscriptions/detail/reload/route-test.js new file mode 100644 index 00000000..fc21ab5e --- /dev/null +++ b/frontend/tests/unit/timed-subscriptions/detail/reload/route-test.js @@ -0,0 +1,11 @@ +import { module, test } from 'qunit' +import { setupTest } from 'ember-qunit' + +module('Unit | Route | timed/detail/reload', function(hooks) { + setupTest(hooks) + + test('it exists', function(assert) { + let route = this.owner.lookup('route:timed-subscriptions/detail/reload') + assert.ok(route) + }) +}) diff --git a/frontend/tests/unit/sysupport-admin/detail/route-test.js b/frontend/tests/unit/timed-subscriptions/index/route-test.js similarity index 55% rename from frontend/tests/unit/sysupport-admin/detail/route-test.js rename to frontend/tests/unit/timed-subscriptions/index/route-test.js index 5df983f8..ffba08e7 100644 --- a/frontend/tests/unit/sysupport-admin/detail/route-test.js +++ b/frontend/tests/unit/timed-subscriptions/index/route-test.js @@ -1,11 +1,11 @@ import { module, test } from 'qunit' import { setupTest } from 'ember-qunit' -module('Unit | Route | sysupport-admin/detail', function(hooks) { +module('Unit | Route | timed/index', function(hooks) { setupTest(hooks) test('it exists', function(assert) { - let route = this.owner.lookup('route:sysupport-admin/detail') + let route = this.owner.lookup('route:timed-subscriptions/index') assert.ok(route) }) }) diff --git a/tools/docker/ldap/ldap.ldif/default.ldif b/tools/docker/ldap/ldap.ldif/default.ldif index dd057e0b..82cd6ae7 100644 --- a/tools/docker/ldap/ldap.ldif/default.ldif +++ b/tools/docker/ldap/ldap.ldif/default.ldif @@ -44,10 +44,21 @@ objectclass: top sambagrouptype: 2 sambasid: S-1-5-21--2000 -dn: cn=customer-sysupport,cn=groups,dc=adsy-ext,dc=becs,dc=adfinis-sygroup,dc=ch -cn: customer-sysupport +dn: cn=adsy-admin,cn=groups,dc=adsy-ext,dc=becs,dc=adfinis-sygroup,dc=ch +cn: adsy-admin +gidnumber: 505 +memberuid: uid=admin1,cn=users,dc=adsy-ext,dc=becs,dc=adfinis-sygroup,dc=ch +objectclass: posixGroup +objectclass: sambaGroupMapping +objectclass: top +sambagrouptype: 2 +sambasid: S-1-5-21--2000 + +dn: cn=customer-timed,cn=groups,dc=adsy-ext,dc=becs,dc=adfinis-sygroup,dc=ch +cn: customer-timed gidnumber: 501 memberuid: uid=user1,cn=users,dc=adsy-ext,dc=becs,dc=adfinis-sygroup,dc=ch +memberuid: uid=admin1,cn=users,dc=adsy-ext,dc=becs,dc=adfinis-sygroup,dc=ch objectclass: posixGroup objectclass: sambaGroupMapping objectclass: top @@ -58,6 +69,7 @@ dn: cn=customer-gitlab,cn=groups,dc=adsy-ext,dc=becs,dc=adfinis-sygroup,dc=ch cn: customer-gitlab gidnumber: 502 memberuid: uid=user1,cn=users,dc=adsy-ext,dc=becs,dc=adfinis-sygroup,dc=ch +memberuid: uid=admin1,cn=users,dc=adsy-ext,dc=becs,dc=adfinis-sygroup,dc=ch objectclass: posixGroup objectclass: sambaGroupMapping objectclass: top @@ -68,6 +80,18 @@ dn: cn=customer-redmine,cn=groups,dc=adsy-ext,dc=becs,dc=adfinis-sygroup,dc=ch cn: customer-redmine gidnumber: 503 memberuid: uid=user1,cn=users,dc=adsy-ext,dc=becs,dc=adfinis-sygroup,dc=ch +memberuid: uid=admin1,cn=users,dc=adsy-ext,dc=becs,dc=adfinis-sygroup,dc=ch +objectclass: posixGroup +objectclass: sambaGroupMapping +objectclass: top +sambagrouptype: 2 +sambasid: S-1-5-21--2000 + +dn: cn=customer-vault,cn=groups,dc=adsy-ext,dc=becs,dc=adfinis-sygroup,dc=ch +cn: customer-vault +gidnumber: 504 +memberuid: uid=user1,cn=users,dc=adsy-ext,dc=becs,dc=adfinis-sygroup,dc=ch +memberuid: uid=admin1,cn=users,dc=adsy-ext,dc=becs,dc=adfinis-sygroup,dc=ch objectclass: posixGroup objectclass: sambaGroupMapping objectclass: top @@ -124,6 +148,22 @@ uid: user1 uidnumber: 1001 userpassword: {CRYPT}R71YutPMJYJAc + +dn: uid=admin1,cn=users,dc=adsy-ext,dc=becs,dc=adfinis-sygroup,dc=ch +cn: admin1 +gidnumber: 511 +givenname: Testus +homedirectory: /home/users/admin1 +loginshell: /bin/sh +mail: admin1@adsy.ch +objectclass: inetOrgPerson +objectclass: posixAccount +objectclass: top +sn: Maximus +uid: admin1 +uidnumber: 1011 +userpassword: {CRYPT}R71YutPMJYJAc + # Entry 10: ou=customers,dc=adsy-ext,dc=becs,dc=adfinis-sygroup,dc=ch dn: ou=customers,dc=adsy-ext,dc=becs,dc=adfinis-sygroup,dc=ch objectclass: organizationalUnit @@ -214,10 +254,10 @@ objectclass: top sambagrouptype: 2 sambasid: S-1-5-21--2002 -# Entry 18: cn=customer1-sysupport,ou=customer1,ou=customers,dc=adsy-ext,... -dn: cn=customer1-sysupport,ou=customer1,ou=customers,dc=adsy-ext,dc=becs,dc= +# Entry 18: cn=customer1-timed,ou=customer1,ou=customers,dc=adsy-ext,... +dn: cn=customer1-timed,ou=customer1,ou=customers,dc=adsy-ext,dc=becs,dc= adfinis-sygroup,dc=ch -cn: customer1-sysupport +cn: customer1-timed gidnumber: 501 memberuid: uid=customer1,ou=customer1,ou=customers,dc=adsy-ext,dc=becs,dc=ad finis-sygroup,dc=ch @@ -340,10 +380,10 @@ objectclass: top sambagrouptype: 2 sambasid: S-1-5-21--2002 -# Entry 28: cn=customer2-sysupport,ou=customer2,ou=customers,dc=adsy-ext,... -dn: cn=customer2-sysupport,ou=customer2,ou=customers,dc=adsy-ext,dc=becs,dc= +# Entry 28: cn=customer2-timed,ou=customer2,ou=customers,dc=adsy-ext,... +dn: cn=customer2-timed,ou=customer2,ou=customers,dc=adsy-ext,dc=becs,dc= adfinis-sygroup,dc=ch -cn: customer2-sysupport +cn: customer2-timed gidnumber: 501 memberuid: uid=customer2,ou=customer2,ou=customers,dc=adsy-ext,dc=becs,dc=ad finis-sygroup,dc=ch diff --git a/tools/docker/postgres/timed-test-data.sql b/tools/docker/postgres/timed-test-data.sql index e1cd4c8b..34779461 100644 --- a/tools/docker/postgres/timed-test-data.sql +++ b/tools/docker/postgres/timed-test-data.sql @@ -1,6 +1,6 @@ -INSERT INTO employment_user (password, is_superuser, username, first_name, last_name, email, is_staff, is_active, date_joined, tour_done) - VALUES ('pbkdf2_sha256$36000$YqQdh2qkA5ia$GmA0LkF3udVW1/tsEz6qOUg265C4Z9d/iqUgQXpQL7U=', false, 'sysupport_api', 'sysupport_api', 'sysupport_api', 'sysupport_api@adsy.ch', true, true, '2018-05-07 08:10:13+00', false); -INSERT INTO projects_customer (name, email, website, comment, archived, reference) +INSERT INTO employment_user (password, is_superuser, username, first_name, last_name, email, is_staff, is_active, date_joined, tour_done) + VALUES ('pbkdf2_sha256$36000$YqQdh2qkA5ia$GmA0LkF3udVW1/tsEz6qOUg265C4Z9d/iqUgQXpQL7U=', false, 'timed_api', 'timed_api', 'timed_api', 'timed_api@adsy.ch', true, true, '2018-05-07 08:10:13+00', false); +INSERT INTO projects_customer (name, email, website, comment, archived, reference) VALUES ('customer1', 'customer1@adsy.ch', '', '', false, 'customer1'); INSERT INTO projects_billingtype (name) VALUES ('Subscription'),('Workhours based'),('We throw random moniez at u'); diff --git a/tools/docker/ucs/scripts/create-new-admin.sh b/tools/docker/ucs/scripts/create-new-admin.sh index b6d31d82..76b48028 100755 --- a/tools/docker/ucs/scripts/create-new-admin.sh +++ b/tools/docker/ucs/scripts/create-new-admin.sh @@ -9,7 +9,7 @@ udm groups/group create --set name=wiki --set description="Wiki-Funktion für Ad udm groups/group create --set name=redmine --set description="Redmine-Funktion Admin" --position "cn=groups,$ldap_base" udm groups/group create --set name=rhev --set description="RHEV-Funktion Admin" --position "cn=groups,$ldap_base" udm groups/group create --set name=mon --set description="Monitoring-Funktion Admin" --position "cn=groups,$ldap_base" -udm groups/group create --set name=sysupport --set description="SySupport-Funktion Admin" --position "cn=groups,$ldap_base" +udm groups/group create --set name=timed --set description="timed-Funktion Admin" --position "cn=groups,$ldap_base" udm groups/group create --set name=vault --set description="Vault-Funktion Admin" --position "cn=groups,$ldap_base" udm groups/group create --set name="adsy-user" --set description="adsy user group" --position="cn=groups,$ldap_base" @@ -30,6 +30,6 @@ udm users/user create \ --set groups="cn=wiki,cn=groups,$ldap_base" \ --set groups="cn=redmine,cn=groups,$ldap_base" \ --set groups="cn=rhev,cn=groups,$ldap_base" \ - --set groups="cn=sysupport,cn=groups,$ldap_base" \ + --set groups="cn=timed,cn=groups,$ldap_base" \ --set groups="cn=mon,cn=groups,$ldap_base" \ --set groups="cn=vault,cn=groups,$ldap_base" diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 00000000..fb57ccd1 --- /dev/null +++ b/yarn.lock @@ -0,0 +1,4 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + From caf3b833e39c657451affcc3d249f863e83e36b3 Mon Sep 17 00:00:00 2001 From: Jonas Cosandey Date: Fri, 6 Jul 2018 09:05:01 +0200 Subject: [PATCH 2/6] add new admin group to backend --- backend/src/login/index.js | 2 +- backend/src/timed/proxy.js | 8 +++++--- backend/src/user/model.js | 13 ++++++++++++- frontend/app/mixins/route-access-mixin.js | 2 +- .../app/timed-admin/confirm-subscriptions/route.js | 9 ++++++++- 5 files changed, 27 insertions(+), 7 deletions(-) diff --git a/backend/src/login/index.js b/backend/src/login/index.js index 25b94b72..71d1b18a 100644 --- a/backend/src/login/index.js +++ b/backend/src/login/index.js @@ -146,7 +146,7 @@ async function addTimedTokenToSession(session, user) { try { session.timedToken = await timedLogin() session.timedTokenTTL = new Date().getTime() - if (!user.isAdmin()) { + if (!user.isIntern()) { session.timedCustomer = await getTimedCustomer(session.timedToken, user) } } catch (e) { diff --git a/backend/src/timed/proxy.js b/backend/src/timed/proxy.js index 247b6fbc..971a7d05 100644 --- a/backend/src/timed/proxy.js +++ b/backend/src/timed/proxy.js @@ -59,10 +59,12 @@ const routes = { * @return boolean - returns true if has access **/ function checkAccess(req) { - if (!req.user.isAdmin() && typeof req.session.timedCustomer === 'undefined') { + if (!req.user.isIntern && typeof req.session.timedCustomer === 'undefined') { return false } - let access = req.user.isAdmin() ? 'admin' : 'customer' + let access = req.user.isAdmin() + ? 'admin' + : req.user.isAdsyUser() ? 'user' : 'customer' for (let route in routes) { if (req.path.match(routes[route].path)) { if (routes[route].access.hasOwnProperty(access)) { @@ -93,7 +95,7 @@ function createProxy(config) { .map(key => `${key}=${queryParams[key]}`) .join('&') - if (!req.user.isAdmin()) { + if (!req.user.isIntern()) { newPath += `customer=${req.session.timedCustomer.id}` } if (req.path.match(routes.reports.path)) { diff --git a/backend/src/user/model.js b/backend/src/user/model.js index e1c4a337..4e14b812 100644 --- a/backend/src/user/model.js +++ b/backend/src/user/model.js @@ -71,7 +71,7 @@ export default bookshelf.Model.extend( }, /** - * Check if user is inter + * Check if user is intern * * @returns {boolean} * @public @@ -81,6 +81,17 @@ export default bookshelf.Model.extend( return this.getGroupNames().includes(config.login.internRole) }, + /** + * Is user a adsy user + * + * @returns {boolean} + * @public + * @author Jonas Cosandey (jonas.cosandey@adfinis-sygroup.ch) + */ + isIntern() { + return this.isAdmin() || this.isAdsyUser() + }, + /** * Does this user have redmine access? * diff --git a/frontend/app/mixins/route-access-mixin.js b/frontend/app/mixins/route-access-mixin.js index 224a743a..b7853b6c 100644 --- a/frontend/app/mixins/route-access-mixin.js +++ b/frontend/app/mixins/route-access-mixin.js @@ -18,7 +18,7 @@ export default Mixin.create({ role => user.get(role) || user.get('groups').includes(role) ) : true) && - (this.groups.requireAll + (this.groups.requireOne ? this.groups.requireOne.some( role => user.get(role) || user.get('groups').includes(role) ) diff --git a/frontend/app/timed-admin/confirm-subscriptions/route.js b/frontend/app/timed-admin/confirm-subscriptions/route.js index 986103b5..e3a99523 100644 --- a/frontend/app/timed-admin/confirm-subscriptions/route.js +++ b/frontend/app/timed-admin/confirm-subscriptions/route.js @@ -1,10 +1,17 @@ +import { computed } from '@ember/object' import Route from '@ember/routing/route' import { inject as service } from '@ember/service' -export default Route.extend({ +import RouteAccessMixin from 'customer-center/mixins/route-access-mixin' + +export default Route.extend(RouteAccessMixin, { i18n: service(), notify: service(), + groups: computed(() => ({ + requireAll: ['timed', 'adsy-admin'] + })), + init() { this._super(...arguments) this.set('breadCrumb', { From b421d10c3756186191d5ef1a88252ed9ef1abc33 Mon Sep 17 00:00:00 2001 From: Jonas Cosandey Date: Fri, 6 Jul 2018 10:30:10 +0200 Subject: [PATCH 3/6] rename translations to timed --- frontend/app/timed-subscriptions/detail/reload/template.hbs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/app/timed-subscriptions/detail/reload/template.hbs b/frontend/app/timed-subscriptions/detail/reload/template.hbs index 7fc5630f..8e69b24e 100644 --- a/frontend/app/timed-subscriptions/detail/reload/template.hbs +++ b/frontend/app/timed-subscriptions/detail/reload/template.hbs @@ -22,9 +22,9 @@ {{else}}

{{mdi-icon "information-outline" size=30 class="uk-margin-small-bottom"}} - {{t 'sysupport.reload.noPackage.title'}}
- {{t 'sysupport.reload.noPackage.text'}}
- {{t 'sysupport.reload.noPackage.phone'}}: +41 61 500 31 30
+ {{t 'timed.reload.noPackage.title'}}
+ {{t 'timed.reload.noPackage.text'}}
+ {{t 'timed.reload.noPackage.phone'}}: +41 61 500 31 30
E-Mail: support@adfinis-sygroup.ch

{{/each}} From bf0bed977b6a1a31e019f70e865e2f52cf30caaa Mon Sep 17 00:00:00 2001 From: Jonas Cosandey Date: Fri, 6 Jul 2018 10:38:00 +0200 Subject: [PATCH 4/6] some more renaming --- .../acceptance/timed-subscription-project-detail-test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/tests/acceptance/timed-subscription-project-detail-test.js b/frontend/tests/acceptance/timed-subscription-project-detail-test.js index f8662441..e9e27f75 100644 --- a/frontend/tests/acceptance/timed-subscription-project-detail-test.js +++ b/frontend/tests/acceptance/timed-subscription-project-detail-test.js @@ -44,10 +44,10 @@ module('Acceptance | Timed Subscriptions', function(hooks) { test('subscription-project reload empty', async function(assert) { server.create('timed-subscription-project') - await visit('/sysupport-subscriptions') + await visit('/timed-subscriptions') await click('[data-test-reload-link="0"]') - assert.equal(currentURL(), '/sysupport-subscriptions/1/reload') + assert.equal(currentURL(), '/timed-subscriptions/1/reload') assert .dom('[data-test-info-panel="0"]') .includesText('support@adfinis-sygroup.ch') From 07fc743e8080080704b2ae4cebdea7c01263fd5e Mon Sep 17 00:00:00 2001 From: Jonas Cosandey Date: Fri, 6 Jul 2018 10:55:35 +0200 Subject: [PATCH 5/6] rename role and remove unused function --- backend/config-test.js | 1 + backend/config.example.js | 2 +- backend/src/user/model.js | 2 +- frontend/app/timed-admin/detail/controller.js | 4 ---- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/backend/config-test.js b/backend/config-test.js index 88edc36f..9afaf952 100644 --- a/backend/config-test.js +++ b/backend/config-test.js @@ -11,6 +11,7 @@ module.exports = { }, login: { adminRole: 'adsy-user', + employeeRole: 'adsy-user', ldap: { searchBase: 'cn=users,dc=adsy-ext,dc=becs,dc=adfinis-sygroup,dc=ch', diff --git a/backend/config.example.js b/backend/config.example.js index 72ed4237..a912c0c4 100644 --- a/backend/config.example.js +++ b/backend/config.example.js @@ -13,7 +13,7 @@ module.exports = { }, login: { adminRole: 'some-role', - internRole: 'some-other-role', + employeeRole: 'some-other-role', ldap: { // Further information how to configure LDAP under: diff --git a/backend/src/user/model.js b/backend/src/user/model.js index 4e14b812..6735e073 100644 --- a/backend/src/user/model.js +++ b/backend/src/user/model.js @@ -78,7 +78,7 @@ export default bookshelf.Model.extend( * @author Jonas Cosandey (jonas.cosandey@adfinis-sygroup.ch) */ isAdsyUser() { - return this.getGroupNames().includes(config.login.internRole) + return this.getGroupNames().includes(config.login.employeeRole) }, /** diff --git a/frontend/app/timed-admin/detail/controller.js b/frontend/app/timed-admin/detail/controller.js index dbf1aadc..2173bec5 100644 --- a/frontend/app/timed-admin/detail/controller.js +++ b/frontend/app/timed-admin/detail/controller.js @@ -28,10 +28,6 @@ export default Controller.extend({ ) }), - isAdmin: computed('session', async function() { - return await this.get('session.user').isAdmin - }), - orders: computed('fetchModels.lastSuccessful.value', function() { return ( this.get('fetchModels.lastSuccessful.value.orders') || From e65d4b7dfc8bddd3a69f160d81b3d0f47122689c Mon Sep 17 00:00:00 2001 From: Jonas Cosandey Date: Fri, 6 Jul 2018 11:21:18 +0200 Subject: [PATCH 6/6] rename intern to employee --- backend/src/login/index.js | 2 +- backend/src/timed/proxy.js | 7 +++++-- backend/src/user/model.js | 4 ++-- frontend/mirage/factories/user.js | 4 ++-- frontend/mirage/scenarios/default.js | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/backend/src/login/index.js b/backend/src/login/index.js index 71d1b18a..19220877 100644 --- a/backend/src/login/index.js +++ b/backend/src/login/index.js @@ -146,7 +146,7 @@ async function addTimedTokenToSession(session, user) { try { session.timedToken = await timedLogin() session.timedTokenTTL = new Date().getTime() - if (!user.isIntern()) { + if (!user.isEmployee()) { session.timedCustomer = await getTimedCustomer(session.timedToken, user) } } catch (e) { diff --git a/backend/src/timed/proxy.js b/backend/src/timed/proxy.js index 971a7d05..96d301d9 100644 --- a/backend/src/timed/proxy.js +++ b/backend/src/timed/proxy.js @@ -59,7 +59,10 @@ const routes = { * @return boolean - returns true if has access **/ function checkAccess(req) { - if (!req.user.isIntern && typeof req.session.timedCustomer === 'undefined') { + if ( + !req.user.isEmployee() && + typeof req.session.timedCustomer === 'undefined' + ) { return false } let access = req.user.isAdmin() @@ -95,7 +98,7 @@ function createProxy(config) { .map(key => `${key}=${queryParams[key]}`) .join('&') - if (!req.user.isIntern()) { + if (!req.user.isEmployee()) { newPath += `customer=${req.session.timedCustomer.id}` } if (req.path.match(routes.reports.path)) { diff --git a/backend/src/user/model.js b/backend/src/user/model.js index 6735e073..aaf7fa9e 100644 --- a/backend/src/user/model.js +++ b/backend/src/user/model.js @@ -71,7 +71,7 @@ export default bookshelf.Model.extend( }, /** - * Check if user is intern + * Check if user is employee * * @returns {boolean} * @public @@ -88,7 +88,7 @@ export default bookshelf.Model.extend( * @public * @author Jonas Cosandey (jonas.cosandey@adfinis-sygroup.ch) */ - isIntern() { + isEmployee() { return this.isAdmin() || this.isAdsyUser() }, diff --git a/frontend/mirage/factories/user.js b/frontend/mirage/factories/user.js index c2d150c6..e60fd1e0 100644 --- a/frontend/mirage/factories/user.js +++ b/frontend/mirage/factories/user.js @@ -24,8 +24,8 @@ export default Mirage.Factory.extend({ return ['timed', 'adsy-admin', 'adsy-vault'] } }), - intern: trait({ - username: 'intern', + employee: trait({ + username: 'employee', groups() { return ['timed', 'adsy-user', 'adsy-vault'] } diff --git a/frontend/mirage/scenarios/default.js b/frontend/mirage/scenarios/default.js index 26dd6427..a226e224 100644 --- a/frontend/mirage/scenarios/default.js +++ b/frontend/mirage/scenarios/default.js @@ -1,6 +1,6 @@ export default function(server) { server.createList('user', 1, 'customer') - server.createList('user', 1, 'intern') + server.createList('user', 1, 'employee') server.createList('user', 1, 'admin') // timed
{{t 'sysupport.date'}}{{t 'sysupport.detail.amount'}}{{t 'sysupport.detail.acknowledged'}}{{t 'timed.date'}}{{t 'timed.detail.amount'}}{{t 'timed.detail.acknowledged'}}