dl-commons 0.0.1-testing.1 → 0.0.1-testing.2
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/dl-commons.module.d.ts +8 -0
- package/dist/dl-commons.module.js +16 -1
- package/dist/dl-commons.module.js.map +1 -1
- package/dist/guards/permission.guard.d.ts +2 -2
- package/dist/guards/permission.guard.js +24 -5
- package/dist/guards/permission.guard.js.map +1 -1
- package/dist/index.d.ts +6 -1
- package/dist/index.js +8 -1
- package/dist/index.js.map +1 -1
- package/dist/models/consts/env-vars.const.d.ts +1 -0
- package/dist/models/consts/env-vars.const.js +2 -1
- package/dist/models/consts/env-vars.const.js.map +1 -1
- package/dist/models/interfaces/session-user.interface.d.ts +11 -0
- package/dist/models/interfaces/session-user.interface.js +3 -0
- package/dist/models/interfaces/session-user.interface.js.map +1 -0
- package/dist/models/interfaces/session.interface.d.ts +8 -0
- package/dist/models/interfaces/session.interface.js +3 -0
- package/dist/models/interfaces/session.interface.js.map +1 -0
- package/dist/models/interfaces/user.interface.d.ts +14 -0
- package/dist/models/interfaces/user.interface.js +3 -0
- package/dist/models/interfaces/user.interface.js.map +1 -0
- package/dist/models/schemas/embedded/session-user.schema.d.ts +23 -0
- package/dist/models/schemas/embedded/session-user.schema.js +48 -0
- package/dist/models/schemas/embedded/session-user.schema.js.map +1 -0
- package/dist/models/schemas/session.schema.d.ts +20 -0
- package/dist/models/schemas/session.schema.js +39 -0
- package/dist/models/schemas/session.schema.js.map +1 -0
- package/dist/services/sessions.service.d.ts +12 -1
- package/dist/services/sessions.service.js +48 -2
- package/dist/services/sessions.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +34 -32
- package/src/dl-commons.module.ts +26 -2
- package/src/guards/permission.guard.ts +27 -30
- package/src/index.ts +14 -0
- package/src/models/consts/env-vars.const.ts +2 -0
- package/src/models/interfaces/session-user.interface.ts +12 -0
- package/src/models/interfaces/session.interface.ts +9 -0
- package/src/models/interfaces/user.interface.ts +15 -0
- package/src/models/schemas/embedded/session-user.schema.ts +32 -0
- package/src/models/schemas/session.schema.ts +24 -0
- package/src/services/sessions.service.ts +57 -2
package/package.json
CHANGED
|
@@ -1,33 +1,35 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
"
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
2
|
+
"name": "dl-commons",
|
|
3
|
+
"type": "commonjs",
|
|
4
|
+
"version": "0.0.1-testing.2",
|
|
5
|
+
"description": "distance learning commons",
|
|
6
|
+
"main": "dist/index.js",
|
|
7
|
+
"types": "dist/index.d.ts",
|
|
8
|
+
"scripts": {
|
|
9
|
+
"prepublish": "tsc",
|
|
10
|
+
"build": "tsc",
|
|
11
|
+
"pack": "npm run build && npm pack --pack-destination ./packs"
|
|
12
|
+
},
|
|
13
|
+
"author": "",
|
|
14
|
+
"license": "ISC",
|
|
15
|
+
"dependencies": {
|
|
16
|
+
"@nestjs/axios": "^3.1.0",
|
|
17
|
+
"@nestjs/common": "^10.3.7",
|
|
18
|
+
"@nestjs/config": "^3.1.1",
|
|
19
|
+
"@nestjs/core": "^10.3.1",
|
|
20
|
+
"@nestjs/mongoose": "^10.0.2",
|
|
21
|
+
"class-transformer": "^0.5.1",
|
|
22
|
+
"class-validator": "^0.14.0",
|
|
23
|
+
"express": "^4.18.2",
|
|
24
|
+
"mongoose": "^8.0.4",
|
|
25
|
+
"reflect-metadata": "^0.2.2"
|
|
26
|
+
},
|
|
27
|
+
"devDependencies": {
|
|
28
|
+
"@types/express": "^4.17.17",
|
|
29
|
+
"@types/node": "^18.15.11",
|
|
30
|
+
"@typescript-eslint/eslint-plugin": "^6.18.1",
|
|
31
|
+
"@typescript-eslint/parser": "^6.18.1",
|
|
32
|
+
"eslint": "^8.56.0",
|
|
33
|
+
"typescript": "^5.0.4"
|
|
34
|
+
}
|
|
35
|
+
}
|
package/src/dl-commons.module.ts
CHANGED
|
@@ -1,9 +1,33 @@
|
|
|
1
1
|
import { Module } from '@nestjs/common';
|
|
2
|
-
import { ConfigModule } from '@nestjs/config';
|
|
2
|
+
import { ConfigModule, ConfigService } from '@nestjs/config';
|
|
3
3
|
import { SessionsService } from './services/sessions.service';
|
|
4
|
+
import { MongooseModule } from '@nestjs/mongoose';
|
|
5
|
+
import { DL_SESSIONS__MONGO__CS } from './models/consts/env-vars.const';
|
|
6
|
+
import { Session, SessionSchema } from './models/schemas/session.schema';
|
|
7
|
+
import { HttpModule } from '@nestjs/axios';
|
|
8
|
+
import { ISession } from './models/interfaces/session.interface';
|
|
9
|
+
|
|
10
|
+
declare global {
|
|
11
|
+
namespace Express {
|
|
12
|
+
interface Request {
|
|
13
|
+
session: ISession;
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
}
|
|
4
17
|
|
|
5
18
|
@Module({
|
|
6
|
-
imports: [
|
|
19
|
+
imports: [
|
|
20
|
+
ConfigModule,
|
|
21
|
+
HttpModule,
|
|
22
|
+
MongooseModule.forRootAsync({
|
|
23
|
+
connectionName: 'sessions-store',
|
|
24
|
+
useFactory: async (configService: ConfigService) => ({
|
|
25
|
+
uri: configService.get(DL_SESSIONS__MONGO__CS),
|
|
26
|
+
}),
|
|
27
|
+
inject: [ConfigService],
|
|
28
|
+
}),
|
|
29
|
+
MongooseModule.forFeature([{ name: Session.name, schema: SessionSchema }], 'sessions-store'),
|
|
30
|
+
],
|
|
7
31
|
controllers: [],
|
|
8
32
|
providers: [SessionsService],
|
|
9
33
|
exports: [SessionsService],
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { Injectable, CanActivate, ExecutionContext, UnauthorizedException } from '@nestjs/common';
|
|
1
|
+
import { Injectable, CanActivate, ExecutionContext, UnauthorizedException, ForbiddenException } from '@nestjs/common';
|
|
2
2
|
import { Reflector } from '@nestjs/core';
|
|
3
|
-
import { Observable, of } from 'rxjs';
|
|
4
3
|
import { SessionsService } from '../services/sessions.service';
|
|
5
4
|
|
|
6
5
|
export class PermissionGuardArgs {
|
|
@@ -14,8 +13,9 @@ export const AllowPermissions = Reflector.createDecorator<PermissionGuardArgs>()
|
|
|
14
13
|
export class PermissionGuard implements CanActivate {
|
|
15
14
|
constructor(private readonly _sessionsService: SessionsService, private readonly _reflector: Reflector) {}
|
|
16
15
|
|
|
17
|
-
canActivate(context: ExecutionContext)
|
|
18
|
-
const args = this._reflector.get(
|
|
16
|
+
async canActivate(context: ExecutionContext) {
|
|
17
|
+
const args = this._reflector.get<PermissionGuardArgs>(AllowPermissions, context.getHandler());
|
|
18
|
+
|
|
19
19
|
const request = context.switchToHttp().getRequest();
|
|
20
20
|
const token: string = this._getToken(request);
|
|
21
21
|
|
|
@@ -23,9 +23,28 @@ export class PermissionGuard implements CanActivate {
|
|
|
23
23
|
throw new UnauthorizedException();
|
|
24
24
|
}
|
|
25
25
|
|
|
26
|
-
|
|
26
|
+
const session = await this._sessionsService.read(token);
|
|
27
|
+
if (!session) {
|
|
28
|
+
throw new UnauthorizedException();
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
let isPermissionsOk = true;
|
|
32
|
+
if (args && args.keywords) {
|
|
33
|
+
isPermissionsOk = false;
|
|
34
|
+
for (let keyword of args.keywords) {
|
|
35
|
+
isPermissionsOk = this._checkPermission(session.user.permissions, keyword);
|
|
36
|
+
if (isPermissionsOk) {
|
|
37
|
+
break;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
if (!isPermissionsOk) {
|
|
43
|
+
throw new ForbiddenException();
|
|
44
|
+
}
|
|
27
45
|
|
|
28
|
-
|
|
46
|
+
request.session = session;
|
|
47
|
+
return true;
|
|
29
48
|
}
|
|
30
49
|
|
|
31
50
|
private _getToken(request: any) {
|
|
@@ -41,29 +60,7 @@ export class PermissionGuard implements CanActivate {
|
|
|
41
60
|
return token;
|
|
42
61
|
}
|
|
43
62
|
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
if (allowedPermission) {
|
|
47
|
-
return userPermissions.some((item) => item.keyword === allowedPermission);
|
|
48
|
-
} else {
|
|
49
|
-
return true;
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
private setUserData(userData: ISessionUserData, client: IClient, permissions: IPermission[], request: Request) {
|
|
54
|
-
const userInfo = {
|
|
55
|
-
...userData,
|
|
56
|
-
client,
|
|
57
|
-
permissions,
|
|
58
|
-
};
|
|
59
|
-
request['user'] = userInfo;
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
private validateUserData(userData: ISessionUserData) {
|
|
63
|
-
if (!userData) {
|
|
64
|
-
throw new RESTError('unauthorized', HttpStatus.UNAUTHORIZED);
|
|
65
|
-
}
|
|
66
|
-
return userData;
|
|
63
|
+
private _checkPermission(userPermissions: string[], allowedPermission: string): boolean {
|
|
64
|
+
return userPermissions.some((keyword) => keyword === allowedPermission);
|
|
67
65
|
}
|
|
68
|
-
*/
|
|
69
66
|
}
|
package/src/index.ts
CHANGED
|
@@ -32,6 +32,8 @@ import { IPerson } from './models/interfaces/person.interface';
|
|
|
32
32
|
import { IRecord } from './models/interfaces/record.interface';
|
|
33
33
|
import { IResidence } from './models/interfaces/residence.interface';
|
|
34
34
|
import { IRole } from './models/interfaces/role.interface';
|
|
35
|
+
import { ISession } from './models/interfaces/session.interface';
|
|
36
|
+
import { ISessionUser } from './models/interfaces/session-user.interface';
|
|
35
37
|
import { Base, BaseDocument, BaseSchema } from './models/schemas/base.schema';
|
|
36
38
|
import { Contact, ContactDocument, ContactSchema } from './models/schemas/embedded/contact.schema';
|
|
37
39
|
import { DictionaryEmbedded, DictionaryEmbeddedDocument, DictionaryEmbeddedSchema } from './models/schemas/embedded/dictionary-embedded.schema';
|
|
@@ -44,6 +46,9 @@ import { MongoIdPipe } from './pipes/mongo-id.pipe';
|
|
|
44
46
|
import { MongoIdsPipe } from './pipes/mongo-ids.pipe';
|
|
45
47
|
import { SessionsService } from './services/sessions.service';
|
|
46
48
|
import { transformers } from './transformers/common.transformer';
|
|
49
|
+
import { IUser } from './models/interfaces/user.interface';
|
|
50
|
+
import { SessionUser, SessionUserDocument, SessionUserSchema } from './models/schemas/embedded/session-user.schema';
|
|
51
|
+
import { Session, SessionDocument, SessionSchema } from './models/schemas/session.schema';
|
|
47
52
|
|
|
48
53
|
export {
|
|
49
54
|
/**
|
|
@@ -107,6 +112,9 @@ export {
|
|
|
107
112
|
IContact,
|
|
108
113
|
IPerson,
|
|
109
114
|
IResidence,
|
|
115
|
+
ISessionUser,
|
|
116
|
+
ISession,
|
|
117
|
+
IUser,
|
|
110
118
|
|
|
111
119
|
/**
|
|
112
120
|
* Schemas & Documents
|
|
@@ -135,6 +143,12 @@ export {
|
|
|
135
143
|
DictionaryEmbedded,
|
|
136
144
|
DictionaryEmbeddedSchema,
|
|
137
145
|
DictionaryEmbeddedDocument,
|
|
146
|
+
SessionUser,
|
|
147
|
+
SessionUserSchema,
|
|
148
|
+
SessionUserDocument,
|
|
149
|
+
Session,
|
|
150
|
+
SessionSchema,
|
|
151
|
+
SessionDocument,
|
|
138
152
|
|
|
139
153
|
/**
|
|
140
154
|
* Filters
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { UserVerificationLevel } from '../enums/user-verifiation-level.enum';
|
|
2
|
+
import { IContact } from './contact.interface';
|
|
3
|
+
import { IPerson } from './person.interface';
|
|
4
|
+
|
|
5
|
+
export interface ISessionUser {
|
|
6
|
+
_id: string;
|
|
7
|
+
username: string;
|
|
8
|
+
person: IPerson;
|
|
9
|
+
contacts: IContact[];
|
|
10
|
+
permissions: string[];
|
|
11
|
+
verificationLevel: UserVerificationLevel;
|
|
12
|
+
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { UserVerificationLevel } from '../enums/user-verifiation-level.enum';
|
|
2
|
+
import { IBase } from './base.interface';
|
|
3
|
+
import { IContact } from './contact.interface';
|
|
4
|
+
import { IPerson } from './person.interface';
|
|
5
|
+
import { IRole } from './role.interface';
|
|
6
|
+
|
|
7
|
+
export interface IUser extends IBase {
|
|
8
|
+
username: string;
|
|
9
|
+
password: string;
|
|
10
|
+
salt: string;
|
|
11
|
+
person: IPerson;
|
|
12
|
+
contacts: IContact[];
|
|
13
|
+
roles: IRole[];
|
|
14
|
+
verificationLevel: UserVerificationLevel;
|
|
15
|
+
}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
|
|
2
|
+
import { HydratedDocument } from 'mongoose';
|
|
3
|
+
import { UserVerificationLevel } from '../../enums/user-verifiation-level.enum';
|
|
4
|
+
import { IContact } from '../../interfaces/contact.interface';
|
|
5
|
+
import { IPerson } from '../../interfaces/person.interface';
|
|
6
|
+
import { ISessionUser } from '../../interfaces/session-user.interface';
|
|
7
|
+
import { ContactSchema } from './contact.schema';
|
|
8
|
+
import { PersonSchema } from './person.schema';
|
|
9
|
+
|
|
10
|
+
@Schema({ id: false })
|
|
11
|
+
export class SessionUser implements ISessionUser {
|
|
12
|
+
@Prop({ required: true, type: String })
|
|
13
|
+
_id: string;
|
|
14
|
+
|
|
15
|
+
@Prop({ required: true, type: String })
|
|
16
|
+
username: string;
|
|
17
|
+
|
|
18
|
+
@Prop({ type: PersonSchema, required: true })
|
|
19
|
+
person: IPerson;
|
|
20
|
+
|
|
21
|
+
@Prop({ type: [ContactSchema], required: true, default: [] })
|
|
22
|
+
contacts: IContact[];
|
|
23
|
+
|
|
24
|
+
@Prop({ type: [String], required: true, default: [] })
|
|
25
|
+
permissions: string[];
|
|
26
|
+
|
|
27
|
+
@Prop({ type: String, enum: UserVerificationLevel, required: true, default: UserVerificationLevel.None })
|
|
28
|
+
verificationLevel: UserVerificationLevel;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
export const SessionUserSchema = SchemaFactory.createForClass(SessionUser);
|
|
32
|
+
export type SessionUserDocument = HydratedDocument<SessionUser>;
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
|
|
2
|
+
import { HydratedDocument } from 'mongoose';
|
|
3
|
+
import { ISessionUser } from '../interfaces/session-user.interface';
|
|
4
|
+
import { ISession } from '../interfaces/session.interface';
|
|
5
|
+
import { SessionUserSchema } from './embedded/session-user.schema';
|
|
6
|
+
import { Identifable } from './identifable.schema';
|
|
7
|
+
|
|
8
|
+
@Schema()
|
|
9
|
+
export class Session extends Identifable implements ISession {
|
|
10
|
+
@Prop({ type: String, unique: true, required: true })
|
|
11
|
+
token: string;
|
|
12
|
+
|
|
13
|
+
@Prop({ type: SessionUserSchema, required: true })
|
|
14
|
+
user: ISessionUser;
|
|
15
|
+
|
|
16
|
+
@Prop({ required: true })
|
|
17
|
+
expiresAt: Date;
|
|
18
|
+
|
|
19
|
+
@Prop({ required: true })
|
|
20
|
+
userAgent: string;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
export const SessionSchema = SchemaFactory.createForClass(Session);
|
|
24
|
+
export type SessionDocument = HydratedDocument<Session>;
|
|
@@ -1,6 +1,61 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { HttpService } from '@nestjs/axios';
|
|
2
|
+
import { Injectable, UnauthorizedException } from '@nestjs/common';
|
|
3
|
+
import { ConfigService } from '@nestjs/config';
|
|
4
|
+
import { RESTResponseBody, RESTError } from '../models/dtos/wrappers/rest-wrapper.class';
|
|
5
|
+
import { ISession } from '../models/interfaces/session.interface';
|
|
6
|
+
import { firstValueFrom } from 'rxjs';
|
|
7
|
+
import { Model } from 'mongoose';
|
|
8
|
+
import { Session, SessionDocument } from '../models/schemas/session.schema';
|
|
9
|
+
import { InjectModel } from '@nestjs/mongoose';
|
|
2
10
|
|
|
3
11
|
@Injectable()
|
|
4
12
|
export class SessionsService {
|
|
5
|
-
|
|
13
|
+
//#region Private Members
|
|
14
|
+
private _baseUrl: string;
|
|
15
|
+
//#endregion
|
|
16
|
+
|
|
17
|
+
//#region Constructor
|
|
18
|
+
constructor(
|
|
19
|
+
@InjectModel(Session.name, 'sessions-store')
|
|
20
|
+
private readonly _sessionModel: Model<SessionDocument>,
|
|
21
|
+
private readonly _httpService: HttpService,
|
|
22
|
+
private readonly _configService: ConfigService,
|
|
23
|
+
) {
|
|
24
|
+
this._baseUrl = this._configService.getOrThrow('DL_SESSIONS__REST__BASE_URL');
|
|
25
|
+
}
|
|
26
|
+
//#endregion
|
|
27
|
+
|
|
28
|
+
//#region Public API
|
|
29
|
+
public async create(userId: string, userAgent: string, ip: string) {
|
|
30
|
+
try {
|
|
31
|
+
const endpoint = `${this._baseUrl}/v1/sessions/${userId}`;
|
|
32
|
+
const headers = { 'user-agent': userAgent, 'x-ip': ip };
|
|
33
|
+
const response$ = this._httpService.post<RESTResponseBody<ISession>>(endpoint, null, { headers });
|
|
34
|
+
const response = await firstValueFrom(response$);
|
|
35
|
+
|
|
36
|
+
if (response.data.errors) {
|
|
37
|
+
throw new RESTError('sessions_api_error', response.data.errors);
|
|
38
|
+
}
|
|
39
|
+
if (!response.data || !response.data.result) {
|
|
40
|
+
throw new RESTError('sessions_api_error', 'empty response');
|
|
41
|
+
}
|
|
42
|
+
return response.data.result.data;
|
|
43
|
+
} catch (e) {
|
|
44
|
+
throw RESTError.createFromCatch(e, { keyword: 'unknown', debug: e });
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
public async read(token: string): Promise<ISession> {
|
|
49
|
+
if (!token) {
|
|
50
|
+
throw new UnauthorizedException();
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
const session = await this._sessionModel.findOne({ token });
|
|
54
|
+
if (!session) {
|
|
55
|
+
throw new UnauthorizedException();
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
return session;
|
|
59
|
+
}
|
|
60
|
+
//#endregion
|
|
6
61
|
}
|