Converted Identity & Session to real objects in SWIG bindings.

2 files changed, 49 insertions, 48 deletions

diff --git a/python/lasso.py b/python/lasso.py
index d1c59a68..c1d7fad7 100644
--- a/python/lasso.py
+++ b/python/lasso.py
@@ -250,21 +250,6 @@ class Identity(_ObjectMixin, lassomod.LassoIdentity):
 
     lassomodClass = lassomod.LassoIdentity
 
-    # Constructors
-
-    def new_from_dump(cls, dump):
-        self = lassomod.lasso_identity_new_from_dump(dump)
-        if self is None:
-            raise ErrorInstanceCreationFailed('lasso_identity_new_from_dump')
-        _setRegisteredClass(self)
-        return self
-    new_from_dump = classmethod(new_from_dump)
-
-    # Methods
-
-    def dump(self):
-        return lassomod.lasso_identity_dump(self)
-
 registerClass(Identity)
 
 
@@ -273,27 +258,6 @@ class Session(_ObjectMixin, lassomod.LassoSession):
 
     lassomodClass = lassomod.LassoSession
 
-    # Constructors
-
-    def new_from_dump(cls, dump):
-        self = lassomod.lasso_session_new_from_dump(dump)
-        if self is None:
-            raise ErrorInstanceCreationFailed('lasso_session_new_from_dump')
-        _setRegisteredClass(self)
-        return self
-    new_from_dump = classmethod(new_from_dump)
-
-    # Attributes
-
-    def get_authentication_method(self, remote_providerID = None):
-        return lassomod.lasso_session_get_authentication_method(self, remote_providerID)
-    authentication_method = property(get_authentication_method)
-
-    # Methods
-
-    def dump(self):
-        return lassomod.lasso_session_dump(self)
-
 registerClass(Session)
 
 
diff --git a/swig/Lasso.i b/swig/Lasso.i
index 144f0072..ee0dcda8 100644
--- a/swig/Lasso.i
+++ b/swig/Lasso.i
@@ -506,6 +506,7 @@ typedef struct {
 				  gchar *ca_certificate = NULL);
 		END_THROW_ERROR
 
+		%newobject dump;
 		gchar *dump();
 	}
 } LassoServer;
@@ -555,16 +556,32 @@ typedef struct {
 	gboolean is_dirty;
 
 	%extend {
-		LassoIdentity() {
-			return lasso_identity_new();
-		}
+		/* Constructor, Destructor & Static Methods */
 
-		~LassoIdentity() {
-			lasso_identity_destroy(self);
-		}
+		LassoIdentity();
+
+		~LassoIdentity();
+
+		%newobject new_from_dump;
+		static LassoIdentity *new_from_dump(gchar *dump);
+
+		/* Methods */
+
+		%newobject dump;
+		gchar *dump();
 	}
 } LassoIdentity;
 
+%{
+
+#define new_LassoIdentity lasso_identity_new
+#define delete_LassoIdentity lasso_identity_destroy
+#define LassoIdentity_new_from_dump lasso_identity_new_from_dump
+#define LassoIdentity_add_provider lasso_identity_add_provider
+#define LassoIdentity_dump lasso_identity_dump
+
+%}
+
 /* Constructors */
 
 %newobject lasso_identity_new;
@@ -595,16 +612,36 @@ typedef struct {
 	gboolean is_dirty;
 
 	%extend {
-		LassoSession() {
-			return lasso_session_new();
-		}
+		/* Constructor, Destructor & Static Methods */
 
-		~LassoSession() {
-			lasso_session_destroy(self);
-		}
+		LassoSession();
+
+		~LassoSession();
+
+		%newobject new_from_dump;
+		static LassoSession *new_from_dump(gchar *dump);
+
+		/* Methods */
+
+		%newobject dump;
+		gchar *dump();
+
+		%newobject get_authentication_method;
+		gchar *get_authentication_method(gchar *remote_providerID);
 	}
 } LassoSession;
 
+%{
+
+#define new_LassoSession lasso_session_new
+#define delete_LassoSession lasso_session_destroy
+#define LassoSession_new_from_dump lasso_session_new_from_dump
+#define LassoSession_add_provider lasso_session_add_provider
+#define LassoSession_dump lasso_session_dump
+#define LassoSession_get_authentication_method lasso_session_get_authentication_method
+
+%}
+
 /* Constructors */
 
 %newobject lasso_session_new;