From 507cb57bcbd2f406a87daa6b0207456911bc8ef8 Mon Sep 17 00:00:00 2001
From: Alexey Lunin <alexey.lunin0@gmail.com>
Date: Thu, 28 Feb 2019 07:03:58 +0400
Subject: [PATCH] use encodeResponse and union if
---
javascript/src/iframe/viamapi-iframe.js | 28 ++++++-------------------
1 file changed, 6 insertions(+), 22 deletions(-)
diff --git a/javascript/src/iframe/viamapi-iframe.js b/javascript/src/iframe/viamapi-iframe.js
index 192a27f..ab4f8b6 100644
--- a/javascript/src/iframe/viamapi-iframe.js
+++ b/javascript/src/iframe/viamapi-iframe.js
@@ -612,29 +612,13 @@ const connection = Penpal.connectToParent({
},
identityPullAvatarFromGravatar: async () => {
const authenticationPublicKey = localStorage.getItem("authenticatedIdentity");
- if (authenticationPublicKey === null) {
- return {
- data : "",
- code : "400",
- status : "Identity not authenticated"
- };
- }
- if (window.loadedIdentities[authenticationPublicKey] === null) {
- return {
- data : "",
- code : "400",
- status : "Identity not authenticated"
- }
- }
- var success = extendPinCodeTtl(authenticationPublicKey);
-
- if(success === false) {
- return {
- data : "",
- code : "400",
- status : "Identity not authenticated"
- };
+ if (
+ !authenticationPublicKey ||
+ !window.loadedIdentities[authenticationPublicKey] ||
+ !extendPinCodeTtl(authenticationPublicKey)
+ ) {
+ return encodeResponse("400", "", "Identity not authenticated");
}
return await executeRestfulFunction("private", viamApi, viamApi.identityPullAvatarFromGravatar);
--
GitLab