doorkeeper-mongodb 5.2.1 → 5.2.3

data/spec/requests/flows/authorization_code_spec.rb

@@ -49,11 +49,13 @@ feature "Authorization Code Flow" do
 
       access_token_should_exist_for(@client, @resource_owner)
 
-      should_not_have_json "error"
-
-      should_have_json "access_token", Doorkeeper::AccessToken.first.token
-      should_have_json "token_type", "Bearer"
-      should_have_json_within "expires_in", Doorkeeper::AccessToken.first.expires_in, 1
+      expect(json_response).to match(
+        "access_token" => Doorkeeper::AccessToken.first.token,
+        "token_type" => "Bearer",
+        "expires_in" => 7200,
+        "scope" => "default",
+        "created_at" => an_instance_of(Integer),
+      )
     end
   end
 
@@ -124,8 +126,10 @@ feature "Authorization Code Flow" do
 
     expect(Doorkeeper::AccessToken.count).to be_zero
 
-    should_have_json "error", "invalid_request"
-    should_have_json "error_description", translated_invalid_request_error_message(:missing_param, :code)
+    expect(json_response).to match(
+      "error" => "invalid_request",
+      "error_description" => translated_invalid_request_error_message(:missing_param, :code),
+    )
   end
 
   scenario "resource owner requests an access token with authorization code" do
@@ -137,11 +141,13 @@ feature "Authorization Code Flow" do
 
     access_token_should_exist_for(@client, @resource_owner)
 
-    should_not_have_json "error"
-
-    should_have_json "access_token", Doorkeeper::AccessToken.first.token
-    should_have_json "token_type", "Bearer"
-    should_have_json_within "expires_in", Doorkeeper::AccessToken.first.expires_in, 1
+    expect(json_response).to match(
+      "access_token" => Doorkeeper::AccessToken.first.token,
+      "token_type" => "Bearer",
+      "expires_in" => 7200,
+      "scope" => "default",
+      "created_at" => an_instance_of(Integer),
+    )
   end
 
   scenario "resource owner requests an access token with authorization code but without secret" do
@@ -156,8 +162,10 @@ feature "Authorization Code Flow" do
 
     expect(Doorkeeper::AccessToken.count).to be_zero
 
-    should_have_json "error", "invalid_client"
-    should_have_json "error_description", translated_error_message(:invalid_client)
+    expect(json_response).to match(
+      "error" => "invalid_client",
+      "error_description" => translated_error_message(:invalid_client),
+    )
   end
 
   scenario "resource owner requests an access token with authorization code but without client id" do
@@ -172,8 +180,10 @@ feature "Authorization Code Flow" do
 
     expect(Doorkeeper::AccessToken.count).to be_zero
 
-    should_have_json "error", "invalid_client"
-    should_have_json "error_description", translated_error_message(:invalid_client)
+    expect(json_response).to match(
+      "error" => "invalid_client",
+      "error_description" => translated_error_message(:invalid_client),
+    )
   end
 
   scenario "silently authorizes if matching token exists" do
@@ -192,7 +202,7 @@ feature "Authorization Code Flow" do
   end
 
   context "with PKCE" do
-    context "plain" do
+    context "when plain" do
       let(:code_challenge) { "a45a9fea-0676-477e-95b1-a40f72ac3cfb" }
       let(:code_verifier) { "a45a9fea-0676-477e-95b1-a40f72ac3cfb" }
 
@@ -216,8 +226,10 @@ feature "Authorization Code Flow" do
         authorization_code = current_params["code"]
         create_access_token authorization_code, @client, code_verifier
 
-        should_have_json "error", "invalid_grant"
-        should_have_json "error_description", translated_error_message(:invalid_grant)
+        expect(json_response).to match(
+          "error" => "invalid_grant",
+          "error_description" => translated_error_message(:invalid_grant),
+        )
       end
 
       scenario "mobile app requests an access token with authorization code and plain code challenge method" do
@@ -233,11 +245,13 @@ feature "Authorization Code Flow" do
 
         access_token_should_exist_for(@client, @resource_owner)
 
