Skip to content

Commit caf5190

Browse files
committed
Fixed bug searching for authenticated public read classes
1 parent 8ee53aa commit caf5190

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1984,6 +1984,7 @@ public void ecrireGenApiServiceImpl2(String classeLangueNom) throws Exception {
19841984
tl(3, "form.add(\"permission\", String.format(\"%s#%s\", ", classeNomSimple, ".", i18nGlobale.getString(I18n.var_CLASSE_AUTH_RESSOURCE), ", \"DELETE\"));");
19851985
tl(3, "form.add(\"permission\", String.format(\"%s#%s\", ", classeNomSimple, ".", i18nGlobale.getString(I18n.var_CLASSE_AUTH_RESSOURCE), ", \"PATCH\"));");
19861986
tl(3, "form.add(\"permission\", String.format(\"%s#%s\", ", classeNomSimple, ".", i18nGlobale.getString(I18n.var_CLASSE_AUTH_RESSOURCE), ", \"PUT\"));");
1987+
tl(3, "form.add(\"permission\", String.format(\"%s-%s#%s\", ", classeNomSimple, ".", i18nGlobale.getString(I18n.var_CLASSE_AUTH_RESSOURCE), ", ", classeVarId, ", \"GET\"));");
19871988
tl(3, "if(", classeVarId, " != null)");
19881989
if(classeAuthRessource == null) {
19891990
tl(4, "form.add(\"permission\", String.format(\"%s-%s#%s\", ", classeNomSimple, ".", i18nGlobale.getString(I18n.var_CLASSE_AUTH_RESSOURCE), ", ", classeVarId, ", \"", classeApiMethodeMethode, "\"));");
@@ -2007,7 +2008,7 @@ public void ecrireGenApiServiceImpl2(String classeLangueNom) throws Exception {
20072008
tl(5, "HttpResponse<Buffer> authorizationDecision = authorizationDecisionResponse.result();");
20082009
tl(5, "JsonArray scopes = authorizationDecisionResponse.failed() ? new JsonArray() : authorizationDecision.bodyAsJsonArray().stream().findFirst().map(decision -> ((JsonObject)decision).getJsonArray(\"scopes\")).orElse(new JsonArray());");
20092010
if(classeRessourcesAutorisation.size() > 0) {
2010-
tl(5, "if(!scopes.contains(\"", classeApiMethodeMethode, "\")) {");
2011+
tl(5, "if(!scopes.contains(\"", classeApiMethodeMethode, "\") && !", i18nGlobale.getString(I18n.var_classe), i18nGlobale.getString(I18n.var_PublicLire), ") {");
20112012
tl(6, "//");
20122013
tl(6, "List<String> fqs = new ArrayList<>();");
20132014
tl(6, "List<String> groups = Optional.ofNullable(", i18nGlobale.getString(I18n.var_requeteSite), ".getGroups()).orElse(new ArrayList<>());");
@@ -2214,7 +2215,7 @@ public void ecrireGenApiServiceImpl2(String classeLangueNom) throws Exception {
22142215
tl(5, "HttpResponse<Buffer> authorizationDecision = authorizationDecisionResponse.result();");
22152216
tl(5, "JsonArray scopes = authorizationDecisionResponse.failed() ? new JsonArray() : authorizationDecision.bodyAsJsonArray().stream().findFirst().map(decision -> ((JsonObject)decision).getJsonArray(\"scopes\")).orElse(new JsonArray());");
22162217
if(classeRessourcesAutorisation.size() > 0) {
2217-
tl(5, "if(!scopes.contains(\"", classeApiMethodeMethode, "\")) {");
2218+
tl(5, "if(!scopes.contains(\"", classeApiMethodeMethode, "\") && !", i18nGlobale.getString(I18n.var_classe), i18nGlobale.getString(I18n.var_PublicLire), ") {");
22182219
tl(6, "//");
22192220
tl(6, "List<String> fqs = new ArrayList<>();");
22202221
tl(6, "List<String> groups = Optional.ofNullable(", i18nGlobale.getString(I18n.var_requeteSite), ".getGroups()).orElse(new ArrayList<>());");

0 commit comments

Comments
 (0)