Feature/w oa 01b

modules/weko-accounts/setup.py

@@ -109,6 +109,7 @@
             'weko_accounts_embedded_ds_multi_lang_js = '
             'weko_accounts.bundles:embedded_ds_multi_language_js',
             'weko_accounts_suggest_js = weko_accounts.bundles:suggest_js',
+            'weko_accounts_shibuser_css = weko_accounts.bundles:shibuser_css',
         ],
     },
     extras_require=extras_require,

modules/weko-accounts/tests/conftest.py

@@ -46,6 +46,7 @@
 from weko_index_tree.models import Index
 from weko_records_ui import WekoRecordsUI
 from weko_redis.redis import RedisConnection
+from weko_search_ui import WekoSearchUI
 from weko_user_profiles import WekoUserProfiles
 
 from weko_accounts import WekoAccounts, WekoAccountsREST
@@ -102,6 +103,7 @@ def base_app(instance_path):
     WekoUserProfiles(app_)
     app_.register_blueprint(blueprint)
     WekoAccountsREST(app_)
+    WekoSearchUI(app_)
     return app_
 
 
@@ -189,7 +191,7 @@ def users(app, db):
     ds.add_role_to_user(generaluser, general_role)
     ds.add_role_to_user(originalroleuser, originalrole)
     ds.add_role_to_user(originalroleuser2, originalrole)
-    ds.add_role_to_user(originalroleuser2, repoadmin_role)
+    # ds.add_role_to_user(originalroleuser2, repoadmin_role)
     ds.add_role_to_user(student,studentrole)
 
     # Assign access authorization

modules/weko-accounts/tests/test_admin.py

@@ -1,7 +1,12 @@
 import pytest
+import json
 from mock import patch
 from flask import current_app,url_for,make_response
 from invenio_accounts.testutils import login_user_via_session as login
+from weko_admin.models import AdminSettings
+from invenio_accounts.models import User
+from sqlalchemy.orm.session import object_session
+
 
 class TestShibSettingView:
 
@@ -11,14 +16,14 @@ def test_index_acl_guest(self,client,session_time):
         assert res.status_code == 302
     @pytest.mark.parametrize('user_index, is_can',[
         (0,True),
-        (1,False),
+        (1,True),
         (2,False),
         (3,False),
         (4,False),
         (5,False),
         (6,False),
     ])
-    def test_index_acl(self,client,users,user_index,is_can,mocker):
+    def test_index_acl(self,client,users,user_index,is_can,mocker, admin_settings):
         mocker.patch("weko_accounts.admin.ShibSettingView.render",return_value=make_response())
         login(client=client,email=users[user_index]["email"])
         url = url_for("shibboleth.index",_external=True)
@@ -28,43 +33,191 @@ def test_index_acl(self,client,users,user_index,is_can,mocker):
         else:
             assert res.status_code == 403
     # .tox/c1/bin/pytest --cov=weko_accounts tests/test_admin.py::TestShibSettingView::test_index -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-workflow/.tox/c1/tmp
