add relog using window.open+postMessage

prigaux · prigaux · commit 0dd97c1dedda · 2014-12-11T16:31:36.000+01:00
diff --git a/app/app.js b/app/app.js
@@ -23,6 +23,7 @@ config(['$routeProvider', function($routeProvider) {
 	    authService.loginConfirmed(resp.data);
 	}, function () {
 	    // jsonp failed,
+	    // start window.open + postMessage
 	    $modal.open({ templateUrl: 'relog/relog.html', controller: 'RelogCtrl', backdrop: false });
 	});
     });
diff --git a/app/backend/login.php b/app/backend/login.php
@@ -3,15 +3,27 @@
 require_once 'init.inc.php';
 
 phpCAS::handleLogoutRequests();
-if (!phpCAS::checkAuthentication()) {
+if (isset($_GET["postMessage"])) {
+    phpCAS::forceAuthentication();
+} else {
+    if (!phpCAS::checkAuthentication()) {
         header('HTTP/1.0 401 Unauthorized');
         echo 'HTTP/1.0 401 Unauthorized';    
         exit();
+    }
 }
 
 $user = array('id' => phpCAS::getUser());
 
-if (isset($_GET["callback"])) {
+if (isset($_GET["postMessage"])) {
+?>
+Login success, please wait...
+<script>
+    (window.opener ? (window.opener.postMessage ? window.opener : window.opener.document) : window.parent).postMessage('loggedUser=' +
+      JSON.stringify(<? echo json_encode($user); ?>), '*');
+</script>
+<?
+} else if (isset($_GET["callback"])) {
   header('Content-type: application/javascript; charset=UTF-8');
   echo $_GET["callback"] . "(" . json_encode($user) . ");";
 } else {
diff --git a/app/relog/relog.js b/app/relog/relog.js
@@ -1,9 +1,33 @@
 'use strict';
 
+var relogState = {};
+
 angular.module('myApp.relog', [])
 
-.controller('RelogCtrl', function($scope, $window) {
-    $scope.relog = function () {
-	$window.location = "index.php";
+.controller('RelogCtrl', function($rootScope, $scope, $window, $modalInstance, $http, authService) {
+    
+    function windowOpenCleanup(state) {
+	try {
+	    if (state.listener) $window.removeEventListener("message", state.listener);  
+	    if (state.window) state.window.close();
+	    if ($modalInstance) $modalInstance.close();
+	} catch (e) {}
     }
+
+    function onmessage(e) {
+	if (typeof e.data !== "string") return;
+	var m = e.data.match(/^loggedUser=(.*)$/);
+	if (!m) return;
+	
+	var user = angular.fromJson(m[1]);
+	windowOpenCleanup(relogState);
+	authService.loginConfirmed(user);
+    };
+
+    $scope.relog = function () {
+	windowOpenCleanup(relogState);
+	relogState.listener = onmessage;
+	$window.addEventListener("message", onmessage);  
+	relogState.window = $window.open('backend/login.php?postMessage');
+    };
 });
