Merge pull request #12 from flavienbwk/develop

Reversed use of add_argument for api.model

Author: flavienbwk

api/app/controller/auth_controller.py

@@ -21,9 +21,10 @@
 
 api = Namespace('Auth', description='Authentication-related operations')
 
-auth_login_ldap_dto = api.parser()
-auth_login_ldap_dto.add_argument('username', type=str, help='LDAP uid', required=True)
-auth_login_ldap_dto.add_argument('password', type=str, help='LDAP password', required=True)
+auth_login_ldap_dto = api.model('auth_login_ldap', {
+    'username': fields.String(required=True, description='LDAP uid'),
+    'password': fields.String(required=True, description='LDAP password')
+})
 
 auth_login_ldap_response_dto = api.model('auth_login_ldap_response', {
     'error': fields.Boolean(description="True on error, false on success"),

api/app/controller/user_controller.py

@@ -27,8 +27,10 @@
     )
 })
 
-user_profile_update_dto = api.parser()
-user_profile_update_dto.add_argument('email', type=str, help='New user email', required=True)
+user_profile_update_dto = api.model('user_profile_update', {
+    'email': fields.String(required=True, description='New user email')
+})
+
 user_profile_update_response_dto = api.model('user_profile_update_response', {
     'error': fields.Boolean(description="True on error, false on success"),
     'message': fields.String(description="Some error or success message"),

app/app/src/Dashboard.js

@@ -5,7 +5,7 @@ import { Auth } from './utils/Auth'
 import styled from 'styled-components'
 
 const Styles = styled.div`
-    .paddind-bottom {
+    .padding-bottom {
         padding-bottom: 16px;
     }
 
@@ -31,7 +31,7 @@ export class Dashboard extends Component {
         return (
             <Styles>
                 <Container>
-                    <Row className="paddind-bottom">
+                    <Row className="padding-bottom">
                         <Col lg={{ span: 12 }} className="center">
                             <Jumbotron>
                                 <h1>Hello { this.state.profile.first_name } !</h1>

app/app/src/Home.js

@@ -4,7 +4,7 @@ import styled from 'styled-components';
 import { Link } from 'react-router-dom';
 
 const Styles = styled.div`
-    .paddind-bottom {
+    .padding-bottom {
         padding-bottom: 16px;
     }
 
@@ -22,7 +22,7 @@ class Home extends Component {
         return (
             <Styles>
                 <Container>
-                    <Row className="paddind-bottom">
+                    <Row className="padding-bottom">
                         <Col lg={{ span: 12 }} className="center">
                             <Jumbotron>
                                 <h1>Hello</h1>

app/app/src/Login.js

@@ -9,7 +9,7 @@ import { Notifier } from './utils/Notifier'
 import styled from 'styled-components'
 
 const Styles = styled.div`
-    .paddind-top {
+    .padding-top {
         padding-top: 16px;
     }
 
@@ -84,7 +84,7 @@ export class Login extends Component {
         return (
             <Styles>
                 <Container>
-                    <Row className="paddind-top">
+                    <Row className="padding-top">
                         <Col lg={{ offset: 3, span: 6 }}>
                             <Card>
                                 <Card.Body>

app/app/src/utils/Auth.js

@@ -136,10 +136,7 @@ export class Auth {
     checkUserToken = async () => {
         let user_authenticated = false
         let auth_cookie = this.cookies.get("authentication")
-        if (auth_cookie 
-            && "token" in auth_cookie 
-            && "authenticated" in auth_cookie 
-            && auth_cookie["authenticated"]) {
+        if (auth_cookie && "token" in auth_cookie && "authenticated" in auth_cookie && auth_cookie["authenticated"]) {
             const api_check = await this.#requestLoginCheck(auth_cookie.token)
             if (api_check === undefined || api_check.error) {
                 Notifier.notifyFromResponse(api_check, "Token check", "Token check failure")