Merge lp:~nonamenoname/pantheon-greeter/pantheon-greeter-auth-fix into lp:~teemperor/pantheon-greeter/new-ui

[No Name]

fixing auth, i wonder how i could work
now allows multi factor auth

[Cody Garver (codygarver)]

Re-target this merge request to lp:pantheon-greeter because this branch eventually became trunk.

review: Needs Fixing

Unmerged revisions

235. By No Name on 2014-01-02

clean up, add instructions

=== modified file 'src/PantheonGreeter.vala'
--- src/PantheonGreeter.vala	2013-11-27 22:30:45 +0000
+++ src/PantheonGreeter.vala	2014-01-02 21:24:29 +0000
@@ -40,6 +40,8 @@
     //from this width on the clock wont fit anymore
     const int NO_CLOCK_WIDTH = 920;
 
+    bool prompted = false;
+
     public PantheonGreeter () {
         settings = new Settings ("org.pantheon.desktop.greeter");
         greeter = new LightDM.Greeter ();
@@ -66,16 +68,18 @@
         PantheonUser.load_default_avatar ();
 
         userlist.user_changed.connect ((user) => {
+            prompted = false;
+            start_auth (user);
             wallpaper.set_wallpaper (user.background);
             indicators.user_changed_cb(user);
             loginbox.set_user (user);
         });
 
-        greeter.show_message.connect (wrong_pw);
-        greeter.show_prompt.connect (send_pw);
-        greeter.authentication_complete.connect (authenticated);
+        greeter.show_message.connect (show_message);
+        greeter.show_prompt.connect (show_prompt);
+        greeter.authentication_complete.connect (authentication_complete);
 
-        loginbox.login_requested.connect (authenticate);
+        loginbox.login_requested.connect (login);
 
         /*activate the numlock if needed*/
         var activate_numlock = settings.get_boolean ("activate-numlock");
@@ -203,41 +207,79 @@
         return true;
     }
 
-    void authenticate () {
-        loginbox.working = true;
-        if (loginbox.current_user.is_guest ())
+    void start_auth (PantheonUser user) {
+        if (user.usertype == UserType.NORMAL) {
+            var lightdm_user = user.get_lightdm_user ();
+            greeter.authenticate (lightdm_user.name);
+        } else if (user.usertype == UserType.GUEST) {
             greeter.authenticate_as_guest ();
-        else
-            greeter.authenticate (loginbox.get_username ());
-    }
-
-    void wrong_pw (string text, LightDM.MessageType type) {
-        loginbox.wrong_pw ();
-    }
-
-    void send_pw (string text, LightDM.PromptType type) {
-        greeter.respond (loginbox.get_password ());
-    }
-
-    void authenticated () {
-        loginbox.working = false;
-
-        settings.set_string ("last-user", loginbox.current_user.name);
-
-        if (greeter.is_authenticated) {
+        } else if (user.usertype == UserType.MANUAL) {
+            warning("manual unsupported");
+        } else {
+            warning("unsupported");
+        }
+    }
+
+    void start_session () {
+        try {
             fadein.show ();
             fadein.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 200, opacity:255);
-
-            try {
-                greeter.start_session_sync (loginbox.current_session);
-            } catch (Error e) {
-                warning (e.message);
-            }
-
-            Gtk.main_quit ();
+     
+            greeter.start_session_sync (loginbox.current_session);
+        } catch (Error e) {
+            warning (e.message);
+        }
+
+        Gtk.main_quit ();
+    }
+
+    void login () {
+
+        if (greeter.is_authenticated) {
+            message("Login start session");
+            start_session ();
+       } else if (greeter.in_authentication) {
+            greeter.respond (loginbox.get_password ());
         } else {
             loginbox.wrong_pw ();
         }
+
+        
+    }
+
+    void show_message (string text, LightDM.MessageType type) {
+        if (type == LightDM.MessageType.INFO) {
+            // for now skip
+        } else if (type == LightDM.MessageType.ERROR) {
+            // for now skip
+        }
+    }
+
+    void show_prompt (string text, LightDM.PromptType type) {
+        prompted = true;
+
+
+        if (type == LightDM.PromptType.QUESTION) {
+            // for now do nothing, just grab focus to password entry
+        } else if (type == LightDM.PromptType.SECRET) {
+            // here we should update hint = text , focus entry
+        }
+    }
+
+    void authentication_complete () {
+        message ("auth complete");
+
+        if (greeter.is_authenticated) {
+            if (prompted) {
+                message("authentication start session");
+                start_session ();
+            }
+                    
+
+        } else {
+            //reset login
+        }
+        
     }
 }