@optimatech88/titomeet-shared-lib 1.0.25 → 1.0.27
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.js
CHANGED
|
@@ -22,7 +22,6 @@ let AuthGuard = AuthGuard_1 = class AuthGuard {
|
|
|
22
22
|
this.prisma = new client_1.PrismaClient();
|
|
23
23
|
}
|
|
24
24
|
async canActivate(context) {
|
|
25
|
-
this.logger.log('canActivate');
|
|
26
25
|
const request = context.switchToHttp().getRequest();
|
|
27
26
|
const token = this.extractTokenFromHeader(request);
|
|
28
27
|
if (!token) {
|
|
@@ -30,17 +29,16 @@ let AuthGuard = AuthGuard_1 = class AuthGuard {
|
|
|
30
29
|
}
|
|
31
30
|
try {
|
|
32
31
|
const payload = (await this.jwtService.verifyAsync(token));
|
|
33
|
-
this.logger.log('payload', payload);
|
|
34
32
|
const user = await this.prisma.user.findUnique({
|
|
35
33
|
where: { id: payload.userId }
|
|
36
34
|
});
|
|
37
|
-
this.logger.log('user', user);
|
|
38
35
|
if (!user) {
|
|
39
36
|
throw new common_1.UnauthorizedException();
|
|
40
37
|
}
|
|
41
38
|
request['user'] = user;
|
|
42
39
|
}
|
|
43
40
|
catch (_a) {
|
|
41
|
+
this.logger.log('UnauthorizedException');
|
|
44
42
|
throw new common_1.UnauthorizedException();
|
|
45
43
|
}
|
|
46
44
|
return true;
|
|
@@ -48,7 +46,6 @@ let AuthGuard = AuthGuard_1 = class AuthGuard {
|
|
|
48
46
|
extractTokenFromHeader(request) {
|
|
49
47
|
var _a, _b;
|
|
50
48
|
const [type, token] = (_b = (_a = request.headers.authorization) === null || _a === void 0 ? void 0 : _a.split(' ')) !== null && _b !== void 0 ? _b : [];
|
|
51
|
-
this.logger.log('extractTokenFromHeader', { type, token });
|
|
52
49
|
return type === 'Bearer' ? token : undefined;
|
|
53
50
|
}
|
|
54
51
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../../src/auth/auth.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAKwB;AACxB,qCAAyC;AACzC,2CAAwD;AAGxD,2CAAwC;AAGjC,IAAM,SAAS,iBAAf,MAAM,SAAS;IAIpB,YACU,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;QAHxB,WAAM,GAAG,IAAI,eAAM,CAAC,WAAS,CAAC,IAAI,CAAC,CAAC;QAK1C,IAAI,CAAC,MAAM,GAAG,IAAI,qBAAY,EAAE,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAyB;QACzC,
|
|
1
|
+
{"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../../src/auth/auth.guard.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/prisma/schema.prisma
CHANGED
|
@@ -20,6 +20,12 @@ enum UserRole {
|
|
|
20
20
|
USER
|
|
21
21
|
}
|
|
22
22
|
|
|
23
|
+
enum UserStatus {
|
|
24
|
+
ACTIVE
|
|
25
|
+
INACTIVE
|
|
26
|
+
DELETED
|
|
27
|
+
}
|
|
28
|
+
|
|
23
29
|
model User {
|
|
24
30
|
id String @id @default(cuid())
|
|
25
31
|
username String @unique
|
|
@@ -31,6 +37,7 @@ model User {
|
|
|
31
37
|
|
|
32
38
|
profilePicture String?
|
|
33
39
|
emailVerified Boolean @default(false)
|
|
40
|
+
status UserStatus @default(ACTIVE)
|
|
34
41
|
|
|
35
42
|
createdAt DateTime @default(now())
|
|
36
43
|
updatedAt DateTime @updatedAt
|
|
@@ -181,6 +188,13 @@ model ChatUser {
|
|
|
181
188
|
updatedAt DateTime @updatedAt
|
|
182
189
|
}
|
|
183
190
|
|
|
191
|
+
enum MediaType {
|
|
192
|
+
image
|
|
193
|
+
video
|
|
194
|
+
audio
|
|
195
|
+
pdf
|
|
196
|
+
}
|
|
197
|
+
|
|
184
198
|
model Message {
|
|
185
199
|
id String @id @default(cuid())
|
|
186
200
|
text String
|
|
@@ -190,6 +204,7 @@ model Message {
|
|
|
190
204
|
senderId String
|
|
191
205
|
|
|
192
206
|
mediaUrl String?
|
|
207
|
+
mediaType MediaType?
|
|
193
208
|
|
|
194
209
|
createdAt DateTime @default(now())
|
|
195
210
|
updatedAt DateTime @updatedAt
|
package/src/auth/auth.guard.ts
CHANGED
|
@@ -22,7 +22,6 @@ export class AuthGuard implements CanActivate {
|
|
|
22
22
|
}
|
|
23
23
|
|
|
24
24
|
async canActivate(context: ExecutionContext): Promise<boolean> {
|
|
25
|
-
this.logger.log('canActivate');
|
|
26
25
|
const request = context.switchToHttp().getRequest();
|
|
27
26
|
const token = this.extractTokenFromHeader(request);
|
|
28
27
|
if (!token) {
|
|
@@ -33,13 +32,13 @@ export class AuthGuard implements CanActivate {
|
|
|
33
32
|
userId: string;
|
|
34
33
|
};
|
|
35
34
|
|
|
36
|
-
this.logger.log('payload', payload);
|
|
35
|
+
//this.logger.log('payload', payload);
|
|
37
36
|
|
|
38
37
|
const user = await this.prisma.user.findUnique({
|
|
39
38
|
where: { id: payload.userId }
|
|
40
39
|
});
|
|
41
40
|
|
|
42
|
-
this.logger.log('user', user);
|
|
41
|
+
//this.logger.log('user', user);
|
|
43
42
|
|
|
44
43
|
if (!user) {
|
|
45
44
|
throw new UnauthorizedException();
|
|
@@ -47,6 +46,7 @@ export class AuthGuard implements CanActivate {
|
|
|
47
46
|
|
|
48
47
|
request['user'] = user;
|
|
49
48
|
} catch {
|
|
49
|
+
this.logger.log('UnauthorizedException');
|
|
50
50
|
throw new UnauthorizedException();
|
|
51
51
|
}
|
|
52
52
|
return true;
|
|
@@ -54,7 +54,7 @@ export class AuthGuard implements CanActivate {
|
|
|
54
54
|
|
|
55
55
|
private extractTokenFromHeader(request: Request & { headers: IncomingHttpHeaders }): string | undefined {
|
|
56
56
|
const [type, token] = request.headers.authorization?.split(' ') ?? [];
|
|
57
|
-
this.logger.log('extractTokenFromHeader', {type, token});
|
|
57
|
+
//this.logger.log('extractTokenFromHeader', {type, token});
|
|
58
58
|
return type === 'Bearer' ? token : undefined;
|
|
59
59
|
}
|
|
60
60
|
}
|