Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-04 21:15:24 +02:00
Code Releases Activity

accept shared folder set account to ACTIVE

Browse source
This commit is contained in:
Harvey Kandola 2017-05-04 13:56:31 +01:00
parent 93ed361705
commit 92eca1a1ce
7 changed files with 641 additions and 621 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/app/components/onboard/share-folder.js
View file

@ -10,12 +10,9 @@
// https://documize.com
import Ember from 'ember';
import encodingUtil from '../../utils/encoding';
import netUtil from '../../utils/net';
export default Ember.Component.extend({
folderService: Ember.inject.service('folder'),
serial: "",
folderId: "",
slug: "",
@ -111,10 +108,16 @@ export default Ember.Component.extend({
var password = $("#stage-2-password").val();
self.get('folderService').onboard(self.folderId, payload).then(function(user) {
var credentials = encodingUtil.Base64.encode(netUtil.getSubdomain() + ":" + user.email + ":" + password);
self.session.sso(credentials).then(function() {
let creds = { password: password, email: user.email };
self.get('session').authenticate('authenticator:documize', creds).then(() => {
window.location.href = 's/' + self.folderId + "/" + self.slug;
});
// var credentials = encodingUtil.Base64.encode(netUtil.getSubdomain() + ":" + user.email + ":" + password);
// self.session.sso(credentials).then(function() {
// window.location.href = 's/' + self.folderId + "/" + self.slug;
// });
}, function() {
window.location.href = "/";
});

7
app/app/pods/auth/share/route.js
View file

@ -13,6 +13,13 @@ import Ember from 'ember';
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
export default Ember.Route.extend(AuthenticatedRouteMixin, {
session: Ember.inject.service(),
localStorage: Ember.inject.service(),
beforeModel() {
this.get('localStorage').clearAll();
},
model: function (params) {
this.set('folderId', params.id);
this.set('slug', params.slug);

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

@ -13,6 +13,11 @@ import Ember from 'ember';
export default Ember.Route.extend({
session: Ember.inject.service(),
localStorage: Ember.inject.service(),
beforeModel() {
this.get('localStorage').clearAll();
},
model({ token }) {
this.get("session").authenticate('authenticator:documize', decodeURIComponent(token))

6
app/app/services/app-meta.js
View file

@ -77,7 +77,11 @@ export default Ember.Service.extend({
return this.get('ajax').request('public/meta').then((response) => {
this.setProperties(response);
this.get('localStorage').storeSessionItem('entryUrl', requestedUrl);
if (is.not.include(requestedUrl, '/auth/')) {
this.get('localStorage').storeSessionItem('entryUrl', requestedUrl);
}
return response;
});
}