Clean up more references to role

Author: lorenyu

app-rails/app/controllers/users/registrations_controller.rb

@@ -18,7 +18,7 @@ def create
     end
 
     begin
-      auth_service.register(@form.email, @form.password, @form.role)
+      auth_service.register(@form.email, @form.password)
     rescue Auth::Errors::BaseAuthError => e
       flash.now[:errors] = [ e.message ]
       return render :new, status: :unprocessable_entity
@@ -72,7 +72,7 @@ def auth_service
     end
 
     def registration_params
-      params.require(:users_registration_form).permit(:email, :password, :password_confirmation, :role, :spam_trap)
+      params.require(:users_registration_form).permit(:email, :password, :password_confirmation, :spam_trap)
     end
 
     def verify_account_params

app-rails/app/forms/users/registration_form.rb

@@ -3,7 +3,7 @@
 class Users::RegistrationForm
   include ActiveModel::Model
 
-  attr_accessor :email, :password, :password_confirmation, :role, :spam_trap
+  attr_accessor :email, :password, :password_confirmation, :spam_trap
 
   validates :email, :password, presence: true
   validates :email, format: { with: URI::MailTo::EMAIL_REGEXP }, if: -> { email.present? }

app-rails/app/models/user_role.rb

@@ -34,12 +34,12 @@ def respond_to_auth_challenge(code, challenge = {})
     handle_auth_result(response, challenge[:email])
   end
 
-  def register(email, password, role)
+  def register(email, password)
     # @TODO: Handle errors from the auth service, like when the email is already taken
     # See https://github.com/navapbc/template-application-rails/issues/15
     account = @auth_adapter.create_account(email, password)
 
-    create_db_user(account[:uid], email, account[:provider], role)
+    create_db_user(account[:uid], email, account[:provider])
   end
 
   # Verify the code sent to the user as part of their initial sign up process.
@@ -72,15 +72,14 @@ def disable_software_token(user)
 
   private
 
-    def create_db_user(uid, email, provider, role = "applicant")
-      Rails.logger.info "Creating User uid: #{uid}, and UserRole: #{role}"
+    def create_db_user(uid, email, provider)
+      Rails.logger.info "Creating User uid: #{uid}"
 
       user = User.create!(
         uid: uid,
         email: email,
         provider: provider,
       )
-      user_role = UserRole.create!(user: user, role: role)
       user
     end
 

app-rails/app/services/auth_service.rb

@@ -1,6 +1,6 @@
 <% content_for :title, t(".title") %>
 <% icon = "local_library" %>
-<% icon_color = @form.role == "applicant" ? "violet" : "mint" %>
+<% icon_color = "violet" %>
 
 <div class="bg-white padding-top-3 padding-bottom-5 padding-x-5 border border-base-lighter">
   <div class="text-center margin-bottom-2 padding-bottom-2 border-bottom border-base-lighter">

app-rails/app/views/users/registrations/new.html.erb

@@ -25,7 +25,6 @@
         users_registration_form: {
           email: email,
           password: "password",
-          role: "employer"
         },
         locale: "en"
       }
@@ -40,7 +39,6 @@
         users_registration_form: {
           email: "invalid",
           password: "password",
-          role: "employer"
         },
         locale: "en"
       }
@@ -53,7 +51,6 @@
         users_registration_form: {
           email: "UsernameExists@example.com",
           password: "password",
-          role: "employer"
         },
         locale: "en"
       }
@@ -68,7 +65,7 @@
         users_registration_form: {
           email: email,
           password: "password",
-          role: "employer",
+
           spam_trap: "I am a bot"
         },
         locale: "en"

app-rails/spec/controllers/users/registrations_controller_spec.rb

@@ -38,7 +38,7 @@
       expect(response.body).to have_selector(".usa-alert--error")
     end
 
-    it "signs in a applicant and redirects to their account page (for now)" do
+    it "signs in a user and redirects to their account page (for now)" do
       create(:user, uid: uid)
 
       post :create, params: {
@@ -141,7 +141,7 @@
       expect(response.body).to have_selector(".usa-alert--error")
     end
 
-    it "signs in a applicant and redirects to their account page (for now)" do
+    it "signs in a user and redirects to their account page (for now)" do
       create(:user, uid: uid)
       session[:challenge_session] = "session"
       session[:challenge_email] = "test@example.com"

app-rails/spec/controllers/users/sessions_controller_spec.rb

@@ -3,7 +3,7 @@
 valid_password = "password1234"
 
 RSpec.describe Users::RegistrationForm do
-  let (:form) { Users::RegistrationForm.new(role: "applicant") }
+  let (:form) { Users::RegistrationForm.new() }
 
   it "passes validation with valid email and password" do
     form.email = "test@example.com"

app-rails/spec/forms/users/registration_form_spec.rb

@@ -5,10 +5,10 @@
   let(:mock_auth_adapter) { Auth::MockAdapter.new(uid_generator: -> { mock_uid }) }
 
   describe "#register" do
-    it "creates a new user with the given role" do
+    it "creates a new user" do
       auth_service = AuthService.new(mock_auth_adapter)
 
-      auth_service.register("test@example.com", "password", "employer")
+      auth_service.register("test@example.com", "password")
 
       user = User.find_by(uid: mock_uid)
       expect(user).to be_present