/*
============LICENSE_START==========================================
===================================================================
-Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
===================================================================
Unless otherwise specified, all software contained herein is licensed
import java.net.UnknownHostException;
import java.util.Base64;
-import java.util.List;
/**
* Created by Amaresh Kumar on 09/May/2018.
@Value("${restConf.backend.port}")
private String restConfPort;
+ @Value("${restConf.username}")
+ private String restConfUsername;
+
+ @Value("${restConf.password}")
+ private String restConfPassword;
@ApiOperation(value = "Return All Test Data for a given user", response = CdtController.class)
@ApiResponses(value = {
})
@RequestMapping(value = "/getDesigns", method = RequestMethod.POST)
@CrossOrigin(origins = "*", allowedHeaders = "*")
- public String getDesigns(@RequestBody String getDesignsRequest, @RequestHeader HttpHeaders requestHeader) throws UnknownHostException {
- HttpEntity<String> entity = getStringHttpEntity(getDesignsRequest, requestHeader);
+ public String getDesigns(@RequestBody String getDesignsRequest) throws UnknownHostException {
+ HttpEntity<String> entity = getStringHttpEntity(getDesignsRequest);
HttpClient httpClient = HttpClientBuilder.create().build();
ClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory(httpClient);
restTemplate.setRequestFactory(factory);
})
@RequestMapping(value = "/testVnf", method = RequestMethod.POST)
@CrossOrigin(origins = "*", allowedHeaders = "*")
- public String testVnf(@RequestParam String urlAction, @RequestBody String testVnf, @RequestHeader HttpHeaders requestHeader) throws UnknownHostException {
- HttpEntity<String> entity = getStringHttpEntity(testVnf, requestHeader);
+ public String testVnf(@RequestParam String urlAction, @RequestBody String testVnf) throws UnknownHostException {
+ HttpEntity<String> entity = getStringHttpEntity(testVnf);
String testVnfResponse = restTemplate.postForObject(getUrl("testVnf")+urlAction, entity, String.class);
return testVnfResponse;
}
})
@RequestMapping(value = "/checkTestStatus", method = RequestMethod.POST)
@CrossOrigin(origins = "*", allowedHeaders = "*")
- public String checkTestStatus(@RequestBody String checkTestStatusRequest, @RequestHeader HttpHeaders requestHeader) throws UnknownHostException {
- HttpEntity<String> entity = getStringHttpEntity(checkTestStatusRequest, requestHeader);
+ public String checkTestStatus(@RequestBody String checkTestStatusRequest) throws UnknownHostException {
+ HttpEntity<String> entity = getStringHttpEntity(checkTestStatusRequest);
String checkTestStatusResponse = restTemplate.postForObject(getUrl("checkTestStatus"), entity, String.class);
return checkTestStatusResponse;
}
})
@RequestMapping(value = "/validateTemplate", method = RequestMethod.POST)
@CrossOrigin(origins = "*", allowedHeaders = "*")
- public String validateTemplate(@RequestBody String validateTemplateRequest, @RequestHeader HttpHeaders requestHeader) throws UnknownHostException {
- HttpEntity<String> entity = getStringHttpEntity(validateTemplateRequest, requestHeader);
+ public String validateTemplate(@RequestBody String validateTemplateRequest) throws UnknownHostException {
+ HttpEntity<String> entity = getStringHttpEntity(validateTemplateRequest);
String validateTemplateResponse = restTemplate.postForObject(getUrl("validateTemplate"), entity, String.class);
return validateTemplateResponse;
}
- private HttpEntity<String> getStringHttpEntity(@RequestBody String getDesignsRequest, @RequestHeader HttpHeaders requestHeader) {
-
+ private HttpEntity<String> getStringHttpEntity(@RequestBody String getDesignsRequest) {
HttpHeaders headers = new HttpHeaders();
- if(requestHeader.containsKey("authorization")) {
- List<String> headerAuthValue = requestHeader.get("authorization");
- if(headerAuthValue != null && headerAuthValue.size() > 0) {
- headers.set("authorization", headerAuthValue.get(0));
- }
- }
headers.setAccessControlAllowCredentials(true);
headers.setContentType(MediaType.APPLICATION_JSON);
+ String planCredentials = restConfUsername + ":" + restConfPassword;
+ String base64Credentails = Base64.getEncoder().encodeToString(planCredentials.getBytes());
+ headers.set("Authorization", "Basic " + base64Credentails);
return new HttpEntity<String>(getDesignsRequest, headers);
}
#=========RestConf Backend properties START==================
restConf.backend.hostname=localhost
restConf.backend.port=8181
+restConf.username=admin
+restConf.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
#=========RestConf Backend properties END==================
#====Allowed origins======================
/*
============LICENSE_START==========================================
===================================================================
-Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
===================================================================
Unless otherwise specified, all software contained herein is licensed
}
ngOnInit() {
- const apiToken = sessionStorage['apiToken'];
- this.currentUser = sessionStorage['userId'];
+ const apiToken = localStorage['apiToken'];
+ this.currentUser = localStorage['userId'];
if(this.paramShareService.ansibleServerData) {
this.ansibleServerData = this.paramShareService.ansibleServerData;
const input = {
"input":{
"design-request":{
- "request-id":sessionStorage['apiToken'],
+ "request-id":localStorage['apiToken'],
"action":"getArtifact",
"payload":"{\"vnf-type\":\"NULL\",\"vnfc-type\":\"NULL\",\"protocol\":\"\",\"incart\":\"N\",\"action\":\"NULL\",\"artifact-name\":\""+this.fileName+"\",\"artifact-type\":\"APPC-CONFIG\",\"userID\":\"admin\"}"
}
}
};
//const x = JSON.parse(data.input['design-request']['payload']);
- //x.userID = sessionStorage['userId'];
+ //x.userID = localStorage['userId'];
//data.input['design-request']['payload'] = JSON.stringify(x);
console.log("input to payload====", JSON.stringify(input));
let input = {
"input": {
"design-request": {
- "request-id": sessionStorage['apiToken'],
+ "request-id": localStorage['apiToken'],
"action": "uploadAdminArtifact",
"payload": "{\"userID\": \"admin\",\"vnf-type\" : \"NULL \",\"action\" : \"NULL\",\"artifact-name\" : \""+this.fileName+"\",\"artifact-type\" : \"APPC-CONFIG\",\"artifact-version\" : \"0.1\",\"artifact-contents\":\""+artifactContent+"\"}",
}
}
}
-}
+}
\ No newline at end of file
/*
============LICENSE_START==========================================
===================================================================
-Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
===================================================================
Unless otherwise specified, all software contained herein is licensed
}
ngOnInit() {
- this.currentUser = sessionStorage['userId'];
+ this.currentUser = localStorage['userId'];
this.item = JSON.parse(sessionStorage.getItem("ansibleserver"));
this.updateIndex = parseInt(sessionStorage.getItem("updateIndex"));
console.log("index===>"+this.updateIndex);
/*
============LICENSE_START==========================================
===================================================================
-Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
===================================================================
Unless otherwise specified, all software contained herein is licensed
it('should go to /vnfs/list if url = vnfs and userId is not null or undefined', inject([Router],(router: Router) => {
let navigateSpy = spyOn(router, 'navigate');
- sessionStorage['userId'] = 'testingId';
+ localStorage['userId'] = 'testingId';
let testUrl = 'vnfs';
component.gotoDetail(testUrl);
it('should go to /vnfs if url = vnfs and userId is null or undefined', inject([Router],(router: Router) => {
let navigateSpy = spyOn(router, 'navigate');
- sessionStorage['userId'] = '';
+ localStorage['userId'] = '';
let testUrl = 'vnfs';
component.gotoDetail(testUrl);
/*
============LICENSE_START==========================================
===================================================================
-Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
Copyright (C) 2018 IBM Intellectual Property. All rights reserved.
===================================================================
//@ViewChild(GoldenConfigurationComponent) goldenConfig: GoldenConfigurationComponent;
@Input() id: string;
userLoggedIn = false;
- userId: string = sessionStorage['userId'];
+ userId: string = localStorage['userId'];
subscription: Subscription;
constructor(private router: Router) {
if (value != null && value != '' && value != undefined && value != 'undefined') {
this.userId = value;
this.userLoggedIn = true;
- sessionStorage['userId'] = this.userId;
+ localStorage['userId'] = this.userId;
} else {
this.logout();
}
}
ngOnInit() {
- this.userId = sessionStorage['userId'];
+ this.userId = localStorage['userId'];
if (this.userId != undefined && this.userId != '') {
this.userLoggedIn = true;
}
gotoDetail(url) {
if (url == 'vnfs') {
- if (sessionStorage['userId'] != undefined && sessionStorage['userId'] != '' && sessionStorage['userId'] != null) {
+ if (localStorage['userId'] != undefined && localStorage['userId'] != '' && localStorage['userId'] != null) {
this.router.navigate(['/vnfs/list']);
} else {
this.router.navigate(url);
}
-}
+}
\ No newline at end of file
/*
============LICENSE_START==========================================
===================================================================
-Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
===================================================================
Unless otherwise specified, all software contained herein is licensed
.post(req.url, req.data, this.options)
.map((res: Response) => res.json())
}
-
- postWithAuth(req) {
- var authString = sessionStorage['auth'];
- if(authString === undefined || authString === null || authString.length === 0){
- this.options = new RequestOptions({
- headers: new Headers({
- 'Content-Type': 'application/json'
- })
- });
- } else {
- this.options = new RequestOptions({
- headers: new Headers({
- 'Content-Type': 'application/json',
- 'Authorization': 'Basic ' + authString
- })
- });
- }
-
- return this
- .http
- .post(req.url, req.data, this.options)
- .map((res: Response) => res.json())
- }
}
/*
============LICENSE_START==========================================
===================================================================
-Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
===================================================================
Copyright (C) 2018 IBM.
===================================================================
public createPayLoadForSave(artifactType,vnfType,action,fileName, versionNo, artifactContent)
{
- let userId=sessionStorage['userId'];
- let apiToken=sessionStorage['apiToken']
+ let userId=localStorage['userId'];
+ let apiToken=localStorage['apiToken']
let newPayload:any;
switch(artifactType)
{
let payload:any;
if(isReference) {
payload=JSON.parse(sessionStorage.getItem('updateParams'));
- payload['userID'] = sessionStorage['userId'];
+ payload['userID'] = localStorage['userId'];
payload = JSON.stringify(payload);
}
- else payload = '{"userID": "' + sessionStorage['userId'] + '","action": "' + action + '", "vnf-type" : "' + vnfType + '", "artifact-type":"APPC-CONFIG", "artifact-name":"' + fileName + '"}';
+ else payload = '{"userID": "' + localStorage['userId'] + '","action": "' + action + '", "vnf-type" : "' + vnfType + '", "artifact-type":"APPC-CONFIG", "artifact-name":"' + fileName + '"}';
let data = {
'input': {
'design-request': {
- 'request-id': sessionStorage['apiToken'],
+ 'request-id': localStorage['apiToken'],
'action': 'getArtifact',
'payload': payload
}
/*
============LICENSE_START==========================================
===================================================================
-Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
===================================================================
Copyright (C) 2018 IBM.
===================================================================
public pollCounter = 0;
public enableCounterDiv: boolean = false;
public enableDownload: boolean = false;
- private userId = sessionStorage['userId'];
+ private userId = localStorage['userId'];
timeStampInt: number;
AppcTimeStampInt: number;
AppcTimeDiff: number;
this.ngProgress.start();
this.apiRequest = JSON.stringify(this.constructRequest());
- this.httpUtil.postWithAuth(
+ this.httpUtil.post(
{
url: environment.testVnf + "?urlAction=" + this.getUrlEndPoint(this.action),
data: this.apiRequest
}
};
console.log('getAppcTimestamp: sending httpUtil.post...');
- this.httpUtil.postWithAuth(
+ this.httpUtil.post(
{
url: environment.getDesigns, data: data
})
'payload': '{"request-id":' + this.requestId + '}'
}
};
- this.httpUtil.postWithAuth(
+ this.httpUtil.post(
{
url: environment.checkTestStatus, data: data
});
it('be able to return true when referenceNameObjects is defined', inject([GCAuthGuardService, MappingEditorService], (service: GCAuthGuardService, mapService: MappingEditorService) => {
- sessionStorage['userId'] = 'abc@xyz.com';
+ localStorage['userId'] = 'abc@xyz.com';
mapService.referenceNameObjects = { data : 'data'};
let route : ActivatedRouteSnapshot;
let state: RouterStateSnapshot;
}));
it('stop routing if referenceNameObjects is not defined', inject([GCAuthGuardService, MappingEditorService, NgbModal], (service: GCAuthGuardService, mapService: MappingEditorService, ngbModal: NgbModal) => {
- sessionStorage['userId'] = 'abc@xyz.com';
+ localStorage['userId'] = 'abc@xyz.com';
mapService.referenceNameObjects = undefined;
let spy = spyOn(NgbModal.prototype, 'open').and.returnValue(Promise.resolve(true));
let route : ActivatedRouteSnapshot;
/*
============LICENSE_START==========================================
===================================================================
-Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
Copyright (C) 2018 IBM.
===================================================================
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
- let userId = sessionStorage['userId'];
+ let userId = localStorage['userId'];
if (userId != null && userId != undefined && userId != '') {
return true;
} else {
}
}
-}
+}
\ No newline at end of file
});
it('be able to hit route when user is logged in', inject([LoginGuardService], (service: LoginGuardService) => {
- sessionStorage['userId'] = 'abc@xyz.com';
+ localStorage['userId'] = 'abc@xyz.com';
let route : ActivatedRouteSnapshot;
let state: RouterStateSnapshot;
expect(service.canActivate(route, state)).toBe(true);
}));
it('be able to navigate to login page when user is not logged in', inject([LoginGuardService], (service: LoginGuardService) => {
- sessionStorage['userId'] = '';
+ localStorage['userId'] = '';
let route : ActivatedRouteSnapshot;
let mockSnapshot:any = jasmine.createSpyObj<RouterStateSnapshot>("RouterStateSnapshot", ['toString']);
expect(service.canActivate(route, mockSnapshot)).toBe(false);
/*
============LICENSE_START==========================================
===================================================================
-Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
Copyright (C) 2018 IBM.
===================================================================
public myKeyFileName = null;
public myPdFileName = null;
private selectedActionReference: any;
- private apiToken = sessionStorage['apiToken'];
- private userId = sessionStorage['userId'];
+ private apiToken = localStorage['apiToken'];
+ private userId = localStorage['userId'];
public versionNoForApiCall=require('../../../../cdt.application.properties.json').versionNoForApiCall;
constructor(private mappingEditorService: MappingEditorService,
this.populatePD(fileModel);
return this.displayParamObjects;
}
-}
+}
\ No newline at end of file
/*
============LICENSE_START==========================================
===================================================================
-Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
Copyright (C) 2018 IBM Intellectual Property. All rights reserved.
===================================================================
public confirmation: boolean;
public showConfirmation: boolean;
public test: boolean;
- apiToken = sessionStorage['apiToken'];
- userId = sessionStorage['userId'];
+ apiToken = localStorage['apiToken'];
+ userId = localStorage['userId'];
public initialData: any;
public intialData: any;
public initialAction: any;
/*
============LICENSE_START==========================================
===================================================================
-Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
===================================================================
Unless otherwise specified, all software contained herein is licensed
let payload = this.utilityService.createPayLoadForSave("reference_data", dataJson['scope']['vnf-type'], "AllAction", fileName, this.versionNoForApiCall, slashedPayload);
this.ngProgress.start();
- this.httpUtils.postWithAuth({
+ this.httpUtils.post({
url: environment.getDesigns,
data: payload
}).subscribe((resp) => {
/*
============LICENSE_START==========================================
===================================================================
-Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
===================================================================
Copyright (C) 2018 IBM Intellectual Property. All rights reserved.
===================================================================
action: any = '';
artifactName: any = '';
enableMerge: boolean = false;
- apiToken = sessionStorage['apiToken'];
- userId = sessionStorage['userId'];
+ apiToken = localStorage['apiToken'];
+ userId = localStorage['userId'];
identifier: any;
public uploadTypes = [
}
}
-}
+}
\ No newline at end of file
/*
============LICENSE_START==========================================
===================================================================
-Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
===================================================================
Unless otherwise specified, all software contained herein is licensed
enableBrowse: boolean = true;
enableMerge: boolean = false;
uploadValidationSuccess: boolean = false;
- apiToken = sessionStorage['apiToken'];
+ apiToken = localStorage['apiToken'];
public appDataObject: any;
public downloadDataObject: any;
public checkNameEntered: boolean = true;
public fileType: any = '';
public actionType: any;
public myfileName: any;
- userId = sessionStorage['userId'];
+ userId = localStorage['userId'];
public artifactRequest: ArtifactRequest = new ArtifactRequest();
public showUploadStatus: boolean = false;
public uploadStatus: boolean = false;
/*
============LICENSE_START==========================================
===================================================================
-Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
===================================================================
Copyright (C) 2018 IBM.
===================================================================
sessionStorage.setItem('updateParams', undefined);
this.mappingEditorService.latestAction = undefined;
- const apiToken = sessionStorage['apiToken'];
+ const apiToken = localStorage['apiToken'];
const data = {
'input': {
}
};
const x = JSON.parse(data.input['design-request']['payload']);
- x.userID = sessionStorage['userId'];
+ x.userID = localStorage['userId'];
data.input['design-request']['payload'] = JSON.stringify(x);
// console.log("input to payload====", JSON.stringify(data));
this.getArtifacts(data);
getArtifacts(data) {
let tempObj: any;
this.ngProgress.start();
- this.httpUtil.postWithAuth({
+ this.httpUtil.post({
url: environment.getDesigns,
data: data
})
}
-}
+}
\ No newline at end of file
<!--
============LICENSE_START==========================================
===================================================================
-Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
===================================================================
Unless otherwise specified, all software contained herein is licensed
[(ngModel)]="userId" name="userId" value="" #user="ngModel" (ngModelChange)="validateUserName()">
<span class="error-message">{{errorMessage}}</span>
</div>
- <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
- <input type="password" placeholder="Enter password" class="mdl-textfield__input" id="password" required
- [(ngModel)]="password" name="password" value="" (ngModelChange)="validatePassword()" >
- </div>
<div class="form-group text-right">
<button type="submit" [disabled]="invalid"
</div>
</div>
</div>
-</div>
+</div>
\ No newline at end of file
/*
============LICENSE_START==========================================
===================================================================
-Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
Modification Copyright (C) 2018 IBM
===================================================================
fixture = TestBed.createComponent(userloginFormComponent);
component = fixture.componentInstance;
fixture.detectChanges();
- // sessionStorage['userId'] = "testUser"
+ // localStorage['userId'] = "testUser"
component.userId = 'test Usr';
});
expect(url.length).toBe(5);
expect(url[0]).toEqual('/');
expect(url[1]).toEqual('h');
- expect(sessionStorage['userId']).toBe('test Usr');
+ expect(localStorage['userId']).toBe('test Usr');
}));
it('test validateUserName function', () => {
/*
============LICENSE_START==========================================
===================================================================
-Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
===================================================================
Unless otherwise specified, all software contained herein is licensed
import { ActivatedRoute } from '@angular/router';
import {EmitterService} from '../../shared/services/emitter.service';
-import { environment } from '../../../environments/environment';
-import { HttpUtilService } from '../../shared/services/httpUtil/http-util.service';
import {Router} from '@angular/router';
-import { NgProgress } from 'ngx-progressbar';
import {UtilityService} from '../../shared/services/utilityService/utility.service';
-import { Http, Response, Headers, RequestOptions } from '@angular/http';
@Component({selector: 'app-mvnfs-form', templateUrl: './userlogin-form.component.html', styleUrls: ['./userlogin-form.component.css']})
export class userloginFormComponent implements OnInit {
userId: string = '';
- password: string = '';
returnUrl:string
invalid = true;
errorMessage = '';
- constructor(private router: Router, private utiltiy: UtilityService, private route: ActivatedRoute,
- private http: Http, private ngProgress: NgProgress) {
+ constructor(private router: Router, private utiltiy: UtilityService, private route: ActivatedRoute
+ ) {
}
ngOnInit() {
getData() {
- this.ngProgress.start();
- var getHeader = new Headers({ 'Content-Type': 'application/json' }); // ... Set content type to JSON
- var authStr = btoa(this.userId + ':' + this.password);
- const options = {
- headers: new Headers({
- 'Content-Type': 'application/json',
- 'Authorization': 'Basic ' + authStr
- }),
- observe: 'response'
- };
- const data = {
- 'input': {
- 'design-request': {
- 'request-id': '1',
- 'action': 'getDesigns',
- 'payload': '{"userID": "","filter":"reference"}'
- }
- }
- };
- const x = JSON.parse(data.input['design-request']['payload']);
- x.userID = this.userId;
- data.input['design-request']['payload'] = JSON.stringify(x);
- console.log("auth " + btoa(this.userId + ':' + this.password));
- this.http.post(environment.getDesigns,data,options).subscribe(resp => {
- console.log("status " + resp.status);
- if(resp.status == 200){
- console.log('logged in');
- sessionStorage['userId'] = this.userId;
- sessionStorage['apiToken'] = this.utiltiy.randomId();
- sessionStorage['auth'] = authStr;
- EmitterService
- .get('userLogin')
- .emit(this.userId);
- this.router.navigateByUrl(this.returnUrl);
- } else {
- console.log("Invalid user or password");
- this.invalid = true;
- this.errorMessage = 'Invalid user or password';
- }
- }, error => {
- console.log(error);
- if(error.status == 401){
- this.invalid = true;
- this.errorMessage = 'Invalid user or password';
- } else {
- this.invalid = true;
- this.errorMessage = 'Incorrect login or connection error.';
- }
- });
- console.log("After");
-
+ localStorage['userId'] = this.userId;
+ localStorage['apiToken'] = this.utiltiy.randomId();
+ EmitterService
+ .get('userLogin')
+ .emit(this.userId);
+ this.router.navigateByUrl(this.returnUrl);
}
validateUserName(){
this.errorMessage = '';
this.invalid = true;
}else if(this.userId.startsWith(' ') || this.userId.endsWith(' ')){
- this.errorMessage = 'Leading and trailing space is not allowed in username';
+ this.errorMessage = 'Leading and trailing space is not allowed';
this.invalid = true;
} else if(this.userId.includes(' ')){
this.errorMessage = 'More than one space is not allowed in username';
this.errorMessage = '';
}
}
-
- validatePassword(){
- if (!this.password.trim() || this.password.length < 1) {
- this.errorMessage = '';
- this.invalid = true;
- }else if(this.password.startsWith(' ') || this.password.endsWith(' ')){
- this.errorMessage = 'Leading and trailing space is not allowed in password';
- this.invalid = true;
- } else if(this.password.includes(' ')){
- this.errorMessage = 'More than one space is not allowed in password';
- this.invalid = true;
- } else if(this.password.length > 50) {
- this.errorMessage = 'Password should be of minimum one character and maximum 50 character';
- this.invalid = true;
- }else {
- this.invalid = false;
- this.errorMessage = '';
- }
- }
}
Code Review / appc / cdt.git / commitdiff