Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[EDIFICE] Ajout de l'api token-as-cookie #495

Draft
wants to merge 7 commits into
base: fix
Choose a base branch
from
Draft

[EDIFICE] Ajout de l'api token-as-cookie #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5634e12
fix(feeder): #NGRN-470, fix NPE for subjects without a Code
ODE-vpeiro Sep 4, 2023
0240a23
feat(crm): INTEG-67, Add an ignoreMFA option to CRM packs
ODE-vpeiro Sep 27, 2023
6e3d208
fix(wayf): #SUPPORT-425, Fix wayf font sizes on small screens
ODE-vpeiro Oct 10, 2023
5825d52
fix(feeder): #SUPPORT-320, Remove old communication rules on structur…
ODE-vpeiro Nov 9, 2023
2d6104a
fix(feeder): #HDF-1316, Let the AAF create and update FuncGroup when …
ODE-vpeiro Nov 7, 2023
fdc2bc1
release: 4.11.18
benjaminperez Nov 17, 2023
d2b3fd9
feat: #WB-3132, new route to get oneSessionId from oauth token
juniorode Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions auth/src/main/java/org/entcore/auth/controllers/AuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import fr.wseduc.rs.Get;
import fr.wseduc.rs.Post;
import fr.wseduc.rs.Put;
import fr.wseduc.rs.ApiDoc;
import fr.wseduc.security.ActionType;
import fr.wseduc.security.SecuredAction;
import fr.wseduc.webutils.Either;
Expand Down Expand Up @@ -101,6 +102,8 @@
import java.util.regex.Pattern;

import static fr.wseduc.webutils.Utils.*;
import static fr.wseduc.webutils.request.RequestUtils.getTokenHeader;

import static org.entcore.auth.oauth.OAuthAuthorizationResponse.*;
import static org.entcore.common.aggregation.MongoConstants.TRACE_TYPE_CONNECTOR;
import static org.entcore.common.http.response.DefaultResponseHandler.defaultResponseHandler;
Expand Down Expand Up @@ -462,6 +465,33 @@ private void activateUser(final String activationCode, final String login, Strin
});
}

@Post("/oauth2/token-as-cookie")
@SecuredAction(value = "", type = ActionType.AUTHENTICATED)
@ApiDoc("Gives back a cookie to the user corresponding to its jwtToken")
public void tokenAsCookie(final HttpServerRequest request) {
UserUtils.getAuthenticatedUserInfos(eb, request).onSuccess(user -> {
final Optional<String> jwtToken = getTokenHeader(request);
if(jwtToken.isPresent()) {
final String oneSessionId = UUID.randomUUID().toString();
UserUtils.createSessionWithId(eb, user.getUserId(), oneSessionId, false)
.onSuccess(e -> {
log.debug("[AuthController@tokenAsCookie] Session created for user");
final long timeout = config.getLong("cookie_timeout", Long.MIN_VALUE);
CookieHelper.getInstance().setSigned("oneSessionId", oneSessionId, timeout, request);
CookieHelper.set("authenticated", "true", timeout, request);
Renders.render(request, new JsonObject().put("succces", true));
})
.onFailure(th -> {
log.warn("[AuthController@tokenAsCookie] Error while creating session", th);
Renders.renderError(request);
});
} else {
log.warn("[AuthController@tokenAsCookie] Called without a jwt token");
Renders.badRequest(request);
}
});
}

