From 561b26ab228bcaba82fc2802384ef1dc3421a1b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Geuken?= <bgeuken@suse.de>
Date: Wed, 9 Aug 2017 17:44:34 +0200
Subject: [PATCH] [api] DRY code by using existing methods
We already have a method for creating users with fake passwords. Let's
use it.
Cherry-picked from 86473a4bd4d6ccd03548d5496ce29238ed645e21
---
src/api/app/models/user.rb | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/src/api/app/models/user.rb b/src/api/app/models/user.rb
index a13697e2ae..af5099eb28 100644
--- a/src/api/app/models/user.rb
+++ b/src/api/app/models/user.rb
@@ -194,14 +194,7 @@ class User < ActiveRecord::Base
end
def self.create_ldap_user(attributes = {})
- # Generate and store a 24 char fake pw in the OBS DB that no-one knows
- password = SecureRandom.base64
- user = User.create(attributes.merge(
- password: password,
- password_confirmation: password,
- state: User.default_user_state,
- adminnote: "User created via LDAP"
- ))
+ user = create_user_with_fake_pw!(attributes.merge(state: default_user_state, adminnote: "User created via LDAP"))
if user.errors.empty?
logger.debug("Created new user...")
--
GitLab