refine user minting logic

Author: terrywbrady

app/lib/client/ldap/ldap.rb

@@ -442,13 +442,13 @@ def default_users(role)
     end
 
     def create_user(params)
-      ark = UC3S3::ConfigObjectsClient.client.mint(
+      dn = "uid=#{params.fetch('uid', '')},#{user_base}"
+      ark = UC3S3::ConfigObjectsClient.client.mint_user(
         UC3S3::ConfigObjectsClient.client.mint_user_url,
-        params.fetch('cn', '')
+        dn
       )
       logger.info("User Ark Minted: #{ark}")
 
-      dn = "uid=#{params.fetch('uid', '')},#{user_base}"
       attributes = {
         objectclass: %w[top person organizationalPerson merrittUser inetOrgPerson],
         uid: params.fetch('uid', ''),

app/lib/client/s3/config_objects.rb

@@ -162,18 +162,9 @@ def mint_user_url
       "#{@ezidconf.fetch(:api, 'http://ezid:4567')}/shoulder/#{@ezidconf.fetch(:user_shoulder, 'ark:/99166/p9')}"
     end
 
-    def mint(url, description)
+    def do_mint(url, body)
       raise 'Minting not supported' unless @ezidconf.fetch(:supported, true)
 
-      # https://ezid.cdlib.org/doc/apidoc.html#internal-metadata
-      body = []
-      body << "_target: #{@ezidconf.fetch(:target, '')}"
-      body << '_owner: merritt'
-      body << '_profile: erc'
-      body << '_status: reserved'
-      body << '_export: no'
-      body << "what: #{description}"
-
       r = post_url_body(
         url,
         body: body.join("\n"),
@@ -187,6 +178,34 @@ def mint(url, description)
       m[2]
     end
 
+    def mint(url, description)
+      # https://ezid.cdlib.org/doc/apidoc.html#internal-metadata
+      body = []
+      body << "_target: #{@ezidconf.fetch(:target, '')}"
+      body << '_owner: merritt'
+      body << '_profile: erc'
+      body << '_status: reserved'
+      body << '_export: no'
+      body << "what: #{description}"
+
+      do_mint(url, body)
+    end
+
+    def mint_user(url, dnid)
+      # https://ezid.cdlib.org/doc/apidoc.html#internal-metadata
+      body = []
+      body << "_target: #{@ezidconf.fetch(:target, '')}"
+      body << '_owner: merritt'
+      body << '_profile: erc'
+      body << '_status: reserved'
+      body << '_export: no'
+      body << "who: #{dnid}"
+      body << 'what: Merritt User'
+      body << "when: #{Date.today.strftime('%Y-%m-%d')}"
+
+      do_mint(url, body)
+    end
+
     def create_collection(params)
       ark = mint(mint_collection_url, params.fetch('description', ''))
       logger.info("Collection Ark Minted: #{ark}")