Merge pull request #88 from mlibrary/omniauth-to-oauth2-proxy

Omniauth to oauth2 proxy

Author: niquerio

.github/workflows/build-main.yml

@@ -37,7 +37,7 @@ jobs:
     uses: mlibrary/platform-engineering-workflows/.github/workflows/deploy.yml@v1
     with:
       image: ${{ needs.build-unstable.outputs.image }}
-      file: environments/get-this/testing/web-image.txt
+      file: environments/get-this/workshop/web-image.txt
       CONFIG_REPO_RW_APP_ID: ${{ vars.CONFIG_REPO_RW_APP_ID }}
       CONFIG_REPO_RW_INSTALL_ID: ${{ vars.CONFIG_REPO_RW_INSTALL_ID }}
       CONFIG_REPO_FULL_NAME: ${{ vars.CONFIG_REPO_FULL_NAME }}

.github/workflows/manual-deploy-unstable.yaml

@@ -3,14 +3,6 @@ name: Manual Deploy Unstable
 on:
   workflow_dispatch:
     inputs:
-      tanka_env:
-        description: 'tanka environment'
-        required: true
-        type: choice
-        default: "testing"
-        options:
-          - "testing"
-          - "staging"
       tag:
         description: tag
         required: true
@@ -46,7 +38,7 @@ jobs:
     uses: mlibrary/platform-engineering-workflows/.github/workflows/deploy.yml@v1
     with:
       image: ${{ needs.build-unstable.outputs.image }}
-      file: environments/get-this/${{ github.event.inputs.tanka_env }}/web-image.txt
+      file: environments/get-this/workshop/web-image.txt
       CONFIG_REPO_RW_APP_ID: ${{ vars.CONFIG_REPO_RW_APP_ID }}
       CONFIG_REPO_RW_INSTALL_ID: ${{ vars.CONFIG_REPO_RW_INSTALL_ID }}
       CONFIG_REPO_FULL_NAME: ${{ vars.CONFIG_REPO_FULL_NAME }}

Gemfile

@@ -7,14 +7,12 @@ gem "puma"
 gem "yabeda-puma-plugin"
 gem "yabeda-prometheus"
 gem "activesupport" # in here because of timezone support
-gem "omniauth"
-gem "omniauth_openid_connect"
 gem "sinatra-flash"
 gem "rackup"
 
 gem "alma_rest_client",
   git: "https://github.com/mlibrary/alma_rest_client",
-  tag: "v2.0.0"
+  tag: "alma_rest_client/v2.2.0"
 
 # In order to get rspec to work for ruby 3.3. Maybe later see if it's still necessary
 gem "net-smtp", require: false

Gemfile.lock

@@ -1,10 +1,10 @@
 GIT
   remote: https://github.com/mlibrary/alma_rest_client
-  revision: 9606225d82480b6d1568902813ae9018dd8c1acc
-  tag: v2.0.0
+  revision: f94276a6e83d1526f7ec91c66aad1cee8b80f97d
+  tag: alma_rest_client/v2.2.0
   specs:
-    alma_rest_client (2.0.0)
-      activesupport (~> 7.0, >= 4.2)
+    alma_rest_client (2.2.0)
+      activesupport (~> 8.0)
       faraday
       faraday-retry
       httpx
@@ -13,9 +13,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.2.2.1)
-      activesupport (= 7.2.2.1)
-    activesupport (7.2.2.1)
+    activesupport (8.0.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -27,17 +25,15 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    aes_key_wrap (1.1.0)
     anyway_config (2.7.2)
       ruby-next-core (~> 1.0)
     ast (2.4.3)
-    attr_required (1.0.2)
     base64 (0.3.0)
     benchmark (0.4.1)
     bigdecimal (3.2.2)
-    bindata (2.5.1)
     byebug (12.0.0)
     climate_control (1.2.0)
     coderay (1.1.3)
@@ -46,14 +42,11 @@ GEM
     crack (1.0.0)
       bigdecimal
       rexml
-    date (3.4.1)
     diff-lcs (1.6.2)
     docile (1.4.1)
     drb (2.2.3)
     dry-initializer (3.2.0)
-    email_validator (2.2.4)
-      activemodel
-    faraday (2.13.1)
+    faraday (2.13.2)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -63,77 +56,48 @@ GEM
       net-http (>= 0.5.0)
     faraday-retry (2.3.2)
       faraday (~> 2.0)
+    ffi (1.17.2)
+    ffi (1.17.2-aarch64-linux-gnu)
+    ffi (1.17.2-aarch64-linux-musl)
+    ffi (1.17.2-arm-linux-gnu)
+    ffi (1.17.2-arm-linux-musl)
+    ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x86-linux-gnu)
+    ffi (1.17.2-x86-linux-musl)
+    ffi (1.17.2-x86_64-darwin)
     ffi (1.17.2-x86_64-linux-gnu)
+    ffi (1.17.2-x86_64-linux-musl)
     hashdiff (1.2.0)
