app/controllers/api/user_controller.rb in gds-sso-15.0.0 vs app/controllers/api/user_controller.rb in gds-sso-15.0.1

- old
+ new

@@ -4,45 +4,47 @@ skip_before_action :verify_authenticity_token, raise: false before_action :authenticate_user! before_action :require_user_update_permission def update - user_json = JSON.parse(request.body.read)['user'] + user_json = JSON.parse(request.body.read)["user"] oauth_hash = build_gds_oauth_hash(user_json) GDS::SSO::Config.user_klass.find_for_gds_oauth(oauth_hash) - head :ok, content_type: 'text/plain' + head :ok, content_type: "text/plain" end def reauth - user = GDS::SSO::Config.user_klass.where(:uid => params[:uid]).first + user = GDS::SSO::Config.user_klass.where(uid: params[:uid]).first if user.nil? || user.set_remotely_signed_out! - head :ok, content_type: 'text/plain' + head :ok, content_type: "text/plain" else - head 500, content_type: 'text/plain' + head 500, content_type: "text/plain" end end - private - # This should mirror the object created by the omniauth-gds strategy/gem - # By doing this, we can reuse the code for creating/updating the user - def build_gds_oauth_hash(user_json) - OmniAuth::AuthHash.new( - uid: user_json['uid'], - provider: 'gds', - info: { - name: user_json['name'], - email: user_json['email'] - }, - extra: { - user: { - permissions: user_json['permissions'], - organisation_slug: user_json['organisation_slug'], - organisation_content_id: user_json['organisation_content_id'], - disabled: user_json['disabled'], - } - }) - end +private - def require_user_update_permission - authorise_user!("user_update_permission") - end + # This should mirror the object created by the omniauth-gds strategy/gem + # By doing this, we can reuse the code for creating/updating the user + def build_gds_oauth_hash(user_json) + OmniAuth::AuthHash.new( + uid: user_json["uid"], + provider: "gds", + info: { + name: user_json["name"], + email: user_json["email"], + }, + extra: { + user: { + permissions: user_json["permissions"], + organisation_slug: user_json["organisation_slug"], + organisation_content_id: user_json["organisation_content_id"], + disabled: user_json["disabled"], + }, + }, + ) + end + + def require_user_update_permission + authorise_user!("user_update_permission") + end end