@optimatech88/titomeet-shared-lib 1.0.22 → 1.0.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/auth/auth.guard.d.ts +1 -0
- package/dist/auth/auth.guard.d.ts.map +1 -1
- package/dist/auth/auth.guard.js +7 -2
- package/dist/auth/auth.guard.js.map +1 -1
- package/dist/auth/auth.module.d.ts.map +1 -1
- package/dist/auth/auth.module.js +1 -0
- package/dist/auth/auth.module.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/package.json +3 -2
- package/prisma/migrations/20250504144629_update_chat/migration.sql +44 -0
- package/prisma/schema.prisma +17 -25
- package/src/auth/auth.guard.ts +4 -0
- package/src/auth/auth.module.ts +1 -0
- package/src/index.ts +6 -2
|
@@ -3,6 +3,7 @@ import { JwtService } from '@nestjs/jwt';
|
|
|
3
3
|
export declare class AuthGuard implements CanActivate {
|
|
4
4
|
private jwtService;
|
|
5
5
|
private prisma;
|
|
6
|
+
private logger;
|
|
6
7
|
constructor(jwtService: JwtService);
|
|
7
8
|
canActivate(context: ExecutionContext): Promise<boolean>;
|
|
8
9
|
private extractTokenFromHeader;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.guard.d.ts","sourceRoot":"","sources":["../../src/auth/auth.guard.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,gBAAgB,EAGjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.guard.d.ts","sourceRoot":"","sources":["../../src/auth/auth.guard.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,gBAAgB,EAGjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAMzC,qBACa,SAAU,YAAW,WAAW;IAKzC,OAAO,CAAC,UAAU;IAJpB,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,MAAM,CAA8B;gBAGlC,UAAU,EAAE,UAAU;IAK1B,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IA2B9D,OAAO,CAAC,sBAAsB;CAK/B;AAGD,qBACa,iBAAkB,YAAW,WAAW;IAIjD,OAAO,CAAC,UAAU;IAHnB,OAAO,CAAC,MAAM,CAAe;gBAGpB,UAAU,EAAE,UAAU;IAK1B,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IA4B9D,OAAO,CAAC,sBAAsB;CAI/B;AAGD,qBACa,cAAe,YAAW,WAAW;IAI9C,OAAO,CAAC,UAAU;IAHpB,OAAO,CAAC,MAAM,CAAe;gBAGnB,UAAU,EAAE,UAAU;IAK1B,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IA8B9D,OAAO,CAAC,sBAAsB;CAI/B"}
|
package/dist/auth/auth.guard.js
CHANGED
|
@@ -8,17 +8,21 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
+
var AuthGuard_1;
|
|
11
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
13
|
exports.AdminAuthGuard = exports.OptionalAuthGuard = exports.AuthGuard = void 0;
|
|
13
14
|
const common_1 = require("@nestjs/common");
|
|
14
15
|
const jwt_1 = require("@nestjs/jwt");
|
|
15
16
|
const client_1 = require("@prisma/client");
|
|
16
|
-
|
|
17
|
+
const common_2 = require("@nestjs/common");
|
|
18
|
+
let AuthGuard = AuthGuard_1 = class AuthGuard {
|
|
17
19
|
constructor(jwtService) {
|
|
18
20
|
this.jwtService = jwtService;
|
|
21
|
+
this.logger = new common_2.Logger(AuthGuard_1.name);
|
|
19
22
|
this.prisma = new client_1.PrismaClient();
|
|
20
23
|
}
|
|
21
24
|
async canActivate(context) {
|
|
25
|
+
this.logger.log('canActivate');
|
|
22
26
|
const request = context.switchToHttp().getRequest();
|
|
23
27
|
const token = this.extractTokenFromHeader(request);
|
|
24
28
|
if (!token) {
|
|
@@ -42,11 +46,12 @@ let AuthGuard = class AuthGuard {
|
|
|
42
46
|
extractTokenFromHeader(request) {
|
|
43
47
|
var _a, _b;
|
|
44
48
|
const [type, token] = (_b = (_a = request.headers.authorization) === null || _a === void 0 ? void 0 : _a.split(' ')) !== null && _b !== void 0 ? _b : [];
|
|
49
|
+
this.logger.log('extractTokenFromHeader', { type, token });
|
|
45
50
|
return type === 'Bearer' ? token : undefined;
|
|
46
51
|
}
|
|
47
52
|
};
|
|
48
53
|
exports.AuthGuard = AuthGuard;
|
|
49
|
-
exports.AuthGuard = AuthGuard = __decorate([
|
|
54
|
+
exports.AuthGuard = AuthGuard = AuthGuard_1 = __decorate([
|
|
50
55
|
(0, common_1.Injectable)(),
|
|
51
56
|
__metadata("design:paramtypes", [jwt_1.JwtService])
|
|
52
57
|
], AuthGuard);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../../src/auth/auth.guard.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../../src/auth/auth.guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.module.d.ts","sourceRoot":"","sources":["../../src/auth/auth.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,aAAa,EAAU,MAAM,gBAAgB,CAAC;AAG/D,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC;AAED,qBAEa,UAAU;IACrB,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,iBAAiB,GAAG,aAAa;
|
|
1
|
+
{"version":3,"file":"auth.module.d.ts","sourceRoot":"","sources":["../../src/auth/auth.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,aAAa,EAAU,MAAM,gBAAgB,CAAC;AAG/D,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC;AAED,qBAEa,UAAU;IACrB,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,iBAAiB,GAAG,aAAa;CAa1D"}
|
package/dist/auth/auth.module.js
CHANGED
|
@@ -12,6 +12,7 @@ const common_1 = require("@nestjs/common");
|
|
|
12
12
|
const jwt_1 = require("@nestjs/jwt");
|
|
13
13
|
let AuthModule = AuthModule_1 = class AuthModule {
|
|
14
14
|
static forRoot(options) {
|
|
15
|
+
console.log('AuthModule.forRoot', options);
|
|
15
16
|
return {
|
|
16
17
|
module: AuthModule_1,
|
|
17
18
|
imports: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../src/auth/auth.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAA+D;AAC/D,qCAAwC;AASjC,IAAM,UAAU,kBAAhB,MAAM,UAAU;IACrB,MAAM,CAAC,OAAO,CAAC,OAA0B;QACvC,OAAO;YACL,MAAM,EAAE,YAAU;YAClB,OAAO,EAAE;gBACP,eAAS,CAAC,QAAQ,CAAC;oBACjB,MAAM,EAAE,OAAO,CAAC,SAAS;oBACzB,WAAW,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,YAAY,IAAI,IAAI,EAAE;iBACzD,CAAC;aACH;YACD,OAAO,EAAE,CAAC,eAAS,CAAC;SACrB,CAAC;IACJ,CAAC;CACF,CAAA;
|
|
1
|
+
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../src/auth/auth.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAA+D;AAC/D,qCAAwC;AASjC,IAAM,UAAU,kBAAhB,MAAM,UAAU;IACrB,MAAM,CAAC,OAAO,CAAC,OAA0B;QACvC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;QAC3C,OAAO;YACL,MAAM,EAAE,YAAU;YAClB,OAAO,EAAE;gBACP,eAAS,CAAC,QAAQ,CAAC;oBACjB,MAAM,EAAE,OAAO,CAAC,SAAS;oBACzB,WAAW,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,YAAY,IAAI,IAAI,EAAE;iBACzD,CAAC;aACH;YACD,OAAO,EAAE,CAAC,eAAS,CAAC;SACrB,CAAC;IACJ,CAAC;CACF,CAAA;AAdY,gCAAU;qBAAV,UAAU;IAFtB,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,UAAU,CActB"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export * from './auth/auth.guard';
|
|
2
|
-
export { PrismaClient, User, Account, UserRole, Event, EventAccess, EventVisibility, EventStatus, EventPrice, Address,
|
|
2
|
+
export { PrismaClient, User, Account, UserRole, Event, EventAccess, EventVisibility, EventStatus, EventPrice, Address, Provider, ProviderStatus, EventCategory, Review, ProviderCategory, Order, OrderStatus, OrderItem, PaymentStatus, Chat, ChatUser, Message, Notification, NotificationType, } from '@prisma/client';
|
|
3
3
|
export * from './auth/auth.guard';
|
|
4
4
|
export * from './auth/auth.module';
|
|
5
5
|
export * from './auth/admin.middleware';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,OAAO,EACH,YAAY,EAAE,IAAI,EAAE,OAAO,EACvB,QAAQ,EAAE,KAAK,EAAE,WAAW,EAC5B,eAAe,EAAE,WAAW,EAC5B,UAAU,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,OAAO,EACH,YAAY,EAAE,IAAI,EAAE,OAAO,EACvB,QAAQ,EAAE,KAAK,EAAE,WAAW,EAC5B,eAAe,EAAE,WAAW,EAC5B,UAAU,EAAE,OAAO,EACnB,QAAQ,EACR,cAAc,EACd,aAAa,EACb,MAAM,EACV,gBAAgB,EAChB,KAAK,EACL,WAAW,EACX,SAAS,EACT,aAAa,EACb,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,YAAY,EACZ,gBAAgB,GACf,MAAM,gBAAgB,CAAC;AAG5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AAGxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AAGtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAE/B,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.JwtService = exports.
|
|
17
|
+
exports.JwtService = exports.NotificationType = exports.PaymentStatus = exports.OrderStatus = exports.ProviderStatus = exports.EventStatus = exports.EventVisibility = exports.EventAccess = exports.UserRole = exports.PrismaClient = void 0;
|
|
18
18
|
__exportStar(require("./auth/auth.guard"), exports);
|
|
19
19
|
var client_1 = require("@prisma/client");
|
|
20
20
|
Object.defineProperty(exports, "PrismaClient", { enumerable: true, get: function () { return client_1.PrismaClient; } });
|
|
@@ -22,10 +22,10 @@ Object.defineProperty(exports, "UserRole", { enumerable: true, get: function ()
|
|
|
22
22
|
Object.defineProperty(exports, "EventAccess", { enumerable: true, get: function () { return client_1.EventAccess; } });
|
|
23
23
|
Object.defineProperty(exports, "EventVisibility", { enumerable: true, get: function () { return client_1.EventVisibility; } });
|
|
24
24
|
Object.defineProperty(exports, "EventStatus", { enumerable: true, get: function () { return client_1.EventStatus; } });
|
|
25
|
-
Object.defineProperty(exports, "ParticipantStatus", { enumerable: true, get: function () { return client_1.ParticipantStatus; } });
|
|
26
25
|
Object.defineProperty(exports, "ProviderStatus", { enumerable: true, get: function () { return client_1.ProviderStatus; } });
|
|
27
26
|
Object.defineProperty(exports, "OrderStatus", { enumerable: true, get: function () { return client_1.OrderStatus; } });
|
|
28
27
|
Object.defineProperty(exports, "PaymentStatus", { enumerable: true, get: function () { return client_1.PaymentStatus; } });
|
|
28
|
+
Object.defineProperty(exports, "NotificationType", { enumerable: true, get: function () { return client_1.NotificationType; } });
|
|
29
29
|
__exportStar(require("./auth/auth.guard"), exports);
|
|
30
30
|
__exportStar(require("./auth/auth.module"), exports);
|
|
31
31
|
__exportStar(require("./auth/admin.middleware"), exports);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,yCAmB4B;AAlBxB,sGAAA,YAAY,OAAA;AACR,kGAAA,QAAQ,OAAA;AAAS,qGAAA,WAAW,OAAA;AAC5B,yGAAA,eAAe,OAAA;AAAE,qGAAA,WAAW,OAAA;AAG5B,wGAAA,cAAc,OAAA;AAKlB,qGAAA,WAAW,OAAA;AAEX,uGAAA,aAAa,OAAA;AAKb,0GAAA,gBAAgB,OAAA;AAIpB,oDAAkC;AAClC,qDAAmC;AACnC,0DAAwC;AAGxC,uDAAqC;AACrC,wDAAsC;AAGtC,yDAAuC;AACvC,0DAAwC;AACxC,gDAA8B;AAC9B,0CAAwB;AACxB,0CAAwB;AACxB,wDAAsC;AACtC,iDAA+B;AAE/B,mCAAyC;AAAhC,iGAAA,UAAU,OAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@optimatech88/titomeet-shared-lib",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.24",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"types": "dist/index.d.ts",
|
|
6
6
|
"scripts": {
|
|
@@ -8,7 +8,8 @@
|
|
|
8
8
|
"build": "nest build",
|
|
9
9
|
"format": "prettier --write \"src/**/*.ts\"",
|
|
10
10
|
"generate": "npx prisma generate",
|
|
11
|
-
"deploy:dev": "prisma migrate dev"
|
|
11
|
+
"deploy:dev": "prisma migrate dev",
|
|
12
|
+
"push": "npm run generate && npm run deploy:dev && npm run build"
|
|
12
13
|
},
|
|
13
14
|
"keywords": [],
|
|
14
15
|
"author": "",
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
/*
|
|
2
|
+
Warnings:
|
|
3
|
+
|
|
4
|
+
- You are about to drop the column `content` on the `Message` table. All the data in the column will be lost.
|
|
5
|
+
- You are about to drop the `Participant` table. If the table is not empty, all the data it contains will be lost.
|
|
6
|
+
- Added the required column `text` to the `Message` table without a default value. This is not possible if the table is not empty.
|
|
7
|
+
|
|
8
|
+
*/
|
|
9
|
+
-- DropForeignKey
|
|
10
|
+
ALTER TABLE "Participant" DROP CONSTRAINT "Participant_eventId_fkey";
|
|
11
|
+
|
|
12
|
+
-- DropForeignKey
|
|
13
|
+
ALTER TABLE "Participant" DROP CONSTRAINT "Participant_userId_fkey";
|
|
14
|
+
|
|
15
|
+
-- AlterTable
|
|
16
|
+
ALTER TABLE "Message" DROP COLUMN "content",
|
|
17
|
+
ADD COLUMN "mediaUrl" TEXT,
|
|
18
|
+
ADD COLUMN "text" TEXT NOT NULL;
|
|
19
|
+
|
|
20
|
+
-- AlterTable
|
|
21
|
+
ALTER TABLE "User" ADD COLUMN "emailVerified" BOOLEAN NOT NULL DEFAULT false;
|
|
22
|
+
|
|
23
|
+
-- DropTable
|
|
24
|
+
DROP TABLE "Participant";
|
|
25
|
+
|
|
26
|
+
-- DropEnum
|
|
27
|
+
DROP TYPE "ParticipantStatus";
|
|
28
|
+
|
|
29
|
+
-- CreateTable
|
|
30
|
+
CREATE TABLE "ChatUser" (
|
|
31
|
+
"id" TEXT NOT NULL,
|
|
32
|
+
"chatId" TEXT NOT NULL,
|
|
33
|
+
"userId" TEXT NOT NULL,
|
|
34
|
+
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
35
|
+
"updatedAt" TIMESTAMP(3) NOT NULL,
|
|
36
|
+
|
|
37
|
+
CONSTRAINT "ChatUser_pkey" PRIMARY KEY ("id")
|
|
38
|
+
);
|
|
39
|
+
|
|
40
|
+
-- AddForeignKey
|
|
41
|
+
ALTER TABLE "ChatUser" ADD CONSTRAINT "ChatUser_chatId_fkey" FOREIGN KEY ("chatId") REFERENCES "Chat"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
|
|
42
|
+
|
|
43
|
+
-- AddForeignKey
|
|
44
|
+
ALTER TABLE "ChatUser" ADD CONSTRAINT "ChatUser_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
|
package/prisma/schema.prisma
CHANGED
|
@@ -30,6 +30,7 @@ model User {
|
|
|
30
30
|
role UserRole @default(USER)
|
|
31
31
|
|
|
32
32
|
profilePicture String?
|
|
33
|
+
emailVerified Boolean @default(false)
|
|
33
34
|
|
|
34
35
|
createdAt DateTime @default(now())
|
|
35
36
|
updatedAt DateTime @updatedAt
|
|
@@ -37,7 +38,6 @@ model User {
|
|
|
37
38
|
accounts Account[]
|
|
38
39
|
messages Message[]
|
|
39
40
|
events Event[]
|
|
40
|
-
participatedEvents Participant[]
|
|
41
41
|
notificationsReceived Notification[] @relation("NotificationRecipient")
|
|
42
42
|
notificationsSent Notification[] @relation("NotificationSender")
|
|
43
43
|
providers Provider[]
|
|
@@ -45,6 +45,7 @@ model User {
|
|
|
45
45
|
|
|
46
46
|
favorites Favorite[]
|
|
47
47
|
orders Order[]
|
|
48
|
+
chatUsers ChatUser[]
|
|
48
49
|
}
|
|
49
50
|
|
|
50
51
|
model Account {
|
|
@@ -132,9 +133,6 @@ model Event {
|
|
|
132
133
|
postedBy User @relation(fields: [postedById], references: [id])
|
|
133
134
|
postedById String
|
|
134
135
|
|
|
135
|
-
// Add participants relation
|
|
136
|
-
participants Participant[]
|
|
137
|
-
|
|
138
136
|
providers Provider[]
|
|
139
137
|
|
|
140
138
|
createdAt DateTime @default(now())
|
|
@@ -166,43 +164,37 @@ model Chat {
|
|
|
166
164
|
event Event @relation(fields: [eventId], references: [id])
|
|
167
165
|
eventId String @unique // One-to-one relation with Event
|
|
168
166
|
messages Message[]
|
|
167
|
+
users ChatUser[]
|
|
169
168
|
|
|
170
169
|
createdAt DateTime @default(now())
|
|
171
170
|
updatedAt DateTime @updatedAt
|
|
172
171
|
}
|
|
173
172
|
|
|
173
|
+
model ChatUser {
|
|
174
|
+
id String @id @default(cuid())
|
|
175
|
+
chat Chat @relation(fields: [chatId], references: [id])
|
|
176
|
+
chatId String
|
|
177
|
+
user User @relation(fields: [userId], references: [id])
|
|
178
|
+
userId String
|
|
179
|
+
|
|
180
|
+
createdAt DateTime @default(now())
|
|
181
|
+
updatedAt DateTime @updatedAt
|
|
182
|
+
}
|
|
183
|
+
|
|
174
184
|
model Message {
|
|
175
185
|
id String @id @default(cuid())
|
|
176
|
-
|
|
186
|
+
text String
|
|
177
187
|
chat Chat @relation(fields: [chatId], references: [id])
|
|
178
188
|
chatId String
|
|
179
189
|
sender User @relation(fields: [senderId], references: [id])
|
|
180
190
|
senderId String
|
|
181
191
|
|
|
192
|
+
mediaUrl String?
|
|
193
|
+
|
|
182
194
|
createdAt DateTime @default(now())
|
|
183
195
|
updatedAt DateTime @updatedAt
|
|
184
196
|
}
|
|
185
197
|
|
|
186
|
-
// Add new Participant model
|
|
187
|
-
model Participant {
|
|
188
|
-
id String @id @default(cuid())
|
|
189
|
-
event Event @relation(fields: [eventId], references: [id])
|
|
190
|
-
eventId String
|
|
191
|
-
user User @relation(fields: [userId], references: [id])
|
|
192
|
-
userId String
|
|
193
|
-
status ParticipantStatus @default(PENDING)
|
|
194
|
-
|
|
195
|
-
createdAt DateTime @default(now())
|
|
196
|
-
updatedAt DateTime @updatedAt
|
|
197
|
-
|
|
198
|
-
@@unique([eventId, userId])
|
|
199
|
-
}
|
|
200
|
-
|
|
201
|
-
enum ParticipantStatus {
|
|
202
|
-
PENDING
|
|
203
|
-
CONFIRMED
|
|
204
|
-
CANCELLED
|
|
205
|
-
}
|
|
206
198
|
|
|
207
199
|
enum NotificationType {
|
|
208
200
|
NEW_MESSAGE
|
package/src/auth/auth.guard.ts
CHANGED
|
@@ -8,10 +8,12 @@ import { JwtService } from '@nestjs/jwt';
|
|
|
8
8
|
import { PrismaClient, UserRole } from '@prisma/client';
|
|
9
9
|
import { Request } from 'express';
|
|
10
10
|
import { IncomingHttpHeaders } from 'http';
|
|
11
|
+
import { Logger } from '@nestjs/common';
|
|
11
12
|
|
|
12
13
|
@Injectable()
|
|
13
14
|
export class AuthGuard implements CanActivate {
|
|
14
15
|
private prisma: PrismaClient;
|
|
16
|
+
private logger = new Logger(AuthGuard.name);
|
|
15
17
|
|
|
16
18
|
constructor(
|
|
17
19
|
private jwtService: JwtService,
|
|
@@ -20,6 +22,7 @@ export class AuthGuard implements CanActivate {
|
|
|
20
22
|
}
|
|
21
23
|
|
|
22
24
|
async canActivate(context: ExecutionContext): Promise<boolean> {
|
|
25
|
+
this.logger.log('canActivate');
|
|
23
26
|
const request = context.switchToHttp().getRequest();
|
|
24
27
|
const token = this.extractTokenFromHeader(request);
|
|
25
28
|
if (!token) {
|
|
@@ -47,6 +50,7 @@ export class AuthGuard implements CanActivate {
|
|
|
47
50
|
|
|
48
51
|
private extractTokenFromHeader(request: Request & { headers: IncomingHttpHeaders }): string | undefined {
|
|
49
52
|
const [type, token] = request.headers.authorization?.split(' ') ?? [];
|
|
53
|
+
this.logger.log('extractTokenFromHeader', {type, token});
|
|
50
54
|
return type === 'Bearer' ? token : undefined;
|
|
51
55
|
}
|
|
52
56
|
}
|
package/src/auth/auth.module.ts
CHANGED
package/src/index.ts
CHANGED
|
@@ -3,8 +3,7 @@ export {
|
|
|
3
3
|
PrismaClient, User, Account,
|
|
4
4
|
UserRole, Event, EventAccess,
|
|
5
5
|
EventVisibility, EventStatus,
|
|
6
|
-
EventPrice, Address,
|
|
7
|
-
ParticipantStatus,
|
|
6
|
+
EventPrice, Address,
|
|
8
7
|
Provider,
|
|
9
8
|
ProviderStatus,
|
|
10
9
|
EventCategory,
|
|
@@ -14,6 +13,11 @@ export {
|
|
|
14
13
|
OrderStatus,
|
|
15
14
|
OrderItem,
|
|
16
15
|
PaymentStatus,
|
|
16
|
+
Chat,
|
|
17
|
+
ChatUser,
|
|
18
|
+
Message,
|
|
19
|
+
Notification,
|
|
20
|
+
NotificationType,
|
|
17
21
|
} from '@prisma/client';
|
|
18
22
|
|
|
19
23
|
//auth
|