Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.

Commit 395984c

Browse files
authored
Prevent error when publicKey or signature is an empty string (#643)
1 parent 2383ce3 commit 395984c

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

bin/www/localPackage.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,13 @@ var LocalPackage = (function (_super) {
140140
return;
141141
}
142142
publicKey = publicKeyResult;
143-
isSignatureVerificationEnabled = (publicKey !== null);
143+
isSignatureVerificationEnabled = !!publicKey;
144144
_this.getSignatureFromUpdate(deploymentResult.deployDir, function (error, signature) {
145145
if (error) {
146146
installError && installError(new Error("Error reading signature from update. " + error));
147147
return;
148148
}
149-
isSignatureAppearedInBundle = (signature !== null);
149+
isSignatureAppearedInBundle = !!signature;
150150
verify(isSignatureVerificationEnabled, isSignatureAppearedInBundle, publicKey, signature);
151151
});
152152
});

www/localPackage.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class LocalPackage extends Package implements ILocalPackage {
115115
}
116116

117117
private verifyPackage(deploymentResult: DeploymentResult, installError: ErrorCallback, successCallback: SuccessCallback<void>): void {
118-
118+
119119
var deployDir = deploymentResult.deployDir;
120120

121121
var verificationFail: ErrorCallback = (error: Error) => {
@@ -129,7 +129,7 @@ class LocalPackage extends Package implements ILocalPackage {
129129
this.verifySignature(deployDir, this.packageHash, publicKey, signature, verificationFail, successCallback);
130130
});
131131
} else {
132-
var errorMessage =
132+
var errorMessage =
133133
"Error! Public key was provided but there is no JWT signature within app bundle to verify. " +
134134
"Possible reasons, why that might happen: \n" +
135135
"1. You've been released CodePush bundle update using version of CodePush CLI that is not support code signing.\n" +
@@ -152,7 +152,7 @@ class LocalPackage extends Package implements ILocalPackage {
152152
} else {
153153
successCallback();
154154
}
155-
}
155+
}
156156
}
157157
};
158158

@@ -172,15 +172,15 @@ class LocalPackage extends Package implements ILocalPackage {
172172
}
173173

174174
publicKey = publicKeyResult;
175-
isSignatureVerificationEnabled = (publicKey !== null);
175+
isSignatureVerificationEnabled = !!publicKey;
176176

177177
this.getSignatureFromUpdate(deploymentResult.deployDir, (error, signature) => {
178178
if (error) {
179179
installError && installError(new Error("Error reading signature from update. " + error));
180180
return;
181181
}
182182

183-
isSignatureAppearedInBundle = (signature !== null);
183+
isSignatureAppearedInBundle = !!signature;
184184

185185
verify(isSignatureVerificationEnabled, isSignatureAppearedInBundle, publicKey, signature);
186186
});
@@ -219,7 +219,7 @@ class LocalPackage extends Package implements ILocalPackage {
219219
callback(error, null);
220220
return;
221221
}
222-
222+
223223
callback(null, signature);
224224
});
225225
});

0 commit comments

Comments
 (0)