Merge branch 'develop'

Author: hahn-kev

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 SIL International
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

docker-compose.yml

@@ -1,6 +1,13 @@
 # https://docs.docker.com/compose/compose-file
 # https://github.com/compose-spec/compose-spec/blob/master/spec.md
 version: '3.5'
+
+# networks:
+#   lexbox:
+#     name: lexbox_default
+#     external: true
+#   default:
+
 services:
   ui-builder:
     build:
@@ -37,14 +44,20 @@ services:
       - mail
       - ld-api
       - lfmerge
+    # networks:
+    #   - default
+    #   - lexbox
     environment:
-      - WAIT_HOSTS=db:27017, mail:25
+      - WAIT_HOSTS=lf-db:27017, mail:25
       - XDEBUG_MODE=develop,debug
       - LDAPI_BASE_URL=http://ld-api:3000/api/v2/
+      # Uncomment this to test getting the LD project list from LexBox
+      # To use LexBox locally (in docker) you'll also need to uncomment the networks here and at the top of the file
+      #- LEX_BOX_HOST=https://staging.languagedepot.org #lexbox-api:5158
       - ENVIRONMENT=development
       - WEBSITE=localhost
       - DATABASE=scriptureforge
-      - MONGODB_CONN=mongodb://db:27017
+      - MONGODB_CONN=mongodb://lf-db:27017
       - MAIL_HOST=mail
       - GOOGLE_CLIENT_ID=bogus-development-token
       - GOOGLE_CLIENT_SECRET=bogus-development-token

docker/deployment/app-deployment.yaml

@@ -138,6 +138,11 @@ spec:
               secretKeyRef:
                 key: LANGUAGE_DEPOT_API_TOKEN
                 name: ld-api
+          - name: LEX_BOX_HOST
+            valueFrom:
+              secretKeyRef:
+                key: LEX_BOX_HOST
+                name: ld-api
           - name: FACEBOOK_CLIENT_ID
             valueFrom:
               secretKeyRef:

docker/deployment/secrets.yaml

@@ -18,6 +18,7 @@ metadata:
 data:
   LANGUAGE_DEPOT_API_TOKEN: ''
   LDAPI_BASE_URL: ''
+  LEX_BOX_HOST: ''
 
 ---
 

docker/lfmerge/Dockerfile

@@ -1,2 +1,2 @@
-FROM ghcr.io/sillsdev/lfmerge:2.0.134
+FROM ghcr.io/sillsdev/lfmerge:2.0.135
 # Do not add anything to this Dockerfile, it should stay empty

src/Api/Model/Languageforge/Lexicon/Command/SendReceiveCommands.php

@@ -88,9 +88,12 @@ public static function getUserProjects($username, $password, array $mockResponse
         }
         $client = new Client(["handler" => $handler]);
 
-        $url = "https://admin.languagedepot.org/api/user/" . $username . "/projects";
+        $host = getenv("LEX_BOX_HOST") ?: "https://admin.languagedepot.org";
+        $url = $host . "/api/user/" . $username . "/projects";
         $postData = [
             "json" => ["password" => $password],
+            // Also supported:
+            // "form_params" => ["password" => $password],
             "headers" => ["Authorization" => "Bearer " . LANGUAGE_DEPOT_API_TOKEN],
         ];