diff --git a/modules/chat/client/controllers/chat.client.controller.js b/modules/chat/client/controllers/chat.client.controller.js index 343ad515..6c453e6c 100644 --- a/modules/chat/client/controllers/chat.client.controller.js +++ b/modules/chat/client/controllers/chat.client.controller.js @@ -50,11 +50,6 @@ * init all event bundle */ function init() { - // If user is not signed in then redirect back home - if (!Authentication.user) { - $state.go('authentication.signin'); - } - registerCallback(); // Make sure the Socket is connected diff --git a/modules/core/client/controllers/home.client.controller.js b/modules/core/client/controllers/home.client.controller.js index 433f0c63..c7fbe1df 100644 --- a/modules/core/client/controllers/home.client.controller.js +++ b/modules/core/client/controllers/home.client.controller.js @@ -42,13 +42,6 @@ }); }); - /** - * If user is not signed in then redirect back signin - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * initTopOneInfo */ diff --git a/modules/forums/client/controllers/forums-post.client.controller.js b/modules/forums/client/controllers/forums-post.client.controller.js index d895ce92..80ee9f13 100644 --- a/modules/forums/client/controllers/forums-post.client.controller.js +++ b/modules/forums/client/controllers/forums-post.client.controller.js @@ -15,13 +15,6 @@ vm.user = Authentication.user; vm.forumPath = []; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * init */ diff --git a/modules/forums/client/controllers/forums-topic.client.controller.js b/modules/forums/client/controllers/forums-topic.client.controller.js index 1e7c174d..2324a0c7 100644 --- a/modules/forums/client/controllers/forums-topic.client.controller.js +++ b/modules/forums/client/controllers/forums-topic.client.controller.js @@ -23,13 +23,6 @@ vm.forumPath = []; vm.postReplyFields = {}; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * buildPager * pagination init diff --git a/modules/forums/client/controllers/forums-view.client.controller.js b/modules/forums/client/controllers/forums-view.client.controller.js index 485837af..482f0776 100644 --- a/modules/forums/client/controllers/forums-view.client.controller.js +++ b/modules/forums/client/controllers/forums-view.client.controller.js @@ -16,13 +16,6 @@ vm.user = Authentication.user; vm.forumPath = []; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * buildPager * pagination init diff --git a/modules/forums/client/controllers/forums.client.controller.js b/modules/forums/client/controllers/forums.client.controller.js index 6d4eb574..382eb94c 100644 --- a/modules/forums/client/controllers/forums.client.controller.js +++ b/modules/forums/client/controllers/forums.client.controller.js @@ -14,13 +14,6 @@ vm.forumsConfig = MeanTorrentConfig.meanTorrentConfig.forumsConfig; vm.user = Authentication.user; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * init */ diff --git a/modules/invitations/client/config/invitations.client.routes.js b/modules/invitations/client/config/invitations.client.routes.js index 477cf6a9..9b82bfae 100644 --- a/modules/invitations/client/config/invitations.client.routes.js +++ b/modules/invitations/client/config/invitations.client.routes.js @@ -14,7 +14,10 @@ .state('invitations', { abstract: true, url: '/invitations', - template: '' + template: '', + data: { + roles: ['user', 'oper', 'admin'] + } }) .state('invitations.detail', { url: '/detail', diff --git a/modules/invitations/client/controllers/admin-invitations.client.controller.js b/modules/invitations/client/controllers/admin-invitations.client.controller.js index e5ea65e4..767ac0b5 100644 --- a/modules/invitations/client/controllers/admin-invitations.client.controller.js +++ b/modules/invitations/client/controllers/admin-invitations.client.controller.js @@ -21,13 +21,6 @@ templateUrl: 'userinfo.html' }; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * buildPager */ diff --git a/modules/invitations/client/controllers/invitations.client.controller.js b/modules/invitations/client/controllers/invitations.client.controller.js index ef0a90b9..df37d566 100644 --- a/modules/invitations/client/controllers/invitations.client.controller.js +++ b/modules/invitations/client/controllers/invitations.client.controller.js @@ -26,13 +26,6 @@ templateUrl: 'userinfo.html' }; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * user-invitations-changed */ diff --git a/modules/messages/client/config/messages.client.routes.js b/modules/messages/client/config/messages.client.routes.js index bcd8542d..54ba802b 100644 --- a/modules/messages/client/config/messages.client.routes.js +++ b/modules/messages/client/config/messages.client.routes.js @@ -14,7 +14,10 @@ .state('messages', { abstract: true, url: '/messages', - templateUrl: '/modules/messages/client/views/messages.client.view.html' + templateUrl: '/modules/messages/client/views/messages.client.view.html', + data: { + roles: ['user', 'oper', 'admin'] + } }) .state('messages.box', { url: '/box', diff --git a/modules/messages/client/controllers/admin-messages.client.controller.js b/modules/messages/client/controllers/admin-messages.client.controller.js index 14ebb5c2..947292dc 100644 --- a/modules/messages/client/controllers/admin-messages.client.controller.js +++ b/modules/messages/client/controllers/admin-messages.client.controller.js @@ -15,13 +15,6 @@ vm.user = Authentication.user; vm.messageType = 'system'; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * sendMessage * @param isValid diff --git a/modules/messages/client/controllers/messages.client.controller.js b/modules/messages/client/controllers/messages.client.controller.js index 63ca314f..9b2b19cf 100644 --- a/modules/messages/client/controllers/messages.client.controller.js +++ b/modules/messages/client/controllers/messages.client.controller.js @@ -16,13 +16,6 @@ vm.messageFields = {}; vm.deleteList = []; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * user-unread-count-changed */ diff --git a/modules/torrents/client/controllers/admin/admin-list.client.controller.js b/modules/torrents/client/controllers/admin/admin-list.client.controller.js index 18505a3a..dbb30ce8 100644 --- a/modules/torrents/client/controllers/admin/admin-list.client.controller.js +++ b/modules/torrents/client/controllers/admin/admin-list.client.controller.js @@ -33,13 +33,6 @@ vm.torrentStatus = 'reviewed'; vm.torrentRLevel = 'none'; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * commentBuildPager * pagination init diff --git a/modules/torrents/client/controllers/admin/announce-edit.client.controller.js b/modules/torrents/client/controllers/admin/announce-edit.client.controller.js index 4231def0..691059bd 100644 --- a/modules/torrents/client/controllers/admin/announce-edit.client.controller.js +++ b/modules/torrents/client/controllers/admin/announce-edit.client.controller.js @@ -16,11 +16,6 @@ vm.announceConfig = MeanTorrentConfig.meanTorrentConfig.announce; vm.comment = vm.announceConfig.comment; - // If user is not signed in then redirect back home - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * upload * @param dataUrl diff --git a/modules/torrents/client/controllers/torrent-info.client.controller.js b/modules/torrents/client/controllers/torrent-info.client.controller.js index 23370f76..b3c4a302 100644 --- a/modules/torrents/client/controllers/torrent-info.client.controller.js +++ b/modules/torrents/client/controllers/torrent-info.client.controller.js @@ -33,13 +33,6 @@ vm.searchTags = []; vm.progress = 0; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * commentBuildPager * pagination init diff --git a/modules/torrents/client/controllers/torrents.client.controller.js b/modules/torrents/client/controllers/torrents.client.controller.js index 694ef09b..7e403934 100644 --- a/modules/torrents/client/controllers/torrents.client.controller.js +++ b/modules/torrents/client/controllers/torrents.client.controller.js @@ -29,13 +29,6 @@ vm.torrentType = $state.current.data.torrentType; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * commentBuildPager * pagination init diff --git a/modules/torrents/client/controllers/uploads.client.controller.js b/modules/torrents/client/controllers/uploads.client.controller.js index 8fe3a3c4..3ebb1095 100644 --- a/modules/torrents/client/controllers/uploads.client.controller.js +++ b/modules/torrents/client/controllers/uploads.client.controller.js @@ -25,11 +25,6 @@ vm.videoNfo = ''; vm.customTorrent = {}; - // If user is not signed in then redirect back home - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * upload * @param dataUrl diff --git a/modules/traces/client/controllers/traces.client.controller.js b/modules/traces/client/controllers/traces.client.controller.js index db68ce7d..095ee572 100644 --- a/modules/traces/client/controllers/traces.client.controller.js +++ b/modules/traces/client/controllers/traces.client.controller.js @@ -13,13 +13,6 @@ var vm = this; vm.itemsPerPageConfig = MeanTorrentConfig.meanTorrentConfig.itemsPerPage; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * buildPager * pagination init diff --git a/modules/users/client/controllers/admin/user-leeching.client.controller.js b/modules/users/client/controllers/admin/user-leeching.client.controller.js index 1b6cd67c..72551fc8 100644 --- a/modules/users/client/controllers/admin/user-leeching.client.controller.js +++ b/modules/users/client/controllers/admin/user-leeching.client.controller.js @@ -19,13 +19,6 @@ vm.searchTags = []; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * buildPager */ diff --git a/modules/users/client/controllers/admin/user-seeding.client.controller.js b/modules/users/client/controllers/admin/user-seeding.client.controller.js index 20af29f4..ca45a31b 100644 --- a/modules/users/client/controllers/admin/user-seeding.client.controller.js +++ b/modules/users/client/controllers/admin/user-seeding.client.controller.js @@ -19,13 +19,6 @@ vm.searchTags = []; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * buildPager */ diff --git a/modules/users/client/controllers/admin/user-uploaded.client.controller.js b/modules/users/client/controllers/admin/user-uploaded.client.controller.js index 489bc73b..5fb9fe4b 100644 --- a/modules/users/client/controllers/admin/user-uploaded.client.controller.js +++ b/modules/users/client/controllers/admin/user-uploaded.client.controller.js @@ -19,13 +19,6 @@ vm.searchTags = []; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * buildPager */ diff --git a/modules/users/client/controllers/admin/user-warning.client.controller.js b/modules/users/client/controllers/admin/user-warning.client.controller.js index 05d74e87..9e000c64 100644 --- a/modules/users/client/controllers/admin/user-warning.client.controller.js +++ b/modules/users/client/controllers/admin/user-warning.client.controller.js @@ -20,13 +20,6 @@ vm.searchTags = []; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * getUserWarningTorrent */ diff --git a/modules/users/client/controllers/score/score.client.controller.js b/modules/users/client/controllers/score/score.client.controller.js index be9daf4a..132b95ca 100644 --- a/modules/users/client/controllers/score/score.client.controller.js +++ b/modules/users/client/controllers/score/score.client.controller.js @@ -16,13 +16,6 @@ vm.lang = getStorageLangService.getLang(); vm.user = Authentication.user; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * auth-user-changed */ diff --git a/modules/users/client/controllers/settings/reset-passkey.client.controller.js b/modules/users/client/controllers/settings/reset-passkey.client.controller.js index f823fa2a..0d1a328f 100644 --- a/modules/users/client/controllers/settings/reset-passkey.client.controller.js +++ b/modules/users/client/controllers/settings/reset-passkey.client.controller.js @@ -9,16 +9,8 @@ function ResetPasskeyController($scope, $state, $translate, Authentication, UsersService, Notification, ModalConfirmService) { var vm = this; - vm.user = Authentication.user; - /** - * If user is not signed in then redirect back home - */ - if (!vm.user) { - $state.go('authentication.signin'); - } - vm.resetPasskey = function () { var modalOptions = { closeButtonText: $translate.instant('RESET_PASSKEY_CONFIRM_CANCEL'), diff --git a/modules/users/client/controllers/status/downloading.client.controller.js b/modules/users/client/controllers/status/downloading.client.controller.js index 72e7ecf0..ba3941d2 100644 --- a/modules/users/client/controllers/status/downloading.client.controller.js +++ b/modules/users/client/controllers/status/downloading.client.controller.js @@ -19,13 +19,6 @@ vm.searchTags = []; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * buildPager */ diff --git a/modules/users/client/controllers/status/seeding.client.controller.js b/modules/users/client/controllers/status/seeding.client.controller.js index 511307e6..850a17c5 100644 --- a/modules/users/client/controllers/status/seeding.client.controller.js +++ b/modules/users/client/controllers/status/seeding.client.controller.js @@ -19,13 +19,6 @@ vm.searchTags = []; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * buildPager */ diff --git a/modules/users/client/controllers/status/status.client.controller.js b/modules/users/client/controllers/status/status.client.controller.js index e0d1e237..8cce2f76 100644 --- a/modules/users/client/controllers/status/status.client.controller.js +++ b/modules/users/client/controllers/status/status.client.controller.js @@ -13,12 +13,5 @@ vm.scoreLevelData = ScoreLevelService.getScoreLevelJson(vm.user.score); vm.announce = MeanTorrentConfig.meanTorrentConfig.announce; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - } }()); diff --git a/modules/users/client/controllers/status/uploaded.client.controller.js b/modules/users/client/controllers/status/uploaded.client.controller.js index aa4c3b34..8f7dd434 100644 --- a/modules/users/client/controllers/status/uploaded.client.controller.js +++ b/modules/users/client/controllers/status/uploaded.client.controller.js @@ -19,13 +19,6 @@ vm.searchTags = []; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * buildPager */ diff --git a/modules/users/client/controllers/status/warning.client.controller.js b/modules/users/client/controllers/status/warning.client.controller.js index bf17a750..e76212c1 100644 --- a/modules/users/client/controllers/status/warning.client.controller.js +++ b/modules/users/client/controllers/status/warning.client.controller.js @@ -22,13 +22,6 @@ vm.searchTags = []; - /** - * If user is not signed in then redirect back home - */ - if (!Authentication.user) { - $state.go('authentication.signin'); - } - /** * getWarningTorrent */ diff --git a/modules/vip/client/controllers/vip.client.controller.js b/modules/vip/client/controllers/vip.client.controller.js index 955e65c7..346afb7b 100644 --- a/modules/vip/client/controllers/vip.client.controller.js +++ b/modules/vip/client/controllers/vip.client.controller.js @@ -24,13 +24,6 @@ uibButtonConfig.activeClass = 'btn-success'; - ///** - // * If user is not signed in then redirect back home - // */ - //if (!Authentication.user) { - // $state.go('authentication.signin'); - //} - /** * buildPager */