Skip to content

Commit 6559936

Browse files
authored
Merge pull request #5 from addapptables/feature/security
Feature/security
2 parents f93ad32 + 3519cc1 commit 6559936

File tree

42 files changed

+659
-348
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+659
-348
lines changed

.eslintignore

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
node_modules
2+
dist
3+
coverage
4+
.eslintrc.js
5+
ormconfig.js
6+
package.json
7+
tsconfig.json
8+
yarn.lock
9+
test
10+
*.spec.ts
11+
test.ts
12+
*.e2e-spec.ts

.eslintrc.js

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
module.exports = {
2+
root: true,
3+
parser: "@typescript-eslint/parser",
4+
parserOptions: {
5+
tsconfigRootDir: __dirname,
6+
project: "./tsconfig.eslint.json",
7+
},
8+
plugins: ["@typescript-eslint"],
9+
extends: [
10+
"eslint:recommended",
11+
"plugin:@typescript-eslint/eslint-recommended",
12+
"plugin:@typescript-eslint/recommended",
13+
"plugin:@typescript-eslint/recommended-requiring-type-checking",
14+
],
15+
rules: {
16+
"@typescript-eslint/no-unsafe-assignment": 0,
17+
"@typescript-eslint/no-unsafe-member-access": 0,
18+
"@typescript-eslint/no-unsafe-call": 0,
19+
"@typescript-eslint/no-unsafe-return": 0,
20+
"@typescript-eslint/no-floating-promises": 0,
21+
"@typescript-eslint/no-explicit-any": 0,
22+
"@typescript-eslint/explicit-module-boundary-types": 0,
23+
"@typescript-eslint/no-empty-function": 0,
24+
"@typescript-eslint/parser": 0,
25+
"@typescript-eslint/unbound-method": 0,
26+
"@typescript-eslint/no-misused-promises": 0,
27+
quotes: [2, "single"]
28+
},
29+
};
30+

package.json

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"start": "ng serve",
1111
"build": "ng build",
1212
"test": "ng test",
13-
"lint": "ng lint",
13+
"lint": "eslint . --ext .ts",
1414
"e2e": "ng e2e",
1515
"build:libs": "ng build @craftsjs/boilerplate --prod",
1616
"test:libs": "ng test @craftsjs/boilerplate",
@@ -19,17 +19,17 @@
1919
},
2020
"private": false,
2121
"dependencies": {
22-
"@angular/animations": "^10.0.2",
22+
"@angular/animations": "^10.0.11",
2323
"@angular/cdk": "^10.0.1",
24-
"@angular/common": "^10.0.2",
25-
"@angular/compiler": "^10.0.2",
26-
"@angular/core": "^10.0.2",
27-
"@angular/forms": "^10.0.2",
28-
"@angular/localize": "^10.0.2",
24+
"@angular/common": "^10.0.11",
25+
"@angular/compiler": "^10.0.11",
26+
"@angular/core": "^10.0.11",
27+
"@angular/forms": "^10.0.11",
28+
"@angular/localize": "^10.0.11",
2929
"@angular/material": "^10.0.1",
30-
"@angular/platform-browser": "^10.0.2",
31-
"@angular/platform-browser-dynamic": "^10.0.2",
32-
"@angular/router": "^10.0.2",
30+
"@angular/platform-browser": "^10.0.11",
31+
"@angular/platform-browser-dynamic": "^10.0.11",
32+
"@angular/router": "^10.0.11",
3333
"@craftsjs/alert": "^1.0.0",
3434
"@craftsjs/card": "^1.0.0",
3535
"@craftsjs/core": "^1.0.0",
@@ -38,19 +38,19 @@
3838
"@craftsjs/ngrx-action": "^1.0.0",
3939
"@craftsjs/notifier": "^1.0.0",
4040
"@craftsjs/perfect-scrollbar": "^1.0.0",
41-
"@ngrx/effects": "^9.0.0",
42-
"@ngrx/entity": "^9.0.0",
43-
"@ngrx/router-store": "^9.0.0",
44-
"@ngrx/store": "^9.0.0",
45-
"@ngrx/store-devtools": "^9.0.0",
41+
"@ngrx/effects": "^10.0.0",
42+
"@ngrx/entity": "^10.0.0",
43+
"@ngrx/router-store": "^10.0.0",
44+
"@ngrx/store": "^10.0.0",
45+
"@ngrx/store-devtools": "^10.0.0",
4646
"@ngx-translate/core": "^13.0.0",
4747
"@ngx-translate/http-loader": "^6.0.0",
4848
"lodash": "^4.17.15",
4949
"materialize-css": "^1.0.0",
5050
"moment": "^2.24.0",
5151
"ng2-file-upload": "^1.4.0",
52-
"ngx-cookie-service": "^3.0.3",
53-
"ngx-img-cropper": "^9.0.1",
52+
"ngx-cookie-service": "^10.0.1",
53+
"ngx-img-cropper": "^10.0.0",
5454
"normalize-scss": "^7.0.1",
5555
"perfect-scrollbar": "^1.5.0",
5656
"rxjs": "~6.5.4",
@@ -61,13 +61,16 @@
6161
"@angular-devkit/build-angular": "^0.1000.1",
6262
"@angular-devkit/build-ng-packagr": "^0.1000.1",
6363
"@angular/cli": "^10.0.1",
64-
"@angular/compiler-cli": "^10.0.2",
65-
"@angular/language-service": "^10.0.2",
64+
"@angular/compiler-cli": "^10.0.11",
65+
"@angular/language-service": "^10.0.11",
6666
"@types/jasmine": "~3.5.0",
6767
"@types/jasminewd2": "~2.0.3",
6868
"@types/lodash": "4.14.157",
6969
"@types/node": "^12.11.1",
70+
"@typescript-eslint/eslint-plugin": "^4.0.1",
71+
"@typescript-eslint/parser": "^4.0.1",
7072
"codelyzer": "^5.1.2",
73+
"eslint": "^7.8.1",
7174
"jasmine-core": "~3.5.0",
7275
"jasmine-spec-reporter": "~5.0.0",
7376
"karma": "~5.0.0",

projects/craftsjs-app/src/app/@redux/account/models/impersonate-input.model.ts

Lines changed: 0 additions & 4 deletions
This file was deleted.

projects/craftsjs-app/src/app/@redux/account/models/impersonate-output.model.ts

Lines changed: 0 additions & 4 deletions
This file was deleted.

projects/craftsjs-app/src/app/@redux/account/services/account.service.ts

Lines changed: 0 additions & 24 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import { StoreModel } from '@redux/shared/models/store.model';
22
import { EditionDto } from './edition-dto.model';
33

4-
export interface EditionStoreModel extends StoreModel<EditionDto> { }
4+
export type EditionStoreModel = StoreModel<EditionDto>

projects/craftsjs-app/src/app/@redux/menu/services/data.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export const menus: MenuModelTenant[] = [
1515
multiOption: false,
1616
url: '/admin/tenants',
1717
exact: true,
18-
permission: 'Page.Tenants',
18+
permission: 'Page.Tenant',
1919
viewTenant: true
2020
},
2121
{

projects/craftsjs-app/src/app/@redux/organization-unit/services/organization-unit.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export class OrganizationUnitService extends ServiceApiBase {
2828
}
2929

3030
getRoleOrganizationUnits() {
31-
const url = `user/organization-units`;
31+
const url = 'user/organization-units';
3232
return this.get<OrganizationUnitDto[]>(url);
3333
}
3434

projects/craftsjs-app/src/app/@redux/permission/effects/permission.effects.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export class PermissionEffects {
2121
loadData$ = createEffect(() => this._actions$.pipe(
2222
ofType(PermissionActions.loadPermissions),
2323
withLatestFrom(this._store.pipe(select(selectAllPermissions))),
24+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
2425
filter(([_, allPermissions]) => allPermissions.length === 0),
2526
switchMap(() =>
2627
this._permissionService.getAll().pipe(

0 commit comments

Comments
 (0)