Fix pronto errors
This commit is contained in:
parent
98fd18077a
commit
3734e074a6
7 changed files with 17 additions and 8 deletions
|
|
@ -95,7 +95,7 @@ module Api
|
||||||
end
|
end
|
||||||
|
|
||||||
def restore_request_parameters
|
def restore_request_parameters
|
||||||
req = Rack::Request.new(request.env)
|
req = build_rack_request
|
||||||
req.update_param("client_id", session[:client_id])
|
req.update_param("client_id", session[:client_id])
|
||||||
req.update_param("redirect_uri", session[:redirect_uri])
|
req.update_param("redirect_uri", session[:redirect_uri])
|
||||||
req.update_param("response_type", response_type_as_space_seperated_values)
|
req.update_param("response_type", response_type_as_space_seperated_values)
|
||||||
|
|
@ -104,6 +104,10 @@ module Api
|
||||||
req.update_param("nonce", session[:nonce])
|
req.update_param("nonce", session[:nonce])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def build_rack_request
|
||||||
|
Rack::Request.new(request.env)
|
||||||
|
end
|
||||||
|
|
||||||
def response_type_as_space_seperated_values
|
def response_type_as_space_seperated_values
|
||||||
if session[:response_type].respond_to?(:map)
|
if session[:response_type].respond_to?(:map)
|
||||||
session[:response_type].map(&:to_s).join(" ")
|
session[:response_type].map(&:to_s).join(" ")
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ module Api
|
||||||
def create_code
|
def create_code
|
||||||
self.code = SecureRandom.hex(32)
|
self.code = SecureRandom.hex(32)
|
||||||
save
|
save
|
||||||
self.code
|
code
|
||||||
end
|
end
|
||||||
|
|
||||||
def create_access_token
|
def create_access_token
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ module Api
|
||||||
end
|
end
|
||||||
|
|
||||||
def image_uri
|
def image_uri
|
||||||
self.logo_uri ? self.logo_uri : "branding/logos/asterisk.png"
|
logo_uri ? logo_uri : "branding/logos/asterisk.png"
|
||||||
end
|
end
|
||||||
|
|
||||||
class << self
|
class << self
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,6 @@
|
||||||
class Api::V0::BasePresenter
|
module Api
|
||||||
|
module V0
|
||||||
|
class BasePresenter
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,8 @@ module Diaspora
|
||||||
config.action_mailer.asset_host = AppConfig.pod_uri.to_s
|
config.action_mailer.asset_host = AppConfig.pod_uri.to_s
|
||||||
|
|
||||||
config.middleware.use Rack::OAuth2::Server::Resource::Bearer, "OpenID Connect" do |req|
|
config.middleware.use Rack::OAuth2::Server::Resource::Bearer, "OpenID Connect" do |req|
|
||||||
Api::OpenidConnect::OAuthAccessToken.valid(Time.zone.now.utc).find_by(token: req.access_token) || req.invalid_token!
|
Api::OpenidConnect::OAuthAccessToken
|
||||||
|
.valid(Time.zone.now.utc).find_by(token: req.access_token) || req.invalid_token!
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ o_auth_query_params = %i(
|
||||||
Given /^I send a post request from that client to the implicit flow authorization endpoint$/ do
|
Given /^I send a post request from that client to the implicit flow authorization endpoint$/ do
|
||||||
client_json = JSON.parse(last_response.body)
|
client_json = JSON.parse(last_response.body)
|
||||||
visit new_api_openid_connect_authorization_path +
|
visit new_api_openid_connect_authorization_path +
|
||||||
"?client_id=#{client_json["client_id"]}&#{o_auth_query_params}"
|
"?client_id=#{client_json['client_id']}&#{o_auth_query_params}"
|
||||||
end
|
end
|
||||||
|
|
||||||
Given /^I send a post request from that client to the implicit flow authorization endpoint using a invalid client id/ do
|
Given /^I send a post request from that client to the implicit flow authorization endpoint using a invalid client id/ do
|
||||||
|
|
|
||||||
|
|
@ -8,14 +8,14 @@ module Api
|
||||||
@app = Rack::OAuth2::Server::Token.new do |req, res|
|
@app = Rack::OAuth2::Server::Token.new do |req, res|
|
||||||
o_auth_app = retrieve_client(req)
|
o_auth_app = retrieve_client(req)
|
||||||
if app_valid?(o_auth_app, req)
|
if app_valid?(o_auth_app, req)
|
||||||
handle_flows(o_auth_app, req, res)
|
handle_flows(req, res)
|
||||||
else
|
else
|
||||||
req.invalid_client!
|
req.invalid_client!
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def handle_flows(o_auth_app, req, res)
|
def handle_flows(req, res)
|
||||||
case req.grant_type
|
case req.grant_type
|
||||||
when :refresh_token
|
when :refresh_token
|
||||||
handle_refresh_flow(req, res)
|
handle_refresh_flow(req, res)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue