Fix SSO issue

app/app/authenticators/documize.js

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

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

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

app/app/pods/folders/settings/route.js

@@ -3,7 +3,7 @@ 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: {},
@@ -113,7 +113,8 @@ export default Ember.Route.extend(NotifierMixin, AuthenticatedRouteMixin, {
 
         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 () {

app/app/routes/application.js

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