Merge pull request #98 from documize/diagnostics

Diagnostics

Author: HarveyKandola

README.md

@@ -8,7 +8,7 @@ The mission is to bring software dev inspired features (refactoring, testing, li
 
 ## Latest version
 
-v1.46.2
+v1.47.0
 
 ## OS Support
 

app/.eslintrc.js

@@ -31,7 +31,6 @@ module.exports = {
     "stubUserNotification": true,
     "userLogin": true,
     "Keycloak": true,
-    "Intercom": true,
     "slug": true
   }
 };

app/app/components/document/document-view.js

@@ -251,8 +251,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 				meta: meta
 			};
 
-			this.audit.record("added-section-" + section.get('contentType'));
-
 			const promise = this.addSection(model);
 			promise.then((id) => {
 				this.set('pageId', id);
@@ -297,8 +295,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 				meta: meta
 			};
 
-			this.audit.record("added-content-block-" + block.get('contentType'));
-
 			const promise = this.addSection(model);
 			promise.then((id) => {
 				this.set('pageId', id);

app/app/components/document/sidebar-view-attachments.js

@@ -65,7 +65,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 				});
 
 				this.on("addedfile", function ( /*file*/ ) {
-					self.audit.record('attached-file');
 				});
 			}
 		});

app/app/components/document/sidebar-view-index.js

@@ -101,7 +101,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 				this.attrs.onPageSequenceChange(pendingChanges);
 
 				this.send('onEntryClick', this.get('currentPageId'));
-				this.audit.record("moved-page-up");
 				this.showNotification("Moved up");
 			}
 		},
@@ -121,7 +120,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 				this.attrs.onPageSequenceChange(pendingChanges);
 
 				this.send('onEntryClick', this.get('currentPageId'));
-				this.audit.record("moved-page-down");
 				this.showNotification("Moved down");
 			}
 		},
@@ -141,7 +139,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 				this.attrs.onPageLevelChange(pendingChanges);
 
 				this.showNotification("Indent");
-				this.audit.record("changed-page-sequence");
 				this.send('onEntryClick', this.get('currentPageId'));
 			}
 		},
@@ -161,7 +158,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 				this.attrs.onPageLevelChange(pendingChanges);
 
 				this.showNotification("Outdent");
-				this.audit.record("changed-page-sequence");
 				this.send('onEntryClick', this.get('currentPageId'));
 			}
 		},

app/app/components/document/sidebar-zone.js

@@ -72,7 +72,6 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, {
 		},
 
 		onPrintDocument() {
-			this.audit.record('printed-document');
 			$("#sidebar-zone-more-button").click();
 			window.print();
 		},
