Skip to content

Commit 5bfe75b

Browse files
computatecomputate
authored
Merge pull request #40 from computate/computate
computate
2 parents 1990084 + cdae5c1 commit 5bfe75b

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

‎src/main/java/org/computate/frFR/java/EcrireApiClasse.java‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1965,6 +1965,8 @@ public void ecrireGenApiServiceImpl2(String classeLangueNom) throws Exception {
19651965
) {
19661966
if(authPolitiqueGranulee) {
19671967
tl(3, "String ", classeVarId, " = ", i18nGlobale.getString(I18n.var_requeteSite), ".get", i18nGlobale.getString(I18n.var_RequeteService), "().getParams().getJsonObject(\"path\").getString(\"", classeVarId, "\");");
1968+
if(classeVarId != null && classeAuthRessource != null && !classeVarId.equals(classeAuthRessource))
1969+
tl(3, "String ", classeAuthRessource, " = ", i18nGlobale.getString(I18n.var_requeteSite), ".get", i18nGlobale.getString(I18n.var_RequeteService), "().getParams().getJsonObject(\"path\").getString(\"", classeAuthRessource, "\");");
19681970
tl(3, "MultiMap form = MultiMap.caseInsensitiveMultiMap();");
19691971
tl(3, "form.add(\"grant_type\", \"urn:ietf:params:oauth:grant-type:uma-ticket\");");
19701972
tl(3, "form.add(\"audience\", config.getString(ComputateConfigKeys.AUTH_CLIENT));");
@@ -1977,7 +1979,11 @@ public void ecrireGenApiServiceImpl2(String classeLangueNom) throws Exception {
19771979
tl(3, "form.add(\"permission\", String.format(\"%s#%s\", ", classeNomSimple, ".", i18nGlobale.getString(I18n.var_CLASSE_AUTH_RESSOURCE), ", \"PATCH\"));");
19781980
tl(3, "form.add(\"permission\", String.format(\"%s#%s\", ", classeNomSimple, ".", i18nGlobale.getString(I18n.var_CLASSE_AUTH_RESSOURCE), ", \"PUT\"));");
19791981
tl(3, "if(", classeVarId, " != null)");
1980-
tl(4, "form.add(\"permission\", String.format(\"%s-%s#%s\", ", classeNomSimple, ".", i18nGlobale.getString(I18n.var_CLASSE_AUTH_RESSOURCE), ", ", classeVarId, ", \"", classeApiMethodeMethode, "\"));");
1982+
if(classeAuthRessource == null) {
1983+
tl(4, "form.add(\"permission\", String.format(\"%s-%s#%s\", ", classeNomSimple, ".", i18nGlobale.getString(I18n.var_CLASSE_AUTH_RESSOURCE), ", ", classeVarId, ", \"", classeApiMethodeMethode, "\"));");
1984+
} else {
1985+
tl(4, "form.add(\"permission\", String.format(\"%s#%s\", ", classeVarId, ", \"", classeApiMethodeMethode, "\"));");
1986+
}
19811987
if(classeRoleUtilisateur) {
19821988
tl(3, i18nGlobale.getString(I18n.var_requeteSite), ".set", i18nGlobale.getString(I18n.var_PublicLire), "(", i18nGlobale.getString(I18n.var_classe), i18nGlobale.getString(I18n.var_PublicLire), ");");
19831989
}
@@ -2002,7 +2008,7 @@ public void ecrireGenApiServiceImpl2(String classeLangueNom) throws Exception {
20022008
for(String classeRessourceAutorisation : classeRessourcesAutorisation) {
20032009

20042010
tl(6, "groups.stream().map(group -> {");
2005-
tl(9, "Matcher mPermission = Pattern.compile(\"^/", StringUtils.substringBefore(classeRessourceAutorisation, "-"), "-(.*)-", classeApiMethodeMethode, "$\").matcher(group);");
2011+
tl(9, "Matcher mPermission = Pattern.compile(\"^/(.*-?", StringUtils.substringBefore(classeRessourceAutorisation, "-"), "-(.*))-(", classeApiMethodeMethode, ")$\").matcher(group);");
20062012
tl(9, "return mPermission.find() ? mPermission.group(1) : null;");
20072013
tl(8, "}).filter(v -> v != null).forEach(", i18nGlobale.getString(I18n.var_valeur), " -> {");
20082014
tl(9, "fqs.add(String.format(\"%s:%s\", \"", StringUtils.substringAfter(classeRessourceAutorisation, "-"), "\", ", i18nGlobale.getString(I18n.var_valeur), "));");
@@ -2163,6 +2169,8 @@ public void ecrireGenApiServiceImpl2(String classeLangueNom) throws Exception {
21632169
if(authPolitiqueGranulee) {
21642170
if(classeVarId != null)
21652171
tl(3, "String ", classeVarId, " = ", i18nGlobale.getString(I18n.var_requeteSite), ".get", i18nGlobale.getString(I18n.var_RequeteService), "().getParams().getJsonObject(\"path\").getString(\"", classeVarId, "\");");
2172+
if(classeVarId != null && classeAuthRessource != null && !classeVarId.equals(classeAuthRessource))
2173+
tl(3, "String ", classeAuthRessource, " = ", i18nGlobale.getString(I18n.var_requeteSite), ".get", i18nGlobale.getString(I18n.var_RequeteService), "().getParams().getJsonObject(\"path\").getString(\"", classeAuthRessource, "\");");
21662174
tl(3, "MultiMap form = MultiMap.caseInsensitiveMultiMap();");
21672175
tl(3, "form.add(\"grant_type\", \"urn:ietf:params:oauth:grant-type:uma-ticket\");");
21682176
tl(3, "form.add(\"audience\", config.getString(ComputateConfigKeys.AUTH_CLIENT));");
@@ -2176,7 +2184,11 @@ public void ecrireGenApiServiceImpl2(String classeLangueNom) throws Exception {
21762184
tl(3, "form.add(\"permission\", String.format(\"%s#%s\", ", classeNomSimple, ".", i18nGlobale.getString(I18n.var_CLASSE_AUTH_RESSOURCE), ", \"PUT\"));");
21772185
if(classeVarId != null) {
21782186
tl(3, "if(", classeVarId, " != null)");
2179-
tl(4, "form.add(\"permission\", String.format(\"%s-%s#%s\", ", classeNomSimple, ".", i18nGlobale.getString(I18n.var_CLASSE_AUTH_RESSOURCE), ", ", classeVarId, ", \"", classeApiMethodeMethode, "\"));");
2187+
if(classeAuthRessource == null) {
2188+
tl(4, "form.add(\"permission\", String.format(\"%s-%s#%s\", ", classeNomSimple, ".", i18nGlobale.getString(I18n.var_CLASSE_AUTH_RESSOURCE), ", ", classeVarId, ", \"", classeApiMethodeMethode, "\"));");
2189+
} else {
2190+
tl(4, "form.add(\"permission\", String.format(\"%s#%s\", ", classeVarId, ", \"", classeApiMethodeMethode, "\"));");
2191+
}
21802192
}
21812193
if(classeRoleUtilisateur) {
21822194
tl(3, i18nGlobale.getString(I18n.var_requeteSite), ".set", i18nGlobale.getString(I18n.var_PublicLire), "(", i18nGlobale.getString(I18n.var_classe), i18nGlobale.getString(I18n.var_PublicLire), ");");
@@ -2202,7 +2214,7 @@ public void ecrireGenApiServiceImpl2(String classeLangueNom) throws Exception {
22022214
for(String classeRessourceAutorisation : classeRessourcesAutorisation) {
22032215

22042216
tl(6, "groups.stream().map(group -> {");
2205-
tl(9, "Matcher mPermission = Pattern.compile(\"^/", StringUtils.substringBefore(classeRessourceAutorisation, "-"), "-(.*)-", classeApiMethodeMethode, "$\").matcher(group);");
2217+
tl(9, "Matcher mPermission = Pattern.compile(\"^/(.*-?", StringUtils.substringBefore(classeRessourceAutorisation, "-"), "-(.*))-(", classeApiMethodeMethode, ")$\").matcher(group);");
22062218
tl(9, "return mPermission.find() ? mPermission.group(1) : null;");
22072219
tl(8, "}).filter(v -> v != null).forEach(", i18nGlobale.getString(I18n.var_valeur), " -> {");
22082220
tl(9, "fqs.add(String.format(\"%s:%s\", \"", StringUtils.substringAfter(classeRessourceAutorisation, "-"), "\", ", i18nGlobale.getString(I18n.var_valeur), "));");

0 commit comments

Comments
 (0)