Fossil SCM
Added loginCookieName to /json/login response payload, mainly as a crutch for certain scripting cases (e.g. RSS feeds). Still TODO: add future expiry time of cookie/token to response.
Commit
daa564c4df7894f2925179aa2521d21d5163258d
Parent
036923b66d37e48…
1 file changed
+3
-2
+3
-2
| --- src/json_login.c | ||
| +++ src/json_login.c | ||
| @@ -155,13 +155,14 @@ | ||
| 155 | 155 | payload = cson_value_new_object(); |
| 156 | 156 | po = cson_value_get_object(payload); |
| 157 | 157 | cson_object_set(po, "authToken", json_new_string(cookie)); |
| 158 | 158 | free(cookie); |
| 159 | 159 | cson_object_set(po, "name", json_new_string(name)); |
| 160 | - cap = db_text(NULL, "SELECT cap FROM user WHERE login=%Q",name); | |
| 161 | - cson_object_set(po, "capabilities", json_new_string(cap)); | |
| 160 | + cap = db_text(NULL, "SELECT cap FROM user WHERE login=%Q", name); | |
| 161 | + cson_object_set(po, "capabilities", cap ? json_new_string(cap) : cson_value_null() ); | |
| 162 | 162 | free(cap); |
| 163 | + cson_object_set(po, "loginCookieName", json_new_string( login_cookie_name() ) ); | |
| 163 | 164 | return payload; |
| 164 | 165 | } |
| 165 | 166 | } |
| 166 | 167 | |
| 167 | 168 | /* |
| 168 | 169 |
| --- src/json_login.c | |
| +++ src/json_login.c | |
| @@ -155,13 +155,14 @@ | |
| 155 | payload = cson_value_new_object(); |
| 156 | po = cson_value_get_object(payload); |
| 157 | cson_object_set(po, "authToken", json_new_string(cookie)); |
| 158 | free(cookie); |
| 159 | cson_object_set(po, "name", json_new_string(name)); |
| 160 | cap = db_text(NULL, "SELECT cap FROM user WHERE login=%Q",name); |
| 161 | cson_object_set(po, "capabilities", json_new_string(cap)); |
| 162 | free(cap); |
| 163 | return payload; |
| 164 | } |
| 165 | } |
| 166 | |
| 167 | /* |
| 168 |
| --- src/json_login.c | |
| +++ src/json_login.c | |
| @@ -155,13 +155,14 @@ | |
| 155 | payload = cson_value_new_object(); |
| 156 | po = cson_value_get_object(payload); |
| 157 | cson_object_set(po, "authToken", json_new_string(cookie)); |
| 158 | free(cookie); |
| 159 | cson_object_set(po, "name", json_new_string(name)); |
| 160 | cap = db_text(NULL, "SELECT cap FROM user WHERE login=%Q", name); |
| 161 | cson_object_set(po, "capabilities", cap ? json_new_string(cap) : cson_value_null() ); |
| 162 | free(cap); |
| 163 | cson_object_set(po, "loginCookieName", json_new_string( login_cookie_name() ) ); |
| 164 | return payload; |
| 165 | } |
| 166 | } |
| 167 | |
| 168 | /* |
| 169 |