refactor: signed_in simplified

Author: JohnCoene

R/class-auth.R

@@ -75,7 +75,6 @@ FirebaseAuth <- R6::R6Class(
 #' containing the user object or \code{NULL} if signing in failed.
     get_signed_in = function(){
       response <- private$get_signed_in_checked()
-      private$.user_signed_in <- response
       invisible(response)
     },
 #' @details Get results of a sign up
@@ -84,7 +83,6 @@ FirebaseAuth <- R6::R6Class(
 #' containing the user object or \code{NULL} if signing in failed.
     get_signed_up = function(){
       user <- private$get_signed_in_checked()
-      private$.user_sign_up <- user
       invisible(user)
     },
 #' @details Check whether use is signed in
@@ -95,22 +93,23 @@ FirebaseAuth <- R6::R6Class(
         msg = "This method is method is deprecated, use `get_signed_in`"
       )
       user <- private$get_signed_in_checked()
-      private$.user_signed_in <- user
       invisible(user$success)
     },
 #' @details Makes Shiny output, observer, or reactive require the user to be signed in
     req_sign_in = function(){
       user <- private$get_signed_in_checked()
-      private$.user_signed_in <- user
+
+      if(!length(user$success))
+        user <- list(success = FALSE)
+
       req(user$success)
     },
 #' @details Makes Shiny output, observer, or reactive require the user to be signed out
     req_sign_out = function(){
       user <- private$get_signed_in_checked()
-      private$.user_signed_in <- user
 
-      if(length(user$success))
-        return(FALSE)
+      if(!length(user$success))
+        user <- list(success = FALSE)
 
       req(!user$success)
     },

inst/packer/core.js

@@ -1,10 +1,6 @@
-check: site
+check: document
 	Rscript -e "devtools::check()"
 
-site: document
-	Rscript docs/docify.R
-	mkdocs build
-
 document: bundle
 	Rscript -e "devtools::document()"
 

makefile

@@ -1,97 +1,98 @@
-import 'shiny';
-import { 
-  getAuth, 
-  signOut, 
+import "shiny";
+import {
+  getAuth,
+  signOut,
   setPersistence,
   isSignInWithEmailLink,
   signInWithEmailLink,
-  onAuthStateChanged
+  onAuthStateChanged,
 } from "firebase/auth";
 import { initializeApp } from "firebase/app";
-import './style.css';
-import { 
-  persistenceOpts, 
-  showHideOnLogin, 
+import "./style.css";
+import {
+  persistenceOpts,
+  showHideOnLogin,
   showHideOnLogout,
   setInputValue,
-  setLanguageCode
-} from './utils.js';
-import { handleStorage } from './components/storage';
+  setLanguageCode,
+} from "./utils.js";
+import { handleStorage } from "./components/storage";
 
 // global variables
-window.globalNs = '';
+window.globalNs = "";
 var globalInit = false;
 window.uiInitialised = false;
 let firebaseApp;
 
-Shiny.addCustomMessageHandler('fireblaze-render-dependencies', (msg) => {
+Shiny.addCustomMessageHandler("fireblaze-render-dependencies", (msg) => {
   Shiny.renderDependencies(msg.deps);
-})
+});
 
-Shiny.addCustomMessageHandler('fireblaze-initialize-core', (msg) => {
-  if(firebaseApp)
-    return;
+Shiny.addCustomMessageHandler("fireblaze-initialize-core", (msg) => {
+  if (firebaseApp) return;
 
   firebaseApp = initializeApp(msg.conf);
 });
 
-Shiny.addCustomMessageHandler('fireblaze-expose-app', (msg) => {
-  if(!firebaseApp)
-    return;
+Shiny.addCustomMessageHandler("fireblaze-expose-app", (msg) => {
+  if (!firebaseApp) return;
 
   window.firebaseApp = firebaseApp;
 });
 
-Shiny.addCustomMessageHandler('fireblaze-expose-auth', (msg) => {
+Shiny.addCustomMessageHandler("fireblaze-expose-auth", (msg) => {
   window.firebaseAuth = getAuth();
 });
 
-Shiny.addCustomMessageHandler('fireblaze-initialize-storage', (msg) => {
+Shiny.addCustomMessageHandler("fireblaze-initialize-storage", (msg) => {
   handleStorage(firebaseApp);
 });
 
 // Initialise
-Shiny.addCustomMessageHandler('fireblaze-initialize-auth', (msg) => {
-
-  if(globalInit)
-    return ;
+Shiny.addCustomMessageHandler("fireblaze-initialize-auth", (msg) => {
+  if (globalInit) return;
 
   globalInit = true;
   // set namespace
   window.globalNs = msg.ns;
 
   // auth
   const auth = getAuth();
-  setLanguageCode(msg.languageCode)
+  setLanguageCode(msg.languageCode);
 
   // set persistence
   let persistence = persistenceOpts(msg.persistence);
   setPersistence(auth, persistence)
     .then(() => {
       onAuthStateChanged(auth, (user) => {
-        if(user){
-
+        if (user) {
           // show signin authorised
           showHideOnLogin("show");
           showHideOnLogout("hide");
           $("#fireblaze-signin-ui").hide();
 
-          auth.currentUser.getIdToken(true)
-            .then(function(token) {
-              setInputValue('signed_in_user', {success: true, response: user, token: token});
-            }).catch(function(error) {
-              console.error('failed to login');
+          auth.currentUser
+            .getIdToken(true)
+            .then(function (token) {
+              setInputValue("signed_in_user", {
+                success: true,
+                response: user,
+                token: token,
+              });
+            })
+            .catch(function () {
+              console.error("failed to login");
             });
 
-        } else {
-          // hide signin required
-          showHideOnLogin("hide");
-          showHideOnLogout("show");
-
-          // set error input
-          setInputValue('signed_in', {success: false, response: null});
-          setInputValue('signed_in_user', {success: false, response: null});
+          return;
         }
+        // hide signin required
+        showHideOnLogin("hide");
+        showHideOnLogout("show");
+
+        // set error input
+        setInputValue("signed_in", { success: false, response: null });
+        setInputValue("signed_in_user", { success: false, response: null });
       });
 
       // check email verification link
@@ -101,68 +102,96 @@ Shiny.addCustomMessageHandler('fireblaze-initialize-auth', (msg) => {
         // the sign-in operation.
         // Get the email if available. This should be available if the user completes
         // the flow on the same device where they started it.
-        var email = window.localStorage.getItem('fireblazeEmailSignIn');
+        var email = window.localStorage.getItem("fireblazeEmailSignIn");
         if (!email) {
-          setInputValue('email_verification', {success: false, response: "Cannot find email"});
+          setInputValue("email_verification", {
+            success: false,
+            response: "Cannot find email",
+          });
         }
         // The client SDK will parse the code from the link for you.
         signInWithEmailLink(auth, email, window.location.href)
           .then((result) => {
-            window.localStorage.removeItem('fireblazeEmailSignIn');
-            setInputValue('email_verification', {success: true, response: result});
+            window.localStorage.removeItem("fireblazeEmailSignIn");
+            setInputValue("email_verification", {
+              success: true,
+              response: result,
+            });
           })
           .catch((error) => {
-            setInputValue('email_verification', {success: false, response: error});
+            setInputValue("email_verification", {
+              success: false,
+              response: error,
+            });
           });
       }
     })
     .catch((error) => {
       console.error(error);
     });
-
 });
 
 // Sign out
-Shiny.addCustomMessageHandler('fireblaze-signout', (msg) => {
+Shiny.addCustomMessageHandler("fireblaze-signout", (msg) => {
   const auth = getAuth();
 
   signOut(auth)
     .then(() => {
-      if(window.uiInitialised){
+      if (window.uiInitialised) {
         window.ui.start("#fireblaze-signin-ui", window.uiOpts);
         $("#fireblaze-signin-ui").show();
       }
 
-      setInputValue('signout', {success: true, response: 'successful'}, msg.ns);
-    }).catch((error) => {
-      setInputValue('signout', {success: false, response: error}, msg.ns);
+      setInputValue(
+        "signout",
+        { success: true, response: "successful" },
+        msg.ns,
+      );
+    })
+    .catch((error) => {
+      setInputValue("signout", { success: false, response: error }, msg.ns);
     });
-
 });
 
 // Language code
-Shiny.addCustomMessageHandler('fireblaze-language-code', (msg) => {
+Shiny.addCustomMessageHandler("fireblaze-language-code", (msg) => {
   const auth = getAuth();
   auth.languageCode = msg.code;
 });
 
 // Delete User
-Shiny.addCustomMessageHandler('fireblaze-delete-user', (msg) => {
+Shiny.addCustomMessageHandler("fireblaze-delete-user", (msg) => {
   const auth = getAuth();
-  auth.currentUser.delete()
+  auth.currentUser
+    .delete()
     .then(() => {
-      setInputValue('deleted_user', {success: true, response: 'successful'}, msg.ns);
-    }).catch((error) => {
-      Shiny.setInputValue('deleted_user', {success: false, response: error}, msg.ns);
+      setInputValue(
+        "deleted_user",
+        { success: true, response: "successful" },
+        msg.ns,
+      );
+    })
+    .catch((error) => {
+      Shiny.setInputValue(
+        "deleted_user",
+        { success: false, response: error },
+        msg.ns,
+      );
     });
 });
 
-Shiny.addCustomMessageHandler('fireblaze-id-token', (msg) => {
+Shiny.addCustomMessageHandler("fireblaze-id-token", (msg) => {
   const auth = getAuth();
-  auth.currentUser.getIdToken(true)
+  auth.currentUser
+    .getIdToken(true)
     .then((idToken) => {
-      setInputValue('id_token', {response: {idToken: idToken}, success: true}, msg.ns);
-    }).catch((error) => {
-      setInputValue('id_token', {response: error, success: false}, msg.ns);
+      setInputValue(
+        "id_token",
+        { response: { idToken: idToken }, success: true },
+        msg.ns,
+      );
+    })
+    .catch((error) => {
+      setInputValue("id_token", { response: error, success: false }, msg.ns);
     });
 });