📎 Add additional reformating to specs naming

backend/src/app/config.clj

@@ -84,7 +84,7 @@
    ;; a server prop key where initial project is stored.
    :initial-project-skey "initial-project"})
 
-(s/def ::flags ::us/vec-of-keywords)
+(s/def ::flags ::us/vec-of-valid-keywords)
 
 ;; DEPRECATED PROPERTIES
 (s/def ::telemetry-enabled ::us/boolean)
@@ -93,7 +93,7 @@
 (s/def ::audit-log-archive-uri ::us/string)
 (s/def ::audit-log-gc-max-age ::dt/duration)
 
-(s/def ::admins ::us/set-of-str)
+(s/def ::admins ::us/set-of-non-empty-strings)
 (s/def ::file-change-snapshot-every ::us/integer)
 (s/def ::file-change-snapshot-timeout ::dt/duration)
 
@@ -128,8 +128,8 @@
 (s/def ::oidc-token-uri ::us/string)
 (s/def ::oidc-auth-uri ::us/string)
 (s/def ::oidc-user-uri ::us/string)
-(s/def ::oidc-scopes ::us/set-of-str)
-(s/def ::oidc-roles ::us/set-of-str)
+(s/def ::oidc-scopes ::us/set-of-non-empty-strings)
+(s/def ::oidc-roles ::us/set-of-non-empty-strings)
 (s/def ::oidc-roles-attr ::us/keyword)
 (s/def ::oidc-email-attr ::us/keyword)
 (s/def ::oidc-name-attr ::us/keyword)
@@ -165,7 +165,7 @@
 (s/def ::profile-complaint-threshold ::us/integer)
 (s/def ::public-uri ::us/string)
 (s/def ::redis-uri ::us/string)
-(s/def ::registration-domain-whitelist ::us/set-of-str)
+(s/def ::registration-domain-whitelist ::us/set-of-non-empty-strings)
 (s/def ::rlimit-font ::us/integer)
 (s/def ::rlimit-file-update ::us/integer)
 (s/def ::rlimit-image ::us/integer)

backend/src/app/http/assets.clj

@@ -29,7 +29,7 @@
 
 (defn coerce-id
   [id]
-  (let [res (us/uuid-conformer id)]
+  (let [res (parse-uuid id)]
     (when-not (uuid? res)
       (ex/raise :type :not-found
                 :hint "object not found"))

backend/src/app/http/debug.clj

@@ -9,7 +9,6 @@
   (:require
    [app.common.exceptions :as ex]
    [app.common.pprint :as pp]
-   [app.common.spec :as us]
    [app.common.uuid :as uuid]
    [app.config :as cf]
    [app.db :as db]
@@ -205,7 +204,7 @@
   [{:keys [pool]} request]
   (letfn [(parse-id [request]
             (let [id (get-in request [:path-params :id])
-                  id (us/uuid-conformer id)]
+                  id (parse-uuid id)]
               (when (uuid? id)
                 id)))
 

backend/src/app/rpc/mutations/teams.clj

@@ -353,7 +353,7 @@
 (declare create-team-invitation)
 
 (s/def ::email ::us/email)
-(s/def ::emails ::us/set-of-emails)
+(s/def ::emails ::us/set-of-valid-emails)
 (s/def ::invite-team-member
   (s/keys :req-un [::profile-id ::team-id ::role]
           :opt-un [::email ::emails]))
@@ -443,7 +443,7 @@
 
 ;; --- Mutation: Create Team & Invite Members
 
-(s/def ::emails ::us/set-of-emails)
+(s/def ::emails ::us/set-of-valid-emails)
 (s/def ::create-team-and-invite-members
   (s/and ::create-team (s/keys :req-un [::emails ::role])))