Login fix (#80)

* login fixes * fixed logout
virtru · Aug 2, 2019 · ec6e2e1 · ec6e2e1
1 parent 48d06ed
commit ec6e2e1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/src/components/Header/Header.js b/src/components/Header/Header.js
@@ -17,7 +17,7 @@ const Header = ({ userId }) => {
       return (
         <span>
           {userId}{' '}
-          <Button variant="link" onClick={Virtru.signOut} verySmall light>
+          <Button variant="link" onClick={() => Virtru.signOut(userId)} verySmall light>
             Sign out
           </Button>
         </span>

diff --git a/src/scenes/Document/Document.js b/src/scenes/Document/Document.js
@@ -39,6 +39,7 @@ function Document({
   setEncryptState,
   setPolicy,
   setPolicyId,
+  isLoggedIn,
 }) {
   const [isShareOpen, setShareOpen] = useState(false);
   const [isAuthOpen, setAuthOpen] = useState(false);
@@ -147,6 +148,7 @@ function Document({
               encrypt={encrypt}
               encryptState={encryptState}
               policyChange={policyChange}
+              isLoggedIn={isLoggedIn}
             />
           </div>
         </Drop>
@@ -239,7 +241,18 @@ const mapToProps = ({
   policy,
   userId,
   virtruClient,
-}) => ({ policyId, file, policy, userId, appId, virtruClient, encrypted, encryptState });
+  isLoggedIn,
+}) => ({
+  policyId,
+  file,
+  policy,
+  userId,
+  appId,
+  virtruClient,
+  encrypted,
+  encryptState,
+  isLoggedIn,
+});
 
 const saveFileToLocalStorage = ({ fileBuffer, fileName, fileType }) => {
   const b64 = arrayBufferToBase64(fileBuffer);

diff --git a/src/scenes/Document/scenes/Policy/Policy.js b/src/scenes/Document/scenes/Policy/Policy.js
@@ -18,6 +18,7 @@ function Policy({
   policyChange,
   virtruClient,
   policyId,
+  isLoggedIn,
 }) {
   const renderButtons = () => {
     switch (encryptState) {
@@ -30,7 +31,7 @@ function Policy({
       case ENCRYPT_STATES.PROTECTED_NO_AUTH:
         return <Button onClick={openAuthModal}># to Protect</Button>;
       default:
-        if (userId) {
+        if (isLoggedIn) {
           return (
             <Button data-testid="encryptFile" onClick={encrypt}>
               Protect File
@@ -47,7 +48,6 @@ function Policy({
             </>
           );
         }
-
     }
   };
   if (encryptState !== ENCRYPT_STATES.PROTECTED) {

diff --git a/src/utils/VirtruWrapper.js b/src/utils/VirtruWrapper.js
@@ -165,7 +165,8 @@ function newVirtruDecryptParamsBuilder(opts) {
   return new Virtru.DecryptParamsBuilder(opts);
 }
 
-function signOut() {
+function signOut(userId) {
+  Virtru.Auth.logout({ email: userId });
   localStorage.clear();
   window.location = window.location.href.split(/[?#]/)[0];
 }