accept shared folder set account to ACTIVE

app/app/components/onboard/share-folder.js

@@ -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);
+                    let creds = { password: password, email: user.email };
-                    self.session.sso(credentials).then(function() {
+
+                    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 = "/";
                 });

app/app/pods/auth/share/route.js

@@ -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);

app/app/pods/auth/sso/route.js

@@ -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))

app/app/services/app-meta.js

@@ -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;
 		});
 	}

core/api/endpoint/label_endpoint.go

@@ -795,6 +795,7 @@ func InviteToFolder(w http.ResponseWriter, r *http.Request) {
 				a.OrgID = p.Context.OrgID
 				a.Admin = false
 				a.Editor = false
+				a.Active = true
 				accountID := util.UniqueID()
 				a.RefID = accountID
 
@@ -897,6 +898,7 @@ func inviteNewUserToSharedFolder(p request.Persister, email string, invitedBy en
 	a.OrgID = p.Context.OrgID
 	a.Admin = false
 	a.Editor = false
+	a.Active = true
 	accountID := util.UniqueID()
 	a.RefID = accountID
 

core/api/entity/objects.go

@@ -529,7 +529,6 @@ const (
 	EventTypeDocumentDelete     EventType = "removed-document"
 	EventTypeDocumentRevisions  EventType = "viewed-document-revisions"
 	EventTypeSpaceAdd           EventType = "added-space"
-	EventTypeSpaceView          EventType = "viewed-space"
 	EventTypeSpaceUpdate        EventType = "updated-space"
 	EventTypeSpaceDelete        EventType = "removed-space"
 	EventTypeSpacePermission    EventType = "changed-space-permissions"