fixed moe issues

MOE_MAIN
umasoodch 3 years ago
parent 2e68280074
commit 5d99bae7fb

@ -421,7 +421,7 @@ export class SmsPageComponent implements OnInit {
if (this.common.validResponse(result)) { if (this.common.validResponse(result)) {
this.common.sharedService.setSharedData(result.MemberLoginList.P_ORACLE_USER_NAME, 'oracle-user-name')
//save business card info //save business card info

@ -107,14 +107,15 @@ export class AuthenticationService {
this.setPublicFields(request); this.setPublicFields(request);
const user = this.getAuthenticatedUser(); const user = this.getAuthenticatedUser();
if (user) { const oracleUserName = this.cs.sharedService.getSharedData('oracle-user-name', false);
if (user && oracleUserName) {
const userName = this.cs.sharedService.getSharedData(LoginRequest.SHARED_DATA, false); const userName = this.cs.sharedService.getSharedData(LoginRequest.SHARED_DATA, false);
request.P_SESSION_ID = user.P_SESSION_ID; request.P_SESSION_ID = user.P_SESSION_ID;
request.MobileNumber = user.EMPLOYEE_MOBILE_NUMBER; request.MobileNumber = user.EMPLOYEE_MOBILE_NUMBER;
request.LogInTokenID = user.LogInTokenID; request.LogInTokenID = user.LogInTokenID;
request.TokenID = user.TokenID; request.TokenID = user.TokenID;
request.P_USER_NAME = userName; // '1100313582' ALWAYS USER NAME request.P_USER_NAME = oracleUserName; // '1100313582' ALWAYS USER NAME
request.UserName = userName; // '1100313582' request.UserName = oracleUserName; // '1100313582'
request.P_EMAIL_ADDRESS = user.EMPLOYEE_EMAIL_ADDRESS; request.P_EMAIL_ADDRESS = user.EMPLOYEE_EMAIL_ADDRESS;
if (AuthenticationService.requireRelogin) { if (AuthenticationService.requireRelogin) {
this.sessionTimeOutDialog(); this.sessionTimeOutDialog();

@ -3,6 +3,7 @@ import { Response } from 'src/app/hmg-common/services/models/response';
import { AuthenticatedUser } from './authenticated-user'; import { AuthenticatedUser } from './authenticated-user';
import { PrivilageModel } from './privilage-model'; import { PrivilageModel } from './privilage-model';
export class SMSCheckResponse extends Response { export class SMSCheckResponse extends Response {
MemberLoginList: any = {};
BasicMemberInformation: any = {}; BasicMemberInformation: any = {};
AuthenticationTokenID: string; AuthenticationTokenID: string;
MemberInformationList:AuthenticatedUser[]; MemberInformationList:AuthenticatedUser[];

@ -29,8 +29,8 @@ export class ConnectorService {
//public static host = 'https://uat.hmgwebservices.com/'; //public static host = 'https://uat.hmgwebservices.com/';
// public static host = 'https://hmgwebservices.com/'; // public static host = 'https://hmgwebservices.com/';
//public static host = 'http://10.0.50.241:1010/' // MOE vpn public static host = 'http://10.0.50.241:1010/' // MOE vpn
public static host = 'https://hrmsys.moenergy.gov.sa/' // public static host = 'https://hrmsys.moenergy.gov.sa/'

Loading…
Cancel
Save