Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-08 06:55:28 +02:00
Code Releases Activity

Fix SSO issue

Browse source
This commit is contained in:
zinyando 2016-07-05 16:54:31 +02:00
parent e26108b90b
commit 3dccfc6a24
7 changed files with 128 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/app/authenticators/documize.js
View file

@ -23,14 +23,26 @@ export default Base.extend({
return reject();
},
authenticate({password, email}) {
authenticate(credentials) {
let domain = netUtil.getSubdomain();
let encoded;
if (typeof credentials === 'object') {
let { password, email } = credentials;
if (!isPresent(password) || !isPresent(email)) {
return Ember.RSVP.reject("invalid");
}
var encoded = encodingUtil.Base64.encode(`${domain}:${email}:${password}`);
encoded = encodingUtil.Base64.encode(`${domain}:${email}:${password}`);
} else if (typeof credentials === 'string') {
encoded = credentials;
} else {
return Ember.RSVP.reject("invalid");
}
var headers = {
'Authorization': 'Basic ' + encoded

23
app/app/pods/auth/sso/route.js
View file

@ -1,23 +1,14 @@
import Ember from 'ember';
export default Ember.Route.extend({
beforeModel() {
this.session.clearSession();
},
session: Ember.inject.service(),
model(params) {
let token = params.token;
if (is.undefined(token) || is.null(token) || token.length === 0) {
return;
}
let self = this;
this.session.sso(decodeURIComponent(token)).then(function() {
self.transitionTo('folders.folder');
}, function() {
self.transitionTo('auth.login');
model({ token }) {
this.get("session").authenticate('authenticator:documize', token)
.then(() => {
this.transitionTo('folders.folder');
}, () => {
this.transitionTo('auth.login');
console.log(">>>>> Documize SSO failure");
});
},

12
app/app/pods/folders/folder/controller.js
View file

@ -21,10 +21,10 @@ export default Ember.Controller.extend(NotifierMixin, {
let self = this;
let documents = this.get('selectedDocuments');
documents.forEach(function(documentId) {
self.get('documentService').getDocument(documentId).then(function(doc) {
documents.forEach(function (documentId) {
self.get('documentService').getDocument(documentId).then(function (doc) {
doc.set('folderId', folder);
self.get('documentService').save(doc).then(function() {
self.get('documentService').save(doc).then(function () {
self.get('target.router').refresh();
});
});
@ -39,8 +39,8 @@ export default Ember.Controller.extend(NotifierMixin, {
let documents = this.get('selectedDocuments');
let self = this;
documents.forEach(function(document) {
self.get('documentService').deleteDocument(document).then(function() {
documents.forEach(function (document) {
self.get('documentService').deleteDocument(document).then(function () {
self.get('target.router').refresh();
});
});
@ -58,7 +58,7 @@ export default Ember.Controller.extend(NotifierMixin, {
let self = this;
this.showNotification("Added");
this.get('folderService').add({ name: folder }).then(function(newFolder) {
this.get('folderService').add({ name: folder }).then(function (newFolder) {
self.get('folderService').setCurrentFolder(newFolder);
self.transitionToRoute('folders.folder', newFolder.get('id'), newFolder.get('slug'));
});

37
app/app/pods/folders/settings/route.js
View file

@ -3,13 +3,13 @@ import models from '../../../utils/model';
import NotifierMixin from '../../../mixins/notifier';
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
export default Ember.Route.extend(NotifierMixin, AuthenticatedRouteMixin, {
export default Ember.Route.extend(NotifierMixin, {
folderService: Ember.inject.service('folder'),
userService: Ember.inject.service('user'),
folder: {},
tab: "",
beforeModel: function(transition) {
beforeModel: function (transition) {
this.tab = is.not.undefined(transition.queryParams.tab) ? transition.queryParams.tab : "tabGeneral";
},
@ -28,11 +28,11 @@ export default Ember.Route.extend(NotifierMixin, AuthenticatedRouteMixin, {
controller.set('tabDelete', false);
controller.set(this.get('tab'), true);
this.get('folderService').getAll().then(function(folders) {
this.get('folderService').getAll().then(function (folders) {
controller.set('folders', folders.rejectBy('id', model.get('id')));
});
this.get('userService').getAll().then(function(users) {
this.get('userService').getAll().then(function (users) {
controller.set('users', users);
var folderPermissions = [];
@ -48,7 +48,7 @@ export default Ember.Route.extend(NotifierMixin, AuthenticatedRouteMixin, {
folderPermissions.pushObject(u);
users.forEach(function(user, index) /* jshint ignore:line */ {
users.forEach(function (user, index) /* jshint ignore:line */ {
if (user.get('active')) {
var u = models.FolderPermissionModel.create({
userId: user.get('id'),
@ -64,8 +64,8 @@ export default Ember.Route.extend(NotifierMixin, AuthenticatedRouteMixin, {
}
});
self.get('folderService').getPermissions(model.id).then(function(permissions) {
permissions.forEach(function(permission, index) /* jshint ignore:line */ {
self.get('folderService').getPermissions(model.id).then(function (permissions) {
permissions.forEach(function (permission, index) /* jshint ignore:line */ {
var folderPermission = folderPermissions.findBy('userId', permission.userId);
if (is.not.undefined(folderPermission)) {
Ember.set(folderPermission, 'orgId', permission.orgId);
@ -82,9 +82,9 @@ export default Ember.Route.extend(NotifierMixin, AuthenticatedRouteMixin, {
},
actions: {
onRename: function(folder) {
onRename: function (folder) {
let self = this;
this.get('folderService').save(folder).then(function() {
this.get('folderService').save(folder).then(function () {
self.showNotification("Renamed");
});
},
@ -92,35 +92,36 @@ export default Ember.Route.extend(NotifierMixin, AuthenticatedRouteMixin, {
onRemove(moveId) {
let self = this;
this.get('folderService').remove(this.folder.get('id'), moveId).then(function() { /* jshint ignore:line */
this.get('folderService').remove(this.folder.get('id'), moveId).then(function () { /* jshint ignore:line */
self.showNotification("Deleted");
self.session.clearSessionItem('folder');
self.get('folderService').getFolder(moveId).then(function(folder) {
self.get('folderService').getFolder(moveId).then(function (folder) {
self.get('folderService').setCurrentFolder(folder);
self.transitionTo('folders.folder', folder.get('id'), folder.get('slug'));
});
});
},
onShare: function(invitation) {
onShare: function (invitation) {
let self = this;
this.get('folderService').share(this.folder.get('id'), invitation).then(function() {
this.get('folderService').share(this.folder.get('id'), invitation).then(function () {
self.showNotification("Shared");
});
},
onPermission: function(folder, message, permissions) {
onPermission: function (folder, message, permissions) {
var self = this;
var data = permissions.map(function(obj){ return obj.getProperties('orgId', 'folderId' , 'userId', 'canEdit', 'canView'); });
var data = permissions.map(function (obj) {
return obj.getProperties('orgId', 'folderId', 'userId', 'canEdit', 'canView'); });
var payload = { Message: message, Roles: data };
this.get('folderService').savePermissions(folder.get('id'), payload).then(function() {
this.get('folderService').savePermissions(folder.get('id'), payload).then(function () {
self.showNotification("Saved");
});
var hasEveryone = _.find(data, function(permission) {
var hasEveryone = _.find(data, function (permission) {
return permission.userId === "" && (permission.canView || permission.canEdit);
});
@ -134,7 +135,7 @@ export default Ember.Route.extend(NotifierMixin, AuthenticatedRouteMixin, {
}
}
this.get('folderService').save(folder).then(function() {
this.get('folderService').save(folder).then(function () {
// window.location.href = "/folder/" + folder.get('id') + "/" + folder.get('slug');
});
}

12
app/app/router.js
View file

@ -16,10 +16,10 @@ var Router = Ember.Router.extend({
location: config.locationType
});
export default Router.map(function() {
export default Router.map(function () {
this.route('folders', {
path: '/'
}, function() {
}, function () {
this.route('folder', {
path: 's/:folder_id/:folder_slug'
});
@ -30,7 +30,7 @@ export default Router.map(function() {
this.route('document', {
path: 's/:folder_id/:folder_slug/d/:document_id/:document_slug'
}, function() {
}, function () {
this.route('edit', {
path: 'edit/:page_id'
});
@ -41,7 +41,7 @@ export default Router.map(function() {
this.route('customize', {
path: 'settings'
}, function() {
}, function () {
this.route('general', {
path: 'general'
});
@ -59,7 +59,7 @@ export default Router.map(function() {
this.route('auth', {
path: 'auth'
}, function() {
}, function () {
this.route('sso', {
path: 'sso/:token'
});
@ -98,5 +98,5 @@ export default Router.map(function() {
path: '/*wildcard'
});
this.route('pods', function() {});
this.route('pods', function () {});
});

10
app/app/routes/application.js
View file

@ -9,9 +9,9 @@
//
// https://documize.com
import Ember from 'ember';
import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin';
import netUtil from '../utils/net';
const {
inject: { service }
@ -21,8 +21,8 @@ export default Ember.Route.extend(ApplicationRouteMixin, {
appMeta: service(),
session: service(),
beforeModel() {
return this.get('appMeta').boot().then( data => {
if ( data.allowAnonymousAccess ) {
return this.get('appMeta').boot().then(data => {
if (data.allowAnonymousAccess) {
return this.get('session').authenticate('authenticator:anonymous', data);
}
return;
@ -30,13 +30,13 @@ export default Ember.Route.extend(ApplicationRouteMixin, {
},
actions: {
willTransition: function( /*transition*/ ) {
willTransition: function ( /*transition*/ ) {
$("#zone-sidebar").css('height', 'auto');
Mousetrap.reset();
},
didTransition() {
Ember.run.schedule("afterRender",this,function() {
Ember.run.schedule("afterRender", this, function () {
$("#zone-sidebar").css('height', $(document).height() - $("#zone-navigation").height() - $("#zone-header").height() - 35);
});