-        should_not_have_json "error"
-
-        should_have_json "access_token", Doorkeeper::AccessToken.first.token
-        should_have_json "token_type", "Bearer"
-        should_have_json_within "expires_in", Doorkeeper::AccessToken.first.expires_in, 1
+        expect(json_response).to match(
+          "access_token" => Doorkeeper::AccessToken.first.token,
+          "token_type" => "Bearer",
+          "expires_in" => 7200,
+          "scope" => "default",
+          "created_at" => an_instance_of(Integer),
+        )
       end
 
       scenario "mobile app requests an access token with authorization code but without code_verifier" do
@@ -251,9 +265,10 @@ feature "Authorization Code Flow" do
         authorization_code = current_params["code"]
         create_access_token authorization_code, @client, nil
 
-        should_not_have_json "access_token"
-        should_have_json "error", "invalid_request"
-        should_have_json "error_description", translated_invalid_request_error_message(:missing_param, :code_verifier)
+        expect(json_response).to match(
+          "error" => "invalid_request",
+          "error_description" => translated_invalid_request_error_message(:missing_param, :code_verifier),
+        )
       end
 
       scenario "mobile app requests an access token with authorization code with wrong code_verifier" do
@@ -267,13 +282,15 @@ feature "Authorization Code Flow" do
         authorization_code = current_params["code"]
         create_access_token authorization_code, @client, "wrong_code_verifier"
 
-        should_not_have_json "access_token"
-        should_have_json "error", "invalid_grant"
-        should_have_json "error_description", translated_error_message(:invalid_grant)
+        expect(json_response).not_to include("access_token")
+        expect(json_response).to match(
+          "error" => "invalid_grant",
+          "error_description" => translated_error_message(:invalid_grant),
+        )
       end
     end
 
-    context "s256" do
+    context "when S256" do
       let(:code_challenge) { "Oz733NtQ0rJP8b04fgZMJMwprn6Iw8sMCT_9bR1q4tA" }
       let(:code_verifier) { "a45a9fea-0676-477e-95b1-a40f72ac3cfb" }
 
@@ -303,11 +320,13 @@ feature "Authorization Code Flow" do
 
         access_token_should_exist_for(@client, @resource_owner)
 
-        should_not_have_json "error"
-
-        should_have_json "access_token", Doorkeeper::AccessToken.first.token
-        should_have_json "token_type", "Bearer"
-        should_have_json_within "expires_in", Doorkeeper::AccessToken.first.expires_in, 1
+        expect(json_response).to match(
+          "access_token" => Doorkeeper::AccessToken.first.token,
+          "token_type" => "Bearer",
+          "expires_in" => 7200,
+          "scope" => "default",
+          "created_at" => an_instance_of(Integer),
+        )
       end
 
       scenario "mobile app requests an access token with authorization code and without secret" do
@@ -325,9 +344,11 @@ feature "Authorization Code Flow" do
           redirect_uri: @client.redirect_uri,
           code_verifier: code_verifier,
         )
-        should_not_have_json "access_token"
-        should_have_json "error", "invalid_client"
-        should_have_json "error_description", translated_error_message(:invalid_client)
+
+        expect(json_response).to match(
+          "error" => "invalid_client",
+          "error_description" => translated_error_message(:invalid_client),
+        )
       end
 
       scenario "mobile app requests an access token with authorization code and without secret but is marked as not confidential" do
@@ -342,11 +363,14 @@ feature "Authorization Code Flow" do
           redirect_uri: @client.redirect_uri,
           code_verifier: code_verifier,
         )
-        should_not_have_json "error"
 
-        should_have_json "access_token", Doorkeeper::AccessToken.first.token
-        should_have_json "token_type", "Bearer"
-        should_have_json_within "expires_in", Doorkeeper::AccessToken.first.expires_in, 1
+        expect(json_response).to match(
+          "access_token" => Doorkeeper::AccessToken.first.token,
+          "token_type" => "Bearer",
+          "expires_in" => 7200,
+          "scope" => "default",
+          "created_at" => an_instance_of(Integer),
+        )
       end
 
       scenario "mobile app requests an access token with authorization code but no code verifier" do
@@ -360,9 +384,11 @@ feature "Authorization Code Flow" do
         authorization_code = current_params["code"]
         create_access_token authorization_code, @client
 
