Merge pull request #19 from ScilifelabDataCentre/develop

Bugfix for key login

backend/order.py

@@ -170,6 +170,7 @@ def add_order():  # pylint: disable=too-many-branches
     try:
         indata = flask.json.loads(flask.request.data)
     except json.decoder.JSONDecodeError:
+        logging.debug('Bad json')
         flask.abort(status=400)
 
     validation = utils.basic_check_indata(indata, order, ['_id'])

backend/user.py

@@ -54,19 +54,19 @@ def oidc_login():
 
 
 # requests
-@blueprint.route('/login/apikey', methods=['POST'])
+@blueprint.route('/login/apikey/', methods=['POST'])
 def key_login():
     """Log in using an apikey."""
     try:
         indata = flask.json.loads(flask.request.data)
     except json.decoder.JSONDecodeError:
         flask.abort(status=400)
 
-    if not 'api-username' in indata or not 'api-key' in indata:
+    if not 'api-user' in indata or not 'api-key' in indata:
+        logging.debug('API key login - bad keys: %s', indata)
         return flask.Response(status=400)
-    if not utils.verify_api_key(indata['api-username'], indata['api-key']):
-        return flask.Response(status=401)
-    do_login(auth_id=indata['api-username'])
+    utils.verify_api_key(indata['api-user'], indata['api-key'])
+    do_login(auth_id=indata['api-user'])
     return flask.Response(status=200)
 
 
@@ -114,7 +114,7 @@ def get_current_user_info():
     return flask.jsonify({'user': outstructure})
 
 # requests
-@blueprint.route('/me/apikey')
+@blueprint.route('/me/apikey/')
 @login_required
 def get_new_api_key():
     """

frontend/src/components/LoginPageKey.vue

@@ -8,7 +8,7 @@
              name="USERNAME"
              type="text"
              placeholder="username"
-             v-model="loginInfo.apiUsername"/>
+             v-model="loginInfo.apiUser"/>
     </div>
     <div class="field">
       <input id="apikey"
@@ -31,15 +31,17 @@ export default {
   data () {
     return {
       loginInfo: {
-        'apiUsername': '',
+        'apiUser': '',
         'apiKey': '',
       },
     }
   },
   methods: {
     submitLogin(event) {
       event.preventDefault();
-      this.$store.dispatch('loginKey', this.loginInfo)
+      let loginData = {'api-key': this.loginInfo.apiKey,
+                       'api-user': this.loginInfo.apiUser}
+      this.$store.dispatch('loginKey', loginData)
         .then((response) => {
           // add performed
           let uuid = '';

frontend/src/store/modules/user/index.js

@@ -41,12 +41,9 @@ const actions = {
 
   loginKey (context, payload) {
     return new Promise((resolve, reject) => {
-      let loginData = {};
-      loginData['api-username'] = payload.apiUsername;
-      loginData['api-key'] = payload.apiKey;
       axios
-        .post('/api/user/login/apikey',
-              loginData,
+        .post('/api/user/login/apikey/',
+              payload,
               {
                 headers: getCsrfHeader(),
               })