From 5d614dd7e52cdbb02aea7f1abef0327243591d0d Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 9 Mar 2020 16:22:56 +0100
Subject: [PATCH] Fix minor issues

---
 client/src/pages/check-email.vue              | 14 --------------
 client/src/pages/forgot-password.vue          |  7 -------
 client/src/pages/license-activation.vue       |  1 -
 server/core/hep_client.py                     | 19 +++++++++----------
 server/core/middleware.py                     |  2 +-
 server/core/settings.py                       |  2 +-
 server/core/utils.py                          |  2 ++
 server/registration/mutations_public.py       | 14 +++++---------
 .../registration/tests/test_registration.py   |  5 +----
 9 files changed, 19 insertions(+), 47 deletions(-)

diff --git a/client/src/pages/check-email.vue b/client/src/pages/check-email.vue
index b4eebee7..70f19bda 100644
--- a/client/src/pages/check-email.vue
+++ b/client/src/pages/check-email.vue
@@ -7,17 +7,3 @@
   </div>
 
 </template>
-
-<script>
-
-  export default {
-    components: {
-
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  @import "@/styles/_mixins.scss";
-
-</style>
diff --git a/client/src/pages/forgot-password.vue b/client/src/pages/forgot-password.vue
index cfffb31d..5436afd1 100644
--- a/client/src/pages/forgot-password.vue
+++ b/client/src/pages/forgot-password.vue
@@ -14,13 +14,6 @@
   </div>
 </template>
 
-<script>
-
-export default {
-  components: {},
-
-};
-</script>
 
 <style scoped lang="scss">
 @import "@/styles/_variables.scss";
diff --git a/client/src/pages/license-activation.vue b/client/src/pages/license-activation.vue
index 9c1348ad..6ca17012 100644
--- a/client/src/pages/license-activation.vue
+++ b/client/src/pages/license-activation.vue
@@ -54,7 +54,6 @@ import REDEEM_COUPON from '@/graphql/gql/mutations/redeemCoupon.gql';
 import ME_QUERY from '@/graphql/gql/meQuery.gql';
 
 export default {
-  components: {},
 
   methods: {
     validateBeforeSubmit() {
diff --git a/server/core/hep_client.py b/server/core/hep_client.py
index 348fe0db..bb18ad61 100644
--- a/server/core/hep_client.py
+++ b/server/core/hep_client.py
@@ -93,18 +93,17 @@ class HepClient:
         return response.json()
 
     def customer_me(self, token):
-        response = self._call('/rest/V1/customers/me', additional_headers={'authorization': 'Bearer {}'.format(token)})
+        response = self._call('/rest/V1/customers/me', additional_headers={'authorization': f'Bearer {token}'})
         return response.json()
 
     def customer_activate(self, confirmation_key, user_id):
-        response = self._call("/customer/account/confirm/?back_url=&id={}&key={}"
-                              .format(user_id, confirmation_key), method='get')
+        response = self._call(f'/customer/account/confirm/?back_url=&id={user_id}&key={confirmation_key}', method='get')
         return response
 
     def customers_search(self, admin_token, email):
-        response = self._call("/rest/V1/customers/search?searchCriteria[filterGroups][0][filters][0][field]="
-                                "email&searchCriteria[filterGroups][0][filters][0][value]={}".format(email),
-                              additional_headers={'authorization': 'Bearer {}'.format(admin_token)})
+        response = self._call('/rest/V1/customers/search?searchCriteria[filterGroups][0][filters][0][field]='
+                                f'email&searchCriteria[filterGroups][0][filters][0][value]={email}',
+                               additional_headers={'authorization': f'Bearer {admin_token}'})
 
         json_data = response.json()
         if len(json_data['items']) > 0:
@@ -113,19 +112,19 @@ class HepClient:
 
     def customers_by_id(self, admin_token, user_id):
         response = self._call('/rest/V1/customers/{}'.format(user_id),
-                              additional_headers={'authorization': 'Bearer {}'.format(admin_token)})
+                              additional_headers={'authorization': f'Bearer {admin_token}'})
         return response.json()
 
     def _customer_orders(self, admin_token, customer_id):
-        url = ("/rest/V1/orders/?searchCriteria[filterGroups][0][filters][0]["
-                "field]=customer_id&searchCriteria[filterGroups][0][filters][0][value]={}".format(customer_id))
+        url = ('/rest/V1/orders/?searchCriteria[filterGroups][0][filters][0]['
+                f'field]=customer_id&searchCriteria[filterGroups][0][filters][0][value]={customer_id}')
 
         response = self._call(url, additional_headers={'authorization': 'Bearer {}'.format(admin_token)})
         return response.json()
 
     def coupon_redeem(self, coupon, customer_id):
         try:
-            response = self._call('/rest/deutsch/V1/coupon/{}/customer/{}'.format(coupon, customer_id), method='put')
+            response = self._call(f'/rest/deutsch/V1/coupon/{coupon}/customer/{customer_id}', method='put')
         except HepClientException as e:
             return None
 
diff --git a/server/core/middleware.py b/server/core/middleware.py
index aebb3d91..3d3752c5 100644
--- a/server/core/middleware.py
+++ b/server/core/middleware.py
@@ -100,7 +100,7 @@ class UserLoggedInCookieMiddleWare(MiddlewareMixin):
         return response
 
 
-class UserHasLicenseeMiddleWare(MiddlewareMixin):
+class UserHasLicenseMiddleWare(MiddlewareMixin):
 
     def process_response(self, request, response):
         if request.path == '/api/graphql/':
diff --git a/server/core/settings.py b/server/core/settings.py
index ba3515ba..96fa4aa0 100644
--- a/server/core/settings.py
+++ b/server/core/settings.py
@@ -126,7 +126,7 @@ MIDDLEWARE += [
     'core.middleware.ThreadLocalMiddleware',
     'core.middleware.CommonRedirectMiddleware',
     'core.middleware.UserLoggedInCookieMiddleWare',
-    'core.middleware.UserHasLicenseeMiddleWare',
+    'core.middleware.UserHasLicenseMiddleWare',
 ]
 
 ROOT_URLCONF = 'core.urls'
diff --git a/server/core/utils.py b/server/core/utils.py
index fd3776ab..a50d46a6 100644
--- a/server/core/utils.py
+++ b/server/core/utils.py
@@ -34,6 +34,8 @@ def is_private_api_call_allowed(user, body):
     except AttributeError:
         return True
 
+    # logged in users should only be able to access all resources if the have a valid license
+    # logged in users without valid license have only access to logout, me & coupon mutations
     if re.search(r"mutation\s*.*\s*logout\s*{", body_unicode) or re.search(r"query\s*.*\s*me\s*{", body_unicode)\
         or re.search(r"mutation\s*Coupon", body_unicode):
         return True
diff --git a/server/registration/mutations_public.py b/server/registration/mutations_public.py
index 156bf918..6b5c7605 100644
--- a/server/registration/mutations_public.py
+++ b/server/registration/mutations_public.py
@@ -16,22 +16,18 @@ from core.models import AdminData
 from users.user_signup_login_handler import handle_user_and_verify_products, UNKNOWN_ERROR
 
 
-class RegistrationError(graphene.ObjectType):
-    field = graphene.String()
-
-
 class Registration(relay.ClientIDMutation):
     class Input:
-        confirmation_key_input = graphene.String()
+        confirmation_key = graphene.String()
         user_id_input = graphene.Int()
 
     success = graphene.Boolean()
     message = graphene.String()
-    errors = graphene.List(RegistrationError)  # todo: change for consistency
+
 
     @classmethod
     def mutate_and_get_payload(cls, root, info, **kwargs):
-        confirmation_key = kwargs.get('confirmation_key_input')
+        confirmation_key = kwargs.get('confirmation_key')
         user_id = kwargs.get('user_id_input')
 
         hep_client = HepClient()
@@ -53,7 +49,7 @@ class Registration(relay.ClientIDMutation):
         if status_msg:
             return cls.return_registration_msg(status_msg)
 
-        return cls(success=True, errors=[], message='success')
+        return cls(success=True, message='success')
 
     @classmethod
     def return_registration_msg(cls, message):
@@ -61,7 +57,7 @@ class Registration(relay.ClientIDMutation):
         if message == UNKNOWN_ERROR:
             raise Exception(message)
 
-        return cls(success=True, errors=[], message=message)
+        return cls(success=True, message=message)
 
 
 class RegistrationMutations:
diff --git a/server/registration/tests/test_registration.py b/server/registration/tests/test_registration.py
index 2f9b8f2a..8a022814 100644
--- a/server/registration/tests/test_registration.py
+++ b/server/registration/tests/test_registration.py
@@ -46,16 +46,13 @@ class RegistrationTests(TestCase):
               registration(input: $input) {
                 success
                 message
-                errors {
-                  field
-                }
               }
             }
         '''
 
         return self.client.execute(mutation, variables={
             'input': {
-                'confirmationKeyInput': confirmation_key,
+                'confirmationKey': confirmation_key,
                 'userIdInput': user_id
             }
         })