Simplify functions for calls

[src/app-framework-binder.git] / src / afb-hswitch.c

diff --git a/src/afb-hswitch.c b/src/afb-hswitch.c
index bdded7f..909480a 100644 (file)
--- a/src/afb-hswitch.c
+++ b/src/afb-hswitch.c
@@ -1,5 +1,5 @@
-/* 
- * Copyright (C) 2015, 2016 "IoT.bzh"
+/*
+ * Copyright (C) 2015, 2016, 2017 "IoT.bzh"
  * Author "Fulup Ar Foll"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
@@ -23,11 +23,11 @@
 
 #include <microhttpd.h>
 
-#include "afb-req-itf.h"
+#include <afb/afb-req-itf.h>
 #include "afb-context.h"
 #include "afb-hreq.h"
 #include "afb-apis.h"
-#include "session.h"
+#include "afb-session.h"
 #include "afb-websock.h"
 
 int afb_hswitch_apis(struct afb_hreq *hreq, void *data)
@@ -44,10 +44,10 @@ int afb_hswitch_apis(struct afb_hreq *hreq, void *data)
        if (!(*api && *verb && lenapi && lenverb))
                return 0;
 
-       if (afb_hreq_init_context(hreq) < 0)
+       if (afb_hreq_init_req_call(hreq, api, lenapi, verb, lenverb) < 0)
                afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
        else
-               afb_apis_call(afb_hreq_to_req(hreq), &hreq->context, api, lenapi, verb, lenverb);
+               afb_apis_call(afb_hreq_to_req(hreq), &hreq->context, hreq->api, hreq->verb);
        return 1;
 }
 
@@ -73,7 +73,8 @@ int afb_hswitch_one_page_api_redirect(struct afb_hreq *hreq, void *data)
        url[plen++] = '#';
        url[plen++] = '!';
        memcpy(&url[plen], &hreq->tail[1], hreq->lentail);
-       return afb_hreq_redirect_to(hreq, url);
+       afb_hreq_redirect_to(hreq, url, 1);
+       return 1;
 }
 
 int afb_hswitch_websocket_switch(struct afb_hreq *hreq, void *data)
@@ -86,6 +87,11 @@ int afb_hswitch_websocket_switch(struct afb_hreq *hreq, void *data)
                return 1;
        }
 
+       if (!hreq->context.validated) {
+               afb_hreq_reply_error(hreq, MHD_HTTP_UNAUTHORIZED);
+               return 1;
+       }
+
        return afb_websock_check_upgrade(hreq);
 }