Subscriber Portal is fully integrated with XOS
diff --git a/applications/subscriberPortal/bs-config.js b/applications/subscriberPortal/bs-config.js
index f608075..f79f762 100644
--- a/applications/subscriberPortal/bs-config.js
+++ b/applications/subscriberPortal/bs-config.js
@@ -40,6 +40,7 @@
],
"server": {
baseDir: './src',
+ //directory: true,
routes: {
'/rs/dashboard': './mocks/dashboard.json',
'/rs/bundle': './mocks/bundle.json',
diff --git a/applications/subscriberPortal/src/app/fw/services/rest.js b/applications/subscriberPortal/src/app/fw/services/rest.js
index e5ea7e0..e97f091 100644
--- a/applications/subscriberPortal/src/app/fw/services/rest.js
+++ b/applications/subscriberPortal/src/app/fw/services/rest.js
@@ -40,8 +40,11 @@
user = JSON.parse(res.data.user);
return $http.get(cordConfig.url + '/xos/tenantrootprivileges?user=' + user.id);
})
- .then(function(subscriber){
- console.log(subscriber);
+ .then(function(subscribers){
+ // subscribers are an array because the way Django perform query
+ // but one user is related to only one subscriber
+
+ $cookies.put('subscriberId', subscribers.data[0].id);
deferred.resolve(user);
})
.catch(function(e){
diff --git a/applications/subscriberPortal/src/app/view/home/home.js b/applications/subscriberPortal/src/app/view/home/home.js
index bc59efb..c7de985 100644
--- a/applications/subscriberPortal/src/app/view/home/home.js
+++ b/applications/subscriberPortal/src/app/view/home/home.js
@@ -18,12 +18,11 @@
'use strict';
angular.module('cordHome', [])
- .controller('CordHomeCtrl', function ($log, $scope, cordConfig, SubscriberUsers) {
+ .controller('CordHomeCtrl', function ($log, $scope, $cookies, cordConfig, SubscriberUsers) {
$scope.page.curr = 'dashboard';
- // NOTE subscriberId should be retrieved by login
- SubscriberUsers.query({subscriberId: 1}).$promise
+ SubscriberUsers.query({subscriberId: $cookies.get('subscriberId')}).$promise
.then(function(res){
$scope.bundle_name = cordConfig.bundles[cordConfig.activeBundle].name;
$scope.bundle_desc = cordConfig.bundles[cordConfig.activeBundle].desc;
diff --git a/applications/subscriberPortal/src/app/view/user/user.js b/applications/subscriberPortal/src/app/view/user/user.js
index d1ab838..57e0a4c 100644
--- a/applications/subscriberPortal/src/app/view/user/user.js
+++ b/applications/subscriberPortal/src/app/view/user/user.js
@@ -25,9 +25,8 @@
$scope.newLevels = {};
$scope.showCheck = false;
$scope.ratingsShown = false;
-
- // NOTE subscriberId should be retrieved by login
- SubscriberUsers.query({subscriberId: 1}).$promise
+
+ SubscriberUsers.query({subscriberId: $cookies.get('subscriberId')}).$promise
.then(function(res){
$scope.isFamily = cordConfig.bundles[cordConfig.activeBundle].id === 'family';
// if bundle is family search for url_filter level