From ea7910b54cac57bd444b99f74c5ce518d57ebf06 Mon Sep 17 00:00:00 2001 From: Christian Zosel Date: Wed, 8 May 2024 17:20:47 +0200 Subject: [PATCH] fix(auth): refactor current user handling into service Writing instances of JS classes directly to the `data` property of the ember simple auth service is problematic, because ember simple auth always saves the _serialized_ form of the class in local storage. In our case, this caused issues when the application is open in multiple tabs, and on tab triggers a token refresh: In that case, the initialization of the class instance is not triggered, and the serialized data is read directly from local storage. This refactors the current implementation to use a separate service, as suggested by the ember-simple-auth docs: https://github.com/mainmatter/ember-simple-auth/blob/master/guides/managing-current-user.md --- frontend/app/abilities/absence-credit.js | 4 +- frontend/app/abilities/overtime-credit.js | 4 +- frontend/app/abilities/page.js | 4 +- frontend/app/abilities/report.js | 4 +- frontend/app/abilities/user.js | 4 +- frontend/app/analysis/edit/controller.js | 10 ++--- frontend/app/analysis/index/controller.js | 3 +- .../report-review-warning/component.js | 2 +- .../report-review-warning/template.hbs | 4 +- .../app/components/sy-topnav/component.js | 2 +- .../app/components/sy-topnav/template.hbs | 6 +-- frontend/app/index/activities/controller.js | 3 +- frontend/app/index/activities/route.js | 6 --- frontend/app/index/attendances/controller.js | 3 +- frontend/app/index/attendances/route.js | 15 +------ frontend/app/index/controller.js | 19 ++++----- frontend/app/index/reports/controller.js | 7 ++-- frontend/app/index/reports/route.js | 4 +- frontend/app/index/route.js | 5 ++- frontend/app/projects/controller.js | 4 +- frontend/app/protected/controller.js | 5 ++- frontend/app/protected/route.js | 35 ++-------------- frontend/app/services/current-user.js | 40 +++++++++++++++++++ frontend/app/services/rejected-reports.js | 4 +- frontend/app/services/unverified-reports.js | 4 +- frontend/app/users/index/controller.js | 10 ++--- frontend/app/users/index/template.hbs | 2 +- frontend/tests/helpers/current-user-mock.js | 9 +++++ frontend/tests/unit/abilities/report-test.js | 32 +++++++-------- .../tests/unit/services/current-user-test.js | 11 +++++ 30 files changed, 140 insertions(+), 125 deletions(-) create mode 100644 frontend/app/services/current-user.js create mode 100644 frontend/tests/helpers/current-user-mock.js create mode 100644 frontend/tests/unit/services/current-user-test.js diff --git a/frontend/app/abilities/absence-credit.js b/frontend/app/abilities/absence-credit.js index d9854c28..c8cea5d7 100644 --- a/frontend/app/abilities/absence-credit.js +++ b/frontend/app/abilities/absence-credit.js @@ -2,10 +2,10 @@ import { inject as service } from "@ember/service"; import { Ability } from "ember-can"; export default class AbsenceCreditAbility extends Ability { - @service session; + @service currentUser; get user() { - return this.session.data.user; + return this.currentUser.user; } get canEdit() { return this.user.isSuperuser; diff --git a/frontend/app/abilities/overtime-credit.js b/frontend/app/abilities/overtime-credit.js index 5c14354c..040f38b3 100644 --- a/frontend/app/abilities/overtime-credit.js +++ b/frontend/app/abilities/overtime-credit.js @@ -2,10 +2,10 @@ import { inject as service } from "@ember/service"; import { Ability } from "ember-can"; export default class OvertimeCreditAbility extends Ability { - @service session; + @service currentUser; get user() { - return this.session.data.user; + return this.currentUser.user; } get canEdit() { return this.user.isSuperuser; diff --git a/frontend/app/abilities/page.js b/frontend/app/abilities/page.js index 557c9d27..133f00e6 100644 --- a/frontend/app/abilities/page.js +++ b/frontend/app/abilities/page.js @@ -2,10 +2,10 @@ import { inject as service } from "@ember/service"; import { Ability } from "ember-can"; export default class PageAbility extends Ability { - @service session; + @service currentUser; get user() { - return this.session.data.user; + return this.currentUser.user; } get canAccess() { if (!this.user) { diff --git a/frontend/app/abilities/report.js b/frontend/app/abilities/report.js index b68eed97..a80212e0 100644 --- a/frontend/app/abilities/report.js +++ b/frontend/app/abilities/report.js @@ -2,10 +2,10 @@ import { inject as service } from "@ember/service"; import { Ability } from "ember-can"; export default class ReportAbility extends Ability { - @service session; + @service currentUser; get user() { - return this.session.data.user; + return this.currentUser.user; } get canEdit() { diff --git a/frontend/app/abilities/user.js b/frontend/app/abilities/user.js index f7706a94..ada672a1 100644 --- a/frontend/app/abilities/user.js +++ b/frontend/app/abilities/user.js @@ -2,10 +2,10 @@ import { inject as service } from "@ember/service"; import { Ability } from "ember-can"; export default class UserAbility extends Ability { - @service session; + @service currentUser; get user() { - return this.session.data.user; + return this.currentUser.user; } get canRead() { diff --git a/frontend/app/analysis/edit/controller.js b/frontend/app/analysis/edit/controller.js index 290e7cfd..e8fe3a2d 100644 --- a/frontend/app/analysis/edit/controller.js +++ b/frontend/app/analysis/edit/controller.js @@ -55,7 +55,7 @@ export default class AnalysisEditController extends Controller { @service notify; @service router; @service fetch; - @service session; + @service currentUser; @service store; @service unverifiedReports; @@ -86,11 +86,11 @@ export default class AnalysisEditController extends Controller { } get isAccountant() { - return this.session.data.user.isAccountant; + return this.currentUser.user.isAccountant; } get isSuperuser() { - return this.session.data.user.isSuperuser; + return this.currentUser.user.isSuperuser; } @task @@ -130,11 +130,11 @@ export default class AnalysisEditController extends Controller { } get hasSelectedOwnReports() { - return this.intersectionModel.user.get("id") === this.session.data.user.id; + return this.intersectionModel.user.get("id") === this.currentUser.user.id; } get isReviewer() { - return allQueryParams(this).reviewer === this.session.data.user.id; + return allQueryParams(this).reviewer === this.currentUser.user.id; } get canVerify() { diff --git a/frontend/app/analysis/index/controller.js b/frontend/app/analysis/index/controller.js index 2b7c1f66..5eb454d0 100644 --- a/frontend/app/analysis/index/controller.js +++ b/frontend/app/analysis/index/controller.js @@ -50,6 +50,7 @@ export default class AnalysisController extends QPController { exportLimit = config.APP.EXPORT_LIMIT; @service session; + @service currentUser; @service store; @service router; @service notify; @@ -119,7 +120,7 @@ export default class AnalysisController extends QPController { get canBill() { return ( - this.session.data.user.isAccountant || this.session.data.user.isSuperuser + this.currentUser.user.isAccountant || this.currentUser.user.isSuperuser ); } diff --git a/frontend/app/components/report-review-warning/component.js b/frontend/app/components/report-review-warning/component.js index c168de6c..93bc3310 100644 --- a/frontend/app/components/report-review-warning/component.js +++ b/frontend/app/components/report-review-warning/component.js @@ -2,7 +2,7 @@ import { inject as service } from "@ember/service"; import Component from "@glimmer/component"; export default class ReportReviewWarning extends Component { - @service session; + @service currentUser; @service unverifiedReports; diff --git a/frontend/app/components/report-review-warning/template.hbs b/frontend/app/components/report-review-warning/template.hbs index efff3fa5..deb5b2ba 100644 --- a/frontend/app/components/report-review-warning/template.hbs +++ b/frontend/app/components/report-review-warning/template.hbs @@ -8,7 +8,7 @@ toDate=(moment-format this.unverifiedReports.reportsToDate "YYYY-MM-DD" ) - reviewer=this.session.data.user.id + reviewer=this.currentUser.user.id editable=1 rejected=null verified=0 @@ -34,7 +34,7 @@ @query={{hash fromDate=null toDate=null - user=this.session.data.user.id + user=this.currentUser.user.id editable=1 rejected=1 verified=0 diff --git a/frontend/app/components/sy-topnav/component.js b/frontend/app/components/sy-topnav/component.js index c73f531d..c879d4c4 100644 --- a/frontend/app/components/sy-topnav/component.js +++ b/frontend/app/components/sy-topnav/component.js @@ -3,7 +3,7 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; export default class SyTopnav extends Component { - @service session; + @service currentUser; @service media; diff --git a/frontend/app/components/sy-topnav/template.hbs b/frontend/app/components/sy-topnav/template.hbs index 379ec5ea..5662fd1a 100644 --- a/frontend/app/components/sy-topnav/template.hbs +++ b/frontend/app/components/sy-topnav/template.hbs @@ -47,7 +47,7 @@ {{/if}} {{/unless}} - {{#if this.session.data.user.isSuperuser}} + {{#if this.currentUser.user.isSuperuser}}
  • @@ -59,9 +59,9 @@
    • - + - {{this.session.data.user.fullName}} + {{this.currentUser.user.fullName}}
    • diff --git a/frontend/app/index/activities/controller.js b/frontend/app/index/activities/controller.js index 66be7687..9bf0c2ce 100644 --- a/frontend/app/index/activities/controller.js +++ b/frontend/app/index/activities/controller.js @@ -22,6 +22,7 @@ export default class ActivitiesIndexController extends Controller { @service store; @service notify; @service tracking; + @service currentUser; @tracked showUnknownWarning = false; @tracked showOverlappingWarning = false; @@ -58,7 +59,7 @@ export default class ActivitiesIndexController extends Controller { return ( activity.get("date") && activity.get("date").isSame(this.model, "day") && - activity.get("user.id") === this.user.id && + activity.get("user.id") === this.currentUser.user.id && !activity.get("isNew") && !activity.get("isDeleted") ); diff --git a/frontend/app/index/activities/route.js b/frontend/app/index/activities/route.js index 579ffc04..62a189fa 100644 --- a/frontend/app/index/activities/route.js +++ b/frontend/app/index/activities/route.js @@ -4,10 +4,4 @@ export default class IndexActivitiesRoute extends Route { model() { return this.modelFor("index"); } - - setupController(controller, ...args) { - super.setupController(controller, ...args); - - controller.set("user", this.modelFor("protected")); - } } diff --git a/frontend/app/index/attendances/controller.js b/frontend/app/index/attendances/controller.js index 0c7518ba..0bb5d37e 100644 --- a/frontend/app/index/attendances/controller.js +++ b/frontend/app/index/attendances/controller.js @@ -19,6 +19,7 @@ export default class AttendanceController extends Controller { @service notify; @service store; @service tracking; + @service currentUser; AttendanceValidator = AttendanceValidator; @@ -53,7 +54,7 @@ export default class AttendanceController extends Controller { return this._allAttendances.filter((a) => { return ( a.get("date").isSame(this.model, "day") && - a.get("user.id") === this.user.id && + a.get("user.id") === this.currentUser.user.id && !a.get("isDeleted") ); }); diff --git a/frontend/app/index/attendances/route.js b/frontend/app/index/attendances/route.js index e0d4c77f..02363a97 100644 --- a/frontend/app/index/attendances/route.js +++ b/frontend/app/index/attendances/route.js @@ -12,17 +12,4 @@ import Route from "@ember/routing/route"; * @extends Ember.Route * @public */ -export default class AttendaceIndexRoute extends Route { - /** - * Setup controller hook, set the current user - * - * @method setupContrller - * @param {Ember.Controller} controller The controller - * @public - */ - setupController(controller, ...args) { - super.setupController(controller, ...args); - - controller.set("user", this.modelFor("protected")); - } -} +export default class AttendaceIndexRoute extends Route {} diff --git a/frontend/app/index/controller.js b/frontend/app/index/controller.js index 45f35369..52fd54ed 100644 --- a/frontend/app/index/controller.js +++ b/frontend/app/index/controller.js @@ -36,6 +36,7 @@ export default class IndexController extends Controller { @service store; @service notify; @service tracking; + @service currentUser; AbsenceValidations = AbsenceValidations; MultipleAbsenceValidations = MultipleAbsenceValidations; @@ -55,7 +56,7 @@ export default class IndexController extends Controller { return ( a.get("date") && a.get("date").isSame(this.date, "day") && - a.get("user.id") === this.user?.id && + a.get("user.id") === this.currentUser.user?.id && !a.get("isDeleted") ); }); @@ -166,7 +167,7 @@ export default class IndexController extends Controller { return ( attendance.get("date") && attendance.get("date").isSame(this.date, "day") && - attendance.get("user.id") === this.user?.id && + attendance.get("user.id") === this.currentUser.user?.id && !attendance.get("isDeleted") ); }); @@ -214,7 +215,7 @@ export default class IndexController extends Controller { return this.allReports.filter((report) => { return ( report.date.isSame(this.date, "day") && - report.get("user.id") === this.user?.id && + report.get("user.id") === this.currentUser.user?.id && !report.isNew && !report.isDeleted ); @@ -231,7 +232,7 @@ export default class IndexController extends Controller { return this.allAbsences.filter((absence) => { return ( absence.date.isSame(this.date, "day") && - absence.get("user.id") === this.user?.id && + absence.get("user.id") === this.currentUser.user?.id && !absence.isNew && !absence.isDeleted ); @@ -301,7 +302,7 @@ export default class IndexController extends Controller { * @public */ get expectedWorktime() { - return this.user.activeEmployment.worktimePerDay; + return this.currentUser.user.activeEmployment.worktimePerDay; } /** @@ -312,7 +313,7 @@ export default class IndexController extends Controller { */ get workdays() { // eslint-disable-next-line ember/no-get - return get(this, "user.activeEmployment.location.workdays"); + return get(this, "currentUser.user.activeEmployment.location.workdays"); } /** @@ -324,14 +325,14 @@ export default class IndexController extends Controller { weeklyOverviewData = trackedFunction(this, {}, async () => { const allReports = this.allReports.filter( (report) => - report.get("user.id") === this.user.get("id") && + report.get("user.id") === this.currentUser.user.get("id") && !report.get("isDeleted") && !report.get("isNew") ); const allAbsences = this.allAbsences.filter( (absence) => - absence.get("user.id") === this.user.get("id") && + absence.get("user.id") === this.currentUser.user.get("id") && !absence.get("isDeleted") && !absence.get("isNew") ); @@ -420,7 +421,7 @@ export default class IndexController extends Controller { const params = { from_date: from.format("YYYY-MM-DD"), to_date: to.format("YYYY-MM-DD"), - user: this.user?.id, + user: this.currentUser.user?.id, }; const absences = yield this.store.query("absence", params); diff --git a/frontend/app/index/reports/controller.js b/frontend/app/index/reports/controller.js index dc3a1da0..cf0ed329 100644 --- a/frontend/app/index/reports/controller.js +++ b/frontend/app/index/reports/controller.js @@ -33,6 +33,7 @@ export default class IndexReportController extends Controller { @service store; @service notify; @service router; + @service currentUser; ReportValidations = ReportValidations; @@ -65,7 +66,7 @@ export default class IndexReportController extends Controller { get reports() { const reportsToday = this._allReports.filter((r) => { return ( - (!r.get("user.id") || r.get("user.id") === this.user.id) && + (!r.get("user.id") || r.get("user.id") === this.currentUser.user.id) && r.get("date").isSame(this.model, "day") && !r.get("isDeleted") ); @@ -74,7 +75,7 @@ export default class IndexReportController extends Controller { if (!reportsToday.filterBy("isNew", true).get("length")) { this.store.createRecord("report", { date: this.model, - user: this.user, + user: this.currentUser.user, }); } @@ -86,7 +87,7 @@ export default class IndexReportController extends Controller { const absences = this.store.peekAll("absence").filter((absence) => { return ( absence.date.isSame(this.model, "day") && - absence.get("user.id") === this.user.id && + absence.get("user.id") === this.currentUser.user.id && !absence.isNew && !absence.isDeleted ); diff --git a/frontend/app/index/reports/route.js b/frontend/app/index/reports/route.js index 8f2e7404..2a4a9ba3 100644 --- a/frontend/app/index/reports/route.js +++ b/frontend/app/index/reports/route.js @@ -4,6 +4,7 @@ import moment from "moment"; export default class IndexReportsRoute extends Route { @service store; + @service currentUser; @service notify; /** @@ -22,7 +23,6 @@ export default class IndexReportsRoute extends Route { async setupController(controller, model, ...args) { super.setupController(controller, model, ...args); - controller.set("user", this.modelFor("protected")); controller.set("rescheduleDate", model); if (controller.task) { @@ -36,7 +36,7 @@ export default class IndexReportsRoute extends Route { : "", date: model, comment: controller.comment ?? "", - user: this.modelFor("protected"), + user: this.currentUser.user, review: controller.review ?? false, notBillable: controller.notBillable ?? false, remainingEffort: task.mostRecentRemainingEffort, diff --git a/frontend/app/index/route.js b/frontend/app/index/route.js index 84ecca68..f4353eec 100644 --- a/frontend/app/index/route.js +++ b/frontend/app/index/route.js @@ -18,6 +18,8 @@ const DATE_FORMAT = "YYYY-MM-DD"; * @public */ export default class IndexRoute extends Route { + @service currentUser; + lastUpdateDate = null; queryParams = { @@ -65,7 +67,7 @@ export default class IndexRoute extends Route { this.lastUpdateDate = formattedDate; - const userId = this.session.data.user.id; + const userId = this.currentUser.user.id; const day = model.format(DATE_FORMAT); const from = moment(model).subtract(20, "days").format(DATE_FORMAT); const to = moment(model).add(10, "days").format(DATE_FORMAT); @@ -107,7 +109,6 @@ export default class IndexRoute extends Route { super.setupController(controller, model, ...args); controller.date = model; - controller.set("user", this.modelFor("protected")); controller.setCenter.perform({ moment: model }); controller.set("newAbsence", { diff --git a/frontend/app/projects/controller.js b/frontend/app/projects/controller.js index 67ce5ea1..4d380a35 100644 --- a/frontend/app/projects/controller.js +++ b/frontend/app/projects/controller.js @@ -10,7 +10,7 @@ export default class ProjectsController extends Controller { taskValidations = TaskValidations; projectValidations = ProjectValidations; - @service session; + @service currentUser; @service store; @service notify; @@ -29,7 +29,7 @@ export default class ProjectsController extends Controller { } get user() { - return this.session.data.user; + return this.currentUser.user; } get customers() { diff --git a/frontend/app/protected/controller.js b/frontend/app/protected/controller.js index 1aabb39e..51ec8476 100644 --- a/frontend/app/protected/controller.js +++ b/frontend/app/protected/controller.js @@ -7,6 +7,7 @@ export default class ProtectedController extends Controller { @service notify; @service router; @service session; + @service currentUser; @service("autostart-tour") autostartTour; @service tour; @@ -37,7 +38,7 @@ export default class ProtectedController extends Controller { @action async neverTour() { try { - const user = this.model; + const user = this.currentUser.user; user.tourDone = true; await user.save(); this.visible = false; @@ -70,7 +71,7 @@ export default class ProtectedController extends Controller { this.autostartTour.done = []; this.visible = false; - this.tour.prepare(this.model); + this.tour.prepare(this.currentUser.user); this.tour.startTour(); } } diff --git a/frontend/app/protected/route.js b/frontend/app/protected/route.js index bb299f33..dce4d99a 100644 --- a/frontend/app/protected/route.js +++ b/frontend/app/protected/route.js @@ -1,7 +1,6 @@ import { action } from "@ember/object"; import Route from "@ember/routing/route"; import { inject as service } from "@ember/service"; -import moment from "moment"; /** * The protected route @@ -13,6 +12,7 @@ import moment from "moment"; */ export default class ProtectedRoute extends Route { @service session; + @service currentUser; @service("autostart-tour") autostartTour; @service router; @service media; @@ -21,36 +21,7 @@ export default class ProtectedRoute extends Route { async beforeModel(transition) { await this.session.requireAuthentication(transition, "login"); - } - - async model() { - const user = await this.fetch.fetch( - `/api/v1/users/me?${new URLSearchParams({ - include: "supervisors,supervisees", - })}`, - { - method: "GET", - } - ); - - await this.store.pushPayload("user", user); - - const usermodel = await this.store.peekRecord("user", user.data.id); - - // Fetch current employment - const employment = await this.store.query("employment", { - user: usermodel.id, - date: moment().format("YYYY-MM-DD"), - include: "location", - }); - - if (!employment.length) { - this.router.transitionTo("no-access"); - } - - this.session.data.user = usermodel; - - return usermodel; + await this.currentUser.load(); } /** @@ -66,7 +37,7 @@ export default class ProtectedRoute extends Route { const visible = !this.autostartTour.allDone && - !model.tourDone && + !this.currentUser.user.tourDone && (this.media.isMd || this.media.isLg || this.media.isXl); controller.set("visible", visible); diff --git a/frontend/app/services/current-user.js b/frontend/app/services/current-user.js new file mode 100644 index 00000000..f4db3669 --- /dev/null +++ b/frontend/app/services/current-user.js @@ -0,0 +1,40 @@ +import Service, { inject as service } from "@ember/service"; +import moment from "moment"; + +export default class CurrentUserService extends Service { + @service session; + @service fetch; + @service store; + @service router; + + async load() { + if (!this.session.isAuthenticated) { + return; + } + const user = await this.fetch.fetch( + `/api/v1/users/me?${new URLSearchParams({ + include: "supervisors,supervisees", + })}`, + { + method: "GET", + } + ); + + await this.store.pushPayload("user", user); + + const usermodel = await this.store.peekRecord("user", user.data.id); + + // Fetch current employment + const employment = await this.store.query("employment", { + user: usermodel.id, + date: moment().format("YYYY-MM-DD"), + include: "location", + }); + + if (!employment.length) { + this.router.transitionTo("no-access"); + } + + this.user = usermodel; + } +} diff --git a/frontend/app/services/rejected-reports.js b/frontend/app/services/rejected-reports.js index c845a941..7180b22c 100644 --- a/frontend/app/services/rejected-reports.js +++ b/frontend/app/services/rejected-reports.js @@ -7,7 +7,7 @@ const INTERVAL_DELAY = 10 * 60000; // 10 Minutes export default class RejectedReportsService extends Service { @service store; - @service session; + @service currentUser; @service notify; @@ -37,7 +37,7 @@ export default class RejectedReportsService extends Service { async pollReports() { try { const reports = await this.store.query("report", { - user: this.session.data.user.id, + user: this.currentUser.user.id, editable: 1, rejected: 1, page: { number: 1, size: 1 }, diff --git a/frontend/app/services/unverified-reports.js b/frontend/app/services/unverified-reports.js index c3367158..eb12282a 100644 --- a/frontend/app/services/unverified-reports.js +++ b/frontend/app/services/unverified-reports.js @@ -18,7 +18,7 @@ const INTERVAL_DELAY = 10 * 60000; // 10 Minutes export default class UnverifiedReportsService extends Service { @service store; - @service session; + @service currentUser; @service notify; @@ -49,7 +49,7 @@ export default class UnverifiedReportsService extends Service { try { const reports = await this.store.query("report", { to_date: this.reportsToDate.format("YYYY-MM-DD"), - reviewer: this.session.data.user.id, + reviewer: this.currentUser.user.id, editable: 1, verified: 0, page: { number: 1, size: 1 }, diff --git a/frontend/app/users/index/controller.js b/frontend/app/users/index/controller.js index 339c1b95..d52e4f9a 100644 --- a/frontend/app/users/index/controller.js +++ b/frontend/app/users/index/controller.js @@ -9,7 +9,7 @@ import QPController from "timed/controllers/qpcontroller"; export default class UsersIndexController extends QPController { queryParams = ["search", "supervisor", "active", "ordering"]; - @service session; + @service currentUser; @service router; @service store; @@ -35,10 +35,6 @@ export default class UsersIndexController extends QPController { return this.supervisor && this.store.peekRecord("user", this.supervisor); } - get currentUser() { - return this.session.data.user; - } - get fetchData() { return this._fetchData ?? {}; } @@ -72,10 +68,10 @@ export default class UsersIndexController extends QPController { return yield this.store.query("user", { ...this.allQueryParams, - ...(this.currentUser.isSuperuser + ...(this.currentUser.user.isSuperuser ? {} : { - supervisor: this.currentUser.id, + supervisor: this.currentUser.user.id, }), }); } diff --git a/frontend/app/users/index/template.hbs b/frontend/app/users/index/template.hbs index 101d0210..dc9fa217 100644 --- a/frontend/app/users/index/template.hbs +++ b/frontend/app/users/index/template.hbs @@ -11,7 +11,7 @@ @onChange={{perform this.setSearchFilter}} /> - {{#if this.currentUser.isSuperuser}} + {{#if this.currentUser.user.isSuperuser}} Supervisor diff --git a/frontend/tests/helpers/current-user-mock.js b/frontend/tests/helpers/current-user-mock.js new file mode 100644 index 00000000..09b6a25a --- /dev/null +++ b/frontend/tests/helpers/current-user-mock.js @@ -0,0 +1,9 @@ +import Service from "@ember/service"; + +class CurrentUserMock extends Service {} + +export default function setupCurrentUser(hooks) { + hooks.beforeEach(async function () { + this.owner.register("service:currentUser", CurrentUserMock); + }); +} diff --git a/frontend/tests/unit/abilities/report-test.js b/frontend/tests/unit/abilities/report-test.js index 78b93865..01158859 100644 --- a/frontend/tests/unit/abilities/report-test.js +++ b/frontend/tests/unit/abilities/report-test.js @@ -1,24 +1,24 @@ import EmberObject from "@ember/object"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; -import setupSession from "timed/tests/helpers/session-mock"; +import setupCurrentUser from "timed/tests/helpers/current-user-mock"; module("Unit | Ability | report", function (hooks) { setupTest(hooks); - setupSession(hooks); + setupCurrentUser(hooks); test("can edit when user is superuser", function (assert) { const ability = this.owner.lookup("ability:report"); - const session = this.owner.lookup("service:session"); - session.data = { user: EmberObject.create({ isSuperuser: true }) }; + const currentUser = this.owner.lookup("service:currentUser"); + currentUser.user = EmberObject.create({ isSuperuser: true }); assert.true(ability.get("canEdit")); }); test("can edit when user is superuser and report is verified", function (assert) { const ability = this.owner.lookup("ability:report"); - const session = this.owner.lookup("service:session"); - session.data = { user: EmberObject.create({ isSuperuser: true }) }; + const currentUser = this.owner.lookup("service:currentUser"); + currentUser.user = EmberObject.create({ isSuperuser: true }); ability.set("model", { verifiedBy: EmberObject.create({ id: 1 }) }); assert.true(ability.get("canEdit")); @@ -26,8 +26,8 @@ module("Unit | Ability | report", function (hooks) { test("can edit when user owns report", function (assert) { const ability = this.owner.lookup("ability:report"); - const session = this.owner.lookup("service:session"); - session.data = { user: EmberObject.create({ id: 1 }) }; + const currentUser = this.owner.lookup("service:currentUser"); + currentUser.user = EmberObject.create({ id: 1 }); ability.set("model", { user: EmberObject.create({ id: 1 }) }); assert.true(ability.get("canEdit")); @@ -35,8 +35,8 @@ module("Unit | Ability | report", function (hooks) { test("can edit when user is supervisor of owner", function (assert) { const ability = this.owner.lookup("ability:report"); - const session = this.owner.lookup("service:session"); - session.data = { user: EmberObject.create({ id: 1 }) }; + const currentUser = this.owner.lookup("service:currentUser"); + currentUser.user = EmberObject.create({ id: 1 }); ability.set("model", { user: EmberObject.create({ supervisors: [{ id: 1 }] }), }); @@ -48,8 +48,8 @@ module("Unit | Ability | report", function (hooks) { const ability = this.owner.lookup("ability:report"); const user = EmberObject.create({ id: 1 }); const projectAssignee = [{ user }]; - const session = this.owner.lookup("service:session"); - session.data = { user }; + const currentUser = this.owner.lookup("service:currentUser"); + currentUser.user = user; ability.set( "model", EmberObject.create({ @@ -62,8 +62,8 @@ module("Unit | Ability | report", function (hooks) { test("can not edit when not allowed", function (assert) { const ability = this.owner.lookup("ability:report"); - const session = this.owner.lookup("service:session"); - session.data = { user: EmberObject.create({ id: 1, isSuperuser: false }) }; + const currentUser = this.owner.lookup("service:currentUser"); + currentUser.user = EmberObject.create({ id: 1, isSuperuser: false }); ability.set("model", { user: EmberObject.create({ id: 2, supervisors: [{ id: 2 }] }), task: { project: { reviewers: [{ id: 2 }] } }, @@ -75,8 +75,8 @@ module("Unit | Ability | report", function (hooks) { test("can not edit when report is verified and billed", function (assert) { const ability = this.owner.lookup("ability:report"); - const session = this.owner.lookup("service:session"); - session.data = { user: EmberObject.create({ id: 1, isSuperuser: false }) }; + const currentUser = this.owner.lookup("service:currentUser"); + currentUser.user = EmberObject.create({ id: 1, isSuperuser: false }); ability.set("model", { user: EmberObject.create({ id: 1, supervisors: [{ id: 1 }] }), projectAssignees: [{ id: 1 }], diff --git a/frontend/tests/unit/services/current-user-test.js b/frontend/tests/unit/services/current-user-test.js new file mode 100644 index 00000000..a6da10fe --- /dev/null +++ b/frontend/tests/unit/services/current-user-test.js @@ -0,0 +1,11 @@ +import { setupTest } from "ember-qunit"; +import { module, test } from "qunit"; + +module("Unit | Service | currentUser", function (hooks) { + setupTest(hooks); + + test("exists", function (assert) { + const service = this.owner.lookup("service:currentUser"); + assert.ok(service); + }); +});