authorio 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a376e3f8c81fdc53ac6c223c42fedadb43cdc02129713ca6756db1506c07f10
-  data.tar.gz: 761c806afafae95a35e97e97b784ae4271cc09fb7cbb6eb6001571e9319cc6a2
+  metadata.gz: 415f389a073c49afa82e47fc8caa28fb66d5586cc81758f63e4840f953fb7950
+  data.tar.gz: 6184be72a5c9f999984c33d6b24e4bd09ea6f0a15469512df70c833610477a69
 SHA512:
-  metadata.gz: 32c86c4be9a8cf949ba616797d0a7b505213687d09435ae7c8e0a5588224076c73b0aab4e7b985af74baa89963dafabdc2db7f562982165886dc8085e2fd88c7
-  data.tar.gz: c9bbaf3bce9c291ddf5619a62caa03962d31c1e57abf0fe45baae96d2325cbd1f0d46f1d6c5477fb9cef6dafa9eb54f4ee2874820e8e74b662dd7e8c9d6aa77d
+  metadata.gz: fbfd300b93d372aa86257b484164be9944ce7950ebc91bfff3a1fe585f858e618e9dee0afbca33ea07953a8aea35b9c79f90cbca6b87e2b78e393cd7e1b9d810
+  data.tar.gz: ea5e5f5b850d0c88be5dfe2fbfd75abb747625059d544bfbd1988076a3c259bc69db8781036e4ad33d8a7d00f23577e06cc8402d11d0d126080334156048f9f1

data/README.md

@@ -34,13 +34,18 @@ You will need to install the migrations and then run them to add these tables
 $ rails authorio:install:migrations
 Copied migration 20210703002653_create_authorio_users.authorio.rb from authorio
 Copied migration 20210703002654_create_authorio_requests.authorio.rb from authorio
+Copied migration 20210710145519_create_authorio_tokens.authorio.rb from authorio
+
 $ rails db:migrate
 ...
 == 20210703002653 CreateAuthorioUsers: migrated (0.0038s) =====================
 ...
 == 20210703002654 CreateAuthorioRequests: migrated (0.0041s) ==================
+...
+== 20210710145519 CreateAuthorioTokens: migrated (0.0037s) ====================
 ```
 
+
 ### 4. Install Authorio routes
 Add the following line somewhere inside the `Rails.application.routes.draw do` block in your `config/routes.rb` file
 ```ruby
@@ -83,15 +88,29 @@ Now restart your rails app, and you should be all set!
 
 ## Usage
 
-To test your authentication endpoint, find an IndieAuth client you can log in to. A simple test is at [Pin13](pin13.net/login). Enter your site's URL and click Sign In.
+To test your authentication endpoint, find an IndieAuth client you can log in to. A simple test is to try and login
+to the [IndieWeb.org website](https://indieweb.org)
 
-You should be then be redirected back to your own site and the Authorio
-login UI  
+- From the home page, click on *Log In* in the upper right, or visit the [login page](https://sso.indieweb.org/login?url=https%3A%2F%2Findieweb.org%2FMain_Page) directly.
+- Enter your site's URL (or if you put the indieauth tag on a page other than your home page, enter that URL)
+- You should be then be redirected back to your own site and the Authorio login UI
+<p align="center">
 <img src="./auth-ui.png" width="400">
+</p>
 
-Enter the password you set up when you installed Authorio. This should redirect you back to the client where you
+- Enter the password you set up when you installed Authorio. This should redirect you back to the client where you
 will be logged in!
 
+## Configuration
+
+When you installed Authorio it placed a config file in `config/initializers/authorio.rb`. If you want to change
+one of the defaults you can uncomment it and specify it here.
+
+### TODO
+
+- [ ] Customizing the authentication view/UI
+- [ ] Customizing the authentication method
+
 ## Contributing
 Send pull requests to [Authorio on GitHub](https://github.com/reiterate-app/authorio)
 

data/app/controllers/authorio/auth_controller.rb

@@ -7,14 +7,9 @@ module Authorio
 
     def authorization_interface
       p = auth_req_params
+      p[:me] ||= "#{host_with_protocol}/"
 
-      path = if p[:me]
-        URI(p[:me]).path
-      else
-        '/'
-      end
-
-      user = User.find_by! profile_path: path
+      user = User.find_by! profile_path: URI(p[:me]).path
       @user_url = p[:me] || user_url(user)
 
       # If there are any old requests from this (client, user), delete them now
@@ -30,6 +25,10 @@ module Authorio
       auth_request.save
       session[:state] = p[:state]
       session[:code_challenge] = p[:code_challenge]
+
+    rescue ActiveRecord::RecordNotFound
+      flash.now[:alert] = "Invalid user"
+      redirect_back fallback_location: Authorio.authorization_path, allow_other_host: false
     end
 
     def authorize_user
@@ -43,6 +42,9 @@ module Authorio
         flash.now[:alert] = "Incorrect password. Try again."
         redirect_back fallback_location: Authorio.authorization_path, allow_other_host: false
       end
+    rescue ActiveRecord::RecordNotFound
+      flash.now[:alert] = "Invlaid user"
+      redirect_back fallback_location: Authorio.authorization_path, allow_other_host: false
     end
 
     def send_profile
@@ -70,13 +72,14 @@ module Authorio
     end
 
     def verify_token
-      token = Token.find_by auth_token: bearer_token
-      head :bad_request and return if token.nil?
+      token = Token.find_by! auth_token: bearer_token
       render json: {
         'me': user_url(token.authorio_user),
         'client_id': token.client,
         'scope': 'token.scope'
       }
+      rescue ActiveRecord::RecordNotFound
+        head :bad_request
     end
 
     private
@@ -94,8 +97,12 @@ module Authorio
       params.permit(:password, :url, :client)
     end
 
+    def host_with_protocol
+      "#{request.scheme}://#{request.host}"
+    end
+
     def user_url(user)
-      "#{request.scheme}://#{request.host}#{user.profile_path}"
+      "#{host_with_protocol}#{user.profile_path}"
     end
 
     def invalid_grant

data/app/views/authorio/auth/authorization_interface.html.erb

@@ -24,7 +24,7 @@
           <%= form.label(:url, "User URL") %>
           <%= form.text_field(:url, value: @user_url, readonly: true) %>
           <%= form.label(:password, "Password") %>
-          <%= form.password_field(:password) %>
+          <%= form.password_field(:password, autofocus: true) %>
           <%= form.hidden_field(:client, value: params[:client_id]) %>
           <%= form.submit("Sign in", class: 'btn btn-success') %>
           <% end %>

data/lib/authorio/version.rb

@@ -1,3 +1,3 @@
 module Authorio
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authorio
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Michael Meckler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-11 00:00:00.000000000 Z
+date: 2021-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,71 +36,71 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-description: Rails engine to add IndieAuth authentication endpoiont functionality
+        version: '11.0'
+description: Rails engine to add IndieAuth authentication endpoint functionality
 email:
 - rattroupe@reiterate-app.com
 executables: []