Introduced compatibility for liferay 7 (#11)

README.md

@@ -12,7 +12,7 @@ Liferay Connector
 
 This module, available for Node.js and Titanium SDK, wraps the Liferay JSON WS into an easier to use (and easier to test!) API.
 
-Works and tested with **Liferay 6.2.x** and **6.1.x**, both CE and EE.
+Works and tested with **Liferay 7.0.x** and **6.2.x** and **6.1.x**, both CE and EE.
 
 
 Installation

index.js

@@ -19,9 +19,10 @@ liferay.camelcase = require('./lib/camelcase');
 liferay.base = require('./lib/connectors/base');
 liferay.v61 = require('./lib/connectors/liferay61');
 liferay.v62 = require('./lib/connectors/liferay62');
+liferay.v70 = require('./lib/connectors/liferay70');
 
 liferay.connectors = [
-  liferay.v61, liferay.v62
+  liferay.v61, liferay.v62, liferay.v70
 ];
 
 liferay.guest = function (portalURL, auth, callback) {

lib/connectors/base.js

@@ -148,17 +148,17 @@ Connector.guest = function (portalURL) {
 Connector.authenticate = function (portalURL, auth) {
   var connection = new this(portalURL, auth);
 
-  return connection.invoke({
-    "/group/get-user-sites": {}
-  })
+  return connection.invoke(
+    connection.getUserSites()
+  )
   .then(function (sites) {
     connection.sites = sites;
 
     if (auth.companyId) {
       connection.companyId = auth.companyId;
     }
 
-    if (sites.length) {
+    if (sites && sites.length) {
       connection.companyId = sites[0].companyId;
     }
 

lib/connectors/liferay61.js

@@ -65,6 +65,12 @@ inherits(Liferay61, Connector, {
       if (user) return user;
       else throw new errors.NotFound("Could not retrieve the user");
     });
+  },
+
+  getUserSites: function () {
+    return {
+       "/group/get-user-sites": {}
+    }
   }
 
 });

lib/connectors/liferay62.js

@@ -60,6 +60,12 @@ inherits(Liferay62, Connector, {
       if (user) return user;
       else throw new errors.NotFound("Could not retrieve the user");
     });
+  },
+
+  getUserSites: function () {
+    return {
+       "/group/get-user-sites": {}
+    }
   }
 
 });

lib/connectors/liferay70.js

@@ -0,0 +1,75 @@
+
+'use strict';
+
+var inherits = require('../inherits');
+var invoker = require('../invoker');
+var errors = require('../errors');
+var Connector = require('./base');
+var Promise = require('bluebird');
+
+module.exports = Liferay70;
+
+function Liferay70(portalURL, auth) {
+  Connector.call(this, portalURL, auth);
+}
+
+Liferay70.version = '7.0';
+
+inherits(Liferay70, Connector, {
+
+  raw: function (payload) {
+    return invoker(this.portalURL, '/api/jsonws', this.auth, this.mangle(payload));
+  },
+
+  mangle: function (payload) {
+    return this.mangleCamelCase(this.mangleInstantiation(payload));
+  },
+
+  getUser: function () {
+    var auth = this.auth;
+    var login = auth.login;
+    var companyId = this.companyId;
+
+    return Promise.bind(this)
+    .then(function () {
+      if (companyId) return this.invoke({
+        "/user/get-user-by-email-address": {
+          emailAddress: login,
+          companyId: companyId
+        }
+      });
+      else throw new errors.NotFound();
+    })
+    .catch(errors.NotFound, function () {
+      if (!isNaN(+login)) return this.invoke({
+        "/user/get-user-by-id": {
+          userId: +login
+        }
+      });
+      else throw new errors.NotFound();
+    })
+    .catch(errors.NotFound, function () {
+      return this.invoke({
+        "/user/get-user-by-screen-name": {
+          screenName: login,
+          companyId: companyId
+        }
+      });
+    })
+    .then(function (user) {
+      if (user) return user;
+      else throw new errors.NotFound("Could not retrieve the user");
+    });
+  },
+
+  getUserSites: function () {
+    return {
+      "/group/get-user-sites-groups": {}
+    }
+  }
+
+});
+
+Liferay70.matches = function (buildnumber) {
+  return buildnumber >= 7000 && buildnumber < 7100; // 7000
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "liferay-connector",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Liferay JSON WS wrapper for Node and Titanium SDK",
   "titaniumManifest": {
     "guid": "b74f4463-69a6-20ae-0ef0-3033a20889de",