-        should_not_have_json "access_token"
-        should_have_json "error", "invalid_request"
-        should_have_json "error_description", translated_invalid_request_error_message(:missing_param, :code_verifier)
+        expect(json_response).not_to include("access_token")
+        expect(json_response).to match(
+          "error" => "invalid_request",
+          "error_description" => translated_invalid_request_error_message(:missing_param, :code_verifier),
+        )
       end
 
       scenario "mobile app requests an access token with authorization code with wrong verifier" do
@@ -376,12 +402,13 @@ feature "Authorization Code Flow" do
         authorization_code = current_params["code"]
         create_access_token authorization_code, @client, "incorrect-code-verifier"
 
-        should_not_have_json "access_token"
-        should_have_json "error", "invalid_grant"
-        should_have_json "error_description", translated_error_message(:invalid_grant)
+        expect(json_response).to match(
+          "error" => "invalid_grant",
+          "error_description" => translated_error_message(:invalid_grant),
+        )
       end
 
-      scenario "code_challenge_mehthod in token request is totally ignored" do
+      scenario "code_challenge_methhod in token request is totally ignored" do
         visit authorization_endpoint_url(
           client: @client,
           code_challenge: code_challenge,
@@ -397,9 +424,10 @@ feature "Authorization Code Flow" do
           code_challenge_method: "plain",
         )
 
-        should_not_have_json "access_token"
-        should_have_json "error", "invalid_grant"
-        should_have_json "error_description", translated_error_message(:invalid_grant)
+        expect(json_response).to match(
+          "error" => "invalid_grant",
+          "error_description" => translated_error_message(:invalid_grant),
+        )
       end
 
       scenario "expects to set code_challenge_method explicitely without fallback" do
@@ -477,7 +505,7 @@ feature "Authorization Code Flow" do
 
       expect(Doorkeeper::AccessToken.count).to be(2)
 
-      should_have_json "access_token", Doorkeeper::AccessToken.last.token
+      expect(json_response).to include("access_token" => Doorkeeper::AccessToken.last.token)
     end
 
     scenario "resource owner authorizes the client with extra scopes" do
@@ -490,41 +518,42 @@ feature "Authorization Code Flow" do
 
       expect(Doorkeeper::AccessToken.count).to be(2)
 
-      should_have_json "access_token", Doorkeeper::AccessToken.last.token
+      expect(json_response).to include("access_token" => Doorkeeper::AccessToken.last.token)
       access_token_should_have_scopes :public, :write
     end
   end
-end
 
-describe "Authorization Code Flow" do
-  before do
-    Doorkeeper.configure do
-      orm DOORKEEPER_ORM
-      use_refresh_token
-    end
+  context "when two requests sent" do
+    before do
+      Doorkeeper.configure do
+        orm DOORKEEPER_ORM
+        use_refresh_token
+      end
 
-    client_exists
-  end
+      client_exists
+    end
 
-  context "issuing a refresh token" do
-    let(:resource_owner) { FactoryBot.create(:resource_owner) }
+    describe "issuing a refresh token" do
+      let(:resource_owner) { FactoryBot.create(:resource_owner) }
 
-    before do
-      authorization_code_exists application: @client,
-                                resource_owner_id: resource_owner.id,
-                                resource_owner_type: resource_owner.class.name
-    end
+      before do
+        authorization_code_exists application: @client,
+                                  resource_owner_id: resource_owner.id,
+                                  resource_owner_type: resource_owner.class.name
+      end
 
-    it "second of simultaneous client requests get an error for revoked acccess token" do
-      authorization_code = Doorkeeper::AccessGrant.first.token
-      allow_any_instance_of(Doorkeeper::AccessGrant)
-        .to receive(:revoked?).and_return(false, true)
+      it "second of simultaneous client requests get an error for revoked access token" do
+        authorization_code = Doorkeeper::AccessGrant.first.token
+        allow_any_instance_of(Doorkeeper::AccessGrant)
+          .to receive(:revoked?).and_return(false, true)
 
-      post token_endpoint_url(code: authorization_code, client: @client)
+        page.driver.post token_endpoint_url(code: authorization_code, client: @client)
 
-      should_not_have_json "access_token"
-      should_have_json "error", "invalid_grant"
-      should_have_json "error_description", translated_error_message(:invalid_grant)
+        expect(json_response).to match(
+          "error" => "invalid_grant",
+          "error_description" => translated_error_message(:invalid_grant),
+        )
+      end
     end
   end
 end

