Handling disabled register with email

Author: devgianlu

WebContent/index.js

@@ -58,8 +58,8 @@ class LoginManager {
 
         this.pyxEmail = this._pyx.find('input[type=email]');
 
-        this.pyxSubmit = this._pyx.find('._register');
-        this.pyxSubmit.on('click', () => this.createPyxAccount());
+        this.pyxRegister = this._pyx.find('._register');
+        this.pyxRegister.on('click', () => this.createPyxAccount());
 
         this._socials = $('#socialLogin');
         this.googleSignIn = this._socials.find('#googleSignIn');
@@ -380,6 +380,7 @@ class LoginManager {
                  * @param {string} data.aC.fb - Facebook app id
                  * @param {string} data.aC.gh - Github app id
                  * @param {string} data.aC.tw - Twitter app id
+                 * @param {string} data.aC.pw - Verification email sender
                  */
                 data.css.sort(function (a, b) {
                     return a.w - b.w;
@@ -396,12 +397,21 @@ class LoginManager {
                     }
                 } else {
                     const authConfig = data.aC;
+                    Notifier.debug(authConfig);
+
+
                     this.setupGoogle(authConfig.g);
                     this.setupFacebook(authConfig.fb);
                     this.setupGitHub(authConfig.gh);
                     this.setupTwitter(authConfig.tw);
 
-                    Notifier.debug(authConfig);
+                    if ("pw" in authConfig) {
+                        this.pyxEmail.parent().show();
+                        this.pyxRegister.show();
+                    } else {
+                        this.pyxEmail.parent().hide();
+                        this.pyxRegister.hide();
+                    }
 
                     switch (getURLParameter("aT")) {
                         case "gh":

src/main/java/com/gianlu/pyxreloaded/handlers/FirstLoadHandler.java

@@ -7,6 +7,7 @@
 import com.gianlu.pyxreloaded.game.GameOptions;
 import com.gianlu.pyxreloaded.server.Annotations;
 import com.gianlu.pyxreloaded.server.Parameters;
+import com.gianlu.pyxreloaded.singletons.Emails;
 import com.gianlu.pyxreloaded.singletons.LoadedCards;
 import com.gianlu.pyxreloaded.singletons.Preferences;
 import com.gianlu.pyxreloaded.singletons.SocialLogin;
@@ -18,11 +19,16 @@
 public class FirstLoadHandler extends BaseHandler {
     public static final String OP = Consts.Operation.FIRST_LOAD.toString();
     private final LoadedCards loadedCards;
+    private final Emails emails;
     private final SocialLogin socials;
     private final Preferences preferences;
 
-    public FirstLoadHandler(@Annotations.LoadedCards LoadedCards loadedCards, @Annotations.SocialLogin SocialLogin socials, @Annotations.Preferences Preferences preferences) {
+    public FirstLoadHandler(@Annotations.LoadedCards LoadedCards loadedCards,
+                            @Annotations.Emails Emails emails,
+                            @Annotations.SocialLogin SocialLogin socials,
+                            @Annotations.Preferences Preferences preferences) {
         this.loadedCards = loadedCards;
+        this.emails = emails;
         this.socials = socials;
         this.preferences = preferences;
     }
@@ -48,14 +54,13 @@ public JsonWrapper handle(User user, Parameters params, HttpServerExchange excha
             }
         }
 
-        // TODO: Is password login enabled?
-
-        JsonWrapper socialsConfig = new JsonWrapper();
-        if (socials.googleEnabled()) socialsConfig.add(Consts.AuthType.GOOGLE, socials.googleAppId());
-        if (socials.facebookEnabled()) socialsConfig.add(Consts.AuthType.FACEBOOK, socials.facebookAppId());
-        if (socials.githubEnabled()) socialsConfig.add(Consts.AuthType.GITHUB, socials.githubAppId());
-        if (socials.twitterEnabled()) socialsConfig.add(Consts.AuthType.TWITTER, socials.twitterAppId());
-        obj.add(Consts.GeneralKeys.AUTH_CONFIG, socialsConfig);
+        JsonWrapper authConfig = new JsonWrapper();
+        if (emails.enabled()) authConfig.add(Consts.AuthType.PASSWORD, emails.senderEmail());
+        if (socials.googleEnabled()) authConfig.add(Consts.AuthType.GOOGLE, socials.googleAppId());
+        if (socials.facebookEnabled()) authConfig.add(Consts.AuthType.FACEBOOK, socials.facebookAppId());
+        if (socials.githubEnabled()) authConfig.add(Consts.AuthType.GITHUB, socials.githubAppId());
+        if (socials.twitterEnabled()) authConfig.add(Consts.AuthType.TWITTER, socials.twitterAppId());
+        obj.add(Consts.GeneralKeys.AUTH_CONFIG, authConfig);
 
         Set<PyxCardSet> cardSets = loadedCards.getLoadedSets();
         JsonArray json = new JsonArray(cardSets.size());

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

@@ -47,6 +47,11 @@ public Emails(ServerDatabase db, Preferences preferences, UsersWithAccount accou
         }
     }
 
+    @NotNull
+    public String senderEmail() {
+        return senderEmail;
+    }
+
     @Nullable
     private Mailer mailer(Preferences preferences) {
         if (senderEmail == null || senderEmail.isEmpty()) return null;