@@ -90,8 +89,6 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, {
 		},	
 
 		onUnpin() {
-			this.audit.record('unpinned-document');
-
 			this.get('pinned').unpinItem(this.get('pinState.pinId')).then(() => {
 				this.set('pinState.isPinned', false);
 				this.set('pinState.pinId', '');
@@ -111,8 +108,6 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, {
 				return false;
 			}
 
-			this.audit.record('pinned-document');
-
 			this.get('pinned').pinItem(pin).then((pin) => {
 				this.set('pinState.isPinned', true);
 				this.set('pinState.pinId', pin.get('id'));

app/app/components/document/tag-editor.js

@@ -84,8 +84,6 @@ export default Ember.Component.extend({
 
             this.get('onChange')(save);
 
-            this.audit.record('added-tag');
-
             return true;
         },
 
@@ -106,7 +104,6 @@ export default Ember.Component.extend({
 
             this.set('tagz', tags);
             this.get('onChange')(save);
-            this.audit.record('removed tag');
         },
     }
 });

app/app/components/folder/documents-list.js

@@ -22,7 +22,6 @@ export default Ember.Component.extend({
     didReceiveAttrs() {
 		this._super(...arguments);
 
-		this.audit.record('viewed-space');
         this.set('selectedDocuments', []);
         this.set('canCreate', this.get('folderService').get('canEditCurrentFolder'));
         this.set('deleteTargets', this.get('folders').rejectBy('id', this.get('folder.id')));

app/app/components/folder/sidebar-zone.js

@@ -70,8 +70,6 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, AuthMixin, {
 		},
 
 		onUnpin() {
-			this.audit.record('unpinned-space');
-
 			this.get('pinned').unpinItem(this.get('pinState.pinId')).then(() => {
 				this.set('pinState.isPinned', false);
 				this.set('pinState.pinId', '');
@@ -91,8 +89,6 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, AuthMixin, {
 				return false;
 			}
 
-			this.audit.record('pinned-space');
-
 			this.get('pinned').pinItem(pin).then((pin) => {
 				this.set('pinState.isPinned', true);
 				this.set('pinState.pinId', pin.get('id'));

app/app/components/folder/start-document.js

@@ -95,7 +95,6 @@ export default Ember.Component.extend(NotifierMixin, {
 
 				this.on("addedfile", function (file) {
 					self.send('onDocumentImporting', file.name);
-					self.audit.record('converted-document');
 				});
 			}
 		});
@@ -113,14 +112,12 @@ export default Ember.Component.extend(NotifierMixin, {
 		},
 
 		editTemplate(template) {
-			this.audit.record('edited-saved-template');
 			this.get('router').transitionTo('document', this.get('folder.id'), this.get('folder.slug'), template.get('id'), template.get('slug'));
 
 			return true;
 		},
 
 		startDocument(template) {
-			this.audit.record('used-saved-template');
             this.send("showNotification", "Creating");
 
             this.get('templateService').importSavedTemplate(this.folder.get('id'), template.id, this.get('newDocumentName')).then((document) => {

app/app/components/layout/zone-navigation.js

@@ -80,8 +80,6 @@ export default Ember.Component.extend(TooltipMixin, {
 			var sortable = Sortable.create(document.getElementById('pinned-zone'), {
 				animation: 150,
 				onEnd: function () {
-					self.audit.record('reorganized-pins');
-
 					self.get('pinned').updateSequence(this.toArray()).then((pins) => {
 						self.set('pins', pins);
 					});
@@ -144,7 +142,6 @@ export default Ember.Component.extend(TooltipMixin, {
 
 	actions: {
 		switchAccount(domain) {
-			this.audit.record('switched-account');
 			window.location.href = netUtil.getAppUrl(domain);
 		},
 

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);
-                    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 = "/";
                 });

app/app/initializers/audit.js

@@ -19,6 +19,5 @@ export function initialize(application) {
 export default {
     name: 'session',
     after: 'application',
-    before: 'audit',
     initialize: initialize
 };

app/app/initializers/session.js

@@ -36,7 +36,6 @@ export default Ember.Route.extend({
 				let data = this.get('kcAuth').mapProfile(profile);
 
 				this.get("session").authenticate('authenticator:keycloak', data).then(() => {
-					this.get('audit').record("logged-in-keycloak");
 					this.transitionTo('folders');
 				}, (reject) => {
 					this.set('message', reject.Error);

app/app/pods/auth/keycloak/route.js

@@ -15,7 +15,6 @@ import AuthProvider from '../../../mixins/auth';
 export default Ember.Controller.extend(AuthProvider, {
 	appMeta: Ember.inject.service('app-meta'),
 	session: Ember.inject.service('session'),
-	audit: Ember.inject.service('audit'),
 	invalidCredentials: false,
 
 	reset() {
@@ -35,7 +34,6 @@ export default Ember.Controller.extend(AuthProvider, {
 			let creds = this.getProperties('email', 'password');
 
 			this.get('session').authenticate('authenticator:documize', creds).then((response) => {
-				this.get('audit').record("logged-in");
 				this.transitionToRoute('folders');
 				return response;
 			}).catch(() => {

app/app/pods/auth/login/controller.js

@@ -17,9 +17,6 @@ export default Ember.Route.extend({
 	appMeta: Ember.inject.service(),
 
 	activate: function () {
-		this.audit.record("logged-out");
-		this.audit.stop();
-
 		this.get('session').invalidate().then(() => { 
 			if (config.environment === 'test') {
 				this.transitionTo('auth.login');

app/app/pods/auth/logout/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/share/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/pods/auth/sso/route.js

@@ -32,7 +32,6 @@ export default Ember.Controller.extend(NotifierMixin, {
 
 				this.get('folderService').save(folder).then(() => {
 					this.showNotification("Changed");
-					this.audit.record('changed-folder-owner');
 				});
 
 				this.send('onChangeOwner');

app/app/pods/customize/folders/controller.js

@@ -31,7 +31,6 @@ export default Ember.Controller.extend({
 			b.set('externalSource', meta.get('externalSource'));
 
 			this.get('sectionService').updateBlock(b).then(function () {
-				self.audit.record("edited-block");
 				self.transitionToRoute('document');
 			});
 		}

app/app/pods/document/block/controller.js

@@ -20,8 +20,6 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 	model(params) {
 		let self = this;
 
-		this.audit.record("edited-block");
- 
 		return Ember.RSVP.hash({
 			folder: self.modelFor('document').folder,
 			document: self.modelFor('document').document,

app/app/pods/document/block/route.js

@@ -6,16 +6,12 @@ export default Ember.Controller.extend(NotifierMixin, {
 
 	actions: {
 		onFetchDiff(pageId, revisionId) {
-			this.audit.record("compared-diff");
-
 			this.get('documentService').getPageRevisionDiff(this.get('model.document.id'), pageId, revisionId).then((revision) => {
 				this.set('model.diff', revision);
 			});
 		},
 
 		onRollback(pageId, revisionId) {
-			this.audit.record("restored-page");
-
 			this.get('documentService').rollbackPage(this.get('model.document.id'), pageId, revisionId).then(() => {
 				this.transitionToRoute('document.index',
 					this.get('model.folder.id'),

app/app/pods/document/history/controller.js

@@ -66,8 +66,6 @@ export default Ember.Controller.extend(NotifierMixin, {
 				page = up;
 				this.set('pageId', page.get('id'));
 			});
-
-			this.audit.record("edited-page");
 		},
 
 		onPageDeleted(deletePage) {
@@ -81,8 +79,6 @@ export default Ember.Controller.extend(NotifierMixin, {
 			let pageIndex = _.indexOf(pages, page, false);
 			let pendingChanges = [];
 
-			this.audit.record("deleted-page");
-
 			// select affected pages
 			for (var i = pageIndex + 1; i < pages.get('length'); i++) {
 				if (pages[i].get('level') <= page.get('level')) {
@@ -155,7 +151,6 @@ export default Ember.Controller.extend(NotifierMixin, {
 		onDeleteBlock(blockId) {
 			return new Ember.RSVP.Promise((resolve) => {
 				this.get('sectionService').deleteBlock(blockId).then(() => {
-					this.audit.record("deleted-block");
 					this.send("showNotification", "Deleted");
 					resolve();
 				});
@@ -173,7 +168,6 @@ export default Ember.Controller.extend(NotifierMixin, {
 
 		onDocumentDelete() {
 			this.get('documentService').deleteDocument(this.get('model.document.id')).then(() => {
-				this.audit.record("deleted-page");
 				this.send("showNotification", "Deleted");
 				this.transitionToRoute('folder', this.get('model.folder.id'), this.get('model.folder.slug'));
 			});

app/app/pods/document/index/controller.js

@@ -44,8 +44,6 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 	},
 
 	model() {
-		this.audit.record('viewed-document');
-	
 		return Ember.RSVP.hash({
 			folders: this.get('folders'),
 			folder: this.get('folder'),