V3.3.2

.env.gui

@@ -1,4 +1,4 @@
 RELEASE=PRE-ALPHA-test
-VERSION=1
-BUILD=1
-FIX=15
+VERSION=3
+BUILD=3
+FIX=4-test

.github/workflows/check-version.yml

@@ -2,7 +2,7 @@ name: Check Version
 
 on:
   push:
-    branches: ["test", "stage", "main"]
+    branches: ["main"]
   workflow_dispatch:
 
 env:
@@ -20,25 +20,8 @@ jobs:
       - name: Docker Setup BuildX
         uses: docker/setup-buildx-action@v2
 
-      - name: Bump Patch Version
-        run: npm run bump-patch
-        if: ${{ env.BRANCH == 'test' }}
-
-      - name: Sync Version
-        run: npm run sync-version
-        if: ${{ env.BRANCH != 'test' }}
-
       - name: Generate Changelog
         run: npm run changelog
-        if: ${{ env.BRANCH == 'main' }}
-
-      - name: Push changes to repo
-        run: |
-          git config --global user.name ${{ secrets.ADMIN_NAME }}
-          git config --global user.email ${{ secrets.ADMIN_EMAIL }}
-          git add .
-          git commit -m "docs: update version"
-          git push
 
       - name: Load environment variables
         run: |
@@ -54,20 +37,16 @@ jobs:
         run: |
           echo "Building Docker image for branch: ${{ env.BRANCH }} major: ${{ env.MAJOR }} minor: ${{ env.MINOR }} patch: ${{ env.PATCH }}"
           cd GUI && docker image build --tag $DOCKER_TAG_CUSTOM --no-cache .
-        if: ${{ env.BRANCH == 'test' }}
-
       - name: Log in to GitHub container registry
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
 
       - name: Push Docker image to GitHub Packages
         run: |
           echo "Pushing Docker image to GitHub Packages"
           docker push $DOCKER_TAG_CUSTOM
-        if: ${{ env.BRANCH == 'test' }}
 
       - name: Create Release
         uses: softprops/action-gh-release@v1
-        if: ${{ env.BRANCH == 'main' }}
         with:
           tag_name: v${{ env.MAJOR }}.${{ env.MINOR }}.${{ env.PATCH }}
           generate_release_notes: true

.github/workflows/ci-build-image.yml

@@ -0,0 +1,47 @@
+name: Build and publish GUI
+
+on:
+  push:
+    branches: [ v3.3.2 ]
+    paths:
+      - '.env.gui'
+
+jobs:
+  PackageDeploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Debugging Step
+        run: |
+          echo "Checking runner status..."
+          # Add more debugging commands as needed
+
+      - uses: actions/checkout@v2
+
+      - name: Docker Setup BuildX
+        uses: docker/setup-buildx-action@v2
+
+      - name: Load environment variables and set them
+        run: |
+          if [ -f .env.gui ]; then
+            export $(cat .env.gui | grep -v '^#' | xargs)
+          fi
+          echo "RELEASE=$RELEASE" >> $GITHUB_ENV
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "BUILD=$BUILD" >> $GITHUB_ENV
+          echo "FIX=$FIX" >> $GITHUB_ENV
+      - name: Set repo
+        run: |
+           LOWER_CASE_GITHUB_REPOSITORY=$(echo $GITHUB_REPOSITORY | tr '[:upper:]' '[:lower:]')
+           echo "DOCKER_TAG_CUSTOM=ghcr.io/${LOWER_CASE_GITHUB_REPOSITORY}:$RELEASE-$VERSION.$BUILD.$FIX" >> $GITHUB_ENV
+           echo "$GITHUB_ENV"
+      - name: Docker Build
+        run: | 
+           cd GUI
+           docker image build --tag $DOCKER_TAG_CUSTOM .
+
+      - name: Log in to GitHub container registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
+
+      - name: Push Docker image to ghcr
+        run: docker push $DOCKER_TAG_CUSTOM

.gitignore

@@ -12,6 +12,7 @@
 .DS_Store
 .vscode
 .env
+.env.gui
 
 **/node_modules
 **/dist

DSL/Resql/services/POST/get-navigable-services-list.sql

