Add preblocking

src/function/sync/apply-actions/dispatch-parent-action/index.ts

@@ -61,7 +61,8 @@ import {
   UpdateParentNotificationFlagsAction,
   UpdateTimelimitRuleAction,
   UpdateUserFlagsAction,
-  UpdateUserLimitLoginCategory
+  UpdateUserLimitLoginCategory,
+  UpdateUserLimitLoginPreBlockDuration
 } from '../../../../action'
 import { Cache } from '../cache'
 import { ActionObjectTypeNotHandledException } from '../exception/illegal-state'
@@ -111,6 +112,7 @@ import { dispatchUpdateParentNotificationFlags } from './updateparentnotificatio
 import { dispatchUpdateTimelimitRule } from './updatetimelimitrule'
 import { dispatchUpdateUserFlagsAction } from './updateuserflags'
 import { dispatchUpdateUserLimitLoginCategoryAction } from './updateuserlimitlogincategory'
+import { dispatchUpdateUserLimitPreBlockDuration } from './updateuserlimitloginpreblockduration'
 
 export const dispatchParentAction = async ({ action, cache, parentUserId, sourceDeviceId, fromChildSelfLimitAddChildUserId }: {
   action: ParentAction
@@ -214,6 +216,8 @@ export const dispatchParentAction = async ({ action, cache, parentUserId, source
       await dispatchReviewChildTaskAction({ action, cache })
     } else if (action instanceof UpdateChildTaskAction) {
       await dispatchUpdateChildTaskAction({ action, cache })
+    } else if (action instanceof UpdateUserLimitLoginPreBlockDuration) {
+      await dispatchUpdateUserLimitPreBlockDuration({ action, cache, parentUserId })
     } else {
       throw new ActionObjectTypeNotHandledException()
     }

src/function/sync/apply-actions/dispatch-parent-action/updateuserlimitlogincategory.ts

@@ -68,7 +68,8 @@ export async function dispatchUpdateUserLimitLoginCategoryAction ({ action, cach
     await cache.database.userLimitLoginCategory.create({
       familyId: cache.familyId,
       userId: action.userId,
-      categoryId: action.categoryId
+      categoryId: action.categoryId,
+      preBlockDuration: 0
     }, {
       transaction: cache.transaction
     })

src/function/sync/apply-actions/dispatch-parent-action/updateuserlimitloginpreblockduration.ts

@@ -0,0 +1,72 @@
+/*
+ * server component for the TimeLimit App
+ * Copyright (C) 2019 - 2020 Jonas Lochmann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import { UpdateUserLimitLoginPreBlockDuration } from '../../../../action'
+import { Cache } from '../cache'
+import { ApplyActionException } from '../exception/index'
+import { MissingItemException, MissingUserException } from '../exception/missing-item'
+
+export async function dispatchUpdateUserLimitPreBlockDuration ({ action, cache, parentUserId }: {
+  action: UpdateUserLimitLoginPreBlockDuration
+  cache: Cache
+  parentUserId: string
+}) {
+  const userEntry = await cache.database.user.findOne({
+    where: {
+      familyId: cache.familyId,
+      userId: action.userId,
+      type: 'parent'
+    },
+    transaction: cache.transaction
+  })
+
+  if (!userEntry) {
+    throw new MissingUserException()
+  }
+
+  if (action.preBlockDuration !== 0 && parentUserId !== action.userId) {
+    throw new ApplyActionException({
+      staticMessage: 'only the parent user itself can add a limit login pre block duration'
+    })
+  }
+
+  const preBlockItem = await cache.database.userLimitLoginCategory.findOne({
+    transaction: cache.transaction,
+    where: {
+      familyId: cache.familyId,
+      userId: action.userId
+    }
+  })
+
+  if (preBlockItem === null) {
+    throw new MissingItemException({
+      staticMessage: 'you can not set a pre block duration if there is no pre block item'
+    })
+  }
+
+  await cache.database.userLimitLoginCategory.update({
+    preBlockDuration: action.preBlockDuration
+  }, {
+    transaction: cache.transaction,
+    where: {
+      familyId: cache.familyId,
+      userId: action.userId
+    }
+  })
+
+  cache.invalidiateUserList = true
+}

src/function/sync/get-server-data-status/user-list.ts

@@ -67,19 +67,21 @@ export async function getUserList ({ database, transaction, familyEntry }: {
     },
     attributes: [
       'userId',
-      'categoryId'
+      'categoryId',
+      'preBlockDuration'
     ],
     transaction
   })).map((item) => ({
     userId: item.userId,
-    categoryId: item.categoryId
+    categoryId: item.categoryId,
+    preBlockDuration: item.preBlockDuration
   }))
 
   const getLimitLoginCategory = (userId: string) => {
     const item = limitLoginCategories.find((item) => item.userId === userId)
 
     if (item) {
-      return item.categoryId
+      return item
     } else {
       return undefined
     }
@@ -87,22 +89,27 @@ export async function getUserList ({ database, transaction, familyEntry }: {
 
   return {
     version: familyEntry.userListVersion,
-    data: users.map((item) => ({
-      id: item.userId,
-      name: item.name,
-      password: item.passwordHash,
-      secondPasswordSalt: item.secondPasswordSalt,
-      type: item.type,
-      timeZone: item.timeZone,
-      disableLimitsUntil: parseInt(item.disableTimelimitsUntil, 10),
-      mail: item.mail,
-      currentDevice: item.currentDevice,
-      categoryForNotAssignedApps: item.categoryForNotAssignedApps,
-      relaxPrimaryDevice: item.relaxPrimaryDeviceRule,
-      mailNotificationFlags: item.mailNotificationFlags,
-      blockedTimes: '',
-      flags: parseInt(item.flags, 10),
-      llc: getLimitLoginCategory(item.userId)
-    }))
+    data: users.map((item) => {
+      const limitLoginCategory = getLimitLoginCategory(item.userId)
+
+      return {
+        id: item.userId,
+        name: item.name,
+        password: item.passwordHash,
+        secondPasswordSalt: item.secondPasswordSalt,
+        type: item.type,
+        timeZone: item.timeZone,
+        disableLimitsUntil: parseInt(item.disableTimelimitsUntil, 10),
+        mail: item.mail,
+        currentDevice: item.currentDevice,
+        categoryForNotAssignedApps: item.categoryForNotAssignedApps,
+        relaxPrimaryDevice: item.relaxPrimaryDeviceRule,
+        mailNotificationFlags: item.mailNotificationFlags,
+        blockedTimes: '',
+        flags: parseInt(item.flags, 10),
+        llc: limitLoginCategory?.categoryId,
+        pbd: limitLoginCategory?.preBlockDuration
+      }
+    })
   }
 }