fix(model-client): OAuth login

Author: slisson

bulk-model-sync-mps/src/main/kotlin/org/modelix/mps/model/sync/bulk/IncludedModulesFilter.kt

@@ -14,6 +14,7 @@ import org.modelix.model.sync.bulk.isModuleIncluded
  * Note: This is currently not meant to be used standalone.
  * It should be used with other filters in a [CompositeFilter].
  */
+@Deprecated("Use IModelMask")
 class IncludedModulesFilter(
     val includedModules: Collection<String>,
     val includedModulePrefixes: Collection<String>,

model-server-with-auth/compose.yaml

@@ -14,6 +14,11 @@ services:
     networks:
       - app-network
 
+  redis:
+    image: redis:latest
+    networks:
+      - app-network
+
   oauth2-proxy:
     image: quay.io/oauth2-proxy/oauth2-proxy:latest
     environment:
@@ -35,12 +40,19 @@ services:
       OAUTH2_PROXY_COOKIE_SECURE: "false"
       OAUTH2_PROXY_SET_AUTHORIZATION_HEADER: "true"
       OAUTH2_PROXY_PASS_ACCESS_TOKEN: "true"
+      OAUTH2_PROXY_PASS_AUTHORIZATION_HEADER: "true"
       OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:4180"
       OAUTH2_PROXY_SCOPE: "sync openid"
+      OAUTH2_PROXY_SESSION_STORE_TYPE: redis
+      OAUTH2_PROXY_REDIS_CONNECTION_URL: redis://redis/
+      OAUTH2_PROXY_COOKIE_REFRESH: 60s
+      OAUTH2_PROXY_API_ROUTES: \/v2\/.*
     ports:
       - "4180:4180"
     depends_on:
       - keycloak
+      - model-server
+      - redis
     networks:
       - app-network
 

model-server-with-auth/realm.json

@@ -114,7 +114,7 @@
   "users": [
     {
       "username": "user1",
-      "email": "authorization-test-user@authorization-test-user.com",
+      "email": "user1@example.com",
       "firstName": "authorization-test-user",
       "lastName": "authorization-test-user",
       "enabled": true,

mps-model-adapters/src/main/kotlin/org/modelix/model/mpsadapters/MPSProjectAsNode.kt

@@ -1,7 +1,9 @@
 package org.modelix.model.mpsadapters
 
+import jetbrains.mps.project.ModuleId
 import jetbrains.mps.project.ProjectBase
 import org.jetbrains.mps.openapi.module.SRepository
+import org.jetbrains.mps.openapi.persistence.PersistenceFacade
 import org.modelix.model.api.BuiltinLanguages
 import org.modelix.model.api.IChildLinkReference
 import org.modelix.model.api.IConcept
@@ -30,7 +32,17 @@ data class MPSProjectAsNode(val project: ProjectBase) : MPSGenericNodeAdapter<Pr
                 }
 
                 override fun addNew(element: ProjectBase, index: Int, sourceNode: SpecWithResolvedConcept): IWritableNode {
-                    return TODO()
+                    val targetModule = requireNotNull(sourceNode.getNode().getReferenceTarget(BuiltinLanguages.MPSRepositoryConcepts.ModuleReference.module.toReference())) {
+                        "Reference to module isn't set"
+                    }
+                    val targetName = targetModule.getPropertyValue(BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name.toReference())
+                    val targetId = requireNotNull(targetModule.getPropertyValue(BuiltinLanguages.MPSRepositoryConcepts.Module.id.toReference())) {
+                        "Module ID isn't set: $targetModule"
+                    }.let { ModuleId.fromString(it) }
+                    val ref = PersistenceFacade.getInstance().createModuleReference(targetId, targetName)
+                    val resolvedModule = checkNotNull(ref.resolve(element.repository)) { "Module not found: $ref" }
+                    element.addModule(resolvedModule)
+                    return MPSProjectModuleAsNode(element, resolvedModule)
                 }
 
                 override fun remove(element: ProjectBase, child: IWritableNode) {