Update Dockerfile to fix npm warnings

Dockerfile

@@ -9,7 +9,7 @@ COPY package.json package-lock.json tsconfig.json .eslintignore .eslintrc.js Rea
 COPY src/ /usr/src/app/src/
 COPY scripts/ /usr/src/app/scripts/
 COPY other/ /usr/src/app/other/
-RUN mkdir -p docs/schema && npm install --no-optional && npm run build && npm prune --production && rm -rf ./src
+RUN mkdir -p docs/schema && npm install --exclude=optional && npm run build && npm prune --omit=dev && rm -rf ./src
 
 # Start the App
 EXPOSE 8080

docs/api/admin.md

@@ -89,3 +89,41 @@ If there was nothing found for the mail address: HTTP status code 409 Conflict
 ### see
 
 - [premium concept](../concept/premium.md)
+
+## POST /admin/unlock-premium-v2
+
+Use this to unlock all features for one user for a specified duration.
+
+### request
+
+request properties: ``purchaseToken`` and ``purchaseId``
+
+- ``purchasetoken`` is a string which the client shows at the purchase screen
+- ``purchaseId`` is the ID that is used at the bill
+
+### response
+
+The response contains the following properties:
+
+- ``ok`` (boolean)
+- ``error``
+  - string
+  - set if and only if ``ok`` is false
+  - possible values
+    - ``token invalid``
+    - ``illegal state``
+    - ``purchase id already used``
+- ``detail``
+  - optional string
+  - should be shown to the support
+- ``lastPurchase``
+  - optional object
+  - should be shown to the support
+- ``wasAlreadyExecuted`` (boolean, set if and only if ``ok`` is true)
+
+If the request was malformed: HTTP status code 400 Bad Request
+
+Using the same ``purchaseId`` twice results in:
+
+- ``wasAlreadyExecuted`` if the familyId is unchanged
+- ``error`` = ``purchase id already used`` otherwise

docs/schema/IdentityTokenPayload.schema.json

@@ -0,0 +1,35 @@
+{
+  "additionalProperties": false,
+  "type": "object",
+  "properties": {
+    "purpose": {
+      "type": "string",
+      "enum": [
+        "purchase"
+      ]
+    },
+    "familyId": {
+      "type": "string"
+    },
+    "userId": {
+      "type": "string"
+    },
+    "mail": {
+      "type": "string"
+    },
+    "exp": {
+      "type": "number"
+    }
+  },
+  "required": [
+    "exp",
+    "familyId",
+    "mail",
+    "purpose",
+    "userId"
+  ],
+  "definitions": {},
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "IdentityTokenPayload",
+  "$id": "https://timelimit.io/IdentityTokenPayload"
+}

docs/schema/README.md

@@ -16,6 +16,8 @@
 
 *   [FinishPurchaseByGooglePlayRequest](./finishpurchasebygoogleplayrequest.md) – `https://timelimit.io/FinishPurchaseByGooglePlayRequest`
 
+*   [IdentityTokenPayload](./identitytokenpayload.md) – `https://timelimit.io/IdentityTokenPayload`
+
 *   [LinkParentMailAddressRequest](./linkparentmailaddressrequest.md) – `https://timelimit.io/LinkParentMailAddressRequest`
 
 *   [MailAuthTokenRequestBody](./mailauthtokenrequestbody.md) – `https://timelimit.io/MailAuthTokenRequestBody`

docs/schema/identitytokenpayload-definitions.md