-    hashie (5.0.0)
     http-2 (1.1.1)
     httpx (1.5.1)
       http-2 (>= 1.0.0)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.12.2)
-    json-jwt (1.16.7)
-      activesupport (>= 4.2)
-      aes_key_wrap
-      base64
-      bindata
-      faraday (~> 2.0)
-      faraday-follow_redirects
+    json (2.13.0)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    mail (2.8.1)
-      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
     method_source (1.1.0)
-    mini_mime (1.1.5)
     minitest (5.25.5)
-    multi_json (1.15.0)
+    multi_json (1.16.0)
     mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
     net-http (0.6.0)
       uri
-    net-imap (0.5.9)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
     net-protocol (0.2.2)
       timeout
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
-    omniauth (2.1.3)
-      hashie (>= 3.4.6)
-      rack (>= 2.2.3)
-      rack-protection
-    omniauth_openid_connect (0.8.0)
-      omniauth (>= 1.9, < 3)
-      openid_connect (~> 2.2)
-    openid_connect (2.3.1)
-      activemodel
-      attr_required (>= 1.0.0)
-      email_validator
-      faraday (~> 2.0)
-      faraday-follow_redirects
-      json-jwt (>= 1.16)
-      mail
-      rack-oauth2 (~> 2.2)
-      swd (~> 2.0)
-      tzinfo
-      validate_url
-      webfinger (~> 2.0)
     parallel (1.27.0)
     parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
     prism (1.4.0)
-    prometheus-client (4.2.4)
+    prometheus-client (4.2.5)
       base64
     pry (0.15.2)
       coderay (~> 1.1)
@@ -146,13 +110,6 @@ GEM
       nio4r (~> 2.0)
     racc (1.8.1)
     rack (3.1.16)
-    rack-oauth2 (2.2.1)
-      activesupport
-      attr_required
-      faraday (~> 2.0)
-      faraday-follow_redirects
-      json-jwt (>= 1.11.0)
-      rack (>= 2.1.0)
     rack-protection (4.1.1)
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
@@ -194,7 +151,7 @@ GEM
       rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.1)
+    rubocop-ast (1.46.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-performance (1.25.0)
@@ -209,7 +166,7 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.1)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
     sinatra (4.1.1)
       logger (>= 1.6.0)
@@ -238,26 +195,14 @@ GEM
     standard-performance (1.8.0)
       lint_roller (~> 1.1)
       rubocop-performance (~> 1.25.0)
-    swd (2.0.3)
-      activesupport (>= 3)
-      attr_required (>= 0.0.5)
-      faraday (~> 2.0)
-      faraday-follow_redirects
-    tilt (2.6.0)
+    tilt (2.6.1)
     timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     uri (1.0.3)
-    validate_url (1.0.15)
-      activemodel (>= 3.0.0)
-      public_suffix
-    webfinger (2.1.3)
-      activesupport
-      faraday (~> 2.0)
-      faraday-follow_redirects
     webmock (3.25.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
@@ -276,7 +221,17 @@ GEM
       yabeda (~> 0.5)
 
 PLATFORMS
-  x86_64-linux
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  ruby
+  x86-linux-gnu
+  x86-linux-musl
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
   activesupport
@@ -285,8 +240,6 @@ DEPENDENCIES
   faraday-follow_redirects
   listen
   net-smtp
-  omniauth
-  omniauth_openid_connect
   pry
   pry-byebug
   puma
@@ -303,4 +256,4 @@ DEPENDENCIES
   yabeda-puma-plugin
 
 BUNDLED WITH
-   2.6.9
+   2.5.23

README.md

@@ -26,9 +26,14 @@ docker compose up -d
 
 ## Updating `institution_hours_exceptions.json`
 
-`config/institution_hours_exceptions.json` is a static file that needs to be updated yearly.
+`config/institution_hours_exceptions.json` is a static file that needs to be
+updated yearly.
 
-### Steps
+There is a github action that checks monthly for updates and then creates a
+pull request. By merging that pull request and making a release this will stay
+up-to-date.
+
+### Manual Steps
 
 1. Verify that you are using a production Alma API Key.
 
@@ -38,6 +43,7 @@ docker compose up -d
 docker compose run --rm web ruby bin/update_alma_config.rb
 ```
 
-The file `config/institution_hours_exceptions.json` will get replaced with the latest information.
+The file `config/institution_hours_exceptions.json` will get replaced with the
+latest information.
 
 3. Commit the file and go through the app release process. 

env.example

@@ -1,6 +1,4 @@
 ALMA_API_KEY='YOUR-ALMA-API-KEY'
-OIDC_CLIENT_SECRET='YOUR-OIDC-CLIENT-SECRET'
-OIDC_CLIENT_ID='YOUR-OIDC-CLIENT-ID'
-OIDC_ISSUER='https://your-oidc-issuer'
-WEBLOGIN_ON='false'
 ACCOUNT_URL='https://account.lib.umich.edu'
+APP_ENV='development'
+