omniauth-nextcloud 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1311dd4e0d9237de153bad4b0396602fb2702c54a22017e389d3609e3917e82a
-  data.tar.gz: 85117f5dcb02df9439c9072e58c38717e3a1f7e996e8cc4a635c3f2169f0ec6c
+  metadata.gz: 762ed8b8bbe3fa1fb7e93aa1e982b31311266f2f0df9fdc563f12b9bf816d9a8
+  data.tar.gz: fae79f69152e32557891bc687a28a2dbf6d0d90df01a5c2ca32db5b99791d5df
 SHA512:
-  metadata.gz: c786e179a8b614c06598b17095ef4823f12bd5fcdcb8eebbae8e1e007c2b25941d4d082f3af5ac1084a8a23dcb03e4be9151f0deabfdc3f24a1f9316784da252
-  data.tar.gz: 2dd7ac856c6d88ed85e9c52a95f872febc2da1afb1bc9503c5c219be6d4cd925b92770f04e22c09ff12a6e51e489f0ca1f731eb4e28a6f846f855d6223a0a0e5
+  metadata.gz: fcb9f9463912e6dcf9bcd4f83772d71378f5c98a602849be04942def7eba5285bf0560c9ba238accebd89206c11054e6bb417cacdd43d3838e1b26a22191f440
+  data.tar.gz: d7e4d38e14850784888a163755c41e98bc132f402e7d33e222974929af9ed40f53223b8d72fc73cc2130987bb747f4cc7089bb9f3df5836e3640858956529407

data/.rubocop.yml

@@ -1,5 +1,8 @@
 AllCops:
   TargetRubyVersion: 2.7
+  Exclude:
+    - 'spec/**/*.rb'
+
 
 Style/StringLiterals:
   Enabled: true

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    omniauth-nextcloud (0.2.0)
+    omniauth-nextcloud (0.2.2)
       omniauth (= 2.0.4)
-      omniauth-oauth2 (= 1.7.1)
+      omniauth-oauth2 (= 1.7.2)
       rexml (= 3.2.5)
 
 GEM
@@ -11,48 +11,32 @@ GEM
   specs:
     ast (2.4.2)
     diff-lcs (1.4.4)
-    faraday (1.8.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.7.1)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    hashie (4.1.0)
-    jwt (2.3.0)
+    faraday-net_http (3.0.2)
+    hashie (5.0.0)
+    jwt (2.5.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    oauth2 (1.4.7)
-      faraday (>= 0.8, < 2.0)
+    oauth2 (1.4.11)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
+      rack (>= 1.2, < 4)
     omniauth (2.0.4)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
       rack-protection
-    omniauth-oauth2 (1.7.1)
+    omniauth-oauth2 (1.7.2)
       oauth2 (~> 1.4)
       omniauth (>= 1.9, < 3)
     parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
-    rack (2.2.3)
-    rack-protection (2.1.0)
+    rack (2.2.4)
+    rack-protection (3.0.4)
       rack
     rainbow (3.0.0)
     rake (13.0.6)

data/README.md

@@ -22,13 +22,10 @@ Or install it yourself as:
 
 ### Configuration
 
+Create a new OAuth2 token in your Nextcloud instance. You can find the option in `Settings > Administration > Security` at the bottom of the page or using the link [https://nc.example.com/index.php/settings/admin/security#oauth2](https://nc.example.com/index.php/settings/admin/security#oauth2) by substituting the hostname.
+
 ```ruby
-NEXTCLOUD_URL = 'https://nc.bbz-cfp.ch'
-config.omniauth :nextcloud, ENV['NEXTCLOUD_APP_ID'], ENV['NEXTCLOUD_APP_SECRET'], client_options: {
-    :site => "#{NEXTCLOUD_URL}/index.php/apps/oauth2",
-    :authorize_url => "#{NEXTCLOUD_URL}/index.php/apps/oauth2/authorize",
-    :token_url => "#{NEXTCLOUD_URL}/index.php/apps/oauth2/api/v1/token",
-  }
+config.omniauth :nextcloud, ENV['NEXTCLOUD_APP_ID'], ENV['NEXTCLOUD_APP_SECRET'], site_url: 'https://nc.bbz-cfp.ch'
 ```
 
 ### Rails

data/lib/omniauth/nextcloud/version.rb

@@ -2,6 +2,6 @@
 
 module Omniauth
   module Nextcloud
-    VERSION = "0.2.0"
+    VERSION = "0.2.2"
   end
 end

data/lib/omniauth/strategies/nextcloud.rb

@@ -15,14 +15,17 @@ module OmniAuth
       # initializing your consumer from the OAuth gem.
       option :client_options, {}
 
-      def client
+      def merged_client_options
         overrides = options.client_options
-        client_options = {
+        {
           site: overrides.site || "#{options.site_url}/index.php/apps/oauth2",
           authorize_url: overrides.authorize_url || "#{options.site_url}/index.php/apps/oauth2/authorize",
           token_url: overrides.token_url || "#{options.site_url}/index.php/apps/oauth2/api/v1/token"
         }
-        ::OAuth2::Client.new(options.client_id, options.client_secret, deep_symbolize(client_options))
+      end
+
+      def client
+        ::OAuth2::Client.new(options.client_id, options.client_secret, deep_symbolize(merged_client_options))
       end
 
       # You may specify that your strategy should use PKCE by setting
@@ -50,7 +53,7 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= Hash.from_xml(access_token.get("/ocs/v2.php/cloud/user").body)
+        @raw_info ||= Hash.from_xml(access_token.get("#{options.site_url}/ocs/v2.php/cloud/user").body)
       end
     end
   end

data/omniauth-nextcloud.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   spec.add_dependency "omniauth", "2.0.4"
-  spec.add_dependency "omniauth-oauth2", "1.7.1"
+  spec.add_dependency "omniauth-oauth2", "1.7.2"
   spec.add_dependency "rexml", "3.2.5"
 
   # For more information and examples about making a new gem, checkout our

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-nextcloud
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Lukas_Skywalker
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-17 00:00:00.000000000 Z
+date: 2022-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ metadata:
   homepage_uri: https://github.com/code-fabrik/omniauth-nextcloud
   source_code_uri: https://github.com/code-fabrik/omniauth-nextcloud
   changelog_uri: https://github.com/code-fabrik/omniauth-nextcloud
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.22
-signing_key:
+signing_key: 
 specification_version: 4
 summary: omniauth provider for Nextcloud
 test_files: []