Merge pull request #38 from Altinn/feature/am-827_FixSupportForDashInAppName

jonkjetiloye · web-flow · commit 378f3068468e · 2024-09-27T09:42:26.000+02:00
PlatformAccessToken | Added support for dash (-) character in app name
diff --git a/TokenGenerator/GetPlatformAccessToken.cs b/TokenGenerator/GetPlatformAccessToken.cs
@@ -33,7 +33,7 @@ public async Task<ActionResult> Run([HttpTrigger(AuthorizationLevel.Anonymous, "
             }
 
             requestValidator.ValidateQueryParam("env", true, tokenHelper.IsValidEnvironment, out string env);
-            requestValidator.ValidateQueryParam("app", true, tokenHelper.IsValidDottedIdentifier, out string appClaim);
+            requestValidator.ValidateQueryParam("app", true, tokenHelper.IsValidIdentifier, out string appClaim);
             requestValidator.ValidateQueryParam("org", false, tokenHelper.IsValidIdentifier, out string issuerOrg);
             requestValidator.ValidateQueryParam<uint>("ttl", false, uint.TryParse, out uint ttl, 1800);
 
diff --git a/TokenGenerator/Services/Token.cs b/TokenGenerator/Services/Token.cs
@@ -334,7 +334,7 @@ public bool TryParseScopes(string input, out string[] scopes)
 
         public bool IsValidIdentifier(string identifier)
         {
-            return !string.IsNullOrEmpty(identifier) && identifier.Length <= 50 && Regex.IsMatch(identifier, "^[a-z0-9_]+$");
+            return !string.IsNullOrEmpty(identifier) && identifier.Length <= 50 && Regex.IsMatch(identifier, "^[a-z0-9_-]+$");
         }
 
         public bool IsValidDottedIdentifier(string identifier)

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public async Task<ActionResult> Run([HttpTrigger(AuthorizationLevel.Anonymous, "`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`requestValidator.ValidateQueryParam("env", true, tokenHelper.IsValidEnvironment, out string env);`
`36`		`- requestValidator.ValidateQueryParam("app", true, tokenHelper.IsValidDottedIdentifier, out string appClaim);`
	`36`	`+ requestValidator.ValidateQueryParam("app", true, tokenHelper.IsValidIdentifier, out string appClaim);`
`37`	`37`	`requestValidator.ValidateQueryParam("org", false, tokenHelper.IsValidIdentifier, out string issuerOrg);`
`38`	`38`	`requestValidator.ValidateQueryParam<uint>("ttl", false, uint.TryParse, out uint ttl, 1800);`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ public bool TryParseScopes(string input, out string[] scopes)`
`334`	`334`
`335`	`335`	`public bool IsValidIdentifier(string identifier)`
`336`	`336`	`{`
`337`		`- return !string.IsNullOrEmpty(identifier) && identifier.Length <= 50 && Regex.IsMatch(identifier, "^[a-z0-9_]+$");`
	`337`	`+ return !string.IsNullOrEmpty(identifier) && identifier.Length <= 50 && Regex.IsMatch(identifier, "^[a-z0-9_-]+$");`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`public bool IsValidDottedIdentifier(string identifier)`