vaultwarden
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

null checking error response model

This commit is contained in:
Kyle Spearrin 2019-03-06 21:37:40 -05:00
parent 82f8f2b85e
commit e9cbf7b7df
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/models/response/baseResponse.ts
View File

@ -9,8 +9,10 @@ export abstract class BaseResponse {
if (propertyName == null || propertyName === '') { if (propertyName == null || propertyName === '') {
throw new Error('propertyName must not be null/empty.'); throw new Error('propertyName must not be null/empty.');
} }
if (response == null) { if (response == null && this.response != null) {
response = this.response; response = this.response;
} else {
return null;
} }
if (!exactName && response[propertyName] === undefined) { if (!exactName && response[propertyName] === undefined) {
let otherCasePropertyName: string = null; let otherCasePropertyName: string = null;

12
src/models/response/errorResponse.ts
View File

@ -8,11 +8,13 @@ export class ErrorResponse extends BaseResponse {
constructor(response: any, status: number, identityResponse?: boolean) { constructor(response: any, status: number, identityResponse?: boolean) {
super(response); super(response);
let errorModel = null; let errorModel = null;
const responseErrorModel = this.getResponseProperty('ErrorModel'); if (response != null) {
if (responseErrorModel && identityResponse && response) { const responseErrorModel = this.getResponseProperty('ErrorModel');
errorModel = responseErrorModel; if (responseErrorModel && identityResponse) {
} else if (response) { errorModel = responseErrorModel;
errorModel = response; } else {
errorModel = response;
}
} }
if (errorModel) { if (errorModel) {