Merge pull request #706 from shimilgithub/api-refactor

Upgrade Kratos to v1.0.0

app/auth/authentication.py

@@ -386,11 +386,13 @@ def get_users_kratos_filter(base_url,name,roles,limit,skip):#pylint: disable=too
                 "userId":data["id"],
                 "name":data["traits"]["name"]
             }
-            kratos_user["name"]["fullname"] = data["traits"]["name"]["first"].capitalize() \
-                + " "+ data["traits"]["name"]["last"].capitalize()
+
+            first_name = data["traits"]["name"]["first"].capitalize()
+            last_name = data["traits"]["name"].get("last", "")
+            last_name = last_name.capitalize() if last_name else last_name
+            kratos_user["name"]["fullname"] = first_name+(" " + last_name if last_name else "")
             if not name is None:
                 if name.lower() == kratos_user["name"]["fullname"].lower() or\
-                    name.lower() == kratos_user["name"]["last"].lower() or\
                         name.lower() == kratos_user["name"]["first"].lower():
                     name_status = True
                 else:
@@ -486,12 +488,14 @@ def update_kratos_user(rec_user_id,data):
 def register_check_success(reg_response):
     """register reqirement success"""
     name_path = reg_response["identity"]["traits"]["name"]
+    last_name = name_path.get("last", "")
     data={
         "message":"Registration Successfull",
         "registered_details":{
             "id":reg_response["identity"]["id"],
             "email":reg_response["identity"]["traits"]["email"],
-            "Name":str(name_path["first"]) + " " + str(name_path["last"]),
+            "Name": str(name_path["first"]) + (" " + last_name if last_name else ""),
+
             "Permissions": reg_response["identity"]["traits"]["userrole"]
         },
         "token":reg_response["session_token"]

app/schema/schema_auth.py

@@ -41,7 +41,7 @@ class Registration(BaseModel):
     """kratos registration input"""
     email:str
     password:types.SecretStr
-    firstname:str = None
+    firstname:str
     lastname:str = None
 
 class EditUser(BaseModel):

app/test/test_auth_basic.py

@@ -40,7 +40,7 @@ def login(data):
     if response.status_code == 200:
         assert response.json()['message'] == "Login Succesfull"
         token =  response.json()['token']
-        assert len(token) == 32
+        assert len(token) == 39
         assert "userId" in response.json()
     elif response.status_code == 401:
         assert response.json()['error'] == "Authentication Error"
@@ -63,7 +63,7 @@ def register(data,apptype):
         assert "Permissions" in response.json()["registered_details"]
         assert "token" in response.json()
         token =  response.json()['token']
-        assert len(token) == 32
+        assert len(token) == 39
     return response
 
 #appending roles to same user on duplicate registration
@@ -213,7 +213,9 @@ def test_incorrect_email():
     """test for validation of incorrect email"""
     data = {
         "email": "incorrectemail",
-        "password": "passwordabc@1"
+        "password": "passwordabc@1",
+        "firstname": "user registration",
+        "lastname": "ABCD Test"
     }
     response = register(data,apptype=schema_auth.App.API.value)
     assert response.status_code == 422
@@ -225,7 +227,9 @@ def test_validate_password():
     #short password
     data = {
         "email": "[email protected]",
-        "password": "test"
+        "password": "test",
+        "firstname": "user registration",
+        "lastname": "PQR Test"
     }
     response = register(data,apptype=schema_auth.App.API.value)
     assert response.status_code == 422
@@ -234,7 +238,9 @@ def test_validate_password():
     #less secure password
     data = {
         "email": "[email protected]",
-        "password": "password"
+        "password": "password",
+        "firstname": "user registration",
+        "lastname": "PQR Test"
     }
     response = register(data,apptype=schema_auth.App.API.value)
     assert response.status_code == 422
@@ -243,29 +249,20 @@ def test_validate_password():
 #test for optional params in registration
 def test_optional_register_params(create_user_fixture):
     """test for optional params in the registration"""
-    #app type is none
+    #app type is none and lastname is not passed
     data = {
-        "email": "[email protected]",
-        "password": "passwordabc@1",
-        "firstname": "user registration",
-        "lastname": "ABC Test"
+        "email": "[email protected]",
+        "password": "passwordabc@11",
+        "firstname": "user registration"
     }
     response = register(data,apptype=schema_auth.App.API.value)
     assert response.json()["registered_details"]["Permissions"] == \
         [schema_auth.App.API.value]
     abc_id = response.json()["registered_details"]["id"]
 
-    #no first and last name, registration execute without error
-    data = {
-        "email": "[email protected]",
-        "password": "passwordabc@1"
-    }
-    response1 = register(data,apptype=schema_auth.App.API.value)
-    abc1_id = response1.json()["registered_details"]["id"]
 
     users_list = create_user_fixture
     users_list.append(abc_id)
-    users_list.append(abc1_id)
 
 #test register with missing field
 def test_register_incorrectdatas():
@@ -384,7 +381,9 @@ def test_register_roles(create_user_fixture):
     # #role changed ag --> vachan
     data_xyz2 = {
         "email": "[email protected]",
-        "password": "passwordxyz2@1"
+        "password": "passwordxyz2@1",
+        "firstname": "xyz user 2",
+        "lastname": "xyz Test 2"
     }
     response2 = register_role_appending(data_xyz2,apptype=schema_auth.App.VACHAN.value)
     assert response2.json()["registered_details"]["Permissions"] ==\
@@ -393,7 +392,9 @@ def test_register_roles(create_user_fixture):
     #role changed none --> ag
     data_xyz3 = {
         "email": "[email protected]",
-        "password": "passwordxyz3@1"
+        "password": "passwordxyz3@1",
+        "firstname": "xyz user 3",
+        "lastname": "xyz Test 3"
     }
     response3 = register_role_appending(data_xyz3,apptype=schema_auth.App.AG.value)
     assert response3.json()["registered_details"]["Permissions"] ==\
@@ -423,15 +424,19 @@ def test_role_assignment_superadmin(create_user_fixture):
     #create 2 users
     user1 = {
         "email": "[email protected]",
-        "password": "passwordvachan@1"
+        "password": "passwordvachan@1",
+        "firstname": "vachan",
+        "lastname": "User Test"
     }
     response1 = register(user1,apptype=schema_auth.App.API.value)
     user1_id = response1.json()["registered_details"]["id"]
     assert response1.json()["registered_details"]["Permissions"] == [schema_auth.App.API.value]
 
     user2 = {
         "email": "[email protected]",
-        "password": "passwordag@1"
+        "password": "passwordag@1",
+        "firstname": "Ag",
+        "lastname": "User Test"
     }
     response2 = register(user2,apptype=schema_auth.App.API.value)
     user2_id = response2.json()["registered_details"]["id"]
@@ -494,7 +499,9 @@ def test_token_expiry(create_user_fixture):
     #try change role with super user after logout
     user = {
         "email": "[email protected]",
-        "password": "passworduser@1"
+        "password": "passworduser@1",
+        "firstname": "user ",
+        "lastname": "role change Test"
     }
     response2 = register(user,apptype=schema_auth.App.API.value)
     user_id = response2.json()["registered_details"]["id"]

docker/Kratos_config/database.yml

@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   kratos-migrate:
-    image: oryd/kratos:v0.7.0-alpha.1
+    image: oryd/kratos:v1.0.0
     environment:
       - DSN=${VACHAN_AUTH_DATABASE:-postgres://kratos:secret@postgresd:5432/kratos?sslmode=disable&max_conns=20&max_idle_conns=4}
     volumes:

docker/Kratos_config/email-password/kratos.yml

@@ -11,9 +11,9 @@ serve:
     base_url: http://kratos:4434/
 
 selfservice:
-  default_browser_return_url: http://127.0.0.1:4455/
-  whitelisted_return_urls:
-    - http://127.0.0.1:4455
+  default_browser_return_url: http://kratos:4455/
+  allowed_return_urls:
+    - http://kratos:4455
 
   methods:
     password:
@@ -23,33 +23,33 @@ selfservice:
 
   flows:
     error:
-      ui_url: http://127.0.0.1:4455/error
+      ui_url: http://kratos:4455/error
 
     settings:
-      ui_url: http://127.0.0.1:4455/settings
+      ui_url: http://kratos:4455/settings
       privileged_session_max_age: 15m
 
     recovery:
       enabled: true
-      ui_url: http://127.0.0.1:4455/recovery
+      ui_url: http://kratos:4455/recovery
 
     verification:
       enabled: true
-      ui_url: http://127.0.0.1:4455/verify
+      ui_url: http://kratos:4455/verify
       after:
         default_browser_return_url: https://api.vachanengine.org/
 
     logout:
       after:
-        default_browser_return_url: http://127.0.0.1:4455/auth/login
+        default_browser_return_url: http://kratos:4455/auth/login
 
     login:
-      ui_url: http://127.0.0.1:4455/auth/login
+      ui_url: http://kratos:4455/auth/login
       lifespan: 2m
 
     registration:
       lifespan: 10m
-      ui_url: http://127.0.0.1:4455/auth/registration
+      ui_url: http://kratos:4455/auth/registration
       after:
         password:
           hooks:
@@ -77,7 +77,10 @@ session:
   lifespan: 60m
 
 identity:
-  default_schema_url: file:///etc/config/kratos/identity.schema.json
+  default_schema_id: default
+  schemas:
+    - id: default
+      url: file:///etc/config/kratos/identity.schema.json
 
 # courier:
 #   smtp:

docker/Kratos_config/quickstart.yml

@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
   kratos-migrate:
-    image: oryd/kratos:v0.7.0-alpha.1
+    image: oryd/kratos:v1.0.0
     environment:
       - DSN=postgres://kratos:secret@postgresd:5432/kratos?sslmode=disable&max_conns=20&max_idle_conns=4
     volumes:
@@ -19,7 +19,7 @@ services:
       - intranet
 
   kratos-selfservice-ui-node:
-    image: oryd/kratos-selfservice-ui-node:v0.7.0-alpha.1
+    image: oryd/kratos-selfservice-ui-node:v1.0.0
     environment:
       - KRATOS_PUBLIC_URL=http://kratos:4433/
       - KRATOS_ADMIN_URL=http://kratos:4434/
@@ -30,7 +30,7 @@ services:
   kratos:
     depends_on:
       - kratos-migrate
-    image: oryd/kratos:v0.7.0-alpha.1
+    image: oryd/kratos:v1.0.0
     ports:
       - '4433:4433' # public
       - '4434:4434' # admin

docker/docker-compose.yml

@@ -23,7 +23,7 @@ services:
       - VE-network
 
  kratos-migrate:
-    image: oryd/kratos:v0.7.0-alpha.1
+    image: oryd/kratos:v1.0.0
     environment:
       - DSN=${VACHAN_AUTH_DATABASE:-postgres://kratos:secret@kratos-postgresd:5432/kratos?sslmode=disable&max_conns=20&max_idle_conns=4}
     volumes:
@@ -44,7 +44,7 @@ services:
       - VE-network
 
  kratos:
-    image: oryd/kratos:v0.7.0-alpha.1
+    image: oryd/kratos:v1.0.0
     ports:
       - '4433:4433' # public
       # - '4434:4434' # admin