added logging for external auth callbacks

modified: app/assets/javascripts/angular/services/services.js modified: app/controllers/api/callbacks_controller.rb modified: app/views/layouts/application.html.erb modified: config/initializers/custom_configs.rb
QutEcoacoustics · Apr 2, 2013 · 5166f85 · 5166f85
1 parent 2067f05
commit 5166f85
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/app/assets/javascripts/angular/services/services.js b/app/assets/javascripts/angular/services/services.js
@@ -250,6 +250,7 @@
 
         // Navigator is the persona global object
         if (navigator) {
+            if(navigator.id){
             navigator.id.watch({
                 loggedInUser: null,
                 onlogin: function (assertion) {
@@ -267,6 +268,7 @@
                 onlogout: signOut
             });
         }
+        }
         else {
             console.error("Unable to start Persona authentication binding. This is usually caused by a lack of internet.")
         }

diff --git a/app/controllers/api/callbacks_controller.rb b/app/controllers/api/callbacks_controller.rb
@@ -112,31 +112,37 @@ def browser_id
   end
 
   def open_id
+    Rails.logger.debug("Open_id data: #{request.env["omniauth.auth"].as_json}; Params: #{params}")
     canonical_data = open_id_info(request.env["omniauth.auth"])
     success_complete(canonical_data)
   end
 
   def facebook
+    Rails.logger.debug("Facebook data: #{request.env["omniauth.auth"].as_json}; Params: #{params}")
     canonical_data = facebook_info(request.env["omniauth.auth"])
     success_complete(canonical_data)
   end
 
   def twitter
+    Rails.logger.debug("Twitter data: #{request.env["omniauth.auth"].as_json}; Params: #{params}")
     canonical_data = twitter_info(request.env["omniauth.auth"])
     success_complete(canonical_data)
   end
 
   def github
+    Rails.logger.debug("Github data: #{request.env["omniauth.auth"].as_json}; Params: #{params}")
     canonical_data = github_info(request.env["omniauth.auth"])
     success_complete(canonical_data)
   end
 
   def windowslive
+    Rails.logger.debug("Windows Live data: #{request.env["omniauth.auth"].as_json}; Params: #{params}")
     canonical_data = windows_live_info(request.env["omniauth.auth"])
     success_complete(canonical_data)
   end
 
   def linked_in
+    Rails.logger.debug("Linked In data: #{request.env["omniauth.auth"].as_json}; Params: #{params}")
     canonical_data = linked_in_info(request.env["omniauth.auth"])
     success_complete(canonical_data)
   end
@@ -242,7 +248,7 @@ def twitter_info(raw)
 
     # create a unique, dummy email, since twitter doesn't provide one
     # set dummy email to true, so that this email is never shown
-    fake_email = raw['uid'].gsub(/[^0-9a-zA-Z]/, '_')+'.twitter@example.com'
+    fake_email = raw['uid'].gsub(/[^0-9a-zA-Z]/, '_')+'.twitter@'+BawSite::Application.config.custom_base_domain
 
     {
         authorization:

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -7,7 +7,7 @@
 
   <%= stylesheet_link_tag    "application", :media => "all" %>
   <%= javascript_include_tag "application" %>
-  <script src="https://login.persona.org/include.js"></script>
+  <!--<script src="https://login.persona.org/include.js"></script>-->
   <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAWT_qg_GDQVSlQB9O_1CEQf8l4bErP5Ek&sensor=false"></script>
   <%= csrf_meta_tags %>
   <%= yield(:head) %>
@@ -55,13 +55,18 @@
           <h2>Sign In</h2>
           <ul >
             <li><a ng-click="submit('google')" class="btn-auth btn-google">Sign in with Google</a> </li>
-            <li><a ng-click="submit('open_id')" class="btn-auth btn-openid">Sign in with OpenID</a> </li>
             <li><a ng-click="submit('facebook')" class="btn-auth btn-facebook">Sign in with Facebook</a></li>
+
             <li><a ng-click="submit('twitter')" class="btn-auth btn-twitter" >Sign in with Twitter</a></li>
+            <li><a ng-click="submit('windowslive')" class="btn-auth btn-windows" >Sign in with Live ID</a></li>
+
+            <!--
             <li><a ng-click="submit('persona')" class="persona-button"><span>Sign in with Persona</span></a> </li>
             <li><a ng-click="submit('github')" class="btn-auth btn-github"  >Sign in with GitHub</a></li>
-            <li><a ng-click="submit('windowslive')" class="btn-auth btn-windows" >Sign in with Live ID</a></li>
+
             <li><a ng-click="submit('yahoo')" href="#" class="btn-auth btn-yahoo">Sign in with Yahoo ID</a> </li>
+            <li><a ng-click="submit('open_id')" class="btn-auth btn-openid">Sign in with OpenID</a> </li>
+            -->
           </ul>
 
           <div ng-show="requireMoreInformation">