-    def test_index(self,client,users,mocker):
-        login(client=client,email=users[0]["email"])
-        url = url_for("shibboleth.index")
-        sibuser_html = 'weko_accounts/setting/shibuser.html'
-        mock_render = mocker.patch("weko_accounts.admin.ShibSettingView.render",return_value=make_response())
-        current_app.config.update(
-            WEKO_ACCOUNTS_SHIB_LOGIN_ENABLED=True
-        )
-        # shib_flg = 1
-        res = client.post(url,data=dict(
-            submit="shib_form",
-            shibbolethRadios="1"
-        ))
-        assert current_app.config["WEKO_ACCOUNTS_SHIB_LOGIN_ENABLED"] == True
-        assert res.status_code==200
-        mock_render.assert_called_with(sibuser_html,shib_flg="1")
-
-        mock_render = mocker.patch("weko_accounts.admin.ShibSettingView.render",return_value=make_response())
-        current_app.config.update(
-            WEKO_ACCOUNTS_SHIB_LOGIN_ENABLED=False
-        )
-        # shib_flg = 0
-        res = client.post(url,data=dict(
-            submit="shib_form",
-            shibbolethRadios="0"
-        ))
-        assert res.status_code == 200
-        assert current_app.config["WEKO_ACCOUNTS_SHIB_LOGIN_ENABLED"] == False
-        mock_render.assert_called_with(sibuser_html,shib_flg="0")
-
-        # raise BaseException
-        with patch("weko_accounts.admin.ShibSettingView.render",side_effect=BaseException):
-            res = client.post(url)
-            assert res.status_code == 400
-
-        # method is GET
-        mock_render = mocker.patch("weko_accounts.admin.ShibSettingView.render",return_value=make_response())
-        res = client.get(url)
-        assert res.status_code == 200
-        mock_render.assert_called_with(sibuser_html,shib_flg="0")
+    def test_index(self,app,client,users,mocker, admin_settings, db):
+        with app.app_context():
+            user = User.query.filter_by(email=users[0]['email']).first()
+            login(client=client, user=user)
+            url = url_for("shibboleth.index")
+            sibuser_html = 'weko_accounts/setting/shibuser.html'
+            mock_render = mocker.patch("weko_accounts.admin.ShibSettingView.render",return_value=make_response())
+            current_app.config["WEKO_ACCOUNTS_SHIB_LOGIN_ENABLED"] = True
+
+            # モックに渡す変数を設定
+            role_list = current_app.config['WEKO_ACCOUNTS_ROLE_LIST']
+            attr_list = current_app.config['WEKO_ACCOUNTS_ATTRIBUTE_LIST']
+            block_user_list = admin_settings[0].settings['blocked_ePPNs']
+            roles = admin_settings[2].settings
+            set_language = "en"
+            shib_flg = "1"
+            attributes = admin_settings[3].settings
+
+            data = {
+                "submit": "shib_form",
+                "shibbolethRadios": "1",
+                "block-eppn-option-list": json.dumps(block_user_list),
+                "enable-login-user-list": [],
+            }
+
+            for i, (_, value) in enumerate(roles.items()):
+                data[f"role-lists{i}"] = value
+
+            for i, (_, value) in enumerate(attributes.items()):
+                data[f"attr-lists{i}"] = value
+
+            # new_shib_flg = 1
+            res = client.post(url, data=data)
+
+            assert admin_settings[1].settings["shib_flg"] is True
+            assert res.status_code==200
+
+            mock_render.assert_called_with(
+                sibuser_html,
+                shib_flg=shib_flg,
+                set_language=set_language,
+                role_list=role_list,
+                attr_list=attr_list,
+                block_user_list=block_user_list,
+                enable_login_user_list=[],
+                **roles,
+                **attributes
+            )
+            current_app.config["WEKO_ACCOUNTS_SHIB_LOGIN_ENABLED"] = False
+
+            data["shibbolethRadios"] = "0"
+
+            # new_shib_flg = 0
+            res = client.post(url, data=data)
+
+            assert res.status_code == 200
+            assert admin_settings[1].settings["shib_flg"] is False
+            shib_flg = "0"
+            mock_render.assert_called_with(
+                sibuser_html,
+                shib_flg=shib_flg,
+                set_language=set_language,
+                role_list=role_list,
+                attr_list=attr_list,
+                block_user_list=block_user_list,
+                enable_login_user_list=[],
+                **roles,
+                **attributes
+            )
+
+            # デフォルトロールを変更
+            mock_render = mocker.patch("weko_accounts.admin.ShibSettingView.render",return_value=make_response())
+            roles = {
+                "gakunin_role": "Repository Administrator",
+                "orthros_outside_role": "None",
+                "extra_role": "Contributor"}  
+
+            for i, (_, value) in enumerate(roles.items()):
+                data[f"role-lists{i}"] = value
+
+            res = client.post(url, data=data)
+
+            assert res.status_code == 200
+            assert admin_settings[2].settings["gakunin_role"] == "Repository Administrator"
+            assert admin_settings[2].settings["orthros_outside_role"] == "None"
+            assert admin_settings[2].settings["extra_role"] == "Contributor"
+            mock_render.assert_called_with(
+                sibuser_html,
+                shib_flg=shib_flg,
+                set_language=set_language,
+                role_list=role_list,
+                attr_list=attr_list,
+                block_user_list=block_user_list,
+                enable_login_user_list=[],
+                **roles,
+                **attributes
+            )
+
+            # 属性を変更
+            mock_render = mocker.patch("weko_accounts.admin.ShibSettingView.render",return_value=make_response())
+            attributes = {
+                "shib_eppn": "eduPersonAffiliation",
+                "shib_role_authority_name": "eppn",
+                "shib_mail": "DisplayName",
+                "shib_user_name": "sn"}  
+
+            for i, (_, value) in enumerate(attributes.items()):
+                data[f"attr-lists{i}"] = value
+
+            res = client.post(url, data=data)
+
+            assert res.status_code == 200
+            assert admin_settings[3].settings["shib_eppn"] == "eduPersonAffiliation"
+            assert admin_settings[3].settings["shib_role_authority_name"] == "eppn"
+            assert admin_settings[3].settings["shib_mail"] == "DisplayName"
+            assert admin_settings[3].settings["shib_user_name"] == "sn"
+            mock_render.assert_called_with(
+                sibuser_html,
+                shib_flg=shib_flg,
+                set_language=set_language,
+                role_list=role_list,
+                attr_list=attr_list,
+                block_user_list=block_user_list,
+                enable_login_user_list=[],
+                **roles,
+                **attributes
+            )
+
+            # ブロックユーザーを変更
+            mock_render = mocker.patch("weko_accounts.admin.ShibSettingView.render",return_value=make_response())
+            block_user_list = ['test1','test2','test3'] 
+            data["block-eppn-option-list"] = json.dumps(block_user_list)
+
+            res = client.post(url, data=data)
+
+            assert res.status_code == 200
+            assert "test1" in admin_settings[0].settings["blocked_ePPNs"]
+
+            mock_render.assert_called_with(
+                sibuser_html,
+                shib_flg=shib_flg,
+                set_language=set_language,
+                role_list=role_list,
+                attr_list=attr_list,
+                block_user_list=str(block_user_list),
+                enable_login_user_list=[],
+                **roles,
+                **attributes
+            )
+
+            # raise BaseException
+            with patch("weko_accounts.admin.ShibSettingView.render",side_effect=BaseException):
+                res = client.post(url)
+                assert res.status_code == 400
+
+            # method is GET
+            mock_render = mocker.patch("weko_accounts.admin.ShibSettingView.render",return_value=make_response())
+            res = client.get(url)
+            assert res.status_code == 200
+            mock_render.assert_called_with(
+                sibuser_html,
+                shib_flg=shib_flg,
+                set_language=set_language,
+                role_list=role_list,
+                attr_list=attr_list,
+                block_user_list=block_user_list,
+                enable_login_user_list=[],
+                **roles,
+                **attributes
+            )
+
+    @pytest.fixture
+    def admin_settings(self, db):
+        settings = list()
+        settings.append(AdminSettings(id=6,name="blocked_user_settings",settings={"blocked_ePPNs": []}))
+        settings.append(AdminSettings(id=7,name="shib_login_enable",settings={"shib_flg": False}))
+        settings.append(AdminSettings(id=8,name="default_role_settings",settings={
+                        "gakunin_role": "Contributor",
+                        "orthros_outside_role": "Community Administrator",
+                        "extra_role": "None"}))
+        settings.append(AdminSettings(id=9,name="attribute_mapping",settings={
+                        "shib_eppn": "eppn",
+                        "shib_role_authority_name": "eduPersonAffiliation",
+                        "shib_mail": "mail",
+                        "shib_user_name": "DisplayName"}))
+        db.session.add_all(settings)
+        db.session.commit()
+        return settings