Preferred_username is store in DB prime_schema.

LayerManager · Dec 7, 2020 · 4d39645 · 4d39645
1 parent 427dac7
commit 4d39645
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/src/layman/authn/http_header/http_header_test.py b/src/layman/authn/http_header/http_header_test.py
@@ -28,6 +28,7 @@ def test_http_header():
                 'iss_id': 'test_http_header_issuer',
                 'sub': username,
                 'claims': {
+                    'preferred_username': username,
                     'given_name': username,
                     'family_name': username,
                     'middle_name': username,

diff --git a/src/layman/common/prime_db_schema/model.py b/src/layman/common/prime_db_schema/model.py
@@ -118,6 +118,7 @@ def setup_codelists_data():
 (
     id integer NOT NULL DEFAULT nextval('{DB_SCHEMA}.users_id_seq'::regclass),
     id_workspace integer REFERENCES {DB_SCHEMA}.workspaces (id),
+    preferred_username VARCHAR(256) COLLATE pg_catalog."default",
     given_name VARCHAR(256) COLLATE pg_catalog."default",
     family_name VARCHAR(256) COLLATE pg_catalog."default",
     middle_name VARCHAR(256) COLLATE pg_catalog."default",

diff --git a/src/layman/common/prime_db_schema/publications_test.py b/src/layman/common/prime_db_schema/publications_test.py
@@ -14,6 +14,7 @@
 userinfo = {"iss_id": 'mock_test',
             "sub": '1',
             "claims": {"email": "test@liferay.com",
+                       "preferred_username": 'test_preferred',
                        "name": "test ensure user",
                        "given_name": "test",
                        "family_name": "user",

diff --git a/src/layman/common/prime_db_schema/users.py b/src/layman/common/prime_db_schema/users.py
@@ -5,10 +5,11 @@
 
 
 def ensure_user(id_workspace, userinfo):
-    sql = f"""insert into {DB_SCHEMA}.users (id_workspace, given_name, family_name, middle_name, name, email, issuer_id, sub)
-values (%s, %s, %s, %s, %s, %s, %s, %s)
+    sql = f"""insert into {DB_SCHEMA}.users (id_workspace, preferred_username, given_name, family_name, middle_name, name, email, issuer_id, sub)
+values (%s, %s, %s, %s, %s, %s, %s, %s, %s)
 ON CONFLICT (id_workspace) DO update SET id_workspace = EXCLUDED.id_workspace returning id;"""
     data = (id_workspace,
+            userinfo["claims"]["preferred_username"],
             userinfo["claims"]["given_name"],
             userinfo["claims"]["family_name"],
             userinfo["claims"]["middle_name"],
@@ -32,6 +33,7 @@ def get_user_infos(username=None):
     sql = f"""with const as (select %s username)
 select u.id,
        w.name username,
+       u.preferred_username,
        u.given_name,
        u.family_name,
        u.middle_name,
@@ -48,14 +50,15 @@ def get_user_infos(username=None):
     values = util.run_query(sql, (username,))
     result = {username: {"id": user_id,
                          "username": username,
+                         "preferred_username": preferred_username,
                          "given_name": given_name,
                          "family_name": family_name,
                          "middle_name": middle_name,
                          "name": name,
                          "email": email,
                          "issuer_id": issuer_id,
                          "sub": sub,
-                         } for user_id, username, given_name, family_name, middle_name, name, email, issuer_id, sub in values}
+                         } for user_id, username, preferred_username, given_name, family_name, middle_name, name, email, issuer_id, sub in values}
     return result
 
 

diff --git a/src/layman/common/prime_db_schema/users_test.py b/src/layman/common/prime_db_schema/users_test.py
@@ -17,6 +17,7 @@ def test_ensure_user():
                 "sub": '1',
                 "claims": {"email": "test@liferay.com",
                            "name": "test ensure user",
+                           "preferred_username": 'test_preferred',
                            "given_name": "test",
                            "family_name": "user",
                            "middle_name": "ensure",
@@ -36,6 +37,7 @@ def test_delete_user():
     userinfo = {"iss_id": 'mock_test',
                 "sub": '1',
                 "claims": {"email": "test@liferay.com",
+                           "preferred_username": 'test_preferred',
                            "name": "test ensure user",
                            "given_name": "test",
                            "family_name": "user",

diff --git a/src/layman/user/rest_users_test.py b/src/layman/user/rest_users_test.py
@@ -15,6 +15,7 @@ def test_get_users():
     userinfo = {"iss_id": 'mock_test',
                 "sub": '1',
                 "claims": {"email": "test@liferay.com",
+                           "preferred_username": 'test_preferred',
                            "name": "test ensure user",
                            "given_name": "test",
                            "family_name": "user",