data/spec/requests/flows/client_credentials_spec.rb

@@ -2,23 +2,22 @@
 
 require "spec_helper"
 
-describe "Client Credentials Request" do
+RSpec.describe "Client Credentials Request" do
   let(:client) { FactoryBot.create :application }
 
-  context "a valid request" do
+  context "with a valid request" do
     it "authorizes the client and returns the token response" do
       headers = authorization client.uid, client.secret
       params  = { grant_type: "client_credentials" }
 
       post "/oauth/token", params: params, headers: headers
 
-      should_have_json "access_token", Doorkeeper::AccessToken.first.token
-      should_have_json_within "expires_in", Doorkeeper.configuration.access_token_expires_in, 1
-      should_not_have_json "scope"
-      should_not_have_json "refresh_token"
-
-      should_not_have_json "error"
-      should_not_have_json "error_description"
+      expect(json_response).to match(
+        "access_token" => Doorkeeper::AccessToken.first.token,
+        "token_type" => "Bearer",
+        "expires_in" => Doorkeeper.configuration.access_token_expires_in,
+        "created_at" => an_instance_of(Integer),
+      )
     end
 
     context "with scopes" do
@@ -33,34 +32,38 @@ describe "Client Credentials Request" do
 
         post "/oauth/token", params: params, headers: headers
 
-        should_have_json "access_token", Doorkeeper::AccessToken.first.token
-        should_have_json "scope", "write"
+        expect(json_response).to include(
+          "access_token" => Doorkeeper::AccessToken.first.token,
+          "scope" => "write",
+        )
       end
 
-      context "that are default" do
+      context "when scopes are default" do
         it "adds the scope to the token an returns in the response" do
           headers = authorization client.uid, client.secret
           params  = { grant_type: "client_credentials", scope: "public" }
 
           post "/oauth/token", params: params, headers: headers
 
-          should_have_json "access_token", Doorkeeper::AccessToken.first.token
-          should_have_json "scope", "public"
+          expect(json_response).to include(
+            "access_token" => Doorkeeper::AccessToken.first.token,
+            "scope" => "public",
+          )
         end
       end
 
-      context "that are invalid" do
+      context "when scopes are invalid" do
         it "does not authorize the client and returns the error" do
           headers = authorization client.uid, client.secret
           params  = { grant_type: "client_credentials", scope: "random" }
 
           post "/oauth/token", params: params, headers: headers
 
-          should_have_json "error", "invalid_scope"
-          should_have_json "error_description", translated_error_message(:invalid_scope)
-          should_not_have_json "access_token"
-
           expect(response.status).to eq(400)
+          expect(json_response).to match(
+            "error" => "invalid_scope",
+            "error_description" => translated_error_message(:invalid_scope),
+          )
         end
       end
     end
@@ -82,8 +85,10 @@ describe "Client Credentials Request" do
 
       post "/oauth/token", params: params, headers: headers
 
-      should_have_json "error", "unauthorized_client"
-      should_have_json "error_description", translated_error_message(:unauthorized_client)
+      expect(json_response).to match(
+        "error" => "unauthorized_client",
+        "error_description" => translated_error_message(:unauthorized_client),
+      )
     end
 
     scenario "allows the request when satisfies condition" do
@@ -94,13 +99,12 @@ describe "Client Credentials Request" do
 
       post "/oauth/token", params: params, headers: headers
 
-      should_have_json "access_token", Doorkeeper::AccessToken.first.token
-      should_have_json_within "expires_in", Doorkeeper.configuration.access_token_expires_in, 1
-      should_not_have_json "scope"
-      should_not_have_json "refresh_token"
-
-      should_not_have_json "error"
-      should_not_have_json "error_description"
+      expect(json_response).to match(
+        "access_token" => Doorkeeper::AccessToken.first.token,
+        "token_type" => "Bearer",
+        "expires_in" => 7200,
+        "created_at" => an_instance_of(Integer),
+      )
     end
   end
 
@@ -122,8 +126,10 @@ describe "Client Credentials Request" do
       token = Doorkeeper::AccessToken.first
 
       expect(token.application_id).to eq client.id
