sonar issue fix with session service path change and encryption key l…

…ocation change
PSMRI · Dec 10, 2024 · f7f3887 · f7f3887
1 parent 133848b
commit f7f3887
Show file tree

Hide file tree

Showing 21 changed files with 24 additions and 29 deletions.
diff --git a/src/app/app-modules/core/components/app-header/app-header.component.ts b/src/app/app-modules/core/components/app-header/app-header.component.ts
@@ -27,7 +27,7 @@ import { HttpServiceService } from '../../services/http-service.service';
 import { MatDialog } from '@angular/material/dialog';
 import { ShowCommitAndVersionDetailsComponent } from '../show-commit-and-version-details/show-commit-and-version-details.component';
 import { environment } from 'src/environments/environment';
-import { SessionStorageService } from 'src/app/app-modules/core/services/session-storage.service';
+import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
 
 @Component({
   selector: 'app-header',

diff --git a/src/app/app-modules/core/components/camera-dialog/camera-dialog.component.ts b/src/app/app-modules/core/components/camera-dialog/camera-dialog.component.ts
@@ -38,7 +38,7 @@ import html2canvas from 'html2canvas';
 import { WebcamImage, WebcamInitError } from 'ngx-webcam';
 import { Observable } from 'rxjs';
 import * as saveAs from 'file-saver';
-import { SessionStorageService } from 'src/app/app-modules/core/services/session-storage.service';
+import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
 
 interface Mark {
   xCord: any;

diff --git a/src/app/app-modules/core/services/http-interceptor.service.ts b/src/app/app-modules/core/services/http-interceptor.service.ts
@@ -36,7 +36,7 @@ import { throwError } from 'rxjs/internal/observable/throwError';
 import { SpinnerService } from './spinner.service';
 import { ConfirmationService } from './confirmation.service';
 import { environment } from 'src/environments/environment';
-import { SessionStorageService } from 'src/app/app-modules/core/services/session-storage.service';
+import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
 import { CookieService } from 'ngx-cookie-service';
 
 @Injectable({

diff --git a/src/app/app-modules/scheduler/appointment-view/appointment-view.component.ts b/src/app/app-modules/scheduler/appointment-view/appointment-view.component.ts
@@ -14,7 +14,7 @@ import { SetLanguageComponent } from '../../core/components/set-language.compone
 import { HttpServiceService } from '../../core/services/http-service.service';
 import * as moment from 'moment';
 import { MatTableDataSource } from '@angular/material/table';
-import { SessionStorageService } from 'src/app/app-modules/core/services/session-storage.service';
+import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
 import { MatPaginator } from '@angular/material/paginator';
 @Component({
   selector: 'app-appointment-view',

diff --git a/src/app/app-modules/scheduler/mystaff/mystaff.component.ts b/src/app/app-modules/scheduler/mystaff/mystaff.component.ts
@@ -24,7 +24,7 @@ import { SchedulerService } from '../shared/services';
 import { Router } from '@angular/router';
 import { HttpServiceService } from '../../core/services/http-service.service';
 import { SetLanguageComponent } from '../../core/components/set-language.component';
-import { SessionStorageService } from 'src/app/app-modules/core/services/session-storage.service';
+import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
 
 @Component({
   selector: 'app-mystaff',

diff --git a/.../app-modules/scheduler/reports/chief-complaint-report/chief-complaint-report.component.ts b/.../app-modules/scheduler/reports/chief-complaint-report/chief-complaint-report.component.ts
@@ -27,7 +27,7 @@ import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-la
 import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
 import * as ExcelJS from 'exceljs';
 import * as saveAs from 'file-saver';
-import { SessionStorageService } from 'src/app/app-modules/core/services/session-storage.service';
+import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
 
 declare global {
   interface Navigator {

diff --git a/src/app/app-modules/scheduler/reports/consultation-report/consultation-report.component.ts b/src/app/app-modules/scheduler/reports/consultation-report/consultation-report.component.ts
@@ -27,7 +27,7 @@ import { SetLanguageComponent } from '../../../core/components/set-language.comp
 import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import * as ExcelJS from 'exceljs';
-import { SessionStorageService } from 'src/app/app-modules/core/services/session-storage.service';
+import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
 import * as saveAs from 'file-saver';
 
 declare global {

diff --git a/src/app/app-modules/scheduler/reports/daily-report/daily-report.component.ts b/src/app/app-modules/scheduler/reports/daily-report/daily-report.component.ts
@@ -26,7 +26,7 @@ import { ConfirmationService } from '../../../core/services/confirmation.service
 import { SetLanguageComponent } from '../../../core/components/set-language.component';
 import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
 import * as ExcelJS from 'exceljs';
-import { SessionStorageService } from 'src/app/app-modules/core/services/session-storage.service';
+import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
 import * as saveAs from 'file-saver';
 
 declare global {

diff --git a/src/app/app-modules/scheduler/reports/monthly-report/monthly-report.component.ts b/src/app/app-modules/scheduler/reports/monthly-report/monthly-report.component.ts
@@ -27,7 +27,7 @@ import * as moment from 'moment';
 import { SetLanguageComponent } from '../../../core/components/set-language.component';
 import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
 import * as ExcelJS from 'exceljs';
-import { SessionStorageService } from 'src/app/app-modules/core/services/session-storage.service';
+import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
 import * as saveAs from 'file-saver';
 
 declare global {

diff --git a/...odules/scheduler/reports/total-consultation-report/total-consultation-report.component.ts b/...odules/scheduler/reports/total-consultation-report/total-consultation-report.component.ts
@@ -27,7 +27,7 @@ import * as moment from 'moment';
 import { SetLanguageComponent } from '../../../core/components/set-language.component';
 import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
 import * as ExcelJS from 'exceljs';
-import { SessionStorageService } from 'src/app/app-modules/core/services/session-storage.service';
+import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
 import * as saveAs from 'file-saver';
 
 declare global {

diff --git a/src/app/app-modules/scheduler/shared/services/scheduler.service.ts b/src/app/app-modules/scheduler/shared/services/scheduler.service.ts
@@ -22,7 +22,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { environment } from 'src/environments/environment';
-import { SessionStorageService } from 'src/app/app-modules/core/services/session-storage.service';
+import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
 
 @Injectable()
 export class SchedulerService {

diff --git a/...p/app-modules/scheduler/sms-template/create-sms-template/create-sms-template.component.ts b/...p/app-modules/scheduler/sms-template/create-sms-template/create-sms-template.component.ts
@@ -28,7 +28,7 @@ import { ActivatedRoute } from '@angular/router';
 import { SetLanguageComponent } from '../../../core/components/set-language.component';
 import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
 import { MatTableDataSource } from '@angular/material/table';
-import { SessionStorageService } from 'src/app/app-modules/core/services/session-storage.service';
+import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
 
 @Component({
   selector: 'app-create-sms-template',

diff --git a/src/app/app-modules/scheduler/sms-template/sms-template-list/sms-template-list.component.ts b/src/app/app-modules/scheduler/sms-template/sms-template-list/sms-template-list.component.ts
@@ -26,7 +26,7 @@ import { Router } from '@angular/router';
 import { SetLanguageComponent } from '../../../core/components/set-language.component';
 import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
 import { MatTableDataSource } from '@angular/material/table';
-import { SessionStorageService } from 'src/app/app-modules/core/services/session-storage.service';
+import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
 import { MatPaginator } from '@angular/material/paginator';
 @Component({
   selector: 'app-sms-template-list',

diff --git a/...-modules/scheduler/specialization-calander-view/specialization-calander-view.component.ts b/...-modules/scheduler/specialization-calander-view/specialization-calander-view.component.ts
@@ -23,7 +23,7 @@ import { Component, DoCheck, OnInit } from '@angular/core';
 import { SchedulerService } from '../shared/services/scheduler.service';
 import { SetLanguageComponent } from '../../core/components/set-language.component';
 import { HttpServiceService } from '../../core/services/http-service.service';
-import { SessionStorageService } from 'src/app/app-modules/core/services/session-storage.service';
+import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
 
 @Component({
   selector: 'app-specialization-calander-view',

diff --git a/src/app/app-modules/scheduler/timesheet/timesheet.component.ts b/src/app/app-modules/scheduler/timesheet/timesheet.component.ts
@@ -40,7 +40,7 @@ import { CalendarOptions } from '@fullcalendar/core';
 import dayGridPlugin from '@fullcalendar/daygrid';
 import { DateTime } from 'ts-luxon';
 import * as moment from 'moment';
-import { SessionStorageService } from 'src/app/app-modules/core/services/session-storage.service';
+import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
 
 @Component({
   selector: 'app-timesheet',

diff --git a/src/app/redir-open/redir-open.component.ts b/src/app/redir-open/redir-open.component.ts
@@ -31,7 +31,7 @@ import { SpinnerService } from '../app-modules/core/services/spinner.service';
 import { Location } from '@angular/common';
 import { AuthService } from '../app-modules/core/services/auth.service';
 import { ConfirmationService } from '../app-modules/core/services/confirmation.service';
-import { SessionStorageService } from 'src/app/app-modules/core/services/session-storage.service';
+import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
 
 @Component({
   selector: 'app-redir-open',

diff --git a/src/environments/enckey.ts b/src/environments/enckey.ts
diff --git a/src/environments/environment.ci.ts.template b/src/environments/environment.ci.ts.template
@@ -29,9 +29,10 @@ const COMMON_API_OPEN = '<%= COMMON_API_BASE %>';
 const COMMON_API = '<%= COMMON_API_BASE %>';
 const SCHEDULER_API =  '<%= SCHEDULER_API_BASE %>';
 const TM_API = '<%= TM_API_BASE %>';
+const sessionStorageEncKey = '<%= SESSION_STORAGE_ENC_KEY %>';
 export const environment = {
   production: true,
-
+  encKey: sessionStorageEncKey,
   app: `TM`,
 
   /**

diff --git a/src/environments/environment.development.ts b/src/environments/environment.development.ts
@@ -33,11 +33,11 @@ const COMMON_API_OPEN = `${commonIP}commonapi-3.0.0/`;
 const COMMON_API = `${commonIP}commonapi-v3.0.0/`;
 const SCHEDULER_API = `${schedulerIP}schedulerapi-v3.0.0/`;
 const TM_API = `${tmIP}tmapi-v3.0.0/`;
-import { keys } from './enckey';
+const sessionStorageEncKey = '<%= SESSION_STORAGE_ENC_KEY %>';
 
 export const environment = {
   production: true,
-  encKey: keys.dev,
+  encKey: sessionStorageEncKey,
   app: `TM`,
 
   /**

diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
@@ -33,11 +33,11 @@ const COMMON_API_OPEN = `${commonIP}commonapi-v3.0.0/`;
 const COMMON_API = `${commonIP}commonapi-v3.0.0/`;
 const SCHEDULER_API = `${schedulerIP}schedulerapi-v3.0.0/`;
 const TM_API = `${tmIP}tmapi-v3.0.0/`;
-import { keys } from './enckey';
+const sessionStorageEncKey = '<%= SESSION_STORAGE_ENC_KEY %>';
 
 export const environment = {
   production: true,
-  encKey: keys.prod,
+  encKey: sessionStorageEncKey,
   app: `TM`,
 
   /**

diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -33,13 +33,13 @@ const COMMON_API_OPEN = `${commonIP}commonapi-v3.0.0/`;
 const COMMON_API = `${commonIP}commonapi-v3.0.0/`;
 const SCHEDULER_API = `${schedulerIP}schedulerapi-v3.0.0/`;
 const TM_API = `${tmIP}tmapi-v3.0.0/`;
-import { keys } from './enckey';
+const sessionStorageEncKey = '<%= SESSION_STORAGE_ENC_KEY %>';
 
 // const TM_API = `${tmIP}tmapi-v1.0/`;
 
 export const environment = {
   production: false,
-  encKey: keys.dev,
+  encKey: sessionStorageEncKey,
   app: `TM`,
 
   /**