ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2863 from FinnStutzenstein/StartUp

Browse Source 
Start up
This commit is contained in:
Emanuel Schütze 2017-01-14 21:46:16 +01:00 committed by GitHub
commit 624fcc663b
23 changed files with 266 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -96,6 +96,7 @@ Other:
- Added new caching system with support for Redis.
- Support https as websocket protocol (wss).
- Added migration path from 2.0.
- Accelerated startup process (send all data to the client after login).
Version 2.0 (2016-04-18)

4
openslides/agenda/apps.py
View File

@ -35,3 +35,7 @@ class AgendaAppConfig(AppConfig):
# Register viewsets.
router.register(self.get_model('Item').get_collection_string(), ItemViewSet)
def get_startup_elements(self):
from ..utils.collection import Collection
return [Collection(self.get_model('Item').get_collection_string())]

4
openslides/assignments/apps.py
View File

@ -24,3 +24,7 @@ class AssignmentsAppConfig(AppConfig):
# Register viewsets.
router.register(self.get_model('Assignment').get_collection_string(), AssignmentViewSet)
router.register('assignments/poll', AssignmentPollViewSet)
def get_startup_elements(self):
from ..utils.collection import Collection
return [Collection(self.get_model('Assignment').get_collection_string())]

15
openslides/core/apps.py
View File

@ -14,10 +14,10 @@ class CoreAppConfig(AppConfig):
# Import all required stuff.
from django.db.models import signals
from openslides.core.config import config
from openslides.core.signals import post_permission_creation
from openslides.utils.rest_api import router
from openslides.utils.search import index_add_instance, index_del_instance
from .config import config
from .signals import post_permission_creation
from ..utils.rest_api import router
from ..utils.search import index_add_instance, index_del_instance
from .config_variables import get_config_variables
from .signals import delete_django_app_permissions
from .views import (
@ -55,3 +55,10 @@ class CoreAppConfig(AppConfig):
signals.m2m_changed.connect(
index_add_instance,
dispatch_uid='m2m_index_add_instance')
def get_startup_elements(self):
from .config import config
from ..utils.collection import Collection
for model in ('Projector', 'ChatMessage', 'Tag', 'ProjectorMessage', 'Countdown'):
yield Collection(self.get_model(model).get_collection_string())
yield Collection(config.get_collection_string())

25
openslides/core/static/css/app.css
View File

@ -129,6 +129,25 @@ img {
margin: 0 auto 0 auto;
}
#startup-overlay {
display: table;
background-color: #fff;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 1000;
}
#startup-overlay h1 {
font-size: 56px;
text-align: center;
}
#startup-overlay > div {
display: table-cell;
vertical-align: middle;
}
/** Header **/
#header {
float: left;
@ -138,12 +157,6 @@ img {
color: #999;
}
#header div.unconnected {
border: 1px solid red;
position: fixed;
width: 100%;
z-index: 1000;
}
#header a.headerlink {
text-decoration: none;
}

110
openslides/core/static/js/core/base.js
View File

