Merge branch 'master' of https://github.com/iotbzh/afb-daemon

[src/app-framework-binder.git] / plugins / session / token-api.c

diff --git a/plugins/session/token-api.c b/plugins/session/token-api.c
index 65c18d2..d550c20 100644 (file)
--- a/plugins/session/token-api.c
+++ b/plugins/session/token-api.c
@@ -1,27 +1,25 @@
 /*
- * Copyright (C) 2015 "IoT.bzh"
+ * Copyright (C) 2015, 2016 "IoT.bzh"
  * Author "Fulup Ar Foll"
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #define _GNU_SOURCE
 #include <stdio.h>
-#include <json.h>
+#include <json-c/json.h>
 
-#include "afb-plugin.h"
-#include "afb-req-itf.h"
+#include <afb/afb-plugin.h>
 
 // Dummy sample of Client Application Context
 typedef struct {
@@ -30,19 +28,28 @@ typedef struct {
 } MyClientApplicationHandle;
 
 
+// This function is call when Client Session Context is removed
+// Note: when freeCtxCB==NULL standard free/malloc is called
+static void clientContextFree(void *context) {
+    fprintf (stderr,"Plugin[token] Closing Session\n");
+    free (context);
+}
+
 // Request Creation of new context if it does not exist
-static void clientContextCreate (struct afb_req request)
+static void clientContextLogin (struct afb_req request)
 {
     json_object *jresp;
 
     // add an application specific client context to session
-    *request.context = malloc (sizeof (MyClientApplicationHandle));
+    afb_req_context_set(request, malloc (sizeof (MyClientApplicationHandle)), clientContextFree);
     
     // Send response to UI
     jresp = json_object_new_object();               
     json_object_object_add(jresp, "token", json_object_new_string ("A New Token and Session Context Was Created"));
 
     afb_req_success(request, jresp, NULL);
+    
+    afb_req_session_set_LOA(request, 1);
 }
 
 // Before entering here token will be check and renew
@@ -68,7 +75,7 @@ static void clientContextCheck (struct afb_req request) {
 
 
 // Close and Free context
-static void clientContextReset (struct afb_req request) {
+static void clientContextLogout (struct afb_req request) {
     json_object *jresp;
    
     /* after this call token will be reset
@@ -81,6 +88,8 @@ static void clientContextReset (struct afb_req request) {
     
     // WARNING: if you free context resource manually here do not forget to set *request.context=NULL; 
     afb_req_success(request, jresp, NULL);
+    
+    afb_req_session_set_LOA(request, 0);
 }
 // Close and Free context
 static void clientGetPing (struct afb_req request) {
@@ -94,31 +103,25 @@ static void clientGetPing (struct afb_req request) {
 }
 
 
-// This function is call when Client Session Context is removed
-// Note: when freeCtxCB==NULL standard free/malloc is called
-static void clientContextFree(void *context) {
-    fprintf (stderr,"Plugin[token] Closing Session\n");
-    free (context);
-}
-
-static const struct AFB_restapi pluginApis[]= {
-  {"ping"    , AFB_SESSION_NONE  , clientGetPing       ,"Ping Rest Test Service"},
-  {"create"  , AFB_SESSION_CREATE, clientContextCreate ,"Request Client Context Creation"},
-  {"refresh" , AFB_SESSION_RENEW , clientContextRefresh,"Refresh Client Context Token"},
-  {"check"   , AFB_SESSION_CHECK , clientContextCheck  ,"Check Client Context Token"},
-  {"reset"   , AFB_SESSION_CLOSE , clientContextReset  ,"Close Client Context and Free resources"},
+static const struct AFB_verb_desc_v1 verbs[]= {
+  {"ping"    , AFB_SESSION_NONE                        , clientGetPing       ,"Ping Rest Test Service"},
+  {"login"  , AFB_SESSION_LOA_EQ_0 | AFB_SESSION_RENEW, clientContextLogin   ,"Login Client"},
+  {"refresh" , AFB_SESSION_LOA_GE_1 | AFB_SESSION_RENEW, clientContextRefresh,"Refresh Client Authentication Token"},
+  {"check"   , AFB_SESSION_LOA_GE_1                    , clientContextCheck  ,"Check Client Authentication Token"},
+  {"logout"  , AFB_SESSION_LOA_GE_1 | AFB_SESSION_CLOSE, clientContextLogout ,"Logout Client and Free resources"},
   {NULL}
 };
 
 static const struct AFB_plugin plugin_desc = {
-       .type = AFB_PLUGIN_JSON,
-       .info = "Application Framework Binder Service",
-       .prefix = "token",
-       .apis = pluginApis,
-       .freeCtxCB = clientContextFree
+       .type = AFB_PLUGIN_VERSION_1,
+       .v1 = {
+               .info = "Application Framework Binder Authentication sample",
+               .prefix = "auth",
+               .verbs = verbs
+       }
 };
 
-const struct AFB_plugin *pluginRegister ()
+const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf)
 {
        return &plugin_desc;
 }