@@ -0,0 +1,15 @@
+# Untitled undefined type in IdentityTokenPayload Schema
+
+```txt
+https://timelimit.io/IdentityTokenPayload#/definitions
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable            | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                                    |
+| :------------------ | :--------- | :------------- | :---------------------- | :---------------- | :-------------------- | :------------------ | :-------------------------------------------------------------------------------------------- |
+| Can be instantiated | No         | Unknown status | Unknown identifiability | Forbidden         | Allowed               | none                | [IdentityTokenPayload.schema.json\*](IdentityTokenPayload.schema.json "open original schema") |
+
+## definitions Type
+
+unknown

docs/schema/identitytokenpayload-properties-exp.md

@@ -0,0 +1,15 @@
+# Untitled number in IdentityTokenPayload Schema
+
+```txt
+https://timelimit.io/IdentityTokenPayload#/properties/exp
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable            | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                                    |
+| :------------------ | :--------- | :------------- | :---------------------- | :---------------- | :-------------------- | :------------------ | :-------------------------------------------------------------------------------------------- |
+| Can be instantiated | No         | Unknown status | Unknown identifiability | Forbidden         | Allowed               | none                | [IdentityTokenPayload.schema.json\*](IdentityTokenPayload.schema.json "open original schema") |
+
+## exp Type
+
+`number`

docs/schema/identitytokenpayload-properties-familyid.md

@@ -0,0 +1,15 @@
+# Untitled string in IdentityTokenPayload Schema
+
+```txt
+https://timelimit.io/IdentityTokenPayload#/properties/familyId
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable            | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                                    |
+| :------------------ | :--------- | :------------- | :---------------------- | :---------------- | :-------------------- | :------------------ | :-------------------------------------------------------------------------------------------- |
+| Can be instantiated | No         | Unknown status | Unknown identifiability | Forbidden         | Allowed               | none                | [IdentityTokenPayload.schema.json\*](IdentityTokenPayload.schema.json "open original schema") |
+
+## familyId Type
+
+`string`

docs/schema/identitytokenpayload-properties-mail.md

@@ -0,0 +1,15 @@
+# Untitled string in IdentityTokenPayload Schema
+
+```txt
+https://timelimit.io/IdentityTokenPayload#/properties/mail
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable            | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                                    |
+| :------------------ | :--------- | :------------- | :---------------------- | :---------------- | :-------------------- | :------------------ | :-------------------------------------------------------------------------------------------- |
+| Can be instantiated | No         | Unknown status | Unknown identifiability | Forbidden         | Allowed               | none                | [IdentityTokenPayload.schema.json\*](IdentityTokenPayload.schema.json "open original schema") |
+
+## mail Type
+
+`string`

docs/schema/identitytokenpayload-properties-purpose.md

@@ -0,0 +1,23 @@
+# Untitled string in IdentityTokenPayload Schema
+
+```txt
+https://timelimit.io/IdentityTokenPayload#/properties/purpose
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable            | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                                    |
+| :------------------ | :--------- | :------------- | :---------------------- | :---------------- | :-------------------- | :------------------ | :-------------------------------------------------------------------------------------------- |
+| Can be instantiated | No         | Unknown status | Unknown identifiability | Forbidden         | Allowed               | none                | [IdentityTokenPayload.schema.json\*](IdentityTokenPayload.schema.json "open original schema") |
+
+## purpose Type
+
+`string`
+
+## purpose Constraints
+
+**enum**: the value of this property must be equal to one of the following values:
+
+| Value        | Explanation |
+| :----------- | :---------- |
+| `"purchase"` |             |

docs/schema/identitytokenpayload-properties-userid.md

@@ -0,0 +1,15 @@
+# Untitled string in IdentityTokenPayload Schema
+
+```txt
+https://timelimit.io/IdentityTokenPayload#/properties/userId
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable            | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                                    |
+| :------------------ | :--------- | :------------- | :---------------------- | :---------------- | :-------------------- | :------------------ | :-------------------------------------------------------------------------------------------- |
+| Can be instantiated | No         | Unknown status | Unknown identifiability | Forbidden         | Allowed               | none                | [IdentityTokenPayload.schema.json\*](IdentityTokenPayload.schema.json "open original schema") |
+
+## userId Type
+
+`string`

docs/schema/identitytokenpayload.md

