nitdoc: Added best way to check authentification
authorStefan Lage <lagestfan@gmail.com>
Tue, 28 May 2013 20:34:46 +0000 (16:34 -0400)
committerStefan Lage <lagestfan@gmail.com>
Tue, 28 May 2013 22:11:17 +0000 (18:11 -0400)
Adding a function to check if credentials informed are correct, if they
are or not a message is displaying to inform us.

Signed-off-by: Stefan Lage <lagestfan@gmail.com>

share/nitdoc/scripts/js-facilities.js

index a40f2de..88f9cc2 100644 (file)
@@ -430,19 +430,21 @@ $(document).ready(function() {
                                githubRepo = $('#repositoryGit').val();\r
                                branchName = $('#branchGit').val();\r
                                userB64 = "Basic " +  base64.encode(userName+':'+password);\r
-                               // Check if repo exist\r
-                               isRepoExisting();\r
-                               if(repoExist){            \r
-                                       $.when(isBranchExisting()).done(function(){  \r
-                                               loginProcess = true;            \r
-                                               if(branchExist){\r
-                                                       setCookie("logginNitdoc", base64.encode(userName+':'+password+':'+githubRepo+':'+branchName), 1);        \r
-                                                       $('#loginGit').val("");\r
-                                                       $('#passwordGit').val("");\r
-                                                       reloadComment();\r
-                                               }\r
-                                       });\r
-                               } \r
+                               if(checkSignIn()){\r
+                                       // Check if repo exist\r
+                                       isRepoExisting();\r
+                                       if(repoExist){\r
+                                               $.when(isBranchExisting()).done(function(){\r
+                                                       loginProcess = true;\r
+                                                       if(branchExist){\r
+                                                               setCookie("logginNitdoc", base64.encode(userName+':'+password+':'+githubRepo+':'+branchName), 1);\r
+                                                               $('#loginGit').val("");\r
+                                                               $('#passwordGit').val("");\r
+                                                               reloadComment();\r
+                                                       }\r
+                                               });\r
+                                       }\r
+                               }\r
                        }\r
                }       \r
                else\r
@@ -749,7 +751,7 @@ function updateDisplaying(){
                $('#githubAccount').attr("href", "https://github.com/"+userName);\r
                $('#logginMessage').css({'display' : 'block'});\r
                $('#logginMessage').css({'text-align' : 'center'});\r
-               $('.popover').css({'height' : '120px'});\r
+               $('.popover').css({'height' : '160px'});\r
                $('#signIn').text("Sign out");  \r
                sessionStarted = true;\r
                reloadComment();\r
@@ -763,7 +765,7 @@ function updateDisplaying(){
                $('#loginGit').val("");\r
                $('#passwordGit').val("");\r
                $('#nickName').text("");\r
-               $('.popover').css({'height' : '280px'});        \r
+               $('.popover').css({'height' : '325px'});        \r
                $('#logginMessage').css({'display' : 'none'});\r
                $('#repositoryGit').val($('#repoName').attr('name'));\r
                $('#branchGit').val('wikidoc');  \r
@@ -1342,3 +1344,27 @@ function closeEditing(tag){
        // Show comment\r
        tag.prev().prev().show();\r
 }\r
+\r
+function checkSignIn(){\r
+       var response = false;\r
+       $.ajax({\r
+        beforeSend: function (xhr) {\r
+            if ($("#login").val() != ""){ xhr.setRequestHeader ("Authorization", userB64); }\r
+        },\r
+        type: "GET",\r
+        url: "https://api.github.com/repos/"+userName+"/"+githubRepo,\r
+        async:false,\r
+        dataType:'json',\r
+        success: function(success)\r
+        {\r
+               displayMessage('You are now logged in');\r
+               response = true;\r
+        },\r
+        error: function()\r
+        {\r
+               displayMessage('Error : Wrong username or password');\r
+               response = false;\r
+        }\r
+    });\r
+    return response;\r
+}\r