From 460e42c4bd67cea2a5c667d626a1e8851f2930bc Mon Sep 17 00:00:00 2001 From: o2null Date: Fri, 20 May 2022 10:22:29 +0000 Subject: [PATCH] Merge branch 'cherry-pick-90930e11' into 'develop' Merge branch 'fix/oauth' into 'master' See merge request o2oa/o2oa!649 (cherry picked from commit de2fb1506c3374e450dbd2ec01cbaa6cd9faebf2) 94963cc2 Merge branch 'fix/oauth' into 'master' --- .../assemble/authentication/jaxrs/oauth/ActionInfo.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/oauth/ActionInfo.java b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/oauth/ActionInfo.java index 1ecdce1700..e85f5a9adb 100644 --- a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/oauth/ActionInfo.java +++ b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/oauth/ActionInfo.java @@ -95,6 +95,9 @@ class ActionInfo extends BaseAction { if (optional.isPresent()) { return (CompiledScript) optional.get(); } else { + System.out.println("!!!!!###"); + System.out.println(ScriptingFactory.functionalization(text)); + System.out.println("!!!!!###"); CompiledScript compiledScript = ScriptingFactory.functionalizationCompile(text); CacheManager.put(cache, cacheKey, compiledScript); return compiledScript; @@ -125,7 +128,7 @@ class ActionInfo extends BaseAction { } } else { Person person = business.entityManagerContainer().find(oauthCode.getPerson(), Person.class); - ScriptContext scriptContext = new SimpleScriptContext(); + ScriptContext scriptContext = ScriptingFactory.scriptContextEvalInitialServiceScript(); scriptContext.getBindings(ScriptContext.ENGINE_SCOPE).put(ScriptingFactory.BINDING_NAME_SERVICE_PERSON, person); for (String str : StringUtils.split(oauthCode.getScope(), ",")) { -- GitLab