-      should_have_json "access_token", token.token
-      should_have_json "scope", "public"
+      expect(json_response).to include(
+        "access_token" => token.token,
+        "scope" => "public",
+      )
     end
 
     it "issues new token with multiple default scopes that are present in application scopes" do
@@ -139,30 +145,33 @@ describe "Client Credentials Request" do
       token = Doorkeeper::AccessToken.first
 
       expect(token.application_id).to eq client.id
-      should_have_json "access_token", token.token
-      should_have_json "scope", "public read"
+      expect(json_response).to include(
+        "access_token" => token.token,
+        "scope" => "public read",
+      )
     end
   end
 
-  context "an invalid request" do
+  context "when request is invalid" do
     it "does not authorize the client and returns the error" do
       headers = {}
       params  = { grant_type: "client_credentials" }
 
       post "/oauth/token", params: params, headers: headers
 
-      should_have_json "error", "invalid_client"
-      should_have_json "error_description", translated_error_message(:invalid_client)
-      should_not_have_json "access_token"
-
       expect(response.status).to eq(401)
+
+      expect(json_response).to match(
+        "error" => "invalid_client",
+        "error_description" => translated_error_message(:invalid_client),
+      )
     end
   end
 
   context "when revoke_previous_client_credentials_token is true" do
     before do
-      allow(Doorkeeper.config).to receive(:reuse_access_token) { false }
-      allow(Doorkeeper.config).to receive(:revoke_previous_client_credentials_token) { true }
+      allow(Doorkeeper.config).to receive(:reuse_access_token).and_return(false)
+      allow(Doorkeeper.config).to receive(:revoke_previous_client_credentials_token?).and_return(true)
     end
 
     it "revokes the previous token" do
@@ -170,15 +179,15 @@ describe "Client Credentials Request" do
       params  = { grant_type: "client_credentials" }
 
       post "/oauth/token", params: params, headers: headers
-      should_have_json "access_token", Doorkeeper::AccessToken.first.token
+      expect(json_response).to include("access_token" => Doorkeeper::AccessToken.first.token)
 
       token = Doorkeeper::AccessToken.first
 
       post "/oauth/token", params: params, headers: headers
-      should_have_json "access_token", Doorkeeper::AccessToken.last.token
+      expect(json_response).to include("access_token" => Doorkeeper::AccessToken.last.token)
 
-      expect(token.reload.revoked?).to be_truthy
-      expect(Doorkeeper::AccessToken.last.revoked?).to be_falsey
+      expect(token.reload).to be_revoked
+      expect(Doorkeeper::AccessToken.last).not_to be_revoked
     end
 
     context "with a simultaneous request" do
@@ -194,8 +203,11 @@ describe "Client Credentials Request" do
         params  = { grant_type: "client_credentials" }
 
         post "/oauth/token", params: params, headers: headers
-        should_not_have_json "access_token"
-        should_have_json "error", "invalid_token_reuse"
+
+        expect(json_response).to match(
+          "error" => "invalid_token_reuse",
+          "error_description" => translated_error_message(:server_error),
+        )
       end
     end
   end

data/spec/requests/flows/implicit_grant_spec.rb

@@ -44,7 +44,7 @@ feature "Implicit Grant Flow (feature spec)" do
   end
 end
 
-describe "Implicit Grant Flow (request spec)" do
+RSpec.describe "Implicit Grant Flow (request spec)" do
   before do
     default_scopes_exist :default
     config_is_set(:authenticate_resource_owner) { User.first || redirect_to("/sign_in") }
@@ -53,8 +53,8 @@ describe "Implicit Grant Flow (request spec)" do
     create_resource_owner
   end
 
-  context "token reuse" do
-    it "should return a new token each request" do
+  context "when reuse_access_token enabled" do
+    it "returns a new token each request" do
       allow(Doorkeeper.configuration).to receive(:reuse_access_token).and_return(false)
 
       token = client_is_authorized(@client, @resource_owner, scopes: "default")
@@ -71,7 +71,7 @@ describe "Implicit Grant Flow (request spec)" do
       expect(response.location).not_to include(token.token)
     end
 
-    it "should return the same token if it is still accessible" do
+    it "returns the same token if it is still accessible" do
       allow(Doorkeeper.configuration).to receive(:reuse_access_token).and_return(true)
 
       token = client_is_authorized(@client, @resource_owner, scopes: "default")