Merge branch 'develop' into i489-hide-double-nested-properties

Author: nabeta

.circleci/config.yml

@@ -1,32 +1,33 @@
 version: 2.1
 orbs:
-  ruby: circleci/ruby@0.1.2 
+  ruby: circleci/ruby@1.8.0
 
 jobs:
   build:
     docker:
-      - image: circleci/ruby:2.7.4-buster-node
-      - image: circleci/postgres:12-alpine
+      - image: cimg/ruby:2.7.4-browsers
+      - image: cimg/postgres:12.11
         environment:
           POSTGRES_USER: postgres
           POSTGRES_DB: hyrax_test
-      - image: circleci/redis:6.2
+      - image: cimg/redis:6.2
+      - image: clamav/clamav:stable
     steps:
       - checkout
       - restore_cache:
           keys:
             - rails-demo-{{ checksum "hyrax/Gemfile.lock" }}
             - rails-demo-
+      - run:
+          name: apt install
+          command: |
+            sudo apt update
+            sudo apt install -y openjdk-11-jre-headless libmediainfo-dev libxslt1-dev libsqlite3-dev
       - run:
           name: bundle install
           command: |
             cd hyrax
             bundle install --jobs 4 --retry 3
-      - run:
-          name: apt install
-          command: |
-            sudo apt update
-            sudo apt install -y openjdk-11-jre-headless libmediainfo-dev
       - run:
           name: download fits
           command: |

.env.template

@@ -100,26 +100,13 @@ SMTP_PORT=
 # Host used for generating URLs
 MDR_HOST=
 
-CAS_BASE_URL=https://cas.nims.go.jp/
-
-# For local docker-based setup for development, use:
-# CAS_BASE_URL=https://cas.mdr.nims.test:8443/cas/
-# and add the following two localhost pointers to your system's /etc/hosts file:
-# 127.0.0.1       mdr.nims.test         # <-- MDR website
-# 127.0.0.1       cas.mdr.nims.test     # <-- CAS server
-# and also trust the SSL certificate for cas.mdr.nims.test
-
-# CAS_VALIDATE_URL may need to be set depending on how MDR is configured
-# CAS_VALIDATE_URL=https://cas:8443/cas/serviceValidate
-# CAS_DESTINATION_URL=https://portal.nims.test/
-
 # OAI config used in config/initializers/oai_config.rb
 OAI_REPOSTIORY_NAME='NIMS MDR'
 OAI_REPOSITORY_URL=http://localhost:3000/catalog/oai
 OAI_RECORD_PREFIX=nims_mdr
 OAI_ADMIN_EMAIL=***REMOVED***
 
-# User Authorisation LDAP (runs after database / LDAP / CAS authentication)
+# User Authorisation LDAP (runs after database / LDAP authentication)
 USER_AUTHORISATION_LDAP_HOST=
 USER_AUTHORISATION_LDAP_PORT=389
 USER_AUTHORISATION_LDAP_ATTRIBUTE=uid
@@ -128,5 +115,10 @@ USER_AUTHORISATION_LDAP_BASE=
 WIKIBASE_BASE_URL=https://wikibase.example.jp
 WIKIBASE_SPARQL_QUERY_SYNONYM=/query/example?query=some_sparql_query
 
-FLUENTD_HOST=
-FLUENTD_URL=http://fluentd:24224/hyrax?messages_type=string
+AZURE_APP_ID=
+AZURE_APP_SECRET=
+AZURE_SCOPES=openid offline_access
+AZURE_OAUTH_SITE_URL=
+AZURE_OAUTH_AUTHORIZE_ENDPOINT=
+AZURE_OAUTH_TOKEN_ENDPOINT=
+AZURE_OAUTH_JWKS_URL=

.env.template.development

@@ -101,30 +101,24 @@ SMTP_PORT=
 
 MDR_HOST=
 
-CAS_BASE_URL=https://cas.nims.go.jp/
-
-# For local docker-based setup for development, use:
-# CAS_BASE_URL=https://cas.mdr.nims.test:8443/cas/
-# and add the following two localhost pointers to your system's /etc/hosts file:
-# 127.0.0.1       mdr.nims.test         # <-- MDR website
-# 127.0.0.1       cas.mdr.nims.test     # <-- CAS server
-# and also trust the SSL certificate for cas.mdr.nims.test
-
-# CAS_VALIDATE_URL may need to be set depending on how MDR is configured
-# CAS_VALIDATE_URL=https://cas:8443/cas/serviceValidate
-# CAS_DESTINATION_URL=https://portal.nims.test/
-
 # OAI config used in config/initializers/oai_config.rb
 OAI_REPOSTIORY_NAME='NIMS MDR'
 OAI_REPOSITORY_URL=http://localhost:3000/catalog/oai
 OAI_RECORD_PREFIX=nims_mdr
 OAI_ADMIN_EMAIL=***REMOVED***
 
-# User Authorisation LDAP (runs after database / LDAP / CAS authentication)
+# User Authorisation LDAP (runs after database / LDAP authentication)
 USER_AUTHORISATION_LDAP_HOST=
 USER_AUTHORISATION_LDAP_PORT=389
 USER_AUTHORISATION_LDAP_ATTRIBUTE=uid
 USER_AUTHORISATION_LDAP_BASE=
 
 WIKIBASE_BASE_URL=https://wikibase.example.jp
 WIKIBASE_SPARQL_QUERY_SYNONYM=/query/example?query=some_sparql_query
+
+AZURE_APP_ID=
+AZURE_APP_SECRET=
+AZURE_SCOPES='openid profile email offline_access user.read mailboxsettings.read calendars.readwrite'
+AZURE_OAUTH_SITE_URL=
+AZURE_OAUTH_AUTHORIZE_ENDPOINT=
+AZURE_OAUTH_TOKEN_ENDPOINT=

.gitignore

@@ -351,7 +351,6 @@ $RECYCLE.BIN/
 .env
 /hyrax/.fedora-test.pid
 /hyrax/.solr-test.pid
-cas/.mvn/jvm.config
 
 # Default HOST_APP_DATA_PATH in .env.template.development
-/data/
+/data/