@ -53,13 +53,12 @@ angular.module('OpenSlidesApp.core', [
.factory('autoupdate', [
'DS',
'$rootScope',
'REALM',
'ProjectorID',
function (DS, $rootScope, REALM, ProjectorID) {
'$q',
function (DS, REALM, ProjectorID, $q) {
var socket = null;
var recInterval = null;
$rootScope.connected = false;
var websocketProtocol;
if (location.protocol == 'https:') {
@ -69,50 +68,83 @@ angular.module('OpenSlidesApp.core', [
}
var websocketPath;
if (REALM == 'site') {
if (REALM === 'site') {
websocketPath = '/ws/site/';
} else if (REALM == 'projector') {
} else if (REALM === 'projector') {
websocketPath = '/ws/projector/' + ProjectorID() + '/';
} else {
console.error('The constant REALM is not set properly.');
}
var Autoupdate = {
messageReceivers: [],
onMessage: function (receiver) {
this.messageReceivers.push(receiver);
},
reconnect: function () {
if (socket) {
socket.close();
}
var Autoupdate = {};
Autoupdate.messageReceivers = [];
// We use later a promise to defer the first message of the established ws connection.
Autoupdate.firstMessageDeferred = $q.defer();
Autoupdate.onMessage = function (receiver) {
Autoupdate.messageReceivers.push(receiver);
};
Autoupdate.reconnect = function () {
if (socket) {
socket.close();
}
};
var newConnect = function () {
Autoupdate.newConnect = function () {
socket = new WebSocket(websocketProtocol + '//' + location.host + websocketPath);
clearInterval(recInterval);
socket.onopen = function () {
$rootScope.connected = true;
};
socket.onclose = function () {
$rootScope.connected = false;
socket = null;
recInterval = setInterval(function () {
newConnect();
Autoupdate.newConnect();
}, 1000);
};
socket.onmessage = function (event) {
_.forEach(Autoupdate.messageReceivers, function (receiver) {
receiver(event.data);
});
// The first message is done: resolve the promise.
// TODO: check whether the promise is already resolved.
Autoupdate.firstMessageDeferred.resolve();
};
};
newConnect();
return Autoupdate;
}
])
.factory('operator', [
'User',
'Group',
function (User, Group) {
var operator = {
user: null,
perms: [],
isAuthenticated: function () {
return !!this.user;
},
setUser: function(user_id, user_data) {
if (user_id && user_data) {
operator.user = User.inject(user_data);
operator.perms = operator.user.getPerms();
} else {
operator.user = null;
operator.perms = Group.get(1).permissions;
}
},
// Returns true if the operator has at least one perm of the perms-list.
hasPerms: function(perms) {
if (typeof perms === 'string') {
perms = perms.split(' ');
}
return _.intersection(perms, operator.perms).length > 0;
},
// Returns true if the operator is a member of group.
isInGroup: function(group) {
return _.indexOf(operator.user.groups_id, group.id) > -1;
},
};
return operator;
}
])
// gets all in OpenSlides available languages
.factory('Languages', [
'gettext',
@ -230,7 +262,7 @@ angular.module('OpenSlidesApp.core', [
var deletedElements = [];
var collectionString = key;
_.forEach(list, function(data) {
// uncomment this line for debugging to log all autoupdates:
// Uncomment this line for debugging to log all autoupdates:
// console.log("Received object: " + data.collection + ", " + data.id);
// remove (=eject) object from local DS store
@ -301,39 +333,7 @@ angular.module('OpenSlidesApp.core', [
}
])
.factory('loadGlobalData', [
'ChatMessage',
'Config',
'Projector',
'ProjectorMessage',
'Countdown',
function (ChatMessage, Config, Projector, ProjectorMessage, Countdown) {
return function () {
Config.findAll();
// Loads all projector data and the projectiondefaults
Projector.findAll();
ProjectorMessage.findAll();
Countdown.findAll();
// Loads all chat messages data and their user_ids
// TODO: add permission check if user has required chat permission
// error if include 'operator' here:
// "Circular dependency found: loadGlobalData <- operator <- loadGlobalData"
//if (operator.hasPerms("core.can_use_chat")) {
ChatMessage.findAll().then( function(chatmessages) {
angular.forEach(chatmessages, function (chatmessage) {
ChatMessage.loadRelations(chatmessage, 'user');
});
});
//}
};
}
])
// Template hooks
.factory('templateHooks', [
function () {
var hooks = {};

11
openslides/core/static/js/core/projector.js
View File

@ -8,6 +8,13 @@ angular.module('OpenSlidesApp.core.projector', ['OpenSlidesApp.core'])
// Can be used to find out if the projector or the side is used
.constant('REALM', 'projector')
.run([
'autoupdate',
function (autoupdate) {
autoupdate.newConnect();
}
])
// Provider to register slides in a .config() statement.
.provider('slides', [
function() {
@ -84,10 +91,8 @@ angular.module('OpenSlidesApp.core.projector', ['OpenSlidesApp.core'])
'$scope',
'$location',
'gettext',
'loadGlobalData',
'Projector',
function($scope, $location, gettext, loadGlobalData, Projector) {
loadGlobalData();
function($scope, $location, gettext, Projector) {
$scope.error = '';
// watch for changes in Projector

43
openslides/core/static/js/core/site.js
View File

@ -5,6 +5,7 @@
// The core module for the OpenSlides site
angular.module('OpenSlidesApp.core.site', [
'OpenSlidesApp.core',
'OpenSlidesApp.core.start',
'OpenSlidesApp.poll.majority',
'ui.router',
'angular-loading-bar',
@ -76,10 +77,7 @@ angular.module('OpenSlidesApp.core.site', [
this.$get = ['operator', function(operator) {
return {
registerScope: function (scope) {
var that = this;
this.scope = scope;
this.updateMainMenu();
operator.onOperatorChange(function () {that.updateMainMenu();});
},
updateMainMenu: function () {
this.scope.elements = this.getElements();
@ -99,15 +97,6 @@ angular.module('OpenSlidesApp.core.site', [
}
])
// Load the global data when the operator changes
.run([
'loadGlobalData',
'operator',
function (loadGlobalData, operator) {
operator.onOperatorChange(loadGlobalData);
}
])
.run([
'editableOptions',
'gettext',
@ -615,14 +604,6 @@ angular.module('OpenSlidesApp.core.site', [
}
])
// Load the global data on startup
.run([
'loadGlobalData',
function(loadGlobalData) {
loadGlobalData();
}
])
// html-tag os-form-field to generate generic from fields
// TODO: make it possible to use other fields then config fields
.directive('osFormField', [
@ -676,28 +657,6 @@ angular.module('OpenSlidesApp.core.site', [
}
])
.directive('routeLoadingIndicator', [
'$rootScope',
'$state',
'gettext',
function($rootScope, $state, gettext) {
gettext('Loading ...');
return {
restrict: 'E',
template: "<div class='header spacer-bottom' ng-if='isRouteLoading'><div class='title'><h1><translate>Loading ...</translate> <i class='fa fa-spinner fa-pulse'></i></h1></div></div>",
link: function(scope, elem, attrs) {
scope.isRouteLoading = false;
$rootScope.$on('$stateChangeStart', function() {
scope.isRouteLoading = true;
});
$rootScope.$on('$stateChangeSuccess', function() {
scope.isRouteLoading = false;
});
}
};
}
])
/* This directive provides a csv import template.
* Papa Parse is used to parse the csv file. Accepted attributes:
* * change:

35
openslides/core/static/js/core/start.js Normal file
View File

@ -0,0 +1,35 @@
(function () {
'use strict';
angular.module('OpenSlidesApp.core.start', [])
.run([
'$http',
'$rootScope',
'$state',
'autoupdate',
'operator',
'Group',
'mainMenu',
function($http, $rootScope, $state, autoupdate, operator, Group, mainMenu) {
$rootScope.startupWaitingEnabled = true;
$http.get('/users/whoami/').success(function(data) {
$rootScope.guest_enabled = data.guest_enabled;
if (data.user_id === null && !data.guest_enabled) {
// Redirect to login dialog if user is not logged in.
$state.go('login', {guest_enabled: data.guest_enabled});
} else {
autoupdate.newConnect();
autoupdate.firstMessageDeferred.promise.then(function () {
operator.setUser(data.user_id, data.user);
$rootScope.operator = operator;
mainMenu.updateMainMenu();
$rootScope.startupWaitingEnabled = false;
});
}
});
}
]);
}());

11
openslides/core/static/templates/index.html
View File

@ -20,9 +20,15 @@
<div id="wrapper" ng-cloak>
<!-- please wait -->
<div id="startup-overlay" ng-if="startupWaitingEnabled">
<div>
<h1><i class="fa fa-spinner fa-pulse"></i></h1>
</div>
</div>
<!-- Header -->
<div id="header">
<div ng-hide="connected" class="unconnected"></div>
<div class="containerOS">
<!-- Logo -->
<div class="title">
@ -174,8 +180,7 @@
<div class="containerOS">
<div class="col1" ng-class="isProjectorSidebar ? 'min' : 'max'">
<!-- dynamic views -->
<route-loading-indicator></route-loading-indicator>
<div ui-view ng-if="!isRouteLoading"></div>
<div ui-view></div>
<!-- footer -->
<div id="footer">
&copy; Copyright by <a href="http://www.openslides.org" target="_blank">OpenSlides</a> |

4
openslides/mediafiles/apps.py
View File

@ -18,3 +18,7 @@ class MediafilesAppConfig(AppConfig):
# Register viewsets.
router.register(self.get_model('Mediafile').get_collection_string(), MediafileViewSet)
def get_startup_elements(self):
from ..utils.collection import Collection
return [Collection(self.get_model('Mediafile').get_collection_string())]

5
openslides/motions/apps.py
View File

@ -34,3 +34,8 @@ class MotionsAppConfig(AppConfig):
router.register(self.get_model('MotionChangeRecommendation').get_collection_string(),
MotionChangeRecommendationViewSet)
router.register('motions/motionpoll', MotionPollViewSet)
def get_startup_elements(self):
from ..utils.collection import Collection
for model in ('Category', 'Motion', 'MotionBlock', 'Workflow', 'MotionChangeRecommendation'):
yield Collection(self.get_model(model).get_collection_string())

4
openslides/motions/static/js/motions/base.js
View File

@ -198,14 +198,14 @@ angular.module('OpenSlidesApp.motions', [
'jsDataModel',
'gettext',
'gettextCatalog',
'operator',
'Config',
'lineNumberingService',
'diffService',
'OpenSlidesSettings',
'Projector',
'operator',
function(DS, $http, MotionPoll, MotionChangeRecommendation, MotionComment, jsDataModel, gettext, gettextCatalog,
operator, Config, lineNumberingService, diffService, OpenSlidesSettings, Projector) {
Config, lineNumberingService, diffService, OpenSlidesSettings, Projector, operator) {
var name = 'motions/motion';
return DS.defineResource({
name: name,

8
openslides/motions/static/js/motions/site.js
View File

@ -285,14 +285,6 @@ angular.module('OpenSlidesApp.motions.site', [
}
])
// Load all MotionWorkflows at startup
.run([
'Workflow',
function (Workflow) {
Workflow.findAll();
}
])
.factory('ChangeRecommendationForm', [
'gettextCatalog',
'Editor',

4
openslides/topics/apps.py
View File

@ -18,3 +18,7 @@ class TopicsAppConfig(AppConfig):
# Register viewsets.
router.register(self.get_model('Topic').get_collection_string(), TopicViewSet)
def get_startup_elements(self):
from ..utils.collection import Collection
return [Collection(self.get_model('Topic').get_collection_string())]

2
openslides/users/access_permissions.py
View File

@ -42,6 +42,8 @@ class UserAccessPermissions(BaseAccessPermissions):
case = MANY_DATA
else:
case = LITTLE_DATA
elif user.pk == full_data.get('id'):
case = LITTLE_DATA
else:
case = NO_DATA

7
openslides/users/apps.py
View File

@ -30,4 +30,9 @@ class UsersAppConfig(AppConfig):
# Register viewsets.
router.register(self.get_model('User').get_collection_string(), UserViewSet)
router.register('users/group', GroupViewSet)
router.register(self.get_model('Group').get_collection_string(), GroupViewSet)
def get_startup_elements(self):
from ..utils.collection import Collection
for model in ('User', 'Group'):
yield Collection(self.get_model(model).get_collection_string())

60
openslides/users/static/js/users/base.js
View File

@ -4,66 +4,6 @@
angular.module('OpenSlidesApp.users', [])
.factory('operator', [
'User',
'Group',
'loadGlobalData',
'autoupdate',
'DS',
function (User, Group, loadGlobalData, autoupdate, DS) {
var operatorChangeCallbacks = [autoupdate.reconnect];
var operator = {
user: null,
perms: [],
isAuthenticated: function () {
return !!this.user;
},
onOperatorChange: function (func) {
operatorChangeCallbacks.push(func);
},
setUser: function(user_id) {
if (user_id) {
User.find(user_id).then(function(user) {
operator.user = user;
// TODO: load only the needed groups
Group.findAll().then(function() {
operator.perms = user.getPerms();
_.forEach(operatorChangeCallbacks, function (callback) {
callback();
});
});
});
} else {
operator.user = null;
operator.perms = [];
DS.clear();
_.forEach(operatorChangeCallbacks, function (callback) {
callback();
});
Group.find(1).then(function(group) {
operator.perms = group.permissions;
_.forEach(operatorChangeCallbacks, function (callback) {
callback();
});
});
}
},
// Returns true if the operator has at least one perm of the perms-list.
hasPerms: function(perms) {
if (typeof perms == 'string') {
perms = perms.split(' ');
}
return _.intersection(perms, operator.perms).length > 0;
},
// Returns true if the operator is a member of group.
isInGroup: function(group) {
return _.indexOf(operator.user.groups_id, group.id) > -1;
},
};
return operator;
}
])
.factory('User', [
'DS',
'Group',

140
openslides/users/static/js/users/site.js
View File

@ -40,31 +40,13 @@ angular.module('OpenSlidesApp.users.site', [
abstract: true,
template: "<ui-view/>",
})
.state('users.user.list', {
resolve: {
users: function(User) {
return User.findAll();
},
groups: function(Group) {
return Group.findAll();
}
}
})
.state('users.user.create', {
resolve: {
groups: function(Group) {
return Group.findAll();
}
}
})
.state('users.user.list', {})
.state('users.user.create', {})
.state('users.user.detail', {
resolve: {
user: function(User, $stateParams) {
return User.find($stateParams.id);
},
groups: function(Group) {
return Group.findAll();
}
userId: ['$stateParams', function($stateParams) {
return $stateParams.id;
}]
}
})
// Redirects to user detail view and opens user edit form dialog, uses edit url.
@ -72,8 +54,8 @@ angular.module('OpenSlidesApp.users.site', [
// (from users list controller use UserForm factory instead to open dialog in front of
// current view without redirect)
.state('users.user.detail.update', {
onEnter: ['$stateParams', '$state', 'ngDialog', 'User',
function($stateParams, $state, ngDialog, User) {
onEnter: ['$stateParams', '$state', 'ngDialog',
function($stateParams, $state, ngDialog) {
ngDialog.open({
template: 'static/templates/users/user-form.html',
controller: 'UserUpdateCtrl',
@ -81,7 +63,7 @@ angular.module('OpenSlidesApp.users.site', [
closeByEscape: false,
closeByDocument: false,
resolve: {
user: function() {return User.find($stateParams.id);}
userId: function() {return $stateParams.id;}
}
});
}
@ -106,22 +88,14 @@ angular.module('OpenSlidesApp.users.site', [
controller: 'UserChangePasswordCtrl',
templateUrl: 'static/templates/users/user-change-password.html',
resolve: {
user: function(User, $stateParams) {
return User.find($stateParams.id);
}
userId: ['$stateParams', function($stateParams) {
return $stateParams.id;
}]
}
})
.state('users.user.import', {
url: '/import',
controller: 'UserImportCtrl',
resolve: {
groups: function(Group) {
return Group.findAll();
},
users: function(User) {
return User.findAll();
}
}
})
// groups
.state('users.group', {
@ -134,9 +108,6 @@ angular.module('OpenSlidesApp.users.site', [
})
.state('users.group.list', {
resolve: {
groups: function(Group) {
return Group.findAll();
},
permissions: function(Group) {
return Group.getPermissions();
}
@ -162,28 +133,6 @@ angular.module('OpenSlidesApp.users.site', [
}
])
.run([
'operator',
'$rootScope',
'$http',
'$state',
'Group',
function(operator, $rootScope, $http, $state, Group) {
// Put the operator into the root scope
$http.get('/users/whoami/').success(function(data) {
operator.setUser(data.user_id);
$rootScope.guest_enabled = data.guest_enabled;
if (data.user_id === null && !data.guest_enabled) {
// redirect to login dialog if use is not logged in
$state.go('login', {guest_enabled: data.guest_enabled});
}
});
$rootScope.operator = operator;
// Load all Groups. They are needed later
Group.findAll();
}
])
/*
* Directive to check for permissions
*
@ -210,7 +159,7 @@ angular.module('OpenSlidesApp.users.site', [
}
$scope.$watch(
function (scope) {
return scope.operator.hasPerms(perms);
return scope.operator && scope.operator.hasPerms(perms);
},
function (value) {
if ($attr.osPerms[0] === '!') {
@ -284,19 +233,15 @@ angular.module('OpenSlidesApp.users.site', [
return {
// ngDialog for user form
getDialog: function (user) {
var resolve;
if (user) {
resolve = {
user: function(User) {return User.find(user.id);}
};
}
return {
template: 'static/templates/users/user-form.html',
controller: (user) ? 'UserUpdateCtrl' : 'UserCreateCtrl',
className: 'ngdialog-theme-default wide-form',
closeByEscape: false,
closeByDocument: false,
resolve: (resolve) ? resolve : null
resolve: {
userId: function () {return user ? user.id : void 0;},
}
};
},
// angular-formly fields for user form
@ -697,12 +642,12 @@ angular.module('OpenSlidesApp.users.site', [
'ngDialog',
'UserForm',
'User',
'user',
'userId',
'Group',
'Projector',
'ProjectionDefault',
function($scope, ngDialog, UserForm, User, user, Group, Projector, ProjectionDefault) {
User.bindOne(user.id, $scope, 'user');
function($scope, ngDialog, UserForm, User, userId, Group, Projector, ProjectionDefault) {
User.bindOne(userId, $scope, 'user');
Group.bindAll({where: {id: {'>': 1}}}, $scope, 'groups');
$scope.$watch(function () {
return Projector.lastModified();
@ -760,13 +705,13 @@ angular.module('OpenSlidesApp.users.site', [
'User',
'UserForm',
'Group',
'user',
function($scope, $state, $http, User, UserForm, Group, user) {
'userId',
function($scope, $state, $http, User, UserForm, Group, userId) {
Group.bindAll({where: {id: {'>': 2}}}, $scope, 'groups');
$scope.alert = {};
// set initial values for form model by create deep copy of user object
// so list/detail view is not updated while editing
$scope.model = angular.copy(user);
$scope.model = angular.copy(User.get(userId));
// get all form fields
$scope.formFields = UserForm.getFormFields();
@ -825,11 +770,11 @@ angular.module('OpenSlidesApp.users.site', [
'$state',
'$http',
'User',
'user',
'userId',
'gettextCatalog',
'PasswordGenerator',
function($scope, $state, $http, User, user, gettextCatalog, PasswordGenerator) {
User.bindOne(user.id, $scope, 'user');
function($scope, $state, $http, User, userId, gettextCatalog, PasswordGenerator) {
User.bindOne(userId, $scope, 'user');
$scope.alert={};
$scope.generatePassword = function () {
$scope.new_password = PasswordGenerator.generate();
@ -1173,7 +1118,7 @@ angular.module('OpenSlidesApp.users.site', [
$scope.groups.forEach(function (group) {
if ((_.indexOf(group.permissions, 'users.can_see_name') > -1) &&
(_.indexOf(group.permissions, 'users.can_manage') > -1)){
if (operator.isInGroup(group)){
if (!operator.user || operator.isInGroup(group)){
groups_danger.push(group);
}
}
@ -1305,19 +1250,15 @@ angular.module('OpenSlidesApp.users.site', [
};
$scope.openDialog = function (group) {
var resolve;
if (group) {
resolve = {
group: function() {return Group.find(group.id);}
};
}
ngDialog.open({
template: 'static/templates/users/group-edit.html',
controller: group ? 'GroupRenameCtrl' : 'GroupCreateCtrl',
className: 'ngdialog-theme-default wide-form',
closeByEscape: false,
closeByDocument: false,
resolve: (resolve) ? resolve : null
resolve: {
group: function () {return group;},
}
});
};
}
@ -1402,10 +1343,15 @@ angular.module('OpenSlidesApp.users.site', [
'$rootScope',
'$scope',
'$http',
'$state',
'$stateParams',
'$q',
'operator',
'gettext',
function ($rootScope, $scope, $http, $stateParams, operator, gettext) {
'autoupdate',
'mainMenu',
'DS',
function ($rootScope, $scope, $http, $state, $stateParams, $q, operator, gettext, autoupdate, mainMenu, DS) {
$scope.alerts = [];
// get login info-text from server
@ -1441,11 +1387,19 @@ angular.module('OpenSlidesApp.users.site', [
$http.post('/users/login/', data).then(
function (response) {
// Success: User logged in.
operator.setUser(response.data.user_id);
$scope.closeThisDialog();
setTimeout(function(){
window.location.replace('/');
}, 1000);
// Clear store and reset deferred first message, if guests was enabled before.
DS.clear();
autoupdate.firstMessageDeferred = $q.defer();
// The next lines are partly the same lines as in core/start.js
autoupdate.newConnect();
autoupdate.firstMessageDeferred.promise.then(function () {
operator.setUser(response.data.user_id, response.data.user);
$rootScope.operator = operator;
mainMenu.updateMainMenu();
$scope.closeThisDialog();
$state.go('home');
$rootScope.startupWaitingEnabled = false;
});
},
function (response) {
// Error: Username or password is not correct.

13
openslides/users/views.py
View File

@ -5,6 +5,7 @@ from django.utils.encoding import force_text
from django.utils.translation import ugettext as _
from ..core.config import config
from ..utils.collection import CollectionElement
from ..utils.rest_api import (
ModelViewSet,
Response,
@ -208,6 +209,8 @@ class UserLoginView(APIView):
else:
# self.request.method == 'POST'
context['user_id'] = self.user.pk
user_collection = CollectionElement.from_instance(self.user)
context['user'] = user_collection.as_dict_for_user(self.user)
return super().get_context_data(**context)
@ -234,10 +237,18 @@ class WhoAmIView(APIView):
"""
Appends the user id to the context. Uses None for the anonymous
user. Appends also a flag if guest users are enabled in the config.
Appends also the serialized user if available.
"""
user_id = self.request.user.pk
if user_id is not None:
user_collection = CollectionElement.from_instance(self.request.user)
user_data = user_collection.as_dict_for_user(self.request.user)
else:
user_data = None
return super().get_context_data(
user_id=self.request.user.pk,
user_id=user_id,
guest_enabled=config['general_system_enable_anonymous'],
user=user_data,
**context)

24
openslides/utils/autoupdate.py
View File

@ -4,6 +4,7 @@ from collections import Iterable
from asgiref.inmemory import ChannelLayer
from channels import Channel, Group
from channels.auth import channel_session_user, channel_session_user_from_http
from django.apps import apps
from django.db import transaction
from ..core.config import config
@ -19,12 +20,33 @@ def ws_add_site(message):
Adds the websocket connection to a group specific to the connecting user.
The group with the name 'user-None' stands for all anonymous users.
Send all "startup-data" through the connection.
"""
Group('site').add(message.reply_channel)
message.channel_session['user_id'] = message.user.id
# Saves the reply channel to the user. Uses 0 for anonymous users.
websocket_user_cache.add(message.user.id or 0, message.reply_channel.name)
message.reply_channel.send({"accept": True})
# Collect all elements that shoud be send to the client when the websocket
# connection is established
output = []
for app in apps.get_app_configs():
try:
# Get the method get_startup_elements() from an app.
# This method has to return an iterable of Collection objects.
get_startup_elements = app.get_startup_elements
except AttributeError:
# Skip apps that do not implement get_startup_elements
continue
for collection in get_startup_elements():
output.extend(collection.as_autoupdate_for_user(message.user))
# Send all data. If there is no data, then only accept the connection
if output:
message.reply_channel.send({'text': json.dumps(output)})
else:
message.reply_channel.send({'accept': True})
@channel_session_user

11
openslides/utils/collection.py
View File

@ -352,6 +352,17 @@ class Collection:
output.append(content)
return output
def as_autoupdate_for_user(self, user):
"""
Returns a list of dicts, that can be send though the websocket to a user.
"""
output = []
for collection_element in self.element_generator():
content = collection_element.as_autoupdate_for_user(user)
if content is not None:
output.append(content)
return output
def as_list_for_user(self, user):
"""
Returns a list of dictonaries to send them to a user, for example over

11
tests/integration/users/test_views.py
View File

@ -14,7 +14,7 @@ class TestWhoAmIView(TestCase):
self.assertEqual(response.status_code, 200)
self.assertEqual(
json.loads(response.content.decode()),
{'user_id': None, 'guest_enabled': False})
{'user_id': None, 'user': None, 'guest_enabled': False})
def test_get_authenticated_user(self):
self.client.login(username='admin', password='admin')
@ -22,9 +22,8 @@ class TestWhoAmIView(TestCase):
response = self.client.get(self.url)
self.assertEqual(response.status_code, 200)
self.assertEqual(
json.loads(response.content.decode()),
{'user_id': 1, 'guest_enabled': False})
self.assertEqual(json.loads(response.content.decode()).get('user_id'), 1)
self.assertEqual(json.loads(response.content.decode()).get('guest_enabled'), False)
def test_post(self):
response = self.client.post(self.url)
@ -79,9 +78,7 @@ class TestUserLoginView(TestCase):
{'username': 'admin', 'password': 'admin'})
self.assertEqual(response.status_code, 200)
self.assertEqual(
json.loads(response.content.decode()),
{'user_id': 1})
self.assertEqual(json.loads(response.content.decode()).get('user_id'), 1)
def test_post_incorrect_data(self):
response = self.client.post(