nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix account deleter specs

Browse source 
Squashed commits:

[7ff4276] Adjust discovery controller
This commit is contained in:
theworldbright 2015-07-25 15:44:34 +09:00
parent b173283692
commit 979adca1e7
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/openid_connect/discovery_controller.rb
View file

@ -18,8 +18,8 @@ class OpenidConnect::DiscoveryController < ApplicationController
token_endpoint: openid_connect_access_tokens_url, token_endpoint: openid_connect_access_tokens_url,
userinfo_endpoint: api_v0_user_url, userinfo_endpoint: api_v0_user_url,
jwks_uri: File.join(root_url, "openid_connect", "jwks.json"), jwks_uri: File.join(root_url, "openid_connect", "jwks.json"),
scopes_supported: Scope.pluck(:name), scopes_supported: OpenidConnect::Scope.pluck(:name),
response_types_supported: OAuthApplication.available_response_types, response_types_supported: OpenidConnect::OAuthApplication.available_response_types,
request_object_signing_alg_values_supported: %i(HS256 HS384 HS512), request_object_signing_alg_values_supported: %i(HS256 HS384 HS512),
subject_types_supported: %w(public pairwise), subject_types_supported: %w(public pairwise),
id_token_signing_alg_values_supported: %i(RS256), id_token_signing_alg_values_supported: %i(RS256),

1
app/models/user.rb
View file

@ -78,7 +78,6 @@ class User < ActiveRecord::Base
has_many :authorizations, class_name: "OpenidConnect::Authorization" has_many :authorizations, class_name: "OpenidConnect::Authorization"
has_many :o_auth_applications, through: :authorizations, class_name: "OpenidConnect::OAuthApplication" has_many :o_auth_applications, through: :authorizations, class_name: "OpenidConnect::OAuthApplication"
has_many :o_auth_access_tokens, through: :authorizations, class_name: "OpenidConnect::OAuthAccessToken"
before_save :guard_unconfirmed_email, before_save :guard_unconfirmed_email,
:save_person! :save_person!

2
db/schema.rb
View file

@ -11,7 +11,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20150714055110) do ActiveRecord::Schema.define(version: 20150724152052) do
create_table "account_deletions", force: :cascade do |t| create_table "account_deletions", force: :cascade do |t|
t.string "diaspora_handle", limit: 255 t.string "diaspora_handle", limit: 255

2
lib/account_deleter.rb
View file

@ -47,7 +47,7 @@ class AccountDeleter
#user deletions #user deletions
def normal_ar_user_associates_to_delete def normal_ar_user_associates_to_delete
%i(tag_followings invitations_to_me services aspects user_preferences %i(tag_followings invitations_to_me services aspects user_preferences
notifications blocks authorizations o_auth_applications o_auth_access_tokens id_tokens) notifications blocks authorizations o_auth_applications)
end end
def special_ar_user_associations def special_ar_user_associations