static const char long_key_for_reqid[] = "x-afb-reqid";
static const char short_key_for_reqid[] = "reqid";
+static const char key_for_bearer[] = "Bearer";
+static const char key_for_access_token[] = "access_token";
+
static char *cookie_name = NULL;
static char *cookie_setter = NULL;
static char *tmp_pattern = NULL;
const char *afb_hreq_get_authorization_bearer(struct afb_hreq *hreq)
{
- static const char bearer[] = "Bearer";
const char *value = afb_hreq_get_header(hreq, MHD_HTTP_HEADER_AUTHORIZATION);
if (value) {
- if (strncasecmp(value, bearer, sizeof bearer - 1) == 0) {
- value += sizeof bearer - 1;
+ if (strncasecmp(value, key_for_bearer, sizeof key_for_bearer - 1) == 0) {
+ value += sizeof key_for_bearer - 1;
if (isblank(*value++)) {
while (isblank(*value))
value++;
/* get the authorisation token */
token = afb_hreq_get_authorization_bearer(hreq);
if (token == NULL) {
- token = afb_hreq_get_header(hreq, long_key_for_token);
+ token = afb_hreq_get_argument(hreq, key_for_access_token);
if (token == NULL) {
- token = afb_hreq_get_argument(hreq, long_key_for_token);
- if (token == NULL)
- token = afb_hreq_get_argument(hreq, short_key_for_token);
+ token = afb_hreq_get_header(hreq, long_key_for_token);
+ if (token == NULL) {
+ token = afb_hreq_get_argument(hreq, long_key_for_token);
+ if (token == NULL)
+ token = afb_hreq_get_argument(hreq, short_key_for_token);
+ }
}
}
var initial = {
base: base.base || "api",
- token: initialtoken || base.token || URLSearchParams(window.location.search).get('token') || "HELLO",
+ token: initialtoken || base.token
+ || URLSearchParams(window.location.search).get('access_token')
+ || URLSearchParams(window.location.search).get('token')
+ || "HELLO",
host: base.host || window.location.host,
url: base.url || undefined
};
var initial = {
base: base.base || "api",
- token: base.token || initialtoken || "HELLO",
+ token: initialtoken || base.token
+ || URLSearchParams(window.location.search).get('access_token')
+ || URLSearchParams(window.location.search).get('token')
+ || "HELLO",
host: base.host || window.location.host,
url: base.url || undefined
};
if (f) {
delete this.onopen;
delete this.onabort;
- f && f(this);
+ f(this);
}
this.onerror && this.onerror(this);
}
switch (code) {
case RETOK:
reply(this.pendings, id, ans, 0);
- break;
+ break;
case RETERR:
reply(this.pendings, id, ans, 1);
- break;
+ break;
case EVENT:
default:
fire(this.awaitens, id, ans);
- break;
+ break;
}
}