@@ -0,0 +1,11 @@
+
+SELECT service_id, name
+FROM (
+  SELECT DISTINCT ON (service_id) service_id, name, current_state
+  FROM services
+  WHERE NOT deleted
+    AND is_common = false
+  ORDER BY service_id, id DESC
+) latest
+WHERE current_state IN ('active', 'ready', 'draft')
+ORDER BY name ASC;

DSL/Resql/services/POST/get-service-status-by-name.sql

@@ -0,0 +1,6 @@
+SELECT current_state
+FROM services
+WHERE name = :service_name
+  AND NOT deleted
+ORDER BY id DESC
+LIMIT 1;

DSL/Resql/services/POST/get-services-list.sql

@@ -5,10 +5,11 @@ SELECT
   current_state AS state,
   ruuter_type AS type,
   slot,
-  CEIL((SELECT COUNT(DISTINCT service_id) FROM services WHERE NOT deleted AND (:is_common::TEXT = '' OR is_common = (:is_common::TEXT)::BOOLEAN)) / :page_size::DECIMAL) AS total_pages
+  CEIL((SELECT COUNT(DISTINCT service_id) FROM services WHERE NOT deleted AND (:is_common::TEXT = '' OR is_common = (:is_common::TEXT)::BOOLEAN) AND (:search IS NULL OR :search = '' OR LOWER(name) LIKE LOWER('%' || :search || '%'))) / :page_size::DECIMAL) AS total_pages
 FROM services
-WHERE NOT deleted 
+WHERE NOT deleted
   AND (:is_common::TEXT = '' OR is_common = (:is_common::TEXT)::BOOLEAN)
+  AND (:search IS NULL OR :search = '' OR LOWER(name) LIKE LOWER('%' || :search || '%'))
 ORDER BY 
   CASE WHEN :sorting = 'name asc' THEN name END ASC,
   CASE WHEN :sorting = 'name desc' THEN name END DESC,

DSL/Resql/training/GET/empty.sql

@@ -0,0 +1,2 @@
+-- This is a empty sql for Buerokratt DSL delivery method
+SELECT current_date;

DSL/Resql/training/POST/get-new-nonce.sql

@@ -0,0 +1 @@
+INSERT INTO request_nonces (valid_until) VALUES ( now() + interval '1 day') RETURNING nonce;

DSL/Resql/training/POST/use-nonce.sql

@@ -0,0 +1 @@
+update request_nonces set used_at = now() where nonce = :updated_nonce and used_at is null returning nonce;

DSL/Ruuter/services/GET/get-new-nonce.yml

@@ -0,0 +1,19 @@
+declaration:
+  call: declare
+  version: 0.1
+  description: "Description placeholder for 'GET-NEW-NONCE'"
+  method: get
+  accepts: json
+  returns: json
+  namespace: service
+
+get_new_nonce:
+  call: http.post
+  args:
+    url: "[#SERVICE_TRAINING_RESQL]/get-new-nonce"
+  result: nonce_res
+
+return_result:
+  wrapper: false
+  return: ${nonce_res.response.body[0].nonce}
+  next: end

DSL/Ruuter/services/GET/navigable-services.yml

@@ -0,0 +1,20 @@
+declaration:
+  call: declare
+  version: 0.1
+  description: "Decription placeholder for 'NAVIGABLE-SERVICES'"
+  method: get
+  accepts: json
+  returns: json
+  namespace: service
+
+get_services_list:
+  call: http.post
+  args:
+    url: "[#SERVICE_RESQL]/get-navigable-services-list"
+  result: results
+
+return_ok:
+  status: 200
+  wrapper: false
+  return: ${results.response.body}
+  next: end

DSL/Ruuter/services/GET/services/active/.guard

