Fossil SCM
minor cleanups in the /json/login payload code.
Commit
3bdae54cae52a4df47137fbb0548b72ee2bbf130
Parent
88ddf2cbce256e3…
1 file changed
+9
-19
+9
-19
| --- src/json_login.c | ||
| +++ src/json_login.c | ||
| @@ -127,37 +127,27 @@ | ||
| 127 | 127 | ? FSL_JSON_E_LOGIN_FAILED_NOTFOUND |
| 128 | 128 | : FSL_JSON_E_LOGIN_FAILED; |
| 129 | 129 | return NULL; |
| 130 | 130 | }else{ |
| 131 | 131 | char * cookie = NULL; |
| 132 | + cson_object * po; | |
| 133 | + char * cap = NULL; | |
| 132 | 134 | if(anonSeed){ |
| 133 | 135 | login_set_anon_cookie(NULL, &cookie); |
| 134 | 136 | }else{ |
| 135 | 137 | login_set_user_cookie(name, uid, &cookie); |
| 136 | 138 | } |
| 137 | - /* FIXME: expand the payload to: | |
| 138 | - | |
| 139 | - { authToken:..., | |
| 140 | - name:..., | |
| 141 | - capabilities:... | |
| 142 | - } | |
| 143 | - */ | |
| 144 | - { | |
| 145 | - cson_object * po; | |
| 146 | - char * cap = NULL; | |
| 147 | - payload = cson_value_new_object(); | |
| 148 | - po = cson_value_get_object(payload); | |
| 149 | - cson_object_set(po, "authToken", json_new_string(cookie)); | |
| 150 | - cson_object_set(po, "name", json_new_string(name)); | |
| 151 | - cap = db_text(NULL,"SELECT cap FROM user WHERE login=%Q",name); | |
| 152 | - cson_object_set(po, "capabilities", json_new_string(cap)); | |
| 153 | - free(cap); | |
| 154 | - } | |
| 139 | + payload = cson_value_new_object(); | |
| 140 | + po = cson_value_get_object(payload); | |
| 141 | + cson_object_set(po, "authToken", json_new_string(cookie)); | |
| 155 | 142 | free(cookie); |
| 143 | + cson_object_set(po, "name", json_new_string(name)); | |
| 144 | + cap = db_text(NULL, "SELECT cap FROM user WHERE login=%Q",name); | |
| 145 | + cson_object_set(po, "capabilities", json_new_string(cap)); | |
| 146 | + free(cap); | |
| 156 | 147 | return payload; |
| 157 | 148 | } |
| 158 | - | |
| 159 | 149 | } |
| 160 | 150 | |
| 161 | 151 | /* |
| 162 | 152 | ** Impl of /json/logout. |
| 163 | 153 | ** |
| 164 | 154 |
| --- src/json_login.c | |
| +++ src/json_login.c | |
| @@ -127,37 +127,27 @@ | |
| 127 | ? FSL_JSON_E_LOGIN_FAILED_NOTFOUND |
| 128 | : FSL_JSON_E_LOGIN_FAILED; |
| 129 | return NULL; |
| 130 | }else{ |
| 131 | char * cookie = NULL; |
| 132 | if(anonSeed){ |
| 133 | login_set_anon_cookie(NULL, &cookie); |
| 134 | }else{ |
| 135 | login_set_user_cookie(name, uid, &cookie); |
| 136 | } |
| 137 | /* FIXME: expand the payload to: |
| 138 | |
| 139 | { authToken:..., |
| 140 | name:..., |
| 141 | capabilities:... |
| 142 | } |
| 143 | */ |
| 144 | { |
| 145 | cson_object * po; |
| 146 | char * cap = NULL; |
| 147 | payload = cson_value_new_object(); |
| 148 | po = cson_value_get_object(payload); |
| 149 | cson_object_set(po, "authToken", json_new_string(cookie)); |
| 150 | cson_object_set(po, "name", json_new_string(name)); |
| 151 | cap = db_text(NULL,"SELECT cap FROM user WHERE login=%Q",name); |
| 152 | cson_object_set(po, "capabilities", json_new_string(cap)); |
| 153 | free(cap); |
| 154 | } |
| 155 | free(cookie); |
| 156 | return payload; |
| 157 | } |
| 158 | |
| 159 | } |
| 160 | |
| 161 | /* |
| 162 | ** Impl of /json/logout. |
| 163 | ** |
| 164 |
| --- src/json_login.c | |
| +++ src/json_login.c | |
| @@ -127,37 +127,27 @@ | |
| 127 | ? FSL_JSON_E_LOGIN_FAILED_NOTFOUND |
| 128 | : FSL_JSON_E_LOGIN_FAILED; |
| 129 | return NULL; |
| 130 | }else{ |
| 131 | char * cookie = NULL; |
| 132 | cson_object * po; |
| 133 | char * cap = NULL; |
| 134 | if(anonSeed){ |
| 135 | login_set_anon_cookie(NULL, &cookie); |
| 136 | }else{ |
| 137 | login_set_user_cookie(name, uid, &cookie); |
| 138 | } |
| 139 | payload = cson_value_new_object(); |
| 140 | po = cson_value_get_object(payload); |
| 141 | cson_object_set(po, "authToken", json_new_string(cookie)); |
| 142 | free(cookie); |
| 143 | cson_object_set(po, "name", json_new_string(name)); |
| 144 | cap = db_text(NULL, "SELECT cap FROM user WHERE login=%Q",name); |
| 145 | cson_object_set(po, "capabilities", json_new_string(cap)); |
| 146 | free(cap); |
| 147 | return payload; |
| 148 | } |
| 149 | } |
| 150 | |
| 151 | /* |
| 152 | ** Impl of /json/logout. |
| 153 | ** |
| 154 |