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

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

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

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

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

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

@ -3,8 +3,8 @@ import NotifierMixin from '../../../mixins/notifier';
export default Ember.Controller.extend(NotifierMixin, { export default Ember.Controller.extend(NotifierMixin, {
documentService: Ember.inject.service('document'), documentService: Ember.inject.service('document'),
folderService: Ember.inject.service('folder'), folderService: Ember.inject.service('folder'),
hasSelectedDocuments: false, hasSelectedDocuments: false,
selectedDocuments: [], selectedDocuments: [],
actions: { actions: {
@ -12,53 +12,53 @@ export default Ember.Controller.extend(NotifierMixin, {
this.get('target.router').refresh(); this.get('target.router').refresh();
}, },
onDocumentsChecked(documents) { onDocumentsChecked(documents) {
this.set('selectedDocuments', documents); this.set('selectedDocuments', documents);
this.set('hasSelectedDocuments', documents.length > 0); this.set('hasSelectedDocuments', documents.length > 0);
}, },
onMoveDocument(folder) { onMoveDocument(folder) {
let self = this; let self = this;
let documents = this.get('selectedDocuments'); let documents = this.get('selectedDocuments');
documents.forEach(function(documentId) { documents.forEach(function (documentId) {
self.get('documentService').getDocument(documentId).then(function(doc) { self.get('documentService').getDocument(documentId).then(function (doc) {
doc.set('folderId', folder); doc.set('folderId', folder);
self.get('documentService').save(doc).then(function() { self.get('documentService').save(doc).then(function () {
self.get('target.router').refresh(); self.get('target.router').refresh();
}); });
}); });
}); });
this.set('selectedDocuments', []); this.set('selectedDocuments', []);
this.set('hasSelectedDocuments', false); this.set('hasSelectedDocuments', false);
this.send("showNotification", "Moved"); this.send("showNotification", "Moved");
}, },
onDeleteDocument() { onDeleteDocument() {
let documents = this.get('selectedDocuments'); let documents = this.get('selectedDocuments');
let self = this; let self = this;
documents.forEach(function(document) { documents.forEach(function (document) {
self.get('documentService').deleteDocument(document).then(function() { self.get('documentService').deleteDocument(document).then(function () {
self.get('target.router').refresh(); self.get('target.router').refresh();
}); });
}); });
this.set('selectedDocuments', []); this.set('selectedDocuments', []);
this.set('hasSelectedDocuments', false); this.set('hasSelectedDocuments', false);
this.send("showNotification", "Deleted"); this.send("showNotification", "Deleted");
}, },
showDocument(folder, document) { showDocument(folder, document) {
this.transitionToRoute('document', folder.get('id'), folder.get('slug'), document.get('id'), document.get('slug')); this.transitionToRoute('document', folder.get('id'), folder.get('slug'), document.get('id'), document.get('slug'));
}, },
onFolderAdd(folder) { onFolderAdd(folder) {
let self = this; let self = this;
this.showNotification("Added"); 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.get('folderService').setCurrentFolder(newFolder);
self.transitionToRoute('folders.folder', newFolder.get('id'), newFolder.get('slug')); self.transitionToRoute('folders.folder', newFolder.get('id'), newFolder.get('slug'));
}); });

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

@ -3,18 +3,18 @@ import models from '../../../utils/model';
import NotifierMixin from '../../../mixins/notifier'; import NotifierMixin from '../../../mixins/notifier';
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin'; 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'), folderService: Ember.inject.service('folder'),
userService: Ember.inject.service('user'), userService: Ember.inject.service('user'),
folder: {}, folder: {},
tab: "", tab: "",
beforeModel: function(transition) { beforeModel: function (transition) {
this.tab = is.not.undefined(transition.queryParams.tab) ? transition.queryParams.tab : "tabGeneral"; this.tab = is.not.undefined(transition.queryParams.tab) ? transition.queryParams.tab : "tabGeneral";
}, },
model(params) { model(params) {
return this.get('folderService').getFolder(params.folder_id); return this.get('folderService').getFolder(params.folder_id);
}, },
setupController(controller, model) { setupController(controller, model) {
@ -22,17 +22,17 @@ export default Ember.Route.extend(NotifierMixin, AuthenticatedRouteMixin, {
this.folder = model; this.folder = model;
controller.set('model', model); controller.set('model', model);
controller.set('tabGeneral', false); controller.set('tabGeneral', false);
controller.set('tabShare', false); controller.set('tabShare', false);
controller.set('tabPermissions', false); controller.set('tabPermissions', false);
controller.set('tabDelete', false); controller.set('tabDelete', false);
controller.set(this.get('tab'), true); 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'))); 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); controller.set('users', users);
var folderPermissions = []; var folderPermissions = [];
@ -48,7 +48,7 @@ export default Ember.Route.extend(NotifierMixin, AuthenticatedRouteMixin, {
folderPermissions.pushObject(u); folderPermissions.pushObject(u);
users.forEach(function(user, index) /* jshint ignore:line */ { users.forEach(function (user, index) /* jshint ignore:line */ {
if (user.get('active')) { if (user.get('active')) {
var u = models.FolderPermissionModel.create({ var u = models.FolderPermissionModel.create({
userId: user.get('id'), userId: user.get('id'),
@ -64,8 +64,8 @@ export default Ember.Route.extend(NotifierMixin, AuthenticatedRouteMixin, {
} }
}); });
self.get('folderService').getPermissions(model.id).then(function(permissions) { self.get('folderService').getPermissions(model.id).then(function (permissions) {
permissions.forEach(function(permission, index) /* jshint ignore:line */ { permissions.forEach(function (permission, index) /* jshint ignore:line */ {
var folderPermission = folderPermissions.findBy('userId', permission.userId); var folderPermission = folderPermissions.findBy('userId', permission.userId);
if (is.not.undefined(folderPermission)) { if (is.not.undefined(folderPermission)) {
Ember.set(folderPermission, 'orgId', permission.orgId); Ember.set(folderPermission, 'orgId', permission.orgId);
@ -82,45 +82,46 @@ export default Ember.Route.extend(NotifierMixin, AuthenticatedRouteMixin, {
}, },
actions: { actions: {
onRename: function(folder) { onRename: function (folder) {
let self = this; let self = this;
this.get('folderService').save(folder).then(function() { this.get('folderService').save(folder).then(function () {
self.showNotification("Renamed"); self.showNotification("Renamed");
}); });
}, },
onRemove(moveId) { onRemove(moveId) {
let self = this; 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.showNotification("Deleted");
self.session.clearSessionItem('folder'); 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.get('folderService').setCurrentFolder(folder);
self.transitionTo('folders.folder', folder.get('id'), folder.get('slug')); self.transitionTo('folders.folder', folder.get('id'), folder.get('slug'));
}); });
}); });
}, },
onShare: function(invitation) { onShare: function (invitation) {
let self = this; 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"); self.showNotification("Shared");
}); });
}, },
onPermission: function(folder, message, permissions) { onPermission: function (folder, message, permissions) {
var self = this; 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 }; 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"); self.showNotification("Saved");
}); });
var hasEveryone = _.find(data, function(permission) { var hasEveryone = _.find(data, function (permission) {
return permission.userId === "" && (permission.canView || permission.canEdit); 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'); // 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 location: config.locationType
}); });
export default Router.map(function() { export default Router.map(function () {
this.route('folders', { this.route('folders', {
path: '/' path: '/'
}, function() { }, function () {
this.route('folder', { this.route('folder', {
path: 's/:folder_id/:folder_slug' path: 's/:folder_id/:folder_slug'
}); });
@ -30,7 +30,7 @@ export default Router.map(function() {
this.route('document', { this.route('document', {
path: 's/:folder_id/:folder_slug/d/:document_id/:document_slug' path: 's/:folder_id/:folder_slug/d/:document_id/:document_slug'
}, function() { }, function () {
this.route('edit', { this.route('edit', {
path: 'edit/:page_id' path: 'edit/:page_id'
}); });
@ -41,7 +41,7 @@ export default Router.map(function() {
this.route('customize', { this.route('customize', {
path: 'settings' path: 'settings'
}, function() { }, function () {
this.route('general', { this.route('general', {
path: 'general' path: 'general'
}); });
@ -59,7 +59,7 @@ export default Router.map(function() {
this.route('auth', { this.route('auth', {
path: 'auth' path: 'auth'
}, function() { }, function () {
this.route('sso', { this.route('sso', {
path: 'sso/:token' path: 'sso/:token'
}); });
@ -98,5 +98,5 @@ export default Router.map(function() {
path: '/*wildcard' path: '/*wildcard'
}); });
this.route('pods', function() {}); this.route('pods', function () {});
}); });

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

@ -9,50 +9,50 @@
// //
// https://documize.com // https://documize.com
import Ember from 'ember'; import Ember from 'ember';
import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin'; import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin';
import netUtil from '../utils/net';
const { const {
inject: { service } inject: { service }
} = Ember; } = Ember;
export default Ember.Route.extend(ApplicationRouteMixin, { export default Ember.Route.extend(ApplicationRouteMixin, {
appMeta: service(), appMeta: service(),
session: service(), session: service(),
beforeModel() { beforeModel() {
return this.get('appMeta').boot().then( data => { return this.get('appMeta').boot().then(data => {
if ( data.allowAnonymousAccess ) { if (data.allowAnonymousAccess) {
return this.get('session').authenticate('authenticator:anonymous', data); return this.get('session').authenticate('authenticator:anonymous', data);
} }
return; return;
}); });
},
actions: {
willTransition: function( /*transition*/ ) {
$("#zone-sidebar").css('height', 'auto');
Mousetrap.reset();
}, },
didTransition() { actions: {
Ember.run.schedule("afterRender",this,function() { willTransition: function ( /*transition*/ ) {
$("#zone-sidebar").css('height', $(document).height() - $("#zone-navigation").height() - $("#zone-header").height() - 35); $("#zone-sidebar").css('height', 'auto');
}); Mousetrap.reset();
},
return true; didTransition() {
}, Ember.run.schedule("afterRender", this, function () {
$("#zone-sidebar").css('height', $(document).height() - $("#zone-navigation").height() - $("#zone-header").height() - 35);
});
error(error, transition) { // jshint ignore: line return true;
if (error) { },
if (netUtil.isAjaxAccessError(error)) {
localStorage.clear(); error(error, transition) { // jshint ignore: line
return this.transitionTo('auth.login'); if (error) {
if (netUtil.isAjaxAccessError(error)) {
localStorage.clear();
return this.transitionTo('auth.login');
}
}
// Return true to bubble this event to any parent route.
return true;
} }
} },
// Return true to bubble this event to any parent route.
return true;
}
},
}); });

2
app/app/services/session.js
View file

@ -32,7 +32,7 @@ export default SimpleAuthSession.extend({
init: function() { init: function() {
this.set('isMac', is.mac()); this.set('isMac', is.mac());
this.set('isMobile', is.mobile()); this.set('isMobile', is.mobile());
}, },
user: computed('isAuthenticated', 'session.content.authenticated.user', function(){ user: computed('isAuthenticated', 'session.content.authenticated.user', function(){
if (this.get('isAuthenticated')) { if (this.get('isAuthenticated')) {