Hide socials card if empty

Author: devgianlu

WebContent/index.html

@@ -80,7 +80,8 @@ <h3 class="mdc-typography--body1 mdc-typography--adjust-margin">You can login wi
                 </section>
             </div>
 
-            <div class="mdc-card mdc-layout-grid__cell mdc-layout-grid__cell--span-12" id="socialLogin">
+            <div class="mdc-card mdc-layout-grid__cell mdc-layout-grid__cell--span-12" id="socialLogin"
+                 style="display: none">
                 <section class="mdc-card__primary">
                     <h1 class="mdc-card__title mdc-typography--title">Social login</h1>
                 </section>

WebContent/index.js

@@ -154,6 +154,7 @@ class LoginManager {
     setupGoogle(appId) {
         if (appId === undefined) {
             this.googleSignIn.hide();
+            return false;
         } else {
             $.getScript("https://apis.google.com/js/api:client.js", () => {
                 this.googleSignIn.show();
@@ -168,12 +169,14 @@ class LoginManager {
                         (error) => Notifier.error("Failed signing in with Google.", error));
                 });
             });
+            return true;
         }
     }
 
     setupFacebook(appId) {
         if (appId === undefined) {
             this.facebookSignIn.hide();
+            return false;
         } else {
             $.getScript("https://connect.facebook.net/en_US/sdk.js", () => {
                 FB.init({
@@ -193,28 +196,33 @@ class LoginManager {
                     scope: 'email,public_profile',
                 }));
             });
+            return true;
         }
     }
 
     setupGitHub(appId) {
         if (appId === undefined) {
             this.githubSignIn.hide();
+            return false;
         } else {
             this.githubSignIn.show();
             this.githubSignIn.on('click', () => {
                 window.location = "https://github.com/login/oauth/authorize?scope=read:user,user:email&client_id=" + appId
-            })
+            });
+            return true;
         }
     }
 
     setupTwitter(appId) {
         if (appId === undefined) {
             this.twitterSignIn.hide();
+            return false;
         } else {
             this.twitterSignIn.show();
             this.twitterSignIn.on('click', () => {
                 window.location = "/TwitterStartAuthFlow"
-            })
+            });
+            return true;
         }
     }
 
@@ -401,20 +409,12 @@ class LoginManager {
                 else localStorage['ssp'] = data.ssp;
 
                 if (data.ip) {
-                    if (data.next === "game") {
-                        window.location = "/games/?gid=" + data.gid;
-                    } else {
-                        window.location = "/games/";
-                    }
+                    if (data.next === "game") window.location = "/games/?gid=" + data.gid;
+                    else window.location = "/games/";
                 } else {
                     const authConfig = data.aC;
                     Notifier.debug(authConfig);
 
-                    this.setupGoogle(authConfig.g);
-                    this.setupFacebook(authConfig.fb);
-                    this.setupGitHub(authConfig.gh);
-                    this.setupTwitter(authConfig.tw);
-
                     if ("pw" in authConfig) {
                         this.pyxEmail.parent().show();
                         this.pyxRegister.show();
@@ -423,17 +423,26 @@ class LoginManager {
                         this.pyxRegister.hide();
                     }
 
-                    switch (getURLParameter("aT")) {
-                        case "gh":
-                            const token = Cookies.getJSON("PYX-Github-Token");
-                            Cookies.remove("PYX-Github-Token");
-                            this._githubSuccess(token);
-                            break;
-                        case "tw":
-                            const tokens = Cookies.getJSON("PYX-Twitter-Token");
-                            Cookies.remove("PYX-Twitter-Token");
-                            this._twitterSuccess(tokens);
-                            break;
+                    if (!this.setupGoogle(authConfig.g)
+                        && !this.setupFacebook(authConfig.fb)
+                        && !this.setupGitHub(authConfig.gh)
+                        && !this.setupTwitter(authConfig.tw)) {
+
+                        this._socials.hide();
+                    } else {
+                        this._socials.show();
+                        switch (getURLParameter("aT")) {
+                            case "gh":
+                                const token = Cookies.getJSON("PYX-Github-Token");
+                                Cookies.remove("PYX-Github-Token");
+                                this._githubSuccess(token);
+                                break;
+                            case "tw":
+                                const tokens = Cookies.getJSON("PYX-Twitter-Token");
+                                Cookies.remove("PYX-Twitter-Token");
+                                this._twitterSuccess(tokens);
+                                break;
+                        }
                     }
                 }
             }, null,

src/main/java/com/gianlu/pyxreloaded/singletons/Preferences.java

@@ -72,7 +72,7 @@ private JsonElement get(String key) {
                 parent = parent.getAsJsonObject(path);
         }
 
-        return parent.get(lastPath);
+        return parent == null ? null : parent.get(lastPath);
     }
 
     @NotNull