提交 ead79413 authored 作者: Christopher Rienzo's avatar Christopher Rienzo

Merge pull request #1644 in FS/freeswitch from ~NETOGUIMARAES/freeswitch:feat/auto_login to master

* commit '85cfd5b5':
  FS-11584: [verto_communicator] make user able to login using url params
...@@ -11,7 +11,18 @@ ...@@ -11,7 +11,18 @@
} }
} }
preRoute(); preRoute();
var name = $location.search().name;
var email = $location.search().email;
var skipPreview = $location.search().skipPreview;
if (name && email) {
verto.data.name = name;
verto.data.email = email;
$scope.login(true, skipPreview);
return;
}
verto.data.name = $scope.storage.data.name; verto.data.name = $scope.storage.data.name;
verto.data.email = $scope.storage.data.email; verto.data.email = $scope.storage.data.email;
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
* Login the user to verto server and * Login the user to verto server and
* redirects him to dialpad page. * redirects him to dialpad page.
*/ */
$scope.login = function(redirect) { $rootScope.login = function(redirect, skipPreview = false) {
if(redirect == undefined) { if(redirect == undefined) {
redirect = true; redirect = true;
} }
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
verto.testSpeed(); verto.testSpeed();
} }
if (redirect && storage.data.preview) { if (redirect && storage.data.preview && !skipPreview) {
$location.path('/loading'); $location.path('/loading');
} else if (redirect) { } else if (redirect) {
$location.path('/dialpad'); $location.path('/dialpad');
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论