private void loginResult(final HttpServerRequest request, String error, String callBack) {
final JsonObject context = new JsonObject();
if (callBack != null && !callBack.trim().isEmpty()) {
Expand Down
4 changes: 2 additions & 2 deletions auth/src/main/resources/view-src/wayf.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,12 @@ <h2 class="row vertical-spacing">
{{/providers}}
</section>
<div style="float:right">
<div id="insert" style="margin-bottom:45px;font-size: 1.5vh;display:none" >
<div id="insert" style="margin-bottom:45px;font-size: 14px;display:none" >
<i18n>wayf.insert.title</i18n><br>
<a href="{{#i18n}}wayf.insert.link{{/i18n}}" target="_blank" translate content="wayf.insert.link.content"></a>
</div>

<a href="{{#i18n}}auth.charter{{/i18n}}" target="_blank" translate content="wayf.label.cgu" style="font-size: 1.5vh;"></a>
<a href="{{#i18n}}auth.charter{{/i18n}}" target="_blank" translate content="wayf.label.cgu" style="font-size: 14px;"></a>
</div>
<img id="partner" src="{{#i18n}}wayf.logo.partner{{/i18n}}" style="margin-left:15px;width:{{#i18n}}wayf.logo.partner.width{{/i18n}};display:none" alt="Logo partenaire">
</section>
Expand Down
3 changes: 3 additions & 0 deletions directory/src/main/java/org/entcore/directory/services/impl/DefaultSchoolService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,16 +518,19 @@ public void massDistributionEducationMobileApp(JsonArray data, Integer transacti
List<Long> education_levels = StringUtils.isEmpty(education) ? Collections.EMPTY_LIST :
Arrays.stream(education.split(",")).mapToLong(Long::parseLong).boxed().collect(Collectors.toList());
Boolean hasApp = jo.getBoolean("hasApp");
Boolean ignoreMFA = jo.getBoolean("ignoreMFA");

if (structureId != null) {
String query = "MATCH (s:Structure {id: {structureId}}) " +
"SET s.levelsOfEducation = {levelsOfEducation} " +
"SET s.distributions = {distributions} " +
"SET s.ignoreMFA = {ignoreMFA} " +
"SET s.hasApp = {hasApp}";

JsonObject params = new JsonObject().put("structureId", structureId)
.put("levelsOfEducation", education_levels)
.put("distributions", distributions)
.put("ignoreMFA", ignoreMFA)
.put("hasApp", hasApp);

s.add(query, params);
Expand Down
5 changes: 3 additions & 2 deletions feeder/src/main/java/org/entcore/feeder/dictionary/structures/Importer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,9 +1177,10 @@ public void addStructureNameInGroups(String structureExternalId, String prefix)
}

public void removeOldCommunicationRules(String prefix) {
// On utilise la joinKey car il arrive que l'externalId d'une structure soit arbitraire et ne reflète pas l'id dans l'AAF...
final String query =
"MATCH (s:Structure)<-[:DEPENDS*1..2]-(g:Group)-[c:COMMUNIQUE]-(u:User) " +
"WHERE s.externalId STARTS WITH {prefix} AND u.source = {currentSource} " +
"WHERE ANY(joinKey IN s.joinKey WHERE joinKey STARTS WITH {prefix}) AND u.source = {currentSource} " +
"AND (c.source IS NULL OR c.source <> 'MANUAL') AND NOT (u)-[:IN]->(g) " +
"DELETE c";
transactionHelper.add(query, new JsonObject().put("prefix", prefix).put("currentSource", currentSource));
Expand Down Expand Up @@ -1242,4 +1243,4 @@ public void setPrefixToImportList(JsonArray importSubDirectories) {
public JsonArray getPrefixToImportList() {
return this.importsPrefixList;
}
}
}
4 changes: 2 additions & 2 deletions feeder/src/main/java/org/entcore/feeder/dictionary/structures/Structure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ public void createFunctionGroupIfAbsent(String groupExternalId, String name, Str
if (isNotEmpty(label)) {
String query =
"MATCH (s:Structure { externalId : {structureExternalId}}) " +
(source == null ? "WHERE (NOT(HAS(s.timetable)) OR s.timetable = '' OR s.timetable = 'NOP') " : "WHERE s.timetable = s.source ") +
//(source == null ? "WHERE (NOT(HAS(s.timetable)) OR s.timetable = '' OR s.timetable = 'NOP') " : "WHERE s.timetable = s.source ") +
"CREATE s<-[:DEPENDS]-(c:Group:FunctionGroup:" + label + "Group {props}) " +
"SET c.source = coalesce({source}, s.source)";
JsonObject params = new JsonObject()
Expand Down Expand Up @@ -595,4 +595,4 @@ public JsonObject getStruct() {
return struct;
}

}
}
3 changes: 3 additions & 0 deletions feeder/src/main/java/org/entcore/feeder/timetable/AbstractTimetableImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,9 @@ public void handle(Message<JsonObject> event) {

protected void addSubject(String id, JsonObject currentEntity) {
final String code = currentEntity.getString("Code");
if(code == null)
return;

String subjectId = subjectsMapping.get(code);
if (isEmpty(subjectId)) {
final String externalId = structureExternalId + "$" + currentEntity.getString("Code");
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ modowner=org.entcore
modname=ent-core

# Your module version
version=4.11.17
version=4.11.18

# The test timeout in seconds
testtimeout=300
Expand Down