16212: Updates form POST to use new 'users/authenticate' endpoint.
authorLucas Di Pentima <lucas@di-pentima.com.ar>
Wed, 1 Apr 2020 16:10:55 +0000 (13:10 -0300)
committerLucas Di Pentima <lucas@di-pentima.com.ar>
Wed, 29 Apr 2020 20:24:36 +0000 (17:24 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

src/views-components/login-form/login-form.tsx
src/views/login-panel/login-panel.tsx

index 8ec856f9dcbdfe4afba3d304e4dfa5665db9b35b..160a1bb89f3c7828ec83f65730c0b110dbcea654 100644 (file)
@@ -85,7 +85,7 @@ export const LoginForm = withStyles(styles)(
             handleSubmit(username, password)
             .then((response) => {
                 setSubmitting(false);
-                const apiToken = response.data.token;
+                const apiToken = response.data.api_token;
                 if (apiToken) {
                     dispatch<any>(saveApiToken(apiToken)).finally(
                         () => dispatch(navigateToRootProject));
index ce8adb8f3f70e37ed0a5c8827aadc7e412dcb013..25fee7eb3ccc99110cada5174aab1363973b52b6 100644 (file)
@@ -50,11 +50,13 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
 });
 
 const doPAMLogin = (url: string) => (username: string, password: string) => {
-    const formData = new FormData();
-    formData.append("username", username);
-    formData.append("password", password);
-    return Axios.post(`${url}/login`, formData, {
-        headers: { 'X-Http-Method-Override': 'GET' },
+    const formData = [];
+    formData.push('username='+encodeURIComponent(username));
+    formData.push('password='+encodeURIComponent(password));
+    return Axios.post(`${url}/arvados/v1/users/authenticate`, formData.join('&'), {
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded'
+        },
     });
 };