✨ new setting to enable OIDC auto login

🐛 trying to fix issue #216 - incorrect dates saved

imports/api/projects/server/publications.js

@@ -166,7 +166,7 @@ Meteor.publish('projectStats', async function projectStats(projectId) {
               .isBetween(beforePreviousMonthStart, beforePreviousMonthEnd)) {
               beforePreviousMonthHours += Number.parseFloat(timecard.hours)
             }
-            if (project.rates[timecard.userId]) {
+            if (project?.rates && project.rates[timecard.userId]) {
               totalRevenue += Number.parseFloat(timecard.hours)
                 * Number.parseFloat(project.rates[timecard.userId])
             } else {

imports/ui/pages/administration/components/oidccomponent.js

@@ -15,7 +15,6 @@ Template.oidccomponent.events({
     event.preventDefault()
     const configuration = {
       service: 'oidc',
-      loginStyle: 'popup',
     }
     for (const element of templateInstance.$('.js-setting-input')) {
       const { name } = element

imports/ui/pages/details/components/detailtimetable.js

@@ -67,8 +67,8 @@ function detailedDataTableMapper(entry, forExport) {
     mapping.push(entry.state)
   }
   if (getGlobalSetting('useStartTime')) {
-    mapping.push(dayjs.utc(entry.date).local().format('HH:mm'))
-    mapping.push(dayjs.utc(entry.date).local().add(entry.hours, 'hour').format('HH:mm'))
+    mapping.push(dayjs.utc(entry.date).local().format('HH:mm')) // Ensure consistent timezone usage
+    mapping.push(dayjs.utc(entry.date).local().add(entry.hours, 'hour').format('HH:mm')) // Ensure consistent timezone usage
   }
   mapping.push(Number(timeInUserUnit(entry.hours)))
   if (getGlobalSetting('showRateInDetails')) {
@@ -113,8 +113,8 @@ Template.detailtimetable.onCreated(function workingtimetableCreated() {
         }
         if (this.data?.period.get() === 'custom') {
           subscriptionParameters.dates = {
-            startDate: getUserSetting('customStartDate') ? getUserSetting('customStartDate') : dayjs.utc().startOf('month').toDate(),
-            endDate: getUserSetting('customEndDate') ? getUserSetting('customEndDate') : dayjs.utc().toDate(),
+            startDate: getUserSetting('customStartDate') ? getUserSetting('customStartDate') : dayjs.utc().startOf('month').toDate(), // Ensure consistent timezone usage
+            endDate: getUserSetting('customEndDate') ? getUserSetting('customEndDate') : dayjs.utc().toDate(), // Ensure consistent timezone usage
           }
         }
         this.detailedEntriesPeriodCountHandle = this.subscribe('getDetailedTimeEntriesForPeriodCount', subscriptionParameters)
@@ -133,8 +133,8 @@ Template.detailtimetable.onCreated(function workingtimetableCreated() {
         customer: this.data?.customer.get(),
         period: this.data?.period.get(),
         dates: {
-          startDate: getUserSetting('customStartDate') ? getUserSetting('customStartDate') : dayjs.utc().startOf('month').toDate(),
-          endDate: getUserSetting('customEndDate') ? getUserSetting('customEndDate') : dayjs.utc().toDate(),
+          startDate: getUserSetting('customStartDate') ? getUserSetting('customStartDate') : dayjs.utc().startOf('month').toDate(), // Ensure consistent timezone usage
+          endDate: getUserSetting('customEndDate') ? getUserSetting('customEndDate') : dayjs.utc().toDate(), // Ensure consistent timezone usage
         },
         userId: this.data?.resource.get(),
         limit: this.data?.limit.get(),

imports/ui/pages/signIn.js

@@ -1,6 +1,7 @@
 import { FlowRouter } from 'meteor/ostrio:flow-router-extra'
 import { validateEmail, getGlobalSetting } from '../../utils/frontend_helpers'
-import { isOidcConfigured, disableDefaultLoginForm } from '../../utils/oidc/oidc_helper'
+import { isOidcConfigured, disableDefaultLoginForm, isAutoLoginEnabled } from '../../utils/oidc/oidc_helper'
+import { oidcReady } from '../../utils/oidc/oidc_client'
 import { t } from '../../utils/i18n.js'
 import './signIn.html'
 
@@ -81,3 +82,14 @@ Template.signIn.events({
     FlowRouter.go('register', {}, { email: templateInstance.$('#at-field-email').val() })
   },
 })
+
+Template.signIn.onRendered(function signInRendered() {
+  const templateInstance = this
+  this.autorun(() => {
+    if(oidcReady.get() && isAutoLoginEnabled()) {
+      Meteor.loginWithOidc((error) => {
+        handleLoginResult(error, templateInstance)
+      })
+    }
+  })
+})

imports/ui/pages/track/components/calendar.js

@@ -14,8 +14,8 @@ import { getHolidays } from '../../../../utils/holiday.js'
 Template.calendar.onCreated(function calendarCreated() {
   dayjs.extend(utc)
   this.subscribe('myprojects', {})
-  this.startDate = new ReactiveVar(dayjs.utc().startOf('month').toDate())
-  this.endDate = new ReactiveVar(dayjs.utc().endOf('month').toDate())
+  this.startDate = new ReactiveVar(dayjs.utc().startOf('month').toDate()) // Ensure consistent timezone usage
+  this.endDate = new ReactiveVar(dayjs.utc().endOf('month').toDate()) // Ensure consistent timezone usage
   this.tcid = new ReactiveVar()
   this.selectedProjectId = new ReactiveVar()
   this.selectedDate = new ReactiveVar()
@@ -42,7 +42,7 @@ Template.calendar.onRendered(() => {
         droppable: true,
         aspectRatio: 2,
         height: 'auto',
-        timeZone: 'UTC',
+        timeZone: 'UTC', // Ensure consistent timezone usage
         firstDay: getUserSetting('startOfWeek'),
         themeSystem: 'bootstrap',
         events: (fetchInfo, successCallback) => {
@@ -119,7 +119,7 @@ Template.calendar.onRendered(() => {
           new bootstrap.Modal($('#edit-tc-entry-modal')[0], { focus: false }).show()
         },
         datesSet: (dateInfo) => {
-          FlowRouter.setQueryParams({ date: dayjs(dateInfo.view.currentStart).format('YYYY-MM-DD') })
+          FlowRouter.setQueryParams({ date: dayjs.utc(dateInfo.view.currentStart).format('YYYY-MM-DD') }) // Ensure consistent timezone usage
         },
       })
       templateInstance.calendar.render()

imports/ui/pages/track/components/weektable.js

@@ -34,14 +34,14 @@ Template.weektable.onCreated(function weekTableCreated() {
   this.totalForWeekPerDay = new ReactiveVar([])
   this.autorun(() => {
     if (this.subscriptionsReady()) {
-      this.startDate.set(dayjs().startOf('day').isoWeekday(getUserSetting('startOfWeek')))
-      this.endDate.set(dayjs().endOf('day').isoWeekday(getUserSetting('startOfWeek')).add(6, 'day'))
+      this.startDate.set(dayjs.utc().startOf('day').isoWeekday(getUserSetting('startOfWeek'))) // Ensure consistent timezone usage
+      this.endDate.set(dayjs.utc().endOf('day').isoWeekday(getUserSetting('startOfWeek')).add(6, 'day')) // Ensure consistent timezone usage
     }
   })
   this.autorun(() => {
     if (FlowRouter.getQueryParam('date')) {
-      this.startDate.set(dayjs.utc(FlowRouter.getQueryParam('date')).isoWeekday(getUserSetting('startOfWeek')), 'YYYY-MM-DD')
-      this.endDate.set(dayjs.utc(FlowRouter.getQueryParam('date')).isoWeekday(getUserSetting('startOfWeek')).add(6, 'day'), 'YYYY-MM-DD')
+      this.startDate.set(dayjs.utc(FlowRouter.getQueryParam('date')).isoWeekday(getUserSetting('startOfWeek')), 'YYYY-MM-DD') // Ensure consistent timezone usage
+      this.endDate.set(dayjs.utc(FlowRouter.getQueryParam('date')).isoWeekday(getUserSetting('startOfWeek')).add(6, 'day'), 'YYYY-MM-DD') // Ensure consistent timezone usage
     }
   })
   this.autorun(async () => {
@@ -77,7 +77,7 @@ Template.weektable.helpers({
   endDate() { return Template.instance().endDate },
   getTotalForDay(day) {
     for (const element of Template.instance().totalForWeekPerDay.get()) {
-      if (dayjs.utc(new Date(element._id.date)).format(getGlobalSetting('weekviewDateFormat')) === day) {
+      if (dayjs.utc(new Date(element._id.date)).format(getGlobalSetting('weekviewDateFormat')) === day) { // Ensure consistent timezone usage
         return element.totalForDate !== 0 ? timeInUserUnit(element.totalForDate) : false
       }
     }
@@ -93,7 +93,7 @@ Template.weektable.helpers({
     }
     return false
   },
-  isTodayClass: (weekday) => (dayjs.utc(weekday, getGlobalSetting('weekviewDateFormat')).isSame(dayjs.utc(), 'day') ? 'text-primary' : ''),
+  isTodayClass: (weekday) => (dayjs.utc(weekday, getGlobalSetting('weekviewDateFormat')).isSame(dayjs.utc(), 'day') ? 'text-primary' : ''), // Ensure consistent timezone usage
 })
 
 Template.weektable.events({
@@ -107,7 +107,7 @@ Template.weektable.events({
   },
   'click .js-today': (event, templateInstance) => {
     event.preventDefault()
-    FlowRouter.setQueryParams({ date: dayjs.utc().isoWeekday(getUserSetting('startOfWeek')).format('YYYY-MM-DD') })
+    FlowRouter.setQueryParams({ date: dayjs.utc().isoWeekday(getUserSetting('startOfWeek')).format('YYYY-MM-DD') }) // Ensure consistent timezone usage
   },
   'keyup .js-hours': (event, templateInstance) => {
     if (event.keyCode === 13) {
@@ -137,7 +137,7 @@ Template.weektable.events({
           hours /= 60
         }
         const projectId = $(element).data('project-id')
-        const date = dayjs.utc(startDate.add(Number(templateInstance.$(element).data('week-day')), 'day').format('YYYY-MM-DD')).toDate()
+        const date = dayjs.utc(startDate.add(Number(templateInstance.$(element).data('week-day')), 'day').format('YYYY-MM-DD')).toDate() // Ensure consistent timezone usage
         const existingElement = weekArray
           .findIndex((arrayElement) => arrayElement.projectId === projectId
           && arrayElement.task === task && dayjs(arrayElement.date).isSame(dayjs(date)))
@@ -291,7 +291,7 @@ Template.weektablerow.helpers({
   getHoursForDay(day, task) {
     if (task.entries && getGlobalSetting('weekviewDateFormat') && i18nReady.get()) {
       const entryForDay = task.entries
-        .filter((entry) => dayjs.utc(entry.date).format(getGlobalSetting('weekviewDateFormat')) === dayjs.utc(day, getGlobalSetting('weekviewDateFormat')).format(getGlobalSetting('weekviewDateFormat')))
+        .filter((entry) => dayjs.utc(entry.date).format(getGlobalSetting('weekviewDateFormat')) === dayjs.utc(day, getGlobalSetting('weekviewDateFormat')).format(getGlobalSetting('weekviewDateFormat'))) // Ensure consistent timezone usage
         .reduce(((total, element) => total + element.hours), 0)
       return entryForDay !== 0 ? timeInUserUnit(entryForDay) : ''
     }
@@ -312,7 +312,7 @@ Template.weektablerow.helpers({
     if (!Meteor.loggingIn() && Meteor.user() && Meteor.user().profile) {
       Template.instance().methodTimeEntries.get().concat(Template.instance().tempTimeEntries.get()).forEach((element) => {
         if (element.entries) {
-          total += element.entries.filter((entry) => dayjs.utc(entry.date).format(getGlobalSetting('weekviewDateFormat')) === dayjs.utc(day, getGlobalSetting('weekviewDateFormat')).format(getGlobalSetting('weekviewDateFormat')))
+          total += element.entries.filter((entry) => dayjs.utc(entry.date).format(getGlobalSetting('weekviewDateFormat')) === dayjs.utc(day, getGlobalSetting('weekviewDateFormat')).format(getGlobalSetting('weekviewDateFormat'))) // Ensure consistent timezone usage
             .reduce((tempTotal, current) => tempTotal + Number(current.hours), 0)
         }
       })

imports/ui/pages/track/tracktime.js

@@ -77,7 +77,7 @@ Template.tracktime.onCreated(function tracktimeCreated() {
   dayjs.extend(utc)
   dayjs.extend(customParseFormat)
   dayjs.extend(duration)
-  this.date = new ReactiveVar(dayjs().toDate())
+  this.date = new ReactiveVar(dayjs.utc().toDate()) // Ensure consistent timezone usage
   this.projectId = new ReactiveVar()
   this.tcid = new ReactiveVar()
   this.totalTime = new ReactiveVar(0)
@@ -99,7 +99,7 @@ Template.tracktime.onCreated(function tracktimeCreated() {
       this.date.set(this.data?.dateArg.get())
     } else if (!(this.data?.dateArg && this.data?.dateArg.get())
       && !(this.data?.tcid && this.data?.tcid.get()) && FlowRouter.getQueryParam('date')) {
-      this.date.set(dayjs(FlowRouter.getQueryParam('date'), 'YYYY-MM-DD').toDate())
+      this.date.set(dayjs.utc(FlowRouter.getQueryParam('date'), 'YYYY-MM-DD').toDate()) // Ensure consistent timezone usage
     }
     if (this.data?.projectIdArg && this.data?.projectIdArg.get()) {
       this.projectId.set(this.data?.projectIdArg.get())
@@ -111,12 +111,12 @@ Template.tracktime.onCreated(function tracktimeCreated() {
       if (this.subscriptionsReady()) {
         this.time_entry.set(Timecards.findOne(this.tcid.get()))
         this.date.set(Timecards.findOne({ _id: this.tcid.get() })
-          ? dayjs.utc(Timecards.findOne({ _id: this.tcid.get() }).date).toDate()
+          ? dayjs.utc(Timecards.findOne({ _id: this.tcid.get() }).date).toDate() // Ensure consistent timezone usage
           : dayjs().toDate())
         this.projectId.set(Timecards.findOne({ _id: this.tcid.get() }) ? Timecards.findOne({ _id: this.tcid.get() }).projectId : '')
       }
     } else {
-      handle = this.subscribe('myTimecardsForDate', { date: dayjs(this.date.get()).format('YYYY-MM-DD') })
+      handle = this.subscribe('myTimecardsForDate', { date: dayjs.utc(this.date.get()).format('YYYY-MM-DD') }) // Ensure consistent timezone usage
       if (handle.ready()) {
         Timecards.find().forEach((timecard) => {
           this.subscribe('publicProjectName', timecard.projectId)
@@ -203,7 +203,7 @@ Template.tracktime.events({
     const localDate = dayjs(templateInstance.$('.js-date').val()).toDate()
     let date = dayjs.utc(templateInstance.$('.js-date').val(), getGlobalSetting('dateformatVerbose')).isValid()
       ? dayjs.utc(templateInstance.$('.js-date').val(), getGlobalSetting('dateformatVerbose')).toDate()
-      : dayjs.utc(`${localDate.getFullYear()}-${localDate.getMonth() + 1}-${localDate.getDate()}`).toDate()
+      : dayjs.utc(`${localDate.getFullYear()}-${localDate.getMonth() + 1}-${localDate.getDate()}`).toDate() // Ensure consistent timezone usage
     if (getGlobalSetting('useStartTime') && !templateInstance.tcid?.get()) {
       if ($('#startTime').val()) {
         date = dayjs.utc(date.setHours($('#startTime').val().split(':')[0], $('#startTime').val().split(':')[1])).toDate()
@@ -404,7 +404,7 @@ function isEditMode() {
 }
 Template.tracktime.helpers({
   date: () => (Template.instance().tcid && Template.instance().tcid.get()
-    ? dayjs.utc(Template.instance().date.get()).format(getGlobalSetting('dateformatVerbose'))
+    ? dayjs.utc(Template.instance().date.get()).format(getGlobalSetting('dateformatVerbose')) // Ensure consistent timezone usage
     : dayjs(Template.instance().date.get()).format(getGlobalSetting('dateformatVerbose'))),
   projectId: () => Template.instance().projectId.get(),
   reactiveProjectId: () => Template.instance().projectId,

imports/utils/oidc/oidc_client.js

@@ -4,7 +4,7 @@ import { Random } from 'meteor/random'
 import { ServiceConfiguration } from 'meteor/service-configuration'
 
 const SERVICE_NAME = 'oidc'
-
+const oidcReady = new ReactiveVar(false)
 function registerOidc() {
   Accounts.oauth.registerService(SERVICE_NAME)
 
@@ -66,5 +66,6 @@ function registerOidc() {
       popupOptions,
     })
   }
+  oidcReady.set(true)
 }
-export { registerOidc }
+export { registerOidc, oidcReady }

imports/utils/oidc/oidc_helper.js

@@ -7,6 +7,9 @@ const oidcFields = [
   {
     property: 'disableDefaultLoginForm', label: 'Disable Default Login Form', type: 'checkbox', value: false,
   },
+  {
+    property: 'autoInitiateLogin', label: 'Automatically initiate login', type: 'checkbox', value: false,
+  },
   {
     property: 'clientId', label: 'Client ID', type: 'text', value: '',
   },
@@ -31,6 +34,9 @@ const oidcFields = [
   {
     property: 'requestPermissions', label: 'Request Permissions', type: 'text', value: '"openid", "profile", "email"',
   },
+  {
+    property: 'loginStyle', label: 'Login style (popup or redirect)', type: 'text', value: 'popup',
+  },
 ]
 
 function isOidcConfigured() {
@@ -39,7 +45,16 @@ function isOidcConfigured() {
   }
   return false
 }
-
+function isAutoLoginEnabled() {
+  if (!getGlobalSetting('enableOpenIDConnect')) {
+    return false
+  }
+  const configuration = ServiceConfiguration.configurations.findOne({ service: SERVICE_NAME })
+  if (configuration === undefined) {
+    return false
+  }
+  return configuration.autoInitiateLogin
+}
 function disableDefaultLoginForm() {
   if (!getGlobalSetting('enableOpenIDConnect')) {
     return false
@@ -61,5 +76,5 @@ function getOidcConfiguration(name) {
   return ''
 }
 export {
-  oidcFields, isOidcConfigured, disableDefaultLoginForm, getOidcConfiguration,
+  oidcFields, isOidcConfigured, disableDefaultLoginForm, getOidcConfiguration, isAutoLoginEnabled
 }