fix: Downloadable Config - org name, and credential names can have sp…

…aces Closes #197
adobe · Apr 28, 2020 · 019113e · 019113e
1 parent ee514d2
commit 019113e
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 20 deletions.
diff --git a/schema/config.schema.json b/schema/config.schema.json
@@ -77,7 +77,7 @@
                 "id": { "type": "string" },
                 "name": { 
                     "type": "string",
-                    "pattern": "^[a-zA-Z0-9]+$"
+                    "pattern": "^[ a-zA-Z0-9]+$"
                 },
                 "ims_org_id": { 
                     "type": "string",
@@ -92,7 +92,7 @@
                 "id": { "type": "string" },
                 "name": { 
                     "type": "string",
-                    "pattern": "^[a-zA-Z0-9]+$"
+                    "pattern": "^[ a-zA-Z0-9]+$"
                 },
                 "integration_type": {
                     "type": "string",

diff --git a/src/lib/import.js b/src/lib/import.js
@@ -418,7 +418,9 @@ function transformCredentials (credentials, imsOrgId) {
     if (!value) {
       value = credential.jwt
     }
-    acc[credential.name] = value
+
+    const name = credential.name.replace(/ /gi, '_') // replace any spaces with underscores
+    acc[name] = value
 
     return acc
   }, {})

diff --git a/test/__fixtures__/existing.merged.aio b/test/__fixtures__/existing.merged.aio
@@ -14,7 +14,7 @@
     "description": "My project description",
     "org": {
       "id": "25591412",
-      "name": "Developers",
+      "name": "Developers Developers Developers",
       "ims_org_id": "XOXOXOXOXOXOX@AdobeOrg"
     },
     "workspace": {

diff --git a/test/__fixtures__/existing.merged.env b/test/__fixtures__/existing.merged.env
@@ -2,14 +2,14 @@ AIO_foo_bar=baz
 AIO_boo=faz
 AIO_runtime_auth=Auth
 AIO_runtime_namespace=Name
-AIO_$ims_ProjectA_client__id=XYXYXYXYXYXYXYXYX
-AIO_$ims_ProjectA_client__secret=XYXYXYXYZZZZZZ
-AIO_$ims_ProjectA_redirect__uri=https://test123
+AIO_$ims_Project__A_client__id=XYXYXYXYXYXYXYXYX
+AIO_$ims_Project__A_client__secret=XYXYXYXYZZZZZZ
+AIO_$ims_Project__A_redirect__uri=https://test123
 AIO_$ims_ProjectB_client__id=XUXUXUXUXUXUXUX
 AIO_$ims_ProjectB_client__secret=XPXPXPXPXPXPXPXPX
 AIO_$ims_ProjectB_techacct=XTXTXTXTXTX@techacct.adobe.com
 AIO_$ims_ProjectB_meta__scopes=["ent_smartcontent_sdk","ent_adobeio_sdk"]
 AIO_$ims_ProjectB_ims__org__id=XOXOXOXOXOXOX@AdobeOrg
-AIO_$ims_NewTestIntegration8_client__id=XRXRXRXRXRXRXRXRXR
-AIO_$ims_NewTestIntegration8_client__secret=XRXRXRXRXRXRXRXRXRX
-AIO_$ims_NewTestIntegration8_redirect__uri=ams:\\+TRTRTRTRTRTR://adobeid/XWXWXWXWXWXWXWX
+AIO_$ims_New__Test__Integration__8_client__id=XRXRXRXRXRXRXRXRXR
+AIO_$ims_New__Test__Integration__8_client__secret=XRXRXRXRXRXRXRXRXRX
+AIO_$ims_New__Test__Integration__8_redirect__uri=ams:\\+TRTRTRTRTRTR://adobeid/XWXWXWXWXWXWXWX
diff --git a/test/__fixtures__/valid.config.aio b/test/__fixtures__/valid.config.aio
@@ -6,7 +6,7 @@
     "description": "My project description",
     "org": {
       "id": "25591412",
-      "name": "Developers",
+      "name": "Developers Developers Developers",
       "ims_org_id": "XOXOXOXOXOXOX@AdobeOrg"
     },
     "workspace": {

diff --git a/test/__fixtures__/valid.config.env b/test/__fixtures__/valid.config.env
@@ -1,13 +1,13 @@
 AIO_runtime_auth=Auth
 AIO_runtime_namespace=Name
-AIO_$ims_ProjectA_client__id=XYXYXYXYXYXYXYXYX
-AIO_$ims_ProjectA_client__secret=XYXYXYXYZZZZZZ
-AIO_$ims_ProjectA_redirect__uri=https://test123
+AIO_$ims_Project__A_client__id=XYXYXYXYXYXYXYXYX
+AIO_$ims_Project__A_client__secret=XYXYXYXYZZZZZZ
+AIO_$ims_Project__A_redirect__uri=https://test123
 AIO_$ims_ProjectB_client__id=XUXUXUXUXUXUXUX
 AIO_$ims_ProjectB_client__secret=XPXPXPXPXPXPXPXPX
 AIO_$ims_ProjectB_techacct=XTXTXTXTXTX@techacct.adobe.com
 AIO_$ims_ProjectB_meta__scopes=["ent_smartcontent_sdk","ent_adobeio_sdk"]
 AIO_$ims_ProjectB_ims__org__id=XOXOXOXOXOXOX@AdobeOrg
-AIO_$ims_NewTestIntegration8_client__id=XRXRXRXRXRXRXRXRXR
-AIO_$ims_NewTestIntegration8_client__secret=XRXRXRXRXRXRXRXRXRX
-AIO_$ims_NewTestIntegration8_redirect__uri=ams:\\+TRTRTRTRTRTR://adobeid/XWXWXWXWXWXWXWX
+AIO_$ims_New__Test__Integration__8_client__id=XRXRXRXRXRXRXRXRXR
+AIO_$ims_New__Test__Integration__8_client__secret=XRXRXRXRXRXRXRXRXRX
+AIO_$ims_New__Test__Integration__8_redirect__uri=ams:\\+TRTRTRTRTRTR://adobeid/XWXWXWXWXWXWXWX
diff --git a/test/__fixtures__/valid.config.json b/test/__fixtures__/valid.config.json
@@ -6,7 +6,7 @@
         "description": "My project description",
         "org": {
             "id": "25591412",
-            "name": "Developers",
+            "name": "Developers Developers Developers",
             "ims_org_id": "XOXOXOXOXOXOX@AdobeOrg"
         },
         "workspace": {
@@ -20,7 +20,7 @@
                 "credentials": [
                     {
                         "id": "17561142",
-                        "name": "ProjectA",
+                        "name": "Project A",
                         "integration_type": "oauthweb",
                         "oauth2": {
                             "client_id": "XYXYXYXYXYXYXYXYX",
@@ -44,7 +44,7 @@
                     },
                     {
                         "id": "17950",
-                        "name": "NewTestIntegration8",
+                        "name": "New Test Integration 8",
                         "integration_type": "oauthandroid",
                         "oauth2": {
                             "client_id": "XRXRXRXRXRXRXRXRXR",