@@ -0,0 +1,125 @@
+# IdentityTokenPayload Schema
+
+```txt
+https://timelimit.io/IdentityTokenPayload
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                                  |
+| :------------------ | :--------- | :------------- | :----------- | :---------------- | :-------------------- | :------------------ | :------------------------------------------------------------------------------------------ |
+| Can be instantiated | Yes        | Unknown status | No           | Forbidden         | Forbidden             | none                | [IdentityTokenPayload.schema.json](IdentityTokenPayload.schema.json "open original schema") |
+
+## IdentityTokenPayload Type
+
+`object` ([IdentityTokenPayload](identitytokenpayload.md))
+
+# IdentityTokenPayload Properties
+
+| Property              | Type     | Required | Nullable       | Defined by                                                                                                                           |
+| :-------------------- | :------- | :------- | :------------- | :----------------------------------------------------------------------------------------------------------------------------------- |
+| [purpose](#purpose)   | `string` | Required | cannot be null | [IdentityTokenPayload](identitytokenpayload-properties-purpose.md "https://timelimit.io/IdentityTokenPayload#/properties/purpose")   |
+| [familyId](#familyid) | `string` | Required | cannot be null | [IdentityTokenPayload](identitytokenpayload-properties-familyid.md "https://timelimit.io/IdentityTokenPayload#/properties/familyId") |
+| [userId](#userid)     | `string` | Required | cannot be null | [IdentityTokenPayload](identitytokenpayload-properties-userid.md "https://timelimit.io/IdentityTokenPayload#/properties/userId")     |
+| [mail](#mail)         | `string` | Required | cannot be null | [IdentityTokenPayload](identitytokenpayload-properties-mail.md "https://timelimit.io/IdentityTokenPayload#/properties/mail")         |
+| [exp](#exp)           | `number` | Required | cannot be null | [IdentityTokenPayload](identitytokenpayload-properties-exp.md "https://timelimit.io/IdentityTokenPayload#/properties/exp")           |
+
+## purpose
+
+
+
+`purpose`
+
+*   is required
+
+*   Type: `string`
+
+*   cannot be null
+
+*   defined in: [IdentityTokenPayload](identitytokenpayload-properties-purpose.md "https://timelimit.io/IdentityTokenPayload#/properties/purpose")
+
+### purpose Type
+
+`string`
+
+### purpose Constraints
+
+**enum**: the value of this property must be equal to one of the following values:
+
+| Value        | Explanation |
+| :----------- | :---------- |
+| `"purchase"` |             |
+
+## familyId
+
+
+
+`familyId`
+
+*   is required
+
+*   Type: `string`
+
+*   cannot be null
+
+*   defined in: [IdentityTokenPayload](identitytokenpayload-properties-familyid.md "https://timelimit.io/IdentityTokenPayload#/properties/familyId")
+
+### familyId Type
+
+`string`
+
+## userId
+
+
+
+`userId`
+
+*   is required
+
+*   Type: `string`
+
+*   cannot be null
+
+*   defined in: [IdentityTokenPayload](identitytokenpayload-properties-userid.md "https://timelimit.io/IdentityTokenPayload#/properties/userId")
+
+### userId Type
+
+`string`
+
+## mail
+
+
+
+`mail`
+
+*   is required
+
+*   Type: `string`
+
+*   cannot be null
+
+*   defined in: [IdentityTokenPayload](identitytokenpayload-properties-mail.md "https://timelimit.io/IdentityTokenPayload#/properties/mail")
+
+### mail Type
+
+`string`
+
+## exp
+
+
+
+`exp`
+
+*   is required
+
+*   Type: `number`
+
+*   cannot be null
+
+*   defined in: [IdentityTokenPayload](identitytokenpayload-properties-exp.md "https://timelimit.io/IdentityTokenPayload#/properties/exp")
+
+### exp Type
+
+`number`
+
+# IdentityTokenPayload Definitions

package-lock.json

@@ -3314,9 +3314,9 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -4447,9 +4447,9 @@
       "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ=="
     },
     "node_modules/socket.io-parser": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz",
-      "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz",
+      "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==",
       "dependencies": {
         "@types/component-emitter": "^1.2.10",
         "component-emitter": "~1.3.0",
@@ -7730,9 +7730,9 @@
       }
     },
     "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -8576,9 +8576,9 @@
       "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ=="
     },
     "socket.io-parser": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz",
-      "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz",
+      "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==",
       "requires": {
         "@types/component-emitter": "^1.2.10",
         "component-emitter": "~1.3.0",

scripts/build-schemas.js

@@ -42,7 +42,8 @@ const types = [
   'RequestIdentityTokenRequest',
   'RequestWithAuthToken',
   'SendMailLoginCodeRequest',
-  'SignInByMailCodeRequest'
+  'SignInByMailCodeRequest',
+  'IdentityTokenPayload'
 ]
 
 const docOnlyTypes = [

src/api/admin.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2020 Jonas Lochmann
+ * Copyright (C) 2019 - 2022 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
@@ -18,11 +18,13 @@
 import { json } from 'body-parser'
 import { Router } from 'express'
 import { BadRequest, Conflict } from 'http-errors'
+import * as Sequelize from 'sequelize'
 import { Database } from '../database'
-import { addPurchase } from '../function/purchase'
+import { addPurchase, canDoNextPurchase } from '../function/purchase'
 import { getStatusMessage, setStatusMessage } from '../function/statusmessage'
 import { EventHandler } from '../monitoring/eventhandler'
 import { generatePurchaseId } from '../util/token'
+import { verifyIdentitifyToken, TokenValidationException } from '../util/identity-token'
 import { WebsocketApi } from '../websocket'
 
 export const createAdminRouter = ({ database, websocket, eventHandler }: {
@@ -120,7 +122,8 @@ export const createAdminRouter = ({ database, websocket, eventHandler }: {
           database,
           familyId: userEntry.familyId,
           type,
-          transactionId: 'manual-' + type + '-' + generatePurchaseId(),
+          service: 'directpurchase',
+          transactionId: 'legacyunlock-' + type + '-' + generatePurchaseId(),
           websocket,
           transaction
         })
@@ -132,5 +135,149 @@ export const createAdminRouter = ({ database, websocket, eventHandler }: {
     }
   })
 
+  router.post('/unlock-premium-v2', json(), async (req, res, next) => {
+    try {
+      if (
+        typeof req.body !== 'object' ||
+        typeof req.body.purchaseToken !== 'string' ||
+        typeof req.body.purchaseId !== 'string'
+      ) {
+        throw new BadRequest()
+      }
+
+      const purchaseToken: string = req.body.purchaseToken
+      const purchaseId: string = req.body.purchaseId
+
+      const tokenContent = await verifyIdentitifyToken(purchaseToken)
+
+      if (tokenContent.purpose !== 'purchase') {
+        res.json({ ok: false, error: 'token invalid', detail: 'wrong purpose' })
+
+        return
+      }
+
+      const response = await database.transaction(async (transaction) => {
+        const userValid = await database.user.count({
+          where: {
+            familyId: tokenContent.familyId,
+            userId: tokenContent.userId,
+            mail: tokenContent.mail,
+            type: 'parent'
+          },
+          transaction
+        })
+
+        if (!userValid) return {
+          ok: false,
+          error: 'token invalid',
+          detail: 'user not found'
+        }
+
+        let mailToReturn: string
+
+        if (tokenContent.mail !== '') mailToReturn = tokenContent.mail
+        else {
+          const userEntryWithMail = await database.user.findOne({
+            where: {
+              familyId: tokenContent.familyId,
+              mail: {
+                [Sequelize.Op.ne]: ''
+              },
+              type: 'parent'
+            },
+            transaction
+          })
+
+          if (!userEntryWithMail) return {
+            ok: false,
+            error: 'illegal state',
+            detail: 'no user with mail found'
+          }
+
+          mailToReturn = userEntryWithMail.mail
+        }
+
+        let wasAlreadyExecuted: boolean
+
+        const oldPurchaseByPurchaseId = await database.purchase.findOne({
+          where: {
+            service: 'directpurchase',
+            transactionId: purchaseId
+          }
+        })
+
+        if (oldPurchaseByPurchaseId === null) wasAlreadyExecuted = false
+        else if (oldPurchaseByPurchaseId.familyId === tokenContent.familyId) wasAlreadyExecuted = true
+        else return {
+          ok: false,
+          error: 'purchase id already used'
+        }
+
+        if (!wasAlreadyExecuted) {
+          const familyEntry = await database.family.findOne({
+            where: {
+              familyId: tokenContent.familyId
+            },
+            transaction
+          })
+
+          if (!familyEntry) return {
+            ok: false,
+            error: 'family not found'
+          }
+
+          const canDoPurchase = canDoNextPurchase({ fullVersionUntil: parseInt(familyEntry.fullVersionUntil) })
+
+          if (!canDoPurchase) {
+            const lastPurchase = await database.purchase.findOne({
+              where: {
+                familyId: tokenContent.familyId
+              },
+              transaction,
+              order: [['loggedAt', 'DESC']],
+              limit: 1
+            })
+
+            return {
+              ok: false,
+              error: 'can not renew now',
+              lastPurchase: lastPurchase ? {
+                service: lastPurchase.service,
+                transactionId: lastPurchase.transactionId,
+                timestamp: parseInt(lastPurchase.loggedAt),
+                timestring: new Date(parseInt(lastPurchase.loggedAt)).toISOString()
+              } : undefined
+            }
+          }
+
+          await addPurchase({
+            database,
+            familyId: tokenContent.familyId,
+            type: 'year',
+            service: 'directpurchase',
+            transactionId: purchaseId,
+            websocket,
+            transaction
+          })
+        }
+
+        return {
+          ok: true,
+          mail: mailToReturn,
+          wasAlreadyExecuted
+        }
+      })
+
+      res.json(response)
+    } catch (ex) {
+      if (ex instanceof TokenValidationException) res.json({
+        ok: false,
+        error: 'token invalid',
+        detail: ex.message
+      })
+      else next(ex)
+    }
+  })
+
   return router
 }

src/api/purchase.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2020 Jonas Lochmann
+ * Copyright (C) 2019 - 2022 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
@@ -122,6 +122,7 @@ export const createPurchaseRouter = ({ database, websocket }: {
           database,
           familyId: deviceEntry.familyId,
           type,
+          service: 'googleplay',
           transactionId: orderId,
           websocket,
           transaction

src/api/schema.ts

@@ -162,5 +162,16 @@ export interface SignInByMailCodeRequest {
   receivedCode: string
 }
 
+export interface IdentityTokenCreatePayload {
+  purpose: 'purchase'
+  familyId: string
+  userId: string
+  mail: string
+}
+
+export type IdentityTokenPayload = IdentityTokenCreatePayload & {
+  exp: number
+}
+
 export { SerializedParentAction, SerializedChildAction, SerializedAppLogicAction } from '../action/serialization'
 export { ServerDataStatus } from '../object/serverdatastatus'

src/api/validator.ts

@@ -1,5 +1,5 @@
 // tslint:disable 
-import { ClientPushChangesRequest, ClientPullChangesRequest, MailAuthTokenRequestBody, CreateFamilyByMailTokenRequest, SignIntoFamilyRequest, RecoverParentPasswordRequest, RegisterChildDeviceRequest, SerializedParentAction, SerializedAppLogicAction, SerializedChildAction, CreateRegisterDeviceTokenRequest, CanDoPurchaseRequest, FinishPurchaseByGooglePlayRequest, LinkParentMailAddressRequest, UpdatePrimaryDeviceRequest, RemoveDeviceRequest, RequestIdentityTokenRequest, RequestWithAuthToken, SendMailLoginCodeRequest, SignInByMailCodeRequest } from './schema'
+import { ClientPushChangesRequest, ClientPullChangesRequest, MailAuthTokenRequestBody, CreateFamilyByMailTokenRequest, SignIntoFamilyRequest, RecoverParentPasswordRequest, RegisterChildDeviceRequest, SerializedParentAction, SerializedAppLogicAction, SerializedChildAction, CreateRegisterDeviceTokenRequest, CanDoPurchaseRequest, FinishPurchaseByGooglePlayRequest, LinkParentMailAddressRequest, UpdatePrimaryDeviceRequest, RemoveDeviceRequest, RequestIdentityTokenRequest, RequestWithAuthToken, SendMailLoginCodeRequest, SignInByMailCodeRequest, IdentityTokenPayload } from './schema'
 import Ajv from 'ajv'
 const ajv = new Ajv()
 
@@ -3451,3 +3451,36 @@ export const isSignInByMailCodeRequest: (value: unknown) => value is SignInByMai
   "definitions": definitions,
   "$schema": "http://json-schema.org/draft-07/schema#"
 })
+export const isIdentityTokenPayload: (value: unknown) => value is IdentityTokenPayload = ajv.compile({
+  "additionalProperties": false,
+  "type": "object",
+  "properties": {
+    "purpose": {
+      "type": "string",
+      "enum": [
+        "purchase"
+      ]
+    },
+    "familyId": {
+      "type": "string"
+    },
+    "userId": {
+      "type": "string"
+    },
+    "mail": {
+      "type": "string"
+    },
+    "exp": {
+      "type": "number"
+    }
+  },
+  "required": [
+    "exp",
+    "familyId",
+    "mail",
+    "purpose",
+    "userId"
+  ],
+  "definitions": definitions,
+  "$schema": "http://json-schema.org/draft-07/schema#"
+})

src/database/purchase.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2020 Jonas Lochmann
+ * Copyright (C) 2019 - 2022 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
@@ -21,7 +21,7 @@ import { SequelizeAttributes } from './types'
 
 export interface PurchaseAttributes {
   familyId: string
-  service: 'googleplay'
+  service: 'googleplay' | 'directpurchase'
   transactionId: string
   type: 'month' | 'year'
   loggedAt: string
@@ -37,7 +37,7 @@ export type PurchaseModelStatic = typeof Sequelize.Model & {
 export const attributes: SequelizeAttributes<PurchaseAttributes> = {
   familyId: { ...familyIdColumn },
   service: {
-    ...createEnumColumn(['googleplay']),
+    ...createEnumColumn(['googleplay', 'directpurchase']),
     primaryKey: true
   },
   transactionId: {

src/function/parent/create-family.ts

@@ -69,7 +69,7 @@ export const createFamily = async ({ database, mailAuthToken, firstParentDevice,
       fullVersionUntil: (Date.now() + 1000 * 60 * 60 * 24 * 14).toString(10),
       hasFullVersion: true,
       nextServerKeyRequestSeq: '1',
-      u2fKeysVersion: generateIdWithinFamily()
+      u2fKeysVersion: generateVersionId()
     }, { transaction })
 
     // create parent user

src/function/purchase/add-purchase.ts

@@ -24,16 +24,15 @@ const day = 1000 * 60 * 60 * 24
 const month = day * 31
 const year = day * 366
 
-export const addPurchase = async ({ database, familyId, type, transactionId, websocket, transaction }: {
+export const addPurchase = async ({ database, familyId, type, service, transactionId, websocket, transaction }: {
   database: Database
   familyId: string
   type: 'month' | 'year'
+  service: 'googleplay' | 'directpurchase'
   transactionId: string
   websocket: WebsocketApi
   transaction: Transaction
 }) => {
-  const service = 'googleplay'
-
   const oldPurchaseEntry = await database.purchase.findOne({
     where: {
       service,

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

@@ -150,6 +150,8 @@ export const dispatchParentAction = async ({
     return dispatchUpdateCategoryBlockedTimes({ action, cache, fromChildSelfLimitAddChildUserId })
   } else if (action instanceof UpdateCategoryDisableLimitsAction) {
     return dispatchUpdateCategoryDisableLimits({ action, cache, fromChildSelfLimitAddChildUserId })
+  } else if (action instanceof UpdateTimelimitRuleAction) {
+    return dispatchUpdateTimelimitRule({ action, cache, fromChildSelfLimitAddChildUserId })
   }
 
   if (fromChildSelfLimitAddChildUserId !== null) {
@@ -211,8 +213,6 @@ export const dispatchParentAction = async ({
       return dispatchUpdateNetworkTimeVerification({ action, cache })
     } else if (action instanceof UpdateParentNotificationFlagsAction) {
       return dispatchUpdateParentNotificationFlags({ action, cache })
-    } else if (action instanceof UpdateTimelimitRuleAction) {
-      return dispatchUpdateTimelimitRule({ action, cache })
     } else if (action instanceof RemoveUserAction) {
       return dispatchRemoveUser({ action, cache, parentUserId })
     } else if (action instanceof ReportU2fLoginAction) {

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

@@ -17,11 +17,17 @@
 
 import { UpdateTimelimitRuleAction } from '../../../../action'
 import { Cache } from '../cache'
-import { MissingRuleException } from '../exception/missing-item'
+import { MissingRuleException, MissingCategoryException } from '../exception/missing-item'
+import {
+  CanNotModifyOtherUsersBySelfLimitationException, CanNotRelaxRestrictionsSelfLimitException
+} from '../exception/self-limit'
 
-export async function dispatchUpdateTimelimitRule ({ action, cache }: {
+export async function dispatchUpdateTimelimitRule ({
+  action, cache, fromChildSelfLimitAddChildUserId
+}: {
   action: UpdateTimelimitRuleAction
   cache: Cache
+  fromChildSelfLimitAddChildUserId: string | null
 }) {
   const ruleEntry = await cache.database.timelimitRule.findOne({
     where: {
@@ -35,6 +41,53 @@ export async function dispatchUpdateTimelimitRule ({ action, cache }: {
     throw new MissingRuleException()
   }
 
+  if (fromChildSelfLimitAddChildUserId != null) {
+    const categoryEntryUnsafe = await cache.database.category.findOne({
+      where: {
+        familyId: cache.familyId,
+        categoryId: ruleEntry.categoryId
+      },
+      transaction: cache.transaction,
+      attributes: ['childId']
+    })
+
+    if (!categoryEntryUnsafe) {
+      throw new MissingCategoryException()
+    }
+
+    const categoryEntry = {
+      childId: categoryEntryUnsafe.childId
+    }
+
+
+    if (fromChildSelfLimitAddChildUserId !== categoryEntry.childId) {
+      throw new CanNotModifyOtherUsersBySelfLimitationException()
+    }
+
+    const wasSessionDurationLimitationEnabled =
+      ruleEntry.sessionPauseMilliseconds > 0 && ruleEntry.sessionDurationMilliseconds > 0
+
+    const countOldAffectedDays = Array(7)
+      .fill(0)
+      .reduce((sum, _, index) => sum + ((ruleEntry.dayMaskAsBitmask >> index) & 1), 0)
+
+    const isAtLeastAsStrictAsPreviously =
+      action.maximumTimeInMillis <= ruleEntry.maximumTimeInMillis &&
+      (action.dayMask & ruleEntry.dayMaskAsBitmask) === ruleEntry.dayMaskAsBitmask &&
+      (action.applyToExtraTimeUsage || !ruleEntry.applyToExtraTimeUsage) &&
+      action.start <= ruleEntry.startMinuteOfDay &&
+      action.end >= ruleEntry.endMinuteOfDay &&
+      (!wasSessionDurationLimitationEnabled || (
+          action.sessionDurationMilliseconds <= ruleEntry.sessionDurationMilliseconds &&
+          action.sessionPauseMilliseconds >= ruleEntry.sessionPauseMilliseconds
+      )) &&
+      (!action.perDay || ruleEntry.perDay || countOldAffectedDays <= 1)
+
+    if (!isAtLeastAsStrictAsPreviously) {
+      throw new CanNotRelaxRestrictionsSelfLimitException()
+    }
+  }
+
   ruleEntry.applyToExtraTimeUsage = action.applyToExtraTimeUsage
   ruleEntry.dayMaskAsBitmask = action.dayMask
   ruleEntry.maximumTimeInMillis = action.maximumTimeInMillis

src/function/sync/apply-actions/exception/self-limit.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2020 Jonas Lochmann
+ * Copyright (C) 2019 - 2022 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
@@ -32,3 +32,9 @@ export class ActionNotSupportedBySelfLimitationException extends SelfLimitationE
 }
 
 export class SelfLimitNotPossibleException extends SelfLimitationException {}
+
+export class CanNotRelaxRestrictionsSelfLimitException extends SelfLimitationException {
+  constructor () {
+    super({ staticMessage: 'can not relax restrictions with the self limitation' })
+  }
+}

src/function/sync/get-server-data-status/index.ts

@@ -59,7 +59,7 @@ export const generateServerDataStatus = async ({
       familyEntry.hasFullVersion ? parseInt(familyEntry.fullVersionUntil, 10) : 0
     ),
     message: await getStatusMessage({ database, transaction }) || undefined,
-    apiLevel: 6
+    apiLevel: 7
   }
 
   if (familyEntry.deviceListVersion !== clientStatus.devices) {

src/util/identity-token.ts

@@ -15,21 +15,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { SignJWT } from 'jose'
+import { SignJWT, jwtVerify } from 'jose'
 import { config } from '../config'
+import { IdentityTokenPayload, IdentityTokenCreatePayload } from '../api/schema'
+import { isIdentityTokenPayload } from '../api/validator'
 
-export async function createIdentityToken({ purpose, familyId, userId, mail }: {
-  purpose: string
-  familyId: string
-  userId: string
-  mail: string
-}) {
-  if (config.signSecret === '') throw new MissingSignSecretException()
-
+export async function createIdentityToken({ purpose, familyId, userId, mail }: IdentityTokenCreatePayload) {
   const jwt = await new SignJWT({ purpose, familyId, userId, mail })
     .setExpirationTime('7d')
     .setProtectedHeader({ alg: 'HS512' })
-    .sign(Buffer.from(config.signSecret, 'utf8'))
+    .sign(getSignSecret())
 
   return Buffer.from(jwt, 'ascii')
     .toString('base64')
@@ -38,4 +33,31 @@ export async function createIdentityToken({ purpose, familyId, userId, mail }: {
     .join('\n')
 }
 
+export async function verifyIdentitifyToken(token: string): Promise<IdentityTokenPayload> {
+  try {
+    const { payload } = await jwtVerify(
+      Buffer.from(token, 'base64').toString('ascii'),
+      getSignSecret(),
+      { algorithms: ['HS512'] }
+    )
+
+    if (!isIdentityTokenPayload(payload)) throw new BadPayloadException()
+
+    return payload
+  } catch (ex) {
+    if (ex instanceof TokenValidationException) throw ex
+    else if (ex instanceof Error) throw new TokenValidationException(ex.message)
+    else throw ex
+  }
+}
+
+function getSignSecret(): Buffer {
+  if (config.signSecret === '') throw new MissingSignSecretException()
+
+  return Buffer.from(config.signSecret, 'utf8')
+}
+
 export class MissingSignSecretException extends Error {}
+
+export class TokenValidationException extends Error {}
+class BadPayloadException extends TokenValidationException { constructor() { super('bad payload') } }