@@ -1,4 +1,61 @@
-guard_allow_all:
+process_request:
+  switch:
+    - condition: ${ incoming.headers['x-ruuter-nonce'] != null }
+      next: verify_header_nonce
+    - condition: ${ incoming.params['ruuter-nonce'] != null }
+      next: verify_param_nonce
+    - condition: ${incoming.headers == null || incoming.headers.cookie == null}
+      next: guard_fail  
+  next: authenticate
+
+verify_header_nonce:
+  call: http.post
+  args:
+    url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
+    body:
+      updated_nonce: ${incoming.headers['x-ruuter-nonce']}
+  result: nonce_response
+  next: check_inline
+
+verify_param_nonce:
+  call: http.post
+  args:
+    url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
+    body:
+      updated_nonce: ${incoming.params['ruuter-nonce']}
+  result: nonce_response
+  next: check_inline
+
+check_inline:
+  inline: extAuth
+  result: extauth
+
+check_nonce:
+  switch:
+    - condition: ${ !extauth || (nonce_response.response.body[0] == null) }
+      next: guard_fail
+  next: guard_success
+
+authenticate:
+  template: "[#SERVICE_PROJECT_LAYER]/check-user-authority"
+  requestType: templates
+  headers:
+    cookie: ${incoming.headers.cookie}
+  result: authority_result
+  next: check_authority_result
+
+check_authority_result:
+  switch:
+    - condition: ${authority_result !== "false"}
+      next: guard_success
+  next: guard_fail
+
+guard_success:
   return: "success"
   status: 200
   next: end
+
+guard_fail:
+  return: "unauthorized"
+  status: 401
+  next: end

DSL/Ruuter/services/GET/services/draft/.guard

@@ -1,4 +1,61 @@
-guard_allow_all:
+process_request:
+  switch:
+    - condition: ${ incoming.headers['x-ruuter-nonce'] != null }
+      next: verify_header_nonce
+    - condition: ${ incoming.params['ruuter-nonce'] != null }
+      next: verify_param_nonce
+    - condition: ${incoming.headers == null || incoming.headers.cookie == null}
+      next: guard_fail  
+  next: authenticate
+
+verify_header_nonce:
+  call: http.post
+  args:
+    url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
+    body:
+      updated_nonce: ${incoming.headers['x-ruuter-nonce']}
+  result: nonce_response
+  next: check_inline
+
+verify_param_nonce:
+  call: http.post
+  args:
+    url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
+    body:
+      updated_nonce: ${incoming.params['ruuter-nonce']}
+  result: nonce_response
+  next: check_inline
+
+check_inline:
+  inline: extAuth
+  result: extauth
+
+check_nonce:
+  switch:
+    - condition: ${ !extauth || (nonce_response.response.body[0] == null) }
+      next: guard_fail
+  next: guard_success
+
+authenticate:
+  template: "[#SERVICE_PROJECT_LAYER]/check-user-authority"
+  requestType: templates
+  headers:
+    cookie: ${incoming.headers.cookie}
+  result: authority_result
+  next: check_authority_result
+
+check_authority_result:
+  switch:
+    - condition: ${authority_result !== "false"}
+      next: guard_success
+  next: guard_fail
+
+guard_success:
   return: "success"
   status: 200
   next: end
+
+guard_fail:
+  return: "unauthorized"
+  status: 401
+  next: end

DSL/Ruuter/services/GET/services/inactive/.guard

@@ -1,4 +1,61 @@
-guard_allow_all:
+process_request:
+  switch:
+    - condition: ${ incoming.headers['x-ruuter-nonce'] != null }
+      next: verify_header_nonce
+    - condition: ${ incoming.params['ruuter-nonce'] != null }
+      next: verify_param_nonce
+    - condition: ${incoming.headers == null || incoming.headers.cookie == null}
+      next: guard_fail  
+  next: authenticate
+
+verify_header_nonce:
+  call: http.post
+  args:
+    url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
+    body:
+      updated_nonce: ${incoming.headers['x-ruuter-nonce']}
+  result: nonce_response
+  next: check_inline
+
+verify_param_nonce:
+  call: http.post
+  args:
+    url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
+    body:
+      updated_nonce: ${incoming.params['ruuter-nonce']}
+  result: nonce_response
+  next: check_inline
+
+check_inline:
+  inline: extAuth
+  result: extauth
+
+check_nonce:
+  switch:
+    - condition: ${ !extauth || (nonce_response.response.body[0] == null) }
+      next: guard_fail
+  next: guard_success
+
+authenticate:
+  template: "[#SERVICE_PROJECT_LAYER]/check-user-authority"
+  requestType: templates
+  headers:
+    cookie: ${incoming.headers.cookie}
+  result: authority_result
+  next: check_authority_result
+
+check_authority_result:
+  switch:
+    - condition: ${authority_result !== "false"}
+      next: guard_success
+  next: guard_fail
+
+guard_success:
   return: "success"
   status: 200
   next: end
+
+guard_fail:
+  return: "unauthorized"
+  status: 401
+  next: end