X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-context.c;h=4cc2e551bce1418975186e7f4b45de0684edd8fa;hb=b4da3b7f3db2211e7ecca74301e26b3089fda5a2;hp=6b3d6e9dae02abbce41a7442b3e13a0aa30be22b;hpb=4521c1e7ae5371ab9d639adc617d17fb4e8ded0c;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-context.c b/src/afb-context.c
index 6b3d6e9d..4cc2e551 100644
--- a/src/afb-context.c
+++ b/src/afb-context.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2018 "IoT.bzh"
+ * Copyright (C) 2015-2019 "IoT.bzh"
  * Author "Fulup Ar Foll"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
@@ -25,8 +25,9 @@
 
 #include "afb-session.h"
 #include "afb-context.h"
+#include "afb-token.h"
 
-static void init_context(struct afb_context *context, struct afb_session *session, const char *token)
+static void init_context(struct afb_context *context, struct afb_session *session, struct afb_token *token)
 {
 	assert(session != NULL);
 
@@ -35,31 +36,39 @@ static void init_context(struct afb_context *context, struct afb_session *sessio
 	context->flags = 0;
 	context->super = NULL;
 	context->api_key = NULL;
+	context->token = afb_token_addref(token);
 
 	/* check the token */
 	if (token != NULL) {
-		if (afb_session_check_token(session, token))
+		if (afb_token_check(token))
 			context->validated = 1;
 		else
 			context->invalidated = 1;
 	}
 }
 
-void afb_context_init(struct afb_context *context, struct afb_session *session, const char *token)
+void afb_context_init(struct afb_context *context, struct afb_session *session, struct afb_token *token)
 {
 	init_context(context, afb_session_addref(session), token);
 }
 
+void afb_context_init_validated(struct afb_context *context, struct afb_session *session)
+{
+	afb_context_init(context, session, NULL);
+	context->validated = 1;
+}
+
 void afb_context_subinit(struct afb_context *context, struct afb_context *super)
 {
 	context->session = super->session;
 	context->flags = 0;
 	context->super = super;
 	context->api_key = NULL;
+	context->token = super->token;
 	context->validated = super->validated;
 }
 
-int afb_context_connect(struct afb_context *context, const char *uuid, const char *token)
+int afb_context_connect(struct afb_context *context, const char *uuid, struct afb_token *token)
 {
 	int created;
 	struct afb_session *session;
@@ -70,55 +79,37 @@ int afb_context_connect(struct afb_context *context, const char *uuid, const cha
 	init_context(context, session, token);
 	if (created) {
 		context->created = 1;
-		/* context->refreshing = 1; */
 	}
 	return 0;
 }
 
+int afb_context_connect_validated(struct afb_context *context, const char *uuid)
+{
+	int rc = afb_context_connect(context, uuid, NULL);
+	if (!rc)
+		context->validated = 1;
+	return rc;
+}
+
 void afb_context_disconnect(struct afb_context *context)
 {
 	if (context->session && !context->super) {
-		if (context->refreshing && !context->refreshed) {
-			afb_session_new_token (context->session);
-			context->refreshed = 1;
-		}
 		if (context->closing && !context->closed) {
 			afb_context_change_loa(context, 0);
 			afb_context_set(context, NULL, NULL);
 			context->closed = 1;
 		}
+		afb_token_unref(context->token);
 		afb_session_unref(context->session);
 		context->session = NULL;
 	}
 }
 
-const char *afb_context_sent_token(struct afb_context *context)
-{
-	if (context->session == NULL || context->closing || context->super)
-		return NULL;
-	if (!context->refreshing)
-		return NULL;
-	if (!context->refreshed) {
-		afb_session_new_token (context->session);
-		context->refreshed = 1;
-	}
-	return afb_session_token(context->session);
-}
-
 const char *afb_context_uuid(struct afb_context *context)
 {
 	return context->session ? afb_session_uuid(context->session) : "";
 }
 
-const char *afb_context_sent_uuid(struct afb_context *context)
-{
-	if (context->session == NULL || context->closing || context->super)
-		return NULL;
-	if (!context->created)
-		return NULL;
-	return afb_session_uuid(context->session);
-}
-
 void *afb_context_make(struct afb_context *context, int replace, void *(*make_value)(void *closure), void (*free_value)(void *item), void *closure)
 {
 	assert(context->session != NULL);
@@ -142,20 +133,6 @@ void afb_context_close(struct afb_context *context)
 	context->closing = 1;
 }
 
-void afb_context_refresh(struct afb_context *context)
-{
-	if (context->super)
-		afb_context_refresh(context->super);
-	else {
-		assert(context->validated);
-		context->refreshing = 1;
-		if (!context->refreshed) {
-			afb_session_new_token (context->session);
-			context->refreshed = 1;
-		}
-	}
-}
-
 int afb_context_check(struct afb_context *context)
 {
 	if (context->super)