@@ -5,112 +5,70 @@ import angular from 'angular'
55
66 angular . module ( 'tc.account' ) . config ( routes )
77
8- routes . $inject = [ '$stateProvider' ]
8+ routes . $inject = [ '$stateProvider' , 'CONSTANTS' ]
99
10- function routes ( $stateProvider ) {
10+ function routes ( $stateProvider , CONSTANTS ) {
1111 var states = {
1212 'auth' : {
1313 parent : 'root' ,
1414 abstract : true ,
1515 data : {
1616 authRequired : false
17- } ,
18- onEnter : [ '$state' , '$stateParams' , 'TcAuthService' , 'logger' , function ( $state , $stateParams , TcAuthService , logger ) {
19- if ( TcAuthService . isAuthenticated ( ) ) {
20- // redirect to next if exists else dashboard
21- if ( $stateParams . next ) {
22- logger . debug ( 'Redirecting: ' + $stateParams . next )
23- window . location . href = decodeURIComponent ( $stateParams . next )
24- } else {
25- $state . go ( 'dashboard' )
26- }
27- }
28- } ]
17+ }
2918 } ,
3019 'login' : {
3120 parent : 'auth' ,
3221 url : '/login/?next&code&state&status&userJWTToken&utm_source&utm_medium&utm_campaign' ,
33- params : { 'notifyReset' : false } ,
34- data : {
35- title : 'Login'
36- } ,
3722 views : {
38- 'header@' : {
39- template : require ( '../layout/header/account-header' ) ( )
40- } ,
41- 'container@' : {
42- template : require ( './login/login' ) ( ) ,
43- controller : 'LoginController' ,
44- controllerAs : 'vm'
45- } ,
46- 'footer@' : {
47- controller : 'FooterController as vm' ,
48- template : require ( '../layout/footer/account-footer' ) ( )
49- }
50- }
51- } ,
52- 'register' : {
53- parent : 'auth' ,
54- url : '/register/?next&utm_source&utm_medium&utm_campaign' ,
55- data : {
56- title : 'Join'
23+ 'header@' : { } ,
24+ 'container@' : { } ,
25+ 'footer@' : { }
5726 } ,
58- views : {
59- 'header@' : {
60- template : require ( '../layout/header/account-header' ) ( )
61- } ,
62- 'container@' : {
63- template : require ( './register/register' ) ( ) ,
64- controller : 'RegisterController' ,
65- controllerAs : 'vm'
66- } ,
67- 'footer@' : {
68- controller : 'FooterController as vm' ,
69- template : require ( '../layout/footer/account-footer' ) ( )
70- }
71- }
72- } ,
73- 'registeredSuccessfully' : {
74- url : '/registered-successfully/' ,
7527 data : {
76- title : 'Registered' ,
7728 authRequired : false
7829 } ,
79- views : {
80- 'header@' : {
81- template : require ( '../layout/header/account-header' ) ( )
82- } ,
83- 'container@' : {
84- template : require ( './register/registered-successfully' ) ( )
85- } ,
86- 'footer@' : {
87- controller : 'FooterController as vm' ,
88- template : require ( '../layout/footer/account-footer' ) ( )
30+ onEnter : [ '$state' , '$window' , '$stateParams' , 'logger' ,
31+ function ( $state , $window , $stateParams , logger ) {
32+ var next = $state . href ( 'dashboard' , { } , { absolute : true } )
33+ if ( $stateParams . next ) {
34+ next = decodeURIComponent ( $stateParams . next )
35+ }
36+ $window . location = CONSTANTS . ACCOUNTS_APP_URL + '?retUrl=' + encodeURIComponent ( next )
8937 }
90- }
38+ ]
39+
9140 } ,
92- 'resetPassword' : {
41+ 'register' : {
42+ url : '/register/?next&utm_source&utm_medium&utm_campaign' ,
9343 parent : 'auth' ,
94- url : '/reset-password/?token&handle' ,
44+ views : {
45+ 'header@' : { } ,
46+ 'container@' : { } ,
47+ 'footer@' : { }
48+ } ,
9549 data : {
96- title : 'Reset Password'
50+ title : 'Join' ,
51+ authRequired : false
9752 } ,
98- views : {
99- 'header@' : {
100- template : require ( '../layout/header/account-header' ) ( )
101- } ,
102- 'container@' : {
103- template : require ( './reset-password/reset-password' ) ( ) ,
104- controller : 'ResetPasswordController' ,
105- controllerAs : 'vm'
106- } ,
107- 'footer@' : {
108- controller : 'FooterController as vm' ,
109- template : require ( '../layout/footer/account-footer' ) ( )
53+ onEnter : [ '$state' , '$window' , '$stateParams' , 'logger' ,
54+ function ( $state , $window , $stateParams , logger ) {
55+ var next = $state . href ( 'dashboard' , { } , { absolute : true } )
56+ if ( $stateParams . next ) {
57+ next = decodeURIComponent ( $stateParams . next )
58+ }
59+ var queryStr = '?retUrl=' + encodeURIComponent ( next )
60+ for ( var param in $stateParams ) {
61+ if ( $stateParams [ param ] ) {
62+ queryStr += ( '&' + param + '=' + encodeURIComponent ( $stateParams [ param ] ) )
63+ }
64+ }
65+ $window . location = CONSTANTS . ACCOUNTS_APP_URL + '/registration' + queryStr
11066 }
111- }
67+ ]
68+
11269 } ,
11370 logout : {
71+ parent : 'auth' ,
11472 url : '/logout/' ,
11573 views : {
11674 'header@' : { } ,
0 commit comments