sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bump reva to 9878984ce702

Browse Source 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2024-09-05 15:03:05 +02:00
parent 0f95ab4d3c
commit 5ab53b2474
17 changed files with 260 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/acceptance/TestHelpers/GraphHelper.php
+9
View File
@@ -87,6 +87,15 @@ class GraphHelper {
public static function getEtagRegex(): string {
return "^\\\"[a-f0-9:.]{1,32}\\\"$";
}
/**
* Federated users have a base64 encoded string of {remoteid}@{provider} as their id
* This regex matches only non empty base64 encoded strings
*
* @return string
*/
public static function getFederatedUserRegex(): string {
return '^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{4})$';
}
/**
* Key name can consist of @@@
tests/acceptance/bootstrap/FeatureContext.php
+8
View File
@@ -2266,6 +2266,14 @@ class FeatureContext extends BehatVariablesContext {
],
"parameter" => []
],
[
"code" => "%federated_user_id_pattern%",
"function" => [
__NAMESPACE__ . '\TestHelpers\GraphHelper',
"getFederatedUserRegex"
],
"parameter" => []
],
[
"code" => "%group_id_pattern%",
"function" => [
tests/acceptance/features/apiOcm/searchFederationUsers.feature
+11 -11
View File
@@ -46,7 +46,7 @@ Feature: search federation users
},
"id": {
"type": "string",
"pattern": "^%user_id_pattern%$"
"pattern": "^%federated_user_id_pattern%$"
},
"userType": {
"type": "string",
@@ -108,7 +108,7 @@ Feature: search federation users
},
"id": {
"type": "string",
"pattern": "^%user_id_pattern%$"
"pattern": "^%federated_user_id_pattern%$"
},
"userType": {
"type": "string",
@@ -126,7 +126,7 @@ Feature: search federation users
],
"properties": {
"issuer": {
"const": "https://federation-ocis-server:10200"
"const": "federation-ocis-server:10200"
},
"issuerAssignedId": {
"type": "string",
@@ -176,7 +176,7 @@ Feature: search federation users
},
"id": {
"type": "string",
"pattern": "^%user_id_pattern%$"
"pattern": "^%federated_user_id_pattern%$"
},
"userType": {
"type": "string",
@@ -238,7 +238,7 @@ Feature: search federation users
},
"id": {
"type": "string",
"pattern": "^%user_id_pattern%$"
"pattern": "^%federated_user_id_pattern%$"
},
"userType": {
"type": "string",
@@ -256,7 +256,7 @@ Feature: search federation users
],
"properties": {
"issuer": {
"const": "https://federation-ocis-server:10200"
"const": "federation-ocis-server:10200"
},
"issuerAssignedId": {
"type": "string",
@@ -460,7 +460,7 @@ Feature: search federation users
},
"id": {
"type": "string",
"pattern": "^%user_id_pattern%$"
"pattern": "^%federated_user_id_pattern%$"
},
"mail": {
"const": "alice@example.org"
@@ -525,7 +525,7 @@ Feature: search federation users
},
"id": {
"type": "string",
"pattern": "^%user_id_pattern%$"
"pattern": "^%federated_user_id_pattern%$"
},
"mail": {
"const": "brian@example.org"
@@ -545,7 +545,7 @@ Feature: search federation users
],
"properties": {
"issuer": {
"const": "https://federation-ocis-server:10200"
"const": "federation-ocis-server:10200"
},
"issuerAssignedId": {
"type": "string",
@@ -672,7 +672,7 @@ Feature: search federation users
},
"id": {
"type": "string",
"pattern": "^%user_id_pattern%$"
"pattern": "^%federated_user_id_pattern%$"
},
"mail": {
"const": "brian@example.org"
@@ -692,7 +692,7 @@ Feature: search federation users
],
"properties": {
"issuer": {
"const": "https://federation-ocis-server:10200"
"const": "federation-ocis-server:10200"
},
"issuerAssignedId": {
"type": "string",