Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 79970b8

Browse files
author
vikasrohit
committed
AS#100297043256582, Move all login to link of Members to accounts.topcoder.com
-- Added debug statements
1 parent 007cbcc commit 79970b8

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

app/account/login/login.controller.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,30 @@ import { getCurrentUser, loadUser } from '../../services/userv3.service.js'
66

77
angular.module('tc.account').controller('LoginController', LoginController)
88

9-
LoginController.$inject = ['logger', '$state', '$stateParams', '$window', '$rootScope', 'TcAuthService', 'UserService', 'Helpers', 'CONSTANTS']
9+
LoginController.$inject = ['logger', '$state', '$stateParams', '$window', '$rootScope', 'Helpers', 'CONSTANTS']
1010

11-
function LoginController(logger, $state, $stateParams, $window, $rootScope, TcAuthService, UserService, Helpers, CONSTANTS) {
11+
function LoginController(logger, $state, $stateParams, $window, $rootScope, Helpers, CONSTANTS) {
1212
var vm = this
1313
vm.$stateParams = $stateParams
1414

1515
activate()
1616

1717
function activate() {
1818
var currentUser = getCurrentUser()
19+
logger.debug('checking for logged in user...' + currentUser)
1920
if (!currentUser) {
21+
logger.debug('loading user...')
22+
var next = $stateParams.next ? $stateParams.next : 'dashboard'
2023
loadUser().then(function(token) {
21-
logger.debug('successful login with token ' + JSON.stringify(token))
24+
logger.debug('successful login with token ' + token)
2225
$rootScope.$broadcast(CONSTANTS.EVENT_USER_LOGGED_IN)
23-
return Helpers.redirectPostLogin($stateParams.next)
26+
logger.debug('reidrecting to ' + next)
27+
Helpers.redirectPostLogin(next)
2428
}, function() {
2529
logger.debug('State requires authentication, and user is not logged in, redirecting')
2630
// setup redirect for post login
27-
event.preventDefault()
28-
var next = $stateParams.next ? $stateParams.next : 'dashboard'
2931
var retUrl = $state.href(next, {}, {absolute: true})
32+
logger.debug('redirecting to accounts app for login...')
3033
$window.location = CONSTANTS.ACCOUNTS_APP_URL + '?retUrl=' + encodeURIComponent(retUrl)
3134
})
3235
}

app/layout/header/header.controller.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import _ from 'lodash'
1313

1414
vm.constants = CONSTANTS
1515
vm.domain = CONSTANTS.domain
16-
vm.login = TcAuthService.login
1716
vm.checkSubmit = checkSubmit
1817
vm.searchTerm = ''
1918
vm.selectedGroup = selectedGroup

0 commit comments

Comments
 (0)