feat: security

teogl · teogl · commit 3519cc1b2d9b · 2020-09-28T19:17:47.000-05:00
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,12 @@
+node_modules
+dist
+coverage
+.eslintrc.js
+ormconfig.js
+package.json
+tsconfig.json
+yarn.lock
+test
+*.spec.ts
+test.ts
+*.e2e-spec.ts
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,30 @@
+module.exports = {
+    root: true,
+    parser: "@typescript-eslint/parser",
+    parserOptions: {
+      tsconfigRootDir: __dirname,
+      project: "./tsconfig.eslint.json",
+    },
+    plugins: ["@typescript-eslint"],
+    extends: [
+      "eslint:recommended",
+      "plugin:@typescript-eslint/eslint-recommended",
+      "plugin:@typescript-eslint/recommended",
+      "plugin:@typescript-eslint/recommended-requiring-type-checking",
+    ],
+    rules: {
+      "@typescript-eslint/no-unsafe-assignment": 0,
+      "@typescript-eslint/no-unsafe-member-access": 0,
+      "@typescript-eslint/no-unsafe-call": 0,
+      "@typescript-eslint/no-unsafe-return": 0,
+      "@typescript-eslint/no-floating-promises": 0,
+      "@typescript-eslint/no-explicit-any": 0,
+      "@typescript-eslint/explicit-module-boundary-types": 0,
+      "@typescript-eslint/no-empty-function": 0,
+      "@typescript-eslint/parser": 0,
+      "@typescript-eslint/unbound-method": 0,
+      "@typescript-eslint/no-misused-promises": 0,
+      quotes: [2, "single"]
+    },
+  };
+  
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "start": "ng serve",
     "build": "ng build",
     "test": "ng test",
-    "lint": "ng lint",
+    "lint": "eslint . --ext .ts",
     "e2e": "ng e2e",
     "build:libs": "ng build @craftsjs/boilerplate --prod",
     "test:libs": "ng test @craftsjs/boilerplate",
@@ -67,7 +67,10 @@
     "@types/jasminewd2": "~2.0.3",
     "@types/lodash": "4.14.157",
     "@types/node": "^12.11.1",
+    "@typescript-eslint/eslint-plugin": "^4.0.1",
+    "@typescript-eslint/parser": "^4.0.1",
     "codelyzer": "^5.1.2",
+    "eslint": "^7.8.1",
     "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~5.0.0",
     "karma": "~5.0.0",
@@ -98,4 +101,4 @@
     "modal",
     "notifier"
   ]
-}
+}
diff --git a/projects/craftsjs-app/src/app/@redux/account/models/impersonate-input.model.ts b/projects/craftsjs-app/src/app/@redux/account/models/impersonate-input.model.ts
diff --git a/projects/craftsjs-app/src/app/@redux/account/models/impersonate-output.model.ts b/projects/craftsjs-app/src/app/@redux/account/models/impersonate-output.model.ts
diff --git a/projects/craftsjs-app/src/app/@redux/account/services/account.service.ts b/projects/craftsjs-app/src/app/@redux/account/services/account.service.ts
diff --git a/projects/craftsjs-app/src/app/@redux/edition/models/edition-store.model.ts b/projects/craftsjs-app/src/app/@redux/edition/models/edition-store.model.ts
@@ -1,4 +1,4 @@
 import { StoreModel } from '@redux/shared/models/store.model';
 import { EditionDto } from './edition-dto.model';
 
-export interface EditionStoreModel extends StoreModel<EditionDto> { }
+export type EditionStoreModel = StoreModel<EditionDto>
diff --git a/projects/craftsjs-app/src/app/@redux/organization-unit/services/organization-unit.service.ts b/projects/craftsjs-app/src/app/@redux/organization-unit/services/organization-unit.service.ts
@@ -28,7 +28,7 @@ export class OrganizationUnitService extends ServiceApiBase {
   }
 
   getRoleOrganizationUnits() {
-    const url = `user/organization-units`;
+    const url = 'user/organization-units';
     return this.get<OrganizationUnitDto[]>(url);
   }
 
diff --git a/projects/craftsjs-app/src/app/@redux/permission/effects/permission.effects.ts b/projects/craftsjs-app/src/app/@redux/permission/effects/permission.effects.ts
@@ -21,6 +21,7 @@ export class PermissionEffects {
   loadData$ = createEffect(() => this._actions$.pipe(
     ofType(PermissionActions.loadPermissions),
     withLatestFrom(this._store.pipe(select(selectAllPermissions))),
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     filter(([_, allPermissions]) => allPermissions.length === 0),
     switchMap(() =>
       this._permissionService.getAll().pipe(
diff --git a/projects/craftsjs-app/src/app/@redux/tenant/models/tenant-store.model.ts b/projects/craftsjs-app/src/app/@redux/tenant/models/tenant-store.model.ts
@@ -1,4 +1,4 @@
 import { StoreModel } from '@redux/shared/models/store.model';
 import { TenantDto } from './tenant-dto.model';
 
-export interface TenantStoreModel extends StoreModel<TenantDto> { }
+export type TenantStoreModel = StoreModel<TenantDto>
diff --git a/projects/craftsjs-app/src/app/@redux/user/models/user-store.model.ts b/projects/craftsjs-app/src/app/@redux/user/models/user-store.model.ts
@@ -1,4 +1,4 @@
 import { UserDto } from './user-dto.model';
 import { StoreModel } from '@redux/shared/models/store.model';
 
-export interface UserStoreModel extends StoreModel<UserDto> { }
+export type UserStoreModel = StoreModel<UserDto>
diff --git a/projects/craftsjs-app/src/app/admin/organization-unit/components/organization-unit-tree/organization-unit-tree.component.ts b/projects/craftsjs-app/src/app/admin/organization-unit/components/organization-unit-tree/organization-unit-tree.component.ts
@@ -87,8 +87,8 @@ export class OrganizationUnitTreeComponent implements OnDestroy {
 
   onContextMenu(event: MouseEvent, node: OrganizationUnitDto) {
     event.preventDefault();
-    this.contextMenuPosition.x = event.clientX + 'px';
-    this.contextMenuPosition.y = event.clientY + 'px';
+    this.contextMenuPosition.x = `${event.clientX}px`;
+    this.contextMenuPosition.y = `${event.clientY}px`;
     this.contextMenu.menuData = { organizationUnit: node };
     this.contextMenu.openMenu();
   }
diff --git a/projects/craftsjs-app/src/app/admin/organization-unit/models/association-user-organization-unit-select.model.ts b/projects/craftsjs-app/src/app/admin/organization-unit/models/association-user-organization-unit-select.model.ts
@@ -1,4 +1,4 @@
-import { ICustomSelection } from 'src/app/shared/models/custom-selection-model';
+import { ICustomSelection } from '../../../shared/models/custom-selection-model';
 
 export class AssociationUserOrganizationUnitSelect implements ICustomSelection<number> {
     id: number;
diff --git a/projects/craftsjs-app/src/app/admin/tenant/components/tenant-list/user-list-impersonation/user-list-impersonation.component.ts b/projects/craftsjs-app/src/app/admin/tenant/components/tenant-list/user-list-impersonation/user-list-impersonation.component.ts
@@ -35,7 +35,6 @@ export class UserListImpersonationComponent implements OnDestroy {
   }
 
   impersonation(user: UserDto) {
-    console.log(user);
     this.saveSubject.next(true);
     this._authService.impersonatedAuthenticate({ userId: user.id, tenantImpersonationId: this.tenantId }).pipe(
       takeUntil(this.unsubscribeAll)
diff --git a/projects/craftsjs-app/src/app/auth/components/tenant/services/tenant-action.service.ts b/projects/craftsjs-app/src/app/auth/components/tenant/services/tenant-action.service.ts
@@ -40,9 +40,9 @@ export class TenantActionService {
 
   setTenantCookie(tenantId: string) {
     if (!_.isEmpty(tenantId)) {
-      this._utilsService.set('craftsjs-tenantId', tenantId, new Date(new Date().getTime() + 5 * 365 * 86400000), '/', undefined, false, "Lax");
+      this._utilsService.set('craftsjs-tenantId', tenantId, new Date(new Date().getTime() + 5 * 365 * 86400000), '/', undefined, false, 'Lax');
     } else {
-      this._utilsService.delete('craftsjs-tenantId', '/', undefined, false, "Lax");
+      this._utilsService.delete('craftsjs-tenantId', '/', undefined, false, 'Lax');
     }
   }
 }
diff --git a/projects/craftsjs-app/src/app/core/controls/base-control-value-accessor.ts b/projects/craftsjs-app/src/app/core/controls/base-control-value-accessor.ts
@@ -107,6 +107,7 @@ export class BaseControlValueAccessor<T> extends
     }
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   propagateChange = (_: any) => { };
   onTouched: any = () => { };
 
diff --git a/projects/craftsjs-app/src/app/core/controls/crop-image/components/crop-image/crop-image.component.ts b/projects/craftsjs-app/src/app/core/controls/crop-image/components/crop-image/crop-image.component.ts
@@ -54,12 +54,14 @@ export class CropImageComponent implements ControlValueAccessor, AfterViewInit {
     this.cropperSettings.dynamicSizing = true;
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   propagateChange = (_: any) => { };
   onTouched: any = () => { };
 
   selectFile(event: File) {
     const image = new Image();
     const reader = new FileReader();
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
     const self = this;
     reader.onloadend = (loadEvent: any) => {
       image.src = loadEvent.target.result;
diff --git a/projects/craftsjs-app/src/app/core/controls/selects/edition-type-pay-select/edition-type-pay-select.component.html b/projects/craftsjs-app/src/app/core/controls/selects/edition-type-pay-select/edition-type-pay-select.component.html
@@ -1,7 +1,7 @@
 <mat-select [multiple]="multiple" [disabled]="disabled" [value]="value$ | async" [required]="required"
 (selectionChange)="onChange($event)" (openedChange)="openedChange($event)">
   <mat-option>--</mat-option>
-  <mat-option [value]="1">{{'general.monthly' | translate}}</mat-option>
-  <mat-option [value]="2">{{'general.biannual' | translate}}</mat-option>
-  <mat-option [value]="3">{{'general.annual' | translate}}</mat-option>
+  <mat-option [value]="'Monthly'">{{'general.monthly' | translate}}</mat-option>
+  <mat-option [value]="'Biannual'">{{'general.biannual' | translate}}</mat-option>
+  <mat-option [value]="'Annual'">{{'general.annual' | translate}}</mat-option>
 </mat-select>
diff --git a/projects/craftsjs-app/src/app/core/controls/tree/permission-tree/permission-tree.component.ts b/projects/craftsjs-app/src/app/core/controls/tree/permission-tree/permission-tree.component.ts
@@ -31,6 +31,7 @@ export class PermissionTreeComponent implements ControlValueAccessor, OnDestroy
   dataSource: MatTreeFlatDataSource<PermissionTreeModel, PermissionTreeFlatNode>;
   checklistSelection = new SelectionModel<PermissionTreeFlatNode>(true);
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   propagateChange = (_: any) => { };
   onTouched: any = () => { };
 
diff --git a/projects/craftsjs-app/src/app/core/shared/select-language/select-language.component.ts b/projects/craftsjs-app/src/app/core/shared/select-language/select-language.component.ts
@@ -41,7 +41,7 @@ export class SelectLanguageComponent implements OnInit {
   }
 
   async changeLanguage(language: LanguageModel) {
-    await this._translateService.use(language.i18nLocale.language);
+    await this._translateService.use(language.i18nLocale.language).toPromise();
     this.selectLanguage$ = of(language);
     moment.locale(language.id);
   }
diff --git a/projects/craftsjs-app/src/app/localization/localization.service.ts b/projects/craftsjs-app/src/app/localization/localization.service.ts
@@ -13,6 +13,7 @@ export class LocalizationService {
         this._translateService.addLangs(['en', 'es']);
         this._translateService.setDefaultLang('en');
         const browserLang = this._translateService.getBrowserLang();
+        // eslint-disable-next-line @typescript-eslint/prefer-regexp-exec
         const lang = browserLang.match(/en|es/) ? browserLang : 'en';
         moment.locale(lang);
         this._translateService.use(lang);
diff --git a/projects/craftsjs-app/src/app/shared/directives/scroll.directive.ts b/projects/craftsjs-app/src/app/shared/directives/scroll.directive.ts
@@ -17,10 +17,9 @@ export class ScrollDirective implements AfterViewInit {
 
   ngAfterViewInit(): void {
     this.elementRef.nativeElement.addEventListener('scroll', () => {
+      const scroll = Number(this.elementRef.nativeElement.offsetHeight) + Number(this.elementRef.nativeElement.scrollTop);
       if (
-        this.elementRef.nativeElement.offsetHeight +
-        this.elementRef.nativeElement.scrollTop >=
-        this.elementRef.nativeElement.scrollHeight
+        scroll >= this.elementRef.nativeElement.scrollHeight
       ) {
         this.scrollBottom.emit(this.eventName);
       }
diff --git a/projects/craftsjs-app/src/app/shared/list/custom-selection-model.ts b/projects/craftsjs-app/src/app/shared/list/custom-selection-model.ts
@@ -104,7 +104,7 @@ export class CustomSelectionModel<T extends ICustomSelection<any>> {
    */
   sort(predicate?: (a: T, b: T) => number): void {
     if (this._multiple && this.selected) {
-      this._selected!.sort(predicate);
+      this._selected.sort(predicate);
     }
   }
 
diff --git a/projects/craftsjs-app/src/app/shared/services/infinite-scroll-base.ts b/projects/craftsjs-app/src/app/shared/services/infinite-scroll-base.ts
@@ -1,8 +1,9 @@
-import { OnDestroy } from '@angular/core';
+import { OnDestroy, Injectable } from '@angular/core';
 import { Store, Action, select, MemoizedSelector } from '@ngrx/store';
 import { Observable, BehaviorSubject, Subject } from 'rxjs';
 import { takeUntil, withLatestFrom, tap } from 'rxjs/operators';
 
+@Injectable()
 export abstract class InfiniteScroll<T, F> implements OnDestroy {
 
   protected unsubscribeAll = new Subject();
diff --git a/projects/craftsjs-app/src/reducers/index.ts b/projects/craftsjs-app/src/reducers/index.ts
@@ -5,6 +5,7 @@ import {
 import { routerReducer } from '@ngrx/router-store';
 import { environment } from '../environments/environment';
 
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface CraftsState { }
 
 export const reducers: ActionReducerMap<CraftsState> = {
diff --git a/projects/craftsjs-app/src/reducers/router-serializer.shared.ts b/projects/craftsjs-app/src/reducers/router-serializer.shared.ts
@@ -3,7 +3,7 @@ import {
   RouterReducerState,
   RouterStateSerializer,
 } from '@ngrx/router-store';
-import { Injectable } from "@angular/core";
+import { Injectable } from '@angular/core';
 
 export interface RouterStateUrl {
   url: string;
diff --git a/projects/craftsjs-app/src/utils/utils.ts b/projects/craftsjs-app/src/utils/utils.ts
@@ -2,6 +2,7 @@ import * as _ from 'lodash';
 
 export function removeEmptyOrNil(object: any) {
   if (typeof object === 'object') {
+    // eslint-disable-next-line @typescript-eslint/unbound-method
     const removeEmptyParams = _(object).omit(_.isUndefined).value();
     const params = _.mapValues(removeEmptyParams, (v) => {
       if (v instanceof Date) {
diff --git a/projects/craftsjs-app/tsconfig.app.json b/projects/craftsjs-app/tsconfig.app.json
@@ -8,7 +8,8 @@
     "src/main.ts",
     "src/polyfills.ts"
   ],
-  "include": [
-    "src/**/*.d.ts"
+  "exclude": [
+    "src/**/*.spec.ts",
+    "test.ts"
   ]
 }
diff --git a/projects/craftsjs-app/tslint.json b/projects/craftsjs-app/tslint.json
diff --git a/projects/craftsjs/boilerplate/src/lib/app-initializer-factory.ts b/projects/craftsjs/boilerplate/src/lib/app-initializer-factory.ts
@@ -17,7 +17,7 @@ export function appInitializerFactory(injector: Injector) {
         finalize(() => resolve(true)),
         catchError((err) => {
           reject(err);
-          throw new Error(`Can't load initial configuration`);
+          throw new Error('Can\'t load initial configuration');
         })
       ).subscribe();
     });
diff --git a/projects/craftsjs/boilerplate/src/lib/helpers/format-string-tokenizer.ts b/projects/craftsjs/boilerplate/src/lib/helpers/format-string-tokenizer.ts
@@ -4,7 +4,7 @@ import { FormatStringTokenType } from './format-string-token-type';
 export class FormatStringTokenizer {
   Tokenize(
     format: string,
-    includeBracketsForDynamicValues: boolean = false,
+    includeBracketsForDynamicValues = false,
   ): FormatStringToken[] {
     const tokens: FormatStringToken[] = [];
 
@@ -17,9 +17,7 @@ export class FormatStringTokenizer {
         case '{':
           if (inDynamicValue) {
             throw new Error(
-              'Incorrect syntax at char ' +
-              i +
-              '! format string can not contain nested dynamic value expression!',
+              `Incorrect syntax at char  ${i} ! format string can not contain nested dynamic value expression!`,
             );
           }
 
@@ -39,22 +37,19 @@ export class FormatStringTokenizer {
         case '}':
           if (!inDynamicValue) {
             throw new Error(
-              'Incorrect syntax at char ' +
-              i +
-              '! These is no opening brackets for the closing bracket }.',
+              `Incorrect syntax at char ${i} ! These is no opening brackets for the closing bracket }.`,
             );
           }
 
           inDynamicValue = false;
 
           if (currentText.length <= 0) {
             throw new Error(
-              'Incorrect syntax at char ' +
-              i +
-              '! Brackets does not contains any chars.',
+              `Incorrect syntax at char ${i} ! Brackets does not contains any chars.`,
             );
           }
 
+          // eslint-disable-next-line no-case-declarations
           let dynamicValue = currentText;
           if (includeBracketsForDynamicValues) {
             dynamicValue = '{' + dynamicValue + '}';
diff --git a/projects/craftsjs/boilerplate/src/lib/services/auth.service.ts b/projects/craftsjs/boilerplate/src/lib/services/auth.service.ts
@@ -97,9 +97,9 @@ export class AuthService {
 
   setTenantCookie(tenantId: string) {
     if (!_.isEmpty(tenantId)) {
-      this._utilsService.set('craftsjs-tenantId', tenantId, new Date(new Date().getTime() + 5 * 365 * 86400000), '/', undefined, false, "Lax");
+      this._utilsService.set('craftsjs-tenantId', tenantId, new Date(new Date().getTime() + 5 * 365 * 86400000), '/', undefined, false, 'Lax');
     } else {
-      this._utilsService.delete('craftsjs-tenantId', '/', undefined, false, "Lax");
+      this._utilsService.delete('craftsjs-tenantId', '/', undefined, false, 'Lax');
     }
   }
 
diff --git a/projects/craftsjs/boilerplate/src/lib/services/token.service.ts b/projects/craftsjs/boilerplate/src/lib/services/token.service.ts
diff --git a/projects/craftsjs/boilerplate/src/test.ts b/projects/craftsjs/boilerplate/src/test.ts
diff --git a/projects/craftsjs/boilerplate/tsconfig.lib.json b/projects/craftsjs/boilerplate/tsconfig.lib.json
diff --git a/projects/craftsjs/boilerplate/tslint.json b/projects/craftsjs/boilerplate/tslint.json
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
diff --git a/tslint.json b/tslint.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ export class OrganizationUnitService extends ServiceApiBase {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`getRoleOrganizationUnits() {`
`31`		- const url = `user/organization-units`;
	`31`	`+ const url = 'user/organization-units';`
`32`	`32`	`return this.get<OrganizationUnitDto[]>(url);`
`33`	`33`	`}`
`34`	`34`