tering-serieuze-types 1.27.1 → 2.0.0

package/dist/index.js

@@ -143,6 +143,12 @@ __decorateClass([
     description: "Token ID, a random UUID"
   })
 ], ApiToken.prototype, "id", 2);
+__decorateClass([
+  (0, import_swagger3.ApiProperty)({
+    type: User,
+    description: "User object"
+  })
+], ApiToken.prototype, "user", 2);
 __decorateClass([
   (0, import_swagger3.ApiProperty)({ type: String, example: "Token name" })
 ], ApiToken.prototype, "name", 2);
@@ -164,11 +170,14 @@ __decorateClass([
 var Session = class {
 };
 __decorateClass([
-  (0, import_swagger3.ApiProperty)({ type: String, example: "1234567890abcdef", description: "Session ID" })
+  (0, import_swagger3.ApiProperty)({ type: Number, example: 123, description: "Session ID" })
 ], Session.prototype, "id", 2);
 __decorateClass([
-  (0, import_swagger3.ApiProperty)({ type: String, example: "frank@maxserv.com", description: "User's email" })
-], Session.prototype, "email", 2);
+  (0, import_swagger3.ApiProperty)({
+    type: User,
+    description: "User object"
+  })
+], Session.prototype, "user", 2);
 __decorateClass([
   (0, import_swagger3.ApiProperty)({
     type: Number,
@@ -192,7 +201,7 @@ __decorateClass([
 var User = class {
 };
 __decorateClass([
-  (0, import_swagger4.ApiProperty)({ type: String })
+  (0, import_swagger4.ApiProperty)({ type: Number })
 ], User.prototype, "id", 2);
 __decorateClass([
   (0, import_class_validator.IsEmail)(),
@@ -211,7 +220,7 @@ __decorateClass([
   (0, import_swagger4.ApiProperty)({ type: [String], default: [] })
 ], User.prototype, "favoriteJingles", 2);
 __decorateClass([
-  (0, import_swagger4.ApiProperty)({ type: Number, nullable: true }),
+  (0, import_swagger4.ApiProperty)({ type: Date, nullable: true }),
   (0, import_swagger4.ApiProperty)()
 ], User.prototype, "isRegistering", 2);
 __decorateClass([
@@ -301,9 +310,6 @@ __decorateClass([
 __decorateClass([
   (0, import_swagger5.ApiProperty)({ type: WebsocketAction, nullable: true })
 ], Button.prototype, "ButtonHold", 2);
-__decorateClass([
-  (0, import_swagger5.ApiProperty)({ type: Number, nullable: true })
-], Button.prototype, "batteryState", 2);
 
 // src/emulator.ts
 var import_swagger6 = require("@nestjs/swagger");

package/interfaces/index.ts

@@ -4,8 +4,8 @@ export * from './mopidy';
 export * from './webamp';
 
 export interface RemoveButtonDto {
-    buttonId: string;
-    owner: string;
+    bdAddr: string;
+    owner: number;
 }
 
 export interface SaveButtonEventDto {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tering-serieuze-types",
-  "version": "1.27.1",
+  "version": "2.0.0",
   "description": "Tering serieuze types",
   "author": "Frank",
   "repository": {

package/src/authenticator.ts

@@ -4,6 +4,7 @@ import type {
     PublicKeyCredentialRequestOptionsJSON,
 } from '@simplewebauthn/typescript-types';
 import { ApiProperty } from '@nestjs/swagger';
+import { User } from './user';
 
 export type Authenticator = AuthenticatorDevice & {
     credentialDeviceType: CredentialDeviceType;
@@ -11,6 +12,7 @@ export type Authenticator = AuthenticatorDevice & {
 };
 
 export type DbAuthenticator = Omit<Authenticator, 'credentialID' | 'credentialPublicKey'> & {
+    user: User;
     credentialID: string;
     credentialPublicKey: string;
 };

package/src/button.ts

@@ -33,10 +33,4 @@ export class Button {
 
     @ApiProperty({ type: WebsocketAction, nullable: true })
     ButtonHold?: WebsocketAction;
-
-    @ApiProperty({ type: Number, nullable: true })
-    batteryState?: number;
-
-    // eslint-disable-next-line no-undef
-    [key: string]: any;
 }

package/src/session.ts

@@ -1,4 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
+import { User } from './user';
 
 export enum TokenType {
     Refresh,
@@ -7,7 +8,7 @@ export enum TokenType {
 }
 
 export type TokenContent = {
-    sessionId: string;
+    sessionId: number;
     email: string;
     tokenNumber: number;
     type: TokenType;
@@ -23,6 +24,12 @@ export class ApiToken {
     })
     id: string;
 
+    @ApiProperty({
+        type: User,
+        description: 'User object',
+    })
+    user: User;
+
     @ApiProperty({ type: String, example: 'Token name' })
     name: string;
 
@@ -43,11 +50,14 @@ export class ApiToken {
 }
 
 export class Session {
-    @ApiProperty({ type: String, example: '1234567890abcdef', description: 'Session ID' })
-    id: string;
+    @ApiProperty({ type: Number, example: 123, description: 'Session ID' })
+    id: number;
 
-    @ApiProperty({ type: String, example: 'frank@maxserv.com', description: "User's email" })
-    email: string;
+    @ApiProperty({
+        type: User,
+        description: 'User object',
+    })
+    user: User;
 
     @ApiProperty({
         type: Number,

package/src/user.ts

@@ -6,8 +6,8 @@ import { type DbAuthenticator } from './authenticator';
 import { ApiToken, Session } from './session';
 
 export class User {
-    @ApiProperty({ type: String })
-    id: string;
+    @ApiProperty({ type: Number })
+    id: number;
 
     @IsEmail()
     @ApiProperty({ type: String })
@@ -25,9 +25,9 @@ export class User {
     @ApiProperty({ type: [String], default: [] })
     favoriteJingles: string[];
 
-    @ApiProperty({ type: Number, nullable: true })
+    @ApiProperty({ type: Date, nullable: true })
     @ApiProperty()
-    isRegistering?: number;
+    isRegistering?: Date;
 
     @ApiProperty({ type: WindowState })
     windowState: WindowState;