diff --git a/.github/scripts/test_speed_report.py b/.github/scripts/test_speed_report.py index 25a9d5744d..194ff69ddf 100644 --- a/.github/scripts/test_speed_report.py +++ b/.github/scripts/test_speed_report.py @@ -1,157 +1,222 @@ #!/usr/bin/env python3 """ -Parse surefire XML reports from all shards and print an http4s-vs-Lift -per-test speed table to stdout (plain text) and, if GITHUB_STEP_SUMMARY -is set, append a markdown version to that file. +Parse surefire XML reports from all shards and print a per-test speed table. + +The Lift -> http4s migration is complete: *every* API version (v1.2.1 through +v7.0.0) is served by http4s. There is no Lift HTTP code left, so the old +"http4s vs Lift" split is meaningless. The meaningful axis now is **execution +model**: + + * unit/pure — no embedded server; pure logic / JSON-factory / route-matcher + / middleware tests. These are the speed win of the migration. + * integration — boots a real server (test class extends ServerSetup) or a + self-started http4s server; pays DB/HTTP cost per test. + +Two tables are printed: + 1. By execution model (unit/pure vs integration) — the migration KPI. + 2. By API version (API v1 .. v7, all http4s) — per-version cost. + +A suite counts as integration when its test class extends `ServerSetup` +(detected by scanning obp-api/src/test/scala) or is one of the self-starting +http4s server suites in HTTP4S_INTEGRATION_SUITES. Everything else is unit/pure. Usage: python3 test_speed_report.py - should contain the extracted artifacts from all shards, -e.g. after downloading test-reports-shard{1,2,3} into one directory. + should contain the extracted artifacts from all shards. +Override the source root (used only for integration detection) with +OBP_TEST_SRC_ROOT; if sources are not found, the execution-model split degrades +gracefully (suites counted as integration) and the by-version table still prints. """ +from __future__ import annotations + import os +import re import sys import glob import xml.etree.ElementTree as ET from collections import defaultdict -# --------------------------------------------------------------------------- -# Classification -# --------------------------------------------------------------------------- - -# These suites run a real embedded server — they pay the same DB/HTTP cost -# as Lift integration tests. +# Self-starting http4s integration suites that boot a server WITHOUT extending +# ServerSetup (so the source scan can't detect them) — list them explicitly. HTTP4S_INTEGRATION_SUITES = { "code.api.v7_0_0.Http4s700RoutesTest", "code.api.v7_0_0.Http4s700TransactionTest", - "code.api.http4sbridge.Http4sLiftBridgePropertyTest", "code.api.http4sbridge.Http4sServerIntegrationTest", "code.api.v5_0_0.Http4s500SystemViewsTest", } +DEFAULT_SRC_ROOT = "obp-api/src/test/scala" + + +# --------------------------------------------------------------------------- +# Integration detection by source scan (does the test class extend ServerSetup?) +# --------------------------------------------------------------------------- + +def build_integration_map(src_root): + """Return ({fqClassName: extendsServerSetup}, scan_ok).""" + fqmap = {} + if not os.path.isdir(src_root): + return fqmap, False + for root, _dirs, files in os.walk(src_root): + for fname in files: + if not fname.endswith(".scala"): + continue + try: + with open(os.path.join(root, fname), encoding="utf-8", errors="ignore") as fh: + txt = fh.read() + except OSError: + continue + pm = re.search(r'^\s*package\s+([\w.]+)', txt, re.M) + pkg = pm.group(1) if pm else "" + # For each `class X ... {`, inspect the parents portion (everything + # up to the first brace) and check whether it mentions ServerSetup. + for cm in re.finditer(r'\bclass\s+(\w+)\b(.*?)\{', txt, re.S): + cls, parents = cm.group(1), cm.group(2) + fqmap[f"{pkg}.{cls}"] = ("ServerSetup" in parents) + return fqmap, True + + +def is_integration(fq, fqmap): + if fq in HTTP4S_INTEGRATION_SUITES: + return True + if fq in fqmap: + return fqmap[fq] + # Unknown (class/file-name mismatch or degraded scan): default to + # integration so we never overstate the unit/pure win. + return True -def categorize(suite_name: str) -> str | None: - """Return a display category or None to exclude from the table.""" - # http4s integration (real server) - if suite_name in HTTP4S_INTEGRATION_SUITES: - return "http4s v7 — integration" - # http4s unit/pure (no server) — everything http4s-flavoured that isn't - # in the integration set above - if ( - "Http4s" in suite_name - or "http4s" in suite_name - or "v7_0_0" in suite_name - or suite_name.startswith("code.api.util.http4s.") - or suite_name.startswith("code.api.berlin.group.v2.Http4sBGv2") - ): - return "http4s v7 — unit/pure" +# --------------------------------------------------------------------------- +# API version from the suite's package +# --------------------------------------------------------------------------- - # Lift versions - for v in ("v6_0_0", "v5_1_0", "v5_0_0", "v4_0_0", "v3_1_0", "v3_0_0", - "v2_2_0", "v2_1_0", "v2_0_0", "v1_4_0", "v1_3_0", "v1_2_1"): - if v in suite_name: - major = v[1] # "1" … "6" - return f"Lift v{major}" +_VERSIONS = ("v7_0_0", "v6_0_0", "v5_1_0", "v5_0_0", "v4_0_0", "v3_1_0", "v3_0_0", + "v2_2_0", "v2_1_0", "v2_0_0", "v1_4_0", "v1_3_0", "v1_2_1") - return None # exclude (util, berlin group non-http4s, etc.) + +def api_version(fq): + for v in _VERSIONS: + if v in fq: + return f"API v{v[1]}" # "1" .. "7" + return "other" # --------------------------------------------------------------------------- # Parse # --------------------------------------------------------------------------- -def collect(reports_root: str) -> dict: - stats = defaultdict(lambda: {"tests": 0, "time": 0.0}) +def collect(reports_root, fqmap): + by_model = defaultdict(lambda: {"tests": 0, "time": 0.0}) + by_version = defaultdict(lambda: {"tests": 0, "time": 0.0}) pattern = os.path.join(reports_root, "**", "TEST-*.xml") for path in glob.glob(pattern, recursive=True): try: root = ET.parse(path).getroot() - name = root.get("name", "") + name = root.get("name", "") tests = int(root.get("tests", 0)) - time = float(root.get("time", 0)) + t = float(root.get("time", 0)) if tests == 0: continue - cat = categorize(name) - if cat is None: - continue - stats[cat]["tests"] += tests - stats[cat]["time"] += time + model = "integration" if is_integration(name, fqmap) else "unit/pure" + by_model[model]["tests"] += tests + by_model[model]["time"] += t + ver = api_version(name) + by_version[ver]["tests"] += tests + by_version[ver]["time"] += t except Exception: pass - return stats + return by_model, by_version # --------------------------------------------------------------------------- # Render # --------------------------------------------------------------------------- -CATEGORY_ORDER = [ - "http4s v7 — unit/pure", - "http4s v7 — integration", - "Lift v6", - "Lift v5", - "Lift v4", - "Lift v3", - "Lift v2", - "Lift v1", -] - - -def render_plain(stats: dict) -> str: - col_w = [25, 7, 12, 10] - sep = "+-" + "-+-".join("-" * w for w in col_w) + "-+" - hdr = "| " + " | ".join( - h.center(w) for h, w in zip( - ["Category", "Tests", "Total time", "Avg/test"], col_w - ) - ) + " |" +MODEL_ORDER = ["unit/pure", "integration"] +VERSION_ORDER = ["API v7", "API v6", "API v5", "API v4", "API v3", + "API v2", "API v1", "other"] + +def _table(stats, order, col_w=(24, 7, 12, 10)): + sep = "+-" + "-+-".join("-" * w for w in col_w) + "-+" + hdr = "| " + " | ".join(h.center(w) for h, w in zip( + ["Category", "Tests", "Total time", "Avg/test"], col_w)) + " |" lines = [sep, hdr, sep] - for cat in CATEGORY_ORDER: + for cat in order: if cat not in stats: continue - d = stats[cat] + d = stats[cat] avg = d["time"] / d["tests"] if d["tests"] else 0 - row = "| " + " | ".join([ + lines.append("| " + " | ".join([ cat.ljust(col_w[0]), str(d["tests"]).rjust(col_w[1]), f"{d['time']:.1f}s".rjust(col_w[2]), f"{avg:.3f}s".rjust(col_w[3]), - ]) + " |" - lines.append(row) + ]) + " |") lines.append(sep) return "\n".join(lines) -def render_markdown(stats: dict) -> str: - rows = ["## http4s v7 vs Lift — per-test speed", - "", - "| Category | Tests | Total time | Avg/test |", - "|---|---:|---:|---:|"] - for cat in CATEGORY_ORDER: - if cat not in stats: +def render_plain(by_model, by_version, scan_ok): + out = ["All API versions (v1-v7) are served by http4s — the split is by", + "execution model, not framework.\n", + "By execution model (unit/pure = no server, integration = embedded server):"] + if not scan_ok: + out.append(" (source scan unavailable — suites counted as integration)") + out.append(_table(by_model, MODEL_ORDER)) + out += ["", "By API version:", _table(by_version, VERSION_ORDER)] + + u = by_model.get("unit/pure") + i = by_model.get("integration") + if u and i and u["tests"] and i["tests"]: + ua = u["time"] / u["tests"] + ia = i["time"] / i["tests"] + if ua > 0: + out += ["", + f"--> unit/pure tests are {ia/ua:.0f}x faster per test than " + f"integration tests ({ua:.3f}s vs {ia:.3f}s)."] + return "\n".join(out) + + +def render_markdown(by_model, by_version, scan_ok): + rows = ["## Per-test speed — all endpoints served by http4s", "", + "_All API versions (v1-v7) run on http4s. The split below is by " + "execution model, not framework._", "", + "### By execution model", ""] + if not scan_ok: + rows += ["> source scan unavailable — suites counted as integration", ""] + rows += ["| Category | Tests | Total time | Avg/test |", "|---|---:|---:|---:|"] + for cat in MODEL_ORDER: + if cat not in by_model: + continue + d = by_model[cat] + avg = d["time"] / d["tests"] if d["tests"] else 0 + rows.append(f"| {cat} | {d['tests']} | {d['time']:.1f}s | {avg:.3f}s |") + + rows += ["", "### By API version", "", + "| Category | Tests | Total time | Avg/test |", "|---|---:|---:|---:|"] + for cat in VERSION_ORDER: + if cat not in by_version: continue - d = stats[cat] + d = by_version[cat] avg = d["time"] / d["tests"] if d["tests"] else 0 rows.append(f"| {cat} | {d['tests']} | {d['time']:.1f}s | {avg:.3f}s |") - # Highlight ratio - u = stats.get("http4s v7 — unit/pure") - lift_times = [stats[c]["time"] for c in CATEGORY_ORDER if c.startswith("Lift") and c in stats] - lift_tests = [stats[c]["tests"] for c in CATEGORY_ORDER if c.startswith("Lift") and c in stats] - if u and lift_tests: - lift_avg = sum(lift_times) / sum(lift_tests) - unit_avg = u["time"] / u["tests"] - rows += [ - "", - f"> **Unit/pure tests are {lift_avg/unit_avg:.0f}× faster than Lift integration tests** " - f"({unit_avg:.3f}s vs {lift_avg:.3f}s per test).", - ] + u = by_model.get("unit/pure") + i = by_model.get("integration") + if u and i and u["tests"] and i["tests"]: + ua = u["time"] / u["tests"] + ia = i["time"] / i["tests"] + if ua > 0: + rows += ["", + f"> **Unit/pure tests are {ia/ua:.0f}x faster per test than " + f"integration tests** ({ua:.3f}s vs {ia:.3f}s). This is the " + f"migration win: logic that used to need a running server is " + f"now pure unit-tested."] return "\n".join(rows) @@ -164,16 +229,19 @@ def render_markdown(stats: dict) -> str: print(f"Usage: {sys.argv[0]} ", file=sys.stderr) sys.exit(1) - stats = collect(sys.argv[1]) - if not stats: + src_root = os.environ.get("OBP_TEST_SRC_ROOT", DEFAULT_SRC_ROOT) + fqmap, scan_ok = build_integration_map(src_root) + + by_model, by_version = collect(sys.argv[1], fqmap) + if not by_model and not by_version: print("No matching surefire XML reports found.", file=sys.stderr) sys.exit(0) - print(render_plain(stats)) + print(render_plain(by_model, by_version, scan_ok)) summary_path = os.environ.get("GITHUB_STEP_SUMMARY") if summary_path: with open(summary_path, "a") as f: f.write("\n") - f.write(render_markdown(stats)) + f.write(render_markdown(by_model, by_version, scan_ok)) f.write("\n") diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml index 3b21c1d697..e932d69315 100644 --- a/.github/workflows/build_container.yml +++ b/.github/workflows/build_container.yml @@ -45,7 +45,13 @@ jobs: - name: Compile and install (skip test execution) run: | # -DskipTests — compile test sources but do NOT run them - # Test classes must be in target/test-classes for the test shards + # Test classes must be in target/test-classes for the test shards. + # `clean` for a guaranteed-correct build. A no-clean Zinc incremental cache + # (actions/cache of target/) was measured and saved only ~17s: compile time is + # dominated by Maven startup + dependency resolution + packaging the ~297MB fat + # jar + install — NOT by Scala compilation (a zero-source-change rebuild was + # still 333s vs 350s). The stale-risk class of no-clean incremental builds is + # not worth ~2.7% of wall-clock, so we keep a full clean build. MAVEN_OPTS="-Xmx3G -Xss2m -XX:MaxMetaspaceSize=1G" \ mvn clean install -T 4 -Pprod -DskipTests @@ -84,67 +90,85 @@ jobs: matrix: include: - shard: 1 - name: "v4 only" - # ~258s of test work + name: "v4 only (bottleneck pkg)" + # ~258s — single largest package, kept on its own shard test_filter: >- code.api.v4_0_0 - shard: 2 - name: "v6 + v5_0 + v3_0 + v2 + small" - # ~267s of test work + name: "v1_2_1 only (largest unsplittable suite, isolated)" + # API1_2_1Test is a single 6604-line suite (~333 scenarios, ~281s). Isolated + # on its own shard: mixing in berlin/management/metrics made this the slowest + # shard (314s); those moved to shards 7/8 to rebalance. + test_filter: >- + code.api.v1_2_1 + - shard: 3 + name: "v6 + v2_x" test_filter: >- code.api.v6_0_0 - code.api.v5_0_0 - code.api.v3_0_0 code.api.v2_1_0 code.api.v2_2_0 code.api.v2_0_0 + - shard: 4 + name: "v5_1 + v5_0 + v3_0" + test_filter: >- + code.api.v5_1_0 + code.api.v5_0_0 + code.api.v3_0_0 + - shard: 5 + name: "ResourceDocs + v3_1 + v1_4 + v1_3" + test_filter: >- + code.api.ResourceDocs1_4_0 + code.api.v3_1_0 code.api.v1_4_0 code.api.v1_3_0 + - shard: 6 + name: "v7 + http4sbridge + UKOpenBanking" + test_filter: >- + code.api.v7_0_0 + code.api.http4sbridge code.api.UKOpenBanking + - shard: 7 + name: "model + views + customer + util + small data + berlin" + test_filter: >- + code.model + code.views + code.customer + code.usercustomerlinks + code.api.util + code.errormessages code.atms code.branches code.products code.crm code.accountHolder - code.entitlement - code.bankaccountcreation - code.bankconnectors - code.container - - shard: 3 - name: "v1_2_1 + ResourceDocs + berlin + util + small" - # ~252s of test work - test_filter: >- - code.api.v1_2_1 - code.api.ResourceDocs1_4_0 - code.api.util code.api.berlin - code.management - code.metrics - code.model - code.views - code.usercustomerlinks - code.customer - code.errormessages - - shard: 4 - name: "v5_1 + v3_1 + http4sbridge + v7 + code.api + util + connector" - # ~232s of test work + catch-all for any new packages - # Root-level code.api tests use class-name prefix matching (lowercase classes) + - shard: 8 + name: "connector + auth + login + mgmt + metrics + remaining (catch-all)" + # catch-all shard: appends any test package not assigned to shards 1-7 + # Root-level code.api tests use class-name prefix matching (lowercase classes). + # NOTE: classes that sit DIRECTLY in package code.api must be listed here by + # FQN-prefix — the catch-all marks the parent package code.api as "covered" once + # any child (code.api.v4_0_0, …) is assigned, so it never appends code.api itself. test_filter: >- - code.api.v5_1_0 - code.api.v3_1_0 - code.api.http4sbridge - code.api.v7_0_0 + code.connector + code.util code.api.Authentication code.api.dauthTest code.api.DirectLoginTest code.api.gateWayloginTest code.api.OBPRestHelperTest - code.util - code.connector + code.api.AliveCheckRoutesTest + code.api.Http4sOpenIdConnect + code.entitlement + code.bankaccountcreation + code.bankconnectors + code.container + code.management + code.metrics services: redis: - image: redis + image: redis:7-alpine # pinned + small (~30MB) to cut redis docker-pull flakiness ports: - 6379:6379 options: >- @@ -246,20 +270,19 @@ jobs: # The YAML >- scalar collapses newlines to spaces, so we convert here. FILTER=$(echo "${{ matrix.test_filter }}" | tr ' ' ',') - # Shard 4 is the catch-all: append any test package not explicitly - # assigned to shards 1–3, so new packages are never silently skipped. - if [ "${{ matrix.shard }}" = "4" ]; then + # Shard 8 is the catch-all: append any test package not explicitly + # assigned to shards 1–7, so new packages are never silently skipped. + if [ "${{ matrix.shard }}" = "8" ]; then SHARD1="code.api.v4_0_0" - SHARD2="code.api.v6_0_0 code.api.v5_0_0 code.api.v3_0_0 code.api.v2_1_0 \ - code.api.v2_2_0 code.api.v2_0_0 code.api.v1_4_0 code.api.v1_3_0 \ - code.api.UKOpenBanking code.atms code.branches code.products code.crm \ - code.accountHolder code.entitlement code.bankaccountcreation \ - code.bankconnectors code.container" - SHARD3="code.api.v1_2_1 code.api.ResourceDocs1_4_0 \ - code.api.util code.api.berlin code.management code.metrics \ - code.model code.views code.usercustomerlinks code.customer \ - code.errormessages" - ASSIGNED="$SHARD1 $SHARD2 $SHARD3 ${{ matrix.test_filter }}" + SHARD2="code.api.v1_2_1" + SHARD3="code.api.v6_0_0 code.api.v2_1_0 code.api.v2_2_0 code.api.v2_0_0" + SHARD4="code.api.v5_1_0 code.api.v5_0_0 code.api.v3_0_0" + SHARD5="code.api.ResourceDocs1_4_0 code.api.v3_1_0 code.api.v1_4_0 code.api.v1_3_0" + SHARD6="code.api.v7_0_0 code.api.http4sbridge code.api.UKOpenBanking" + SHARD7="code.model code.views code.customer code.usercustomerlinks \ + code.api.util code.errormessages code.atms code.branches \ + code.products code.crm code.accountHolder code.api.berlin" + ASSIGNED="$SHARD1 $SHARD2 $SHARD3 $SHARD4 $SHARD5 $SHARD6 $SHARD7 ${{ matrix.test_filter }}" # Discover all packages that contain at least one .scala test file ALL_PKGS=$(find obp-api/src/test/scala obp-commons/src/test/scala \ @@ -278,12 +301,22 @@ jobs: [ "$covered" = "false" ] && EXTRAS="$EXTRAS,$pkg" done - [ -n "$EXTRAS" ] && echo "Catch-all extras added to shard 4:$EXTRAS" + [ -n "$EXTRAS" ] && echo "Catch-all extras added to shard ${{ matrix.shard }}:$EXTRAS" FILTER="${FILTER}${EXTRAS}" fi + # `mvn process-resources scalatest:test` — run process-resources (copies the + # dynamically-generated props from src/main/resources onto the classpath at + # target/classes/props) then the scalatest:test goal. This SKIPS the + # compile/testCompile lifecycle phases (~208s/shard: classes already come from + # the compiled-output artifact + touch trick) while still placing + # test.default.props on the classpath. (Plain goal-only `scalatest:test` skips + # process-resources → Props init fails → 0 tests but BUILD SUCCESS = false green.) + # -pl obp-commons,obp-api: obp-commons' own 5 util suites run on whichever + # shard's filter matches com.openbankproject.* (the catch-all shard); on every + # other shard the filter matches nothing in obp-commons → 0 tests there. MAVEN_OPTS="-Xmx3G -Xss2m -XX:MaxMetaspaceSize=1G" \ - mvn test \ + mvn process-resources scalatest:test -pl obp-commons,obp-api -DfailIfNoTests=false \ -DwildcardSuites="$FILTER" \ > maven-build-shard${{ matrix.shard }}.log 2>&1 @@ -352,7 +385,7 @@ jobs: path: all-reports merge-multiple: true - - name: http4s v7 vs Lift — per-test speed + - name: Per-test speed — unit/pure vs integration (all http4s) run: python3 .github/scripts/test_speed_report.py all-reports # -------------------------------------------------------------------------- diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index 2c4af6d108..0dbd9c28bf 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -25,7 +25,6 @@ jobs: # -------------------------------------------------------------------------- compile: runs-on: ubuntu-latest - if: github.repository == 'OpenBankProject/OBP-API' steps: - uses: actions/checkout@v4 @@ -47,7 +46,10 @@ jobs: - name: Compile and install (skip test execution) run: | # -DskipTests — compile test sources but do NOT run them - # Test classes must be in target/test-classes for the test shards + # Test classes must be in target/test-classes for the test shards. + # `clean` for a guaranteed-correct build (see build_container.yml: a no-clean + # Zinc incremental cache saved only ~17s — compile is dominated by Maven + + # fat-jar packaging + install, not Scala compilation). MAVEN_OPTS="-Xmx3G -Xss2m -XX:MaxMetaspaceSize=1G" \ mvn clean install -T 4 -Pprod -DskipTests @@ -87,67 +89,85 @@ jobs: matrix: include: - shard: 1 - name: "v4 only" - # ~258s of test work + name: "v4 only (bottleneck pkg)" + # ~258s — single largest package, kept on its own shard test_filter: >- code.api.v4_0_0 - shard: 2 - name: "v6 + v5_0 + v3_0 + v2 + small" - # ~267s of test work + name: "v1_2_1 only (largest unsplittable suite, isolated)" + # API1_2_1Test is a single 6604-line suite (~333 scenarios, ~281s). Isolated + # on its own shard: mixing in berlin/management/metrics made this the slowest + # shard (314s); those moved to shards 7/8 to rebalance. + test_filter: >- + code.api.v1_2_1 + - shard: 3 + name: "v6 + v2_x" test_filter: >- code.api.v6_0_0 - code.api.v5_0_0 - code.api.v3_0_0 code.api.v2_1_0 code.api.v2_2_0 code.api.v2_0_0 + - shard: 4 + name: "v5_1 + v5_0 + v3_0" + test_filter: >- + code.api.v5_1_0 + code.api.v5_0_0 + code.api.v3_0_0 + - shard: 5 + name: "ResourceDocs + v3_1 + v1_4 + v1_3" + test_filter: >- + code.api.ResourceDocs1_4_0 + code.api.v3_1_0 code.api.v1_4_0 code.api.v1_3_0 + - shard: 6 + name: "v7 + http4sbridge + UKOpenBanking" + test_filter: >- + code.api.v7_0_0 + code.api.http4sbridge code.api.UKOpenBanking + - shard: 7 + name: "model + views + customer + util + small data + berlin" + test_filter: >- + code.model + code.views + code.customer + code.usercustomerlinks + code.api.util + code.errormessages code.atms code.branches code.products code.crm code.accountHolder - code.entitlement - code.bankaccountcreation - code.bankconnectors - code.container - - shard: 3 - name: "v1_2_1 + ResourceDocs + berlin + util + small" - # ~252s of test work - test_filter: >- - code.api.v1_2_1 - code.api.ResourceDocs1_4_0 - code.api.util code.api.berlin - code.management - code.metrics - code.model - code.views - code.usercustomerlinks - code.customer - code.errormessages - - shard: 4 - name: "v5_1 + v3_1 + http4sbridge + v7 + code.api + util + connector" - # ~232s of test work + catch-all for any new packages - # Root-level code.api tests use class-name prefix matching (lowercase classes) + - shard: 8 + name: "connector + auth + login + mgmt + metrics + remaining (catch-all)" + # catch-all shard: appends any test package not assigned to shards 1-7 + # Root-level code.api tests use class-name prefix matching (lowercase classes). + # NOTE: classes that sit DIRECTLY in package code.api must be listed here by + # FQN-prefix — the catch-all marks the parent package code.api as "covered" once + # any child (code.api.v4_0_0, …) is assigned, so it never appends code.api itself. test_filter: >- - code.api.v5_1_0 - code.api.v3_1_0 - code.api.http4sbridge - code.api.v7_0_0 + code.connector + code.util code.api.Authentication code.api.dauthTest code.api.DirectLoginTest code.api.gateWayloginTest code.api.OBPRestHelperTest - code.util - code.connector + code.api.AliveCheckRoutesTest + code.api.Http4sOpenIdConnect + code.entitlement + code.bankaccountcreation + code.bankconnectors + code.container + code.management + code.metrics services: redis: - image: redis + image: redis:7-alpine # pinned + small (~30MB) to cut redis docker-pull flakiness ports: - 6379:6379 options: >- @@ -255,20 +275,19 @@ jobs: # The YAML >- scalar collapses newlines to spaces, so we convert here. FILTER=$(echo "${{ matrix.test_filter }}" | tr ' ' ',') - # Shard 4 is the catch-all: append any test package not explicitly - # assigned to shards 1–3, so new packages are never silently skipped. - if [ "${{ matrix.shard }}" = "4" ]; then + # Shard 8 is the catch-all: append any test package not explicitly + # assigned to shards 1–7, so new packages are never silently skipped. + if [ "${{ matrix.shard }}" = "8" ]; then SHARD1="code.api.v4_0_0" - SHARD2="code.api.v6_0_0 code.api.v5_0_0 code.api.v3_0_0 code.api.v2_1_0 \ - code.api.v2_2_0 code.api.v2_0_0 code.api.v1_4_0 code.api.v1_3_0 \ - code.api.UKOpenBanking code.atms code.branches code.products code.crm \ - code.accountHolder code.entitlement code.bankaccountcreation \ - code.bankconnectors code.container" - SHARD3="code.api.v1_2_1 code.api.ResourceDocs1_4_0 \ - code.api.util code.api.berlin code.management code.metrics \ - code.model code.views code.usercustomerlinks code.customer \ - code.errormessages" - ASSIGNED="$SHARD1 $SHARD2 $SHARD3 ${{ matrix.test_filter }}" + SHARD2="code.api.v1_2_1" + SHARD3="code.api.v6_0_0 code.api.v2_1_0 code.api.v2_2_0 code.api.v2_0_0" + SHARD4="code.api.v5_1_0 code.api.v5_0_0 code.api.v3_0_0" + SHARD5="code.api.ResourceDocs1_4_0 code.api.v3_1_0 code.api.v1_4_0 code.api.v1_3_0" + SHARD6="code.api.v7_0_0 code.api.http4sbridge code.api.UKOpenBanking" + SHARD7="code.model code.views code.customer code.usercustomerlinks \ + code.api.util code.errormessages code.atms code.branches \ + code.products code.crm code.accountHolder code.api.berlin" + ASSIGNED="$SHARD1 $SHARD2 $SHARD3 $SHARD4 $SHARD5 $SHARD6 $SHARD7 ${{ matrix.test_filter }}" # Discover all packages that contain at least one .scala test file ALL_PKGS=$(find obp-api/src/test/scala obp-commons/src/test/scala \ @@ -287,12 +306,22 @@ jobs: [ "$covered" = "false" ] && EXTRAS="$EXTRAS,$pkg" done - [ -n "$EXTRAS" ] && echo "Catch-all extras added to shard 4:$EXTRAS" + [ -n "$EXTRAS" ] && echo "Catch-all extras added to shard ${{ matrix.shard }}:$EXTRAS" FILTER="${FILTER}${EXTRAS}" fi + # `mvn process-resources scalatest:test` — run process-resources (copies the + # dynamically-generated props from src/main/resources onto the classpath at + # target/classes/props) then the scalatest:test goal. This SKIPS the + # compile/testCompile lifecycle phases (~208s/shard: classes already come from + # the compiled-output artifact + touch trick) while still placing + # test.default.props on the classpath. (Plain goal-only `scalatest:test` skips + # process-resources → Props init fails → 0 tests but BUILD SUCCESS = false green.) + # -pl obp-commons,obp-api: obp-commons' own 5 util suites run on whichever + # shard's filter matches com.openbankproject.* (the catch-all shard); on every + # other shard the filter matches nothing in obp-commons → 0 tests there. MAVEN_OPTS="-Xmx3G -Xss2m -XX:MaxMetaspaceSize=1G" \ - mvn test \ + mvn process-resources scalatest:test -pl obp-commons,obp-api -DfailIfNoTests=false \ -DwildcardSuites="$FILTER" \ > maven-build-shard${{ matrix.shard }}.log 2>&1 @@ -345,7 +374,7 @@ jobs: **/target/site/surefire-report/* # -------------------------------------------------------------------------- - # Job 3: report — http4s v7 vs Lift per-test speed table + # Job 3: report — per-test speed (unit/pure vs integration, all http4s) # -------------------------------------------------------------------------- report: needs: test @@ -361,5 +390,5 @@ jobs: path: all-reports merge-multiple: true - - name: http4s v7 vs Lift — per-test speed + - name: Per-test speed — unit/pure vs integration (all http4s) run: python3 .github/scripts/test_speed_report.py all-reports diff --git a/CLAUDE.md b/CLAUDE.md index 68c5e30592..8fb4c8a7f3 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -13,7 +13,7 @@ The goal is a full http4s migration — replace Lift Web across all version files and remove it entirely. **API versions are tech-agnostic**: a version bump means a changed/new API signature, never a framework change. Framework migration happens in-place inside the existing version file. v7.0.0 currently serves 45 endpoints; most arrived there for historical reasons and stay as-is. -**Request priority chain** (Http4sServer): `corsHandler` (OPTIONS) → StatusPage → Http4s500 → Http4s700 → Http4sBGv2 → Http4s200 → Http4s140 → Http4s130 → Http4s121 → Http4sLiftWebBridge (Lift fallback). Unhandled `/obp/v7.0.0/*` paths fall through silently to Lift — they do not 404. +**Request priority chain** (`Http4sApp.baseServices`): `corsHandler` (OPTIONS short-circuit) → `AppsPage` → `StatusPage` → `Http4sResourceDocs` → v510 → v600 → v500 → v700 → Berlin Group v2 → UK v2.0 → UK v3.1 → Berlin Group v1.3 (+Alias) → v400 → v310 → v300 → v220 → v210 → v200 → v140 → v130 → v121 → `dynamicEntityRoutes` → `dynamicEndpointRoutes` → DirectLogin → OpenIdConnect → AliveCheck → `notFoundCatchAll` (JSON 404). There is no Lift fallback — `Http4sLiftWebBridge` has been removed. Any unhandled `/obp/*` path returns a JSON 404 from `notFoundCatchAll`; it does not fall through to Lift. **Key files**: `Http4s700.scala` (v7.0.0 endpoints), `Http4s200.scala` (v2.0.0 endpoints — 37 own + path-rewriting bridge to Http4s140), `Http4s140.scala` (v1.4.0 endpoints — 11 own + path-rewriting bridge to Http4s130), `Http4s130.scala` (v1.3.0 endpoints — 3 own + path-rewriting bridge to Http4s121), `Http4s121.scala` (v1.2.1 endpoints — all 323 API1_2_1Test scenarios), `Http4sSupport.scala` (EndpointHelpers + recordMetric), `ResourceDocMiddleware.scala` (auth, entity resolution, transaction wrapper), `IdempotencyMiddleware.scala` (Redis-backed idempotency, opt-in via `Idempotency-Key` header, nested inside ResourceDocMiddleware), `RequestScopeConnection.scala` (DB transaction propagation to Futures). @@ -30,8 +30,7 @@ Rules apply regardless of which version file the endpoint lives in. Use v7.0.0 o val myEndpoint: HttpRoutes[IO] = HttpRoutes.of[IO] { ... } resourceDocs += ResourceDoc( - null, // always null — no Lift endpoint ref - implementedInApiVersion, + implementedInApiVersion, // first param; ResourceDoc.partialFunction (OBPEndpoint) was removed in the Lift teardown nameOf(myEndpoint), "GET", "/some/path", "Summary", """Description""", EmptyBody, responseJson, @@ -172,7 +171,7 @@ EndpointHelpers.withUser(req) { (user, cc) => } yield ... } // ResourceDoc: -resourceDocs += ResourceDoc(null, ..., "/banks/FIREHOSE_BANK_ID/firehose/...", ..., None, ...) +resourceDocs += ResourceDoc(implementedInApiVersion, ..., "/banks/FIREHOSE_BANK_ID/firehose/...", ..., None, ...) ``` **`ResourceDoc` description and `needsAuthentication`**: The `ResourceDoc` constructor removes `AuthenticatedUserIsRequired` from `errorResponseBodies` when `description.contains(authenticationIsOptional) && rolesIsEmpty`. `needsAuthentication = errorResponseBodies.contains($AuthenticatedUserIsRequired) || roles.nonEmpty`. If the description embeds `${userAuthenticationMessage(false)}` (which includes `authenticationIsOptional`) and roles are empty, the error is silently removed → `needsAuthentication=false` → anonymous access → unauthenticated requests reach the handler. Fix: remove `${userAuthenticationMessage(false)}` from the description when `AuthenticatedUserIsRequired` must remain in the error list. @@ -202,7 +201,7 @@ for tc in t.findall('testcase'): ``` The `` element's *text* contains the full stack trace + the lift-json `MappingException` body dump — read that when the message alone (`"500 did not equal 400"`) isn't enough to find the failing assertion. -**Empty path segments fall into http4s patterns that should reject them**: A Lift test like `getSystemView("")` builds URL `/system-views/`. http4s's `Path` keeps the trailing empty segment, so `case GET -> prefixPath / "system-views" / viewIdStr` matches with `viewIdStr = ""`. Meanwhile `ResourceDocMatcher.matchesUrlTemplate` filters empty segments via `.split("/").filter(_.nonEmpty)`, so the matcher sees 1 segment vs the template's 2 — no doc match → middleware skips auth/role validation and falls through to your handler with `viewIdStr = ""`. The handler then throws inside the business logic → 500 (test expected 401/403 from middleware). Fix: add a pattern guard so empty viewId doesn't match and the request falls through to the Lift bridge: `case req @ GET -> prefixPath / "system-views" / viewIdStr if viewIdStr.nonEmpty =>`. Apply to GET/PUT/DELETE variants. +**Empty path segments fall into http4s patterns that should reject them**: A Lift test like `getSystemView("")` builds URL `/system-views/`. http4s's `Path` keeps the trailing empty segment, so `case GET -> prefixPath / "system-views" / viewIdStr` matches with `viewIdStr = ""`. Meanwhile `ResourceDocMatcher.matchesUrlTemplate` filters empty segments via `.split("/").filter(_.nonEmpty)`, so the matcher sees 1 segment vs the template's 2 — no doc match → middleware skips auth/role validation and falls through to your handler with `viewIdStr = ""`. The handler then throws inside the business logic → 500 (test expected 401/403 from middleware). Fix: add a pattern guard so empty viewId doesn't match and the request falls through to `notFoundCatchAll` (JSON 404): `case req @ GET -> prefixPath / "system-views" / viewIdStr if viewIdStr.nonEmpty =>`. Apply to GET/PUT/DELETE variants. **Throwing a `RuntimeException` in Lift returns 500, not 400**: When porting Lift code like: ```scala @@ -256,7 +255,7 @@ POST /obp/v4.0.0/banks → Http4s220 (HAS POST /banks → executes v2.2.0 createBank ✗) ``` -Without the v4 work the chain falls all the way through to the Lift bridge, which honours the `collectResourceDocs` URL+verb dedup that keeps the highest-version handler for each route — so Lift's v4 createBank runs and the test passes. Once you add an `Http4sXYZ` for an in-flight migration, that "Lift dedup" no longer protects you. Cure: before flipping a new version's `wrappedRoutesVxxxServices` into `Http4sApp.baseServices`, audit the version's overrides (Lift's `excludeEndpoints` is *not* the right list — it only names *removed* endpoints, not overrides) and migrate them too. +Before `Http4sLiftWebBridge` was removed, an un-migrated v4 override fell all the way through to the Lift bridge, which honoured the `collectResourceDocs` URL+verb dedup that keeps the highest-version handler for each route — so Lift's v4 createBank ran and the test passed. **That safety net is gone**: the chain now terminates in `notFoundCatchAll`, so a v4 path not matched by `Http4s400`'s own routes cascades down the http4s version bridges to an older handler (or 404s) — it never reaches a Lift v4 handler. Cure: before flipping a new version's `wrappedRoutesVxxxServices` into `Http4sApp.baseServices`, audit the version's overrides (Lift's `excludeEndpoints` is *not* the right list — it only names *removed* endpoints, not overrides) and migrate them too. How to find overrides for a version: grep `lazy val (\w+)` in the target `APIMethods*.scala`, then check whether the same URL + verb also appears in any older `APIMethods*.scala`. The intersection is the override set. Migrate that set as part of the same PR that introduces the bridge; otherwise reviewers will see test failures whose proximate cause (a downstream version's handler running) doesn't match the file the migration touches. @@ -268,7 +267,7 @@ Symptoms in tests: a v4-specific assertion fails (e.g. an entitlement should-be- ## CI (shard map + run tips) -Perf note: integration tests are DB/HTTP-bound (~0.4 s/test) on both frameworks; the http4s win is the **pure-unit tier** (no running server, ~0.008 s/test). `ResourceDocsTest`/`SwaggerDocsTest` are the slowest per-test cost — they serialize the whole API surface, so cost grows with endpoint count (needs ResourceDoc-serialization caching before the migration completes). +Perf note: integration tests are DB/HTTP-bound (~0.4 s/test) on both frameworks; the http4s win is the **pure-unit tier** (no running server, ~0.008 s/test). `ResourceDocsTest`/`SwaggerDocsTest` are the slowest per-test cost — they serialize the whole API surface, so cost grows with endpoint count. `Http4sResourceDocs` already caches the serialized output (`Caching.{getDynamic,getStatic,getAll}ResourceDocCache` + `getStaticSwaggerDocCache`, keyed via `APIUtil.createResourceDocCacheKey`), so repeat requests for the same version/params skip re-serialization. ### Shard assignment diff --git a/EXTRA_TESTS_TODO.md b/EXTRA_TESTS_TODO.md index 2330c64bbe..bc0c2e169f 100644 --- a/EXTRA_TESTS_TODO.md +++ b/EXTRA_TESTS_TODO.md @@ -5,7 +5,6 @@ Tracks dependency bumps where compile + the standard 4-suite smoke test passed, Test suites currently used as the smoke gate: - `code.api.v7_0_0.Http4s700RoutesTest` - `code.api.v7_0_0.Http4s700TransactionTest` -- `code.api.http4sbridge.Http4sLiftBridgePropertyTest` - `code.api.http4sbridge.Http4sServerIntegrationTest` Test DB is H2; many integrations are stubbed or absent. diff --git a/FAQ.md b/FAQ.md index 23628778d0..2dd4a0bbf4 100644 --- a/FAQ.md +++ b/FAQ.md @@ -24,34 +24,17 @@ In summary, we: In more detail: -0) At boot time, Boot.scala is run +0) At boot time, `Boot.scala` initialises Lift Mapper (the database / ORM layer) and OBP configuration. It no longer registers any HTTP routes — endpoint dispatch is served entirely by native http4s. -1) For each API version that a developer might call, we only run it if is enabled in Props e.g. +1) For each API version, `enableVersionIfAllowed(ApiVersion.v3_0_0)` gates the version against the Props (`api_enabled_versions` / `api_disabled_versions`). This now only records and logs whether the version is enabled. -enableVersionIfAllowed(ApiVersion.v3_0_0) +2) Each version's endpoints are defined as native http4s `HttpRoutes[IO]` in `code.api.vX.Http4sXxx` (e.g. `Http4s300`) and exposed via `wrappedRoutesVXxxServices`. These are wired, in priority order, into `Http4sApp.baseServices` (see `obp-api/src/main/scala/code/api/util/http4s/Http4sApp.scala`). Each version's routes are wrapped by `Http4sApp.gate`, which returns `HttpRoutes.empty` when the version is disabled. -2) As long as its not disabled in Props we add endpoints: +The matching Lift `OBPAPI3_0_0.scala` / `APIMethods300.scala` files are retained only as commented-out source-of-truth and as the `allResourceDocs` registry used by the resource-docs aggregation — they no longer serve requests. -case ApiVersion.v3_0_0 => LiftRules.statelessDispatch.append(v3_0_0.OBPAPI3_0_0) +3) Per-endpoint enable/disable is enforced at request time by `ResourceDocMiddleware`, which reads the Props for explicitly enabled/disabled endpoints (`api_enabled_endpoints` / `api_disabled_endpoints`) and also performs authentication, role checks, and entity resolution. -In this case we look into: /src/main/scala/code/api/v3_0_0/OBPAPI3_0_0.scala - -This file defines which endpoints are made available to v3.0.0 -Note that a version may have endpoints from the current and also previous versions e.g.from v3.0.0 and v2.1.0 and so on. - -3) Then for the total endpoints available from each version, we check which endpoints should be enabled by looking at the Props for explicitly enabled endpoints or disabled endpoints. -For this to work we must pass the resource docs also. - -e.g. - -routes = ... -getAllowedEndpoints(endpointsOf2_2_0, Implementations2_2_0.resourceDocs) -getAllowedEndpoints(endpointsOf3_0_0, Implementations3_0_0.resourceDocs) - - -4) Once we have a final list of routes we serve them: - - `registerRoutes(routes, allResourceDocs, apiPrefix, autoValidateAll = true)` +4) Any request that matches no route falls through to `notFoundCatchAll`, which returns a JSON 404. There is no Lift fallback. diff --git a/LIFT_HTTP4S_MIGRATION.md b/LIFT_HTTP4S_MIGRATION.md index 8e0b788f3c..3e22f1c185 100644 --- a/LIFT_HTTP4S_MIGRATION.md +++ b/LIFT_HTTP4S_MIGRATION.md @@ -1,113 +1,307 @@ -# Lift → http4s Migration +# Lift → http4s Migration — COMPLETE -Single source of truth for **migration status and open TODOs**. The how-to and the gotchas live in `CLAUDE.md` (§ Migrating a Lift Endpoint, § Tricky Parts). +## Status + +**The Lift → http4s migration of the HTTP request path is complete.** Every OBP API endpoint is served by native http4s `HttpRoutes[IO]`: + +- All version files **v1.2.1 → v7.0.0** +- **Berlin Group** v1.3 + v2 +- **UK Open Banking** v2.0 + v3.1 +- **Dynamic Entity / Dynamic Endpoint** runtime dispatch +- **Resource-docs / message-docs / openapi.yaml** (centralized `Http4sResourceDocs`) +- **Auth handlers**: DirectLogin, OpenID Connect, AliveCheck + +`Http4sLiftWebBridge` has been **deleted**; `lift-webkit` has been **removed from `pom.xml`**. There is no Lift fallback in the request path — any unmatched `/obp/*` path returns a JSON 404 from `notFoundCatchAll`. The **"Lift Web removed"** milestone is therefore achieved. + +The remaining Lift dependencies are the **non-web libraries** — `lift-mapper` (ORM / database layer), plus `lift-json` / `lift-common` / `lift-util` — kept deliberately. Replacing `lift-mapper` is a separate long-term effort tracked under [What remains](#what-remains--lift-mapper). + +--- ## Principle -API version numbers reflect **API contract changes** (new/changed fields, new behaviour), never the framework. Lift → http4s is an **in-place** refactor at the existing version/URL — no version bump. Use a new version only when the contract itself changes. +API version numbers reflect **API contract changes** (new/changed fields, new behaviour). The underlying framework is invisible to clients. Lift → http4s was a refactoring: it happened **in-place** inside the existing version file at the existing URL. No version bump. -## Architecture (current) +A new version (e.g. v7.0.0) is used only when the API contract itself changes — new fields, changed request/response shape, new behaviour. -OBP-API runs as a single **http4s Ember server** (`Http4sServer`, a Cats Effect `IOApp`). Jetty / servlet container are gone. Lift now does only two things: (1) **Mapper ORM** — schema, migrations, all data access; (2) **legacy endpoint dispatch** for not-yet-migrated paths via `Http4sLiftWebBridge` (converts http4s ⇄ Lift `Req`, runs `LiftRules.dispatch`). Native http4s routes never touch the bridge. +--- -**Priority routing** (`Http4sApp.baseServices`): `corsHandler` → AppsPage → StatusPage → LiftBridgeTraffic(audit) → Http4sResourceDocs → v510 → v600 → v500 → v700 → BGv2 → **ukV20 → ukV31** → v400 → v310 → v300 → v220 → v210 → v200 → v140 → v130 → v121 → dynamic-entity → dynamic-endpoint → `Http4sLiftWebBridge`. Each per-version service gates on its own prefix, so ordering only matters where URL patterns overlap. Unhandled `/obp/*` paths fall through to Lift (no 404). +## Current Architecture -**Version enable/disable**: `api_disabled_versions` / `api_enabled_versions` (allowlist; empty = all) are enforced once at startup by `Http4sApp.gate` (disabled → `HttpRoutes.empty`). The path-rewriting cascade between versions bypasses `gate` deliberately, so an endpoint declared in v2.0.0 stays reachable via `/obp/v4.0.0/...` even if v2.0.0's prefix is disabled. To kill an endpoint on every prefix use `api_disabled_endpoints` (enforced per-request by the middleware). `ResourceDocMiddleware.isEndpointEnabled` must **not** re-check version per request — a 2026-05 regression that did was reverted 2026-05-26; `ResourceDocMiddlewareEnableDisableTest` pins this. +OBP-API runs as a **single http4s Ember server** (single process, single port). The application entry point is a Cats Effect `IOApp` (`Http4sServer`). Lift is no longer an HTTP server — Jetty, the servlet container, and the request bridge have all been removed. -## In-place migration, per file +Lift now plays exactly one role: -`APIMethods{version}.scala`: drop `self: RestHelper =>`; `lazy val xyz: OBPEndpoint` → `lazy val xyz: HttpRoutes[IO]`; Lift `case "path" :: Nil JsonGet _` → `case req @ GET -> \`prefixPath\` / "path"`; auth via the right `EndpointHelpers.*`; `ResourceDoc(root, ...)` → `ResourceDoc(null, ..., http4sPartialFunction = Some(root))`. `OBPAPI{version}.scala`: drop `extends OBPRestHelper` / `registerRoutes`, expose routes wired into the `Http4sServer` chain. Full Rule 1–5 reference + gotchas in `CLAUDE.md`. +- **`lift-mapper` ORM / Database** — Mapper manages schema creation, migrations, and all data access (`MappedBank`, `AuthUser`, etc.). A handful of `net.liftweb.json` / `net.liftweb.common` (`Box`/`Full`/`Empty`) serialisation helpers are also still used; these are library utilities, not the Lift web stack. -**One file = one PR; a file is fully Lift or fully http4s.** `APIMethods121` was done as a parallel `Http4s121.scala` (not in-place) because it's a mixin trait inherited by 130/140/etc.; http4s takes priority in the chain and the Lift trait is deleted once all inheritors are migrated. +### Entry point — `Http4sServer.scala` -## Per-version progress +`Http4sServer` extends `IOApp`. On startup it: -All 12 APIMethods files **done** — every functional endpoint on http4s, test suites green: +1. Calls `bootstrap.liftweb.Boot().boot()` to initialise Lift Mapper, connectors, and OBP configuration (DB/ORM init only — no `LiftRules` request-path registrations remain active). +2. Parses the configured `hostname` and `dev.port` props (defaults: `127.0.0.1`, `8080`). +3. Starts an Ember server with the application defined in `Http4sApp.httpApp`. + +### Priority routing + +Routes are tried in order (see `Http4sApp.baseServices`): `corsHandler` (OPTIONS) → `AppsPage` → `StatusPage` → `Http4sResourceDocs` → `Http4s510` → `Http4s600` → `Http4s500` → `Http4s700` → `Http4sBGv2` → `Http4sUKOBv200` → `Http4sUKOBv310` → `Http4sBGv13` (+`Http4sBGv13Alias`) → `Http4s400` → `Http4s310` → `Http4s300` → `Http4s220` → `Http4s210` → `Http4s200` → `Http4s140` → `Http4s130` → `Http4s121` → `dynamicEntityRoutes` → `dynamicEndpointRoutes` → `DirectLoginRoutes` → `Http4sOpenIdConnect` → `AliveCheckRoutes` → `notFoundCatchAll` (JSON 404). + +There is **no Lift fallback** — the chain terminates in `notFoundCatchAll`, which returns a JSON 404 for any unmatched path. The non-numeric ordering (v510 before v600, v500 after v600, etc.) doesn't affect correctness because each per-version service gates on its own version prefix; ordering only matters when two services overlap on the same URL pattern. -| File | http4s | Notes | -|---|---|---| -| 121 | Http4s121 | 70 own; 323 API1_2_1Test scenarios | -| 130 | Http4s130 | 3 own + bridge→121 | -| 140 | Http4s140 | 11 own + bridge→130 | -| 200 | Http4s200 | 37 own + bridge→140 | -| 210 | Http4s210 | 25 own + bridge→200; 79 tests | -| 220 | Http4s220 | 18 own + bridge→210; 27 tests | -| 300 | Http4s300 | 47 own + bridge→220; 86 tests | -| 310 | Http4s310 | 100 own + bridge→300; 181 tests. See v3.1.0 leftovers below | -| 400 | Http4s400 | **258/258** (253 handlers + 8 txn-request-type doc aliases); lazy-val+init-def pattern; all 35 v4 overrides migrated | -| 500 | Http4s500 | 10 own | -| 510 | Http4s510 | 111 own; `createConsent` exposed as `createConsentImplicit` (EMAIL/SMS/IMPLICIT guard) | -| 600 | Http4s600 | **243/243** (35 overrides + 208 originals); introduced the lazy-val+init-def pattern | - -**v3.1.0 bridge leftovers** (both off-bridge in production; Lift definitions deferred to the bridge-removal PR): `getMessageDocsSwagger` — real handler in `Http4sResourceDocs`; `Http4s310` keeps an `HttpRoutes.empty` stub only so `nameOf(...)` compiles for `FrozenClassTest`. `getObpConnectorLoopback` — native http4s route that always returns 400 NotImplemented. Deleting their Lift `lazy val`s shrinks the frozen STABLE surface → needs a snapshot refresh. - -## Workstream status - -| Workstream | Status | -|---|---| -| Resource-docs serving | **done** — `Http4sResourceDocs` serves `/obp/*/resource-docs/{ver}/{obp,swagger,openapi,openapi.yaml}`, the per-bank variant, and `/message-docs/{conn}/swagger2.0`; 10 Lift dispatch entries + the raw `openapi.yaml serve{}` block retired. ResourceDocsTest (63) + SwaggerDocsTest (10) green. | -| Resource-docs aggregation bug | **done** — `getResourceDocsObpV700` aggregates all versions; `V7ResourceDocsAggregationTest` passes. | -| Auth: DirectLogin | **done** — `DirectLoginRoutes` (bare `/my/logins/direct`, gated on `allow_direct_login`) + per-version paths; Lift dispatch removed. Migration gotcha: `createTokenFuture` ignored its args and re-read `S.request` — use `validatorFutureWithParams` instead. Dead `dlServe` block + `extends RestHelper` cleanup is a small follow-up PR. | -| Auth: GatewayLogin / DAuth / OAuth2 | **done** — all library-only validators (no routes); vestigial `extends RestHelper` removed. | -| Auth: OAuth 1.0a | **done — removed** (`51820c75e`): `oauth1.0.scala` deleted, `OAuthHandshake` unregistered, OAuth header parsing + dead fields removed. | -| Auth: OpenIdConnect | **blocked** — see Decision gates. The only auth handler still on Lift. | -| Dynamic-entity data plane | **done** — `Http4sDynamicEntity` serves `/obp/dynamic-entity/*` natively (`OBPAPIDynamicEntity` stays as a dormant Lift fallback, removed in the bridge-removal PR). | -| Dynamic-endpoint data plane | **done** — `Http4sDynamicEndpoint.wrappedRoutesDynamicEndpoint` serves `/obp/dynamic-endpoint/*` **fully native** (3b): proxy via `DynamicEndpointHelper.DynamicReq.resolveProxyTarget` + `APIMethodsDynamicEndpoint.proxyHandle`, and runtime-compiled docs via `ResourceDoc.dynamicHttp4sFunction` / `authCheckIO` — no Lift dispatch. Wired into `Http4sApp.baseServices` ahead of the bridge. Landed via the upstream merge (`74ead2134`, 2026-05-29). **Known test issue** (inherited from upstream, not the merge): 3 `DynamicResourceDocTest` runtime-compiled end-to-end scenarios fail locally — see test note below. | -| Std: Berlin Group v2 | **done** — `Http4sBGv2`. | -| Std: UK Open Banking v2.0 + v3.1 | **done** — PR #2817 (merged 2026-05-29). v2.0: 5; v3.1: ~67 / 20 categories; Lift aggregators are `routes = Nil` stubs. 142 test scenarios pass. | -| Std: Berlin Group v1.3 | **todo** — 7 files still on active Lift (`code/api/berlin/group/v1_3/*`). | -| Std: Bahrain / AU / STET / MxOF / Polish | **retired** — commented out in PR #2814 (`d19af2b92`); `RetiredApiStandardsTest` guards against re-registration. | -| Std: Sandbox | **n/a** — `SandboxApiCalls.scala` fully commented out (dead code, registers no routes); deletion candidate. | - -## ResourceDoc parity (content fidelity vs Lift) - -Separate from serving: every migrated http4s `ResourceDoc(...)` should render identically to its Lift original. **`APIMethodsXYZ.scala` (the commented-out Lift) is the source of truth — never edit it to make the audit pass.** When the audit flags a diff, either fix http4s to match, or document a deliberate drift at the http4s site (placeholder rename for `ResourceDocMatcher`, upstream case-class shift, or a genuine improvement). Stub fidelity is verified: 0 field diffs across the v6 (243) and v5.1 (111) stubs vs their pre-stub Lift. - -Run the audit for the **live** drift list — don't transcribe it here (it rots): ``` -python3 scripts/check_lift_http4s_resource_doc_parity.py [--field=X] [--list-only] +HTTP Request + │ + ▼ +Http4sServer (IOApp / Ember) + │ + ▼ +corsHandler → AppsPage → StatusPage → Http4sResourceDocs + → Http4s510 → Http4s600 → Http4s500 → Http4s700 + → Http4sBGv2 → Http4sUKOBv200 → Http4sUKOBv310 → Http4sBGv13(+Alias) + → Http4s400 → Http4s310 → Http4s300 → Http4s220 → Http4s210 → Http4s200 + → Http4s140 → Http4s130 → Http4s121 + → dynamicEntityRoutes → dynamicEndpointRoutes + → DirectLoginRoutes → Http4sOpenIdConnect → AliveCheckRoutes + → notFoundCatchAll (JSON 404 — no Lift fallback) + │ + ▼ +HTTP Response (with standard headers) ``` -Restoration tools: `rehydrate_resource_docs.py` (descriptions / example bodies from Lift comments) and `restore_resource_doc_bodies.py` (surgical per-field restore). At the last full audit ~60 drifts remained, almost all **middleware-driven placeholder renames** that are required and stay documented at the http4s site: `ACCOUNT_ID`→`NEW_ACCOUNT_ID` (PUT-creates-account), `VIEW_ID`→`*_VIEW_ID` (disambiguation), firehose `*_BANK_ID`/`*_VIEW_ID` (prop-before-bank bypass), `COUNTERPARTY_ID`→`COUNTERPARTY_ID_PARAM`, hyphen→underscore for `DYNAMIC_RESOURCE_DOC_ID`. Genuine fix candidates: verb-casing (`revokeMyConsent` Delete→DELETE), v4 `deleteExplicitCounterparty` POST→DELETE (REST-correct), and v4's two only-lift endpoints never ported (`getAllAuthenticationTypeValidationsPublic`, `getAllJsonSchemaValidationsPublic`). -## Open TODOs — master list for "remove Lift Web" +### Body caching + +http4s request bodies are single-shot streams. The first version's `ResourceDocMiddleware.fromRequest` consumes the body to build the CallContext; any later path-rewriting bridge hop (v400→v310→…→v210) that re-reads `req.bodyText` would get an empty stream and the handler would 500. `Http4sApp.cacheBodyOnce` pre-reads the body and stashes it in `cachedBodyKey`, so every downstream `fromRequest` reads from the attribute instead of the drained stream. GET/DELETE/HEAD/OPTIONS skip this. + +### Version enable/disable semantics -**Bridge-traffic audit (data-driven prioritisation).** Every bridge hit is tallied by `Http4sLiftBridgeTraffic`; `GET /admin/lift-bridge-traffic` returns `real_work` (non-404 = migration targets) vs `not_found` (stale/probes, ignore); `POST .../reset` clears it. Playbook: reset on a representative instance → run a normal traffic window (24h + scheduled jobs) → if `real_work[]` is empty the bridge is retirable (modulo documented leftovers). Both dynamic-entity and dynamic-endpoint are now served natively, so **no known `real_work` remains** — re-run the audit on a representative instance to confirm before cutting the bridge-removal PR. +Two Props govern which API versions are served: `api_disabled_versions` and `api_enabled_versions` (allowlist; empty means "all"). They are enforced **once at startup**, by `Http4sApp.gate`: + +```scala +private def gate(version: ScannedApiVersion, routes: HttpRoutes[IO]): HttpRoutes[IO] = + if (APIUtil.versionIsAllowed(version)) routes else HttpRoutes.empty[IO] +``` -1. **OpenIdConnect** — blocked on the OIDC portal-session decision (gate 1). With dynamic-endpoint now native, this is the **last code blocker** for bridge removal. -2. **Bridge-removal PR** — delete `Http4sLiftWebBridge` + the request-path `Boot.scala` hooks: the `LiftRules.statelessDispatch.append(...)` registrations (DirectLogin, ResourceDocs140–600, aliveCheck), `LiftRules.dispatch.append(OpenIdConnect)`, `addToPackages("code")`, the global exception + 404 handlers, the `early`/`supplementalHeaders`/`localeCalculator` request hooks, and `unloadHooks`. The Mapper schemifier stays (that's lift-mapper, not the bridge). Plan a `FrozenClassTest` snapshot refresh in the same PR. -3. **Open-banking standards** — decide BG v1.3's fate (gate 2). -4. **`lift-mapper`** — separate long-term ORM replacement; out of scope here. -5. **Misc**: OBP-Trading payment-auth endpoints (notifyDeposit, create/capture/release/getPaymentAuth) still commented out in `Http4s700` (see `ideas/CAPTURE_RELEASE_TRANSACTION_REQUEST_TYPES.md`); CI speed-up (two-tier fast gate + surefire parallel forks) not done. +A disabled version's top-level routes are replaced with `HttpRoutes.empty[IO]`, so a direct `GET /obp/vX.Y.Z/...` falls through the chain to `notFoundCatchAll` (JSON 404). -**Small singletons:** `aliveCheck` **done** (`AliveCheckRoutes`, `GET /alive`); `ImporterAPI` **retired** (endpoint + `TransactionInserter` + connector helpers removed). +**Cascade is intentionally unaffected.** Each `Http4sXxx` has a path-rewriting bridge to the next-lower version that calls `code.api.vN.HttpNxx.wrappedRoutesVNxxServices` *directly*, bypassing `Http4sApp.gate`. `ResourceDocMiddleware` does **not** re-check `implementedInApiVersion` per request either (`ResourceDocMiddleware.isEndpointEnabled` deliberately has no `versionAllowed` parameter — `ResourceDocMiddlewareEnableDisableTest` pins this). So an endpoint originally declared in v2.0.0 stays reachable via `/obp/v4.0.0/...` even when v2.0.0 is disabled, as long as v4.0.0 is enabled. -**Disabled / ignored tests to revisit:** `Http4s500RoutesTest`, `RootAndBanksTest`, `V500ContractParityTest` (`@Ignore`); `CardTest` (commented out); v5.0.0 13 skipped; `AbacRuleTests` 6 local fails are environment-dependent (too few users → `isStatisticallyTooPermissive`), not a regression. The `MakerCheckerTransactionRequestTest` proxy/TTL race is **resolved** by the `RequestScopeConnection` hardening on `develop` (regression-guarded by its "Stress: repeated multi-challenge creates" scenario); if it ever flakes again, route DB Futures through `RequestScopeConnection.fromFuture`. **`DynamicResourceDocTest`** — 3 runtime-compiled end-to-end scenarios (practise + no-role + role-gated `pieceC`) fail with `AccessControlException: specifyStreamHandler` because the compiled dynamic class is **lazily loaded inside `DynamicUtil$Sandbox.runInSandbox`** (which grants no `NetPermission`). Files are byte-identical to `upstream/develop`; not caused by our merge. Fix options: warm the compiled class *before* entering the sandbox, or add `specifyStreamHandler` to the sandbox permission set. Confirm against upstream CI before treating as a real regression vs. a warm-classloader timing artifact. +This preserves the documented OBP-API contract: newer versions act as the supported entry point for older endpoints' functionality. Operators can retire a version's *URL prefix* with `api_disabled_versions` without losing the underlying endpoints from newer prefixes. To retire a specific endpoint everywhere, use `api_disabled_endpoints` (operationId list) — that **is** enforced per request by the middleware and so kills the endpoint on every prefix it would otherwise be reachable from. -## Decision gates (stakeholder calls, before the bridge-removal PR) +A brief regression in early 2026-05 inverted this: a `versionAllowed` check was added inside the middleware, making `api_disabled_versions` kill cascaded reachability too. Restored 2026-05-26. If you're tempted to put the per-request version check back, read the `isEndpointEnabled` docstring first — it spells out the design rationale, and the "version-level gating is delegated to Http4sApp.gate" feature in the unit test will fail loudly. -1. **OIDC portal-session strategy.** The OIDC callback's success path calls `AuthUser.logUserIn` / `S.redirectTo`, which mutate Lift `SessionVar`s the portal reads. Forks: **(a) drop portal-login** — pure http4s callback issues a token but seeds no portal session (behaviour change; needs sign-off from any OIDC portal-UI users); **(b) Lift-session shim** — keep `lift-webkit` for this one callback (cheapest code; "Lift Web removed" never actually ships); **(c) replace portal session** (Redis/JWT-backed; months, but also unblocks lift-mapper later). No tests cover the callback success path. **This is the only thing blocking bridge removal.** -2. **Open-banking standards.** Not required for bridge removal, but for the public claim: if the headline is "Lift Web removed", a feature-flagged Lift remnant (BG v1.3) is acceptable; if "Lift Web removed *from this repo*", BG v1.3 must be migrated or extracted as a plugin project. +--- + +## What "in-place migration" means per file + +### `APIMethods{version}.scala` + +| Before (Lift) | After (http4s) | +|---|---| +| `self: RestHelper =>` on the trait | removed | +| `lazy val xyz: OBPEndpoint` | `val xyz: HttpRoutes[IO]` | +| `case "path" :: Nil JsonGet _` | `case req @ GET -> \`prefixPath\` / "path"` | +| `authenticatedAccess(cc)` in for-comp | pick the right `EndpointHelpers.*` helper | +| `implicit val ec = EndpointContext(Some(cc))` | removed | +| `yield (json, HttpCode.\`200\`(cc))` | `yield json` | +| `ResourceDoc(root, ...)` | `ResourceDoc(implementedInApiVersion, ..., http4sPartialFunction = Some(root))` | -## Risks +### `OBPAPI{version}.scala` -| Risk | Mitigation | +| Before | After | |---|---| -| `FrozenClassTest` ratchet — deleting any Lift `lazy val ... : OBPEndpoint` shrinks the STABLE surface and trips the test | Refresh the frozen snapshot inside the bridge-removal PR; list each removed `lazy val` in the PR body. | -| OIDC callback success path has no tests | Write a Keycloak-container integration test before picking a fork. | -| `S.request` translation — handlers re-read `S.request`/`S.param` invisibly (bit DirectLogin's `createTokenFuture`) | Audit for `S.request`/`S.param`/`S.queryString` before designing the http4s entry; replicate the `validatorFutureWithParams` pattern. | -| Bridge-cascade hijack on partial migrations (see CLAUDE.md) | When wiring a new `Http4sXxx` into `baseServices`, migrate its URL+verb overrides vs older versions first. | -| `isStatisticallyTooPermissive` flakiness — too few local users | Seed enough users in any ABAC test. | +| `extends OBPRestHelper` | removed | +| `registerRoutes(routes, allResourceDocs, apiPrefix)` | expose `val allRoutes: HttpRoutes[IO]` | +| registered via Boot / LiftRules | wired into `Http4sApp.baseServices` chain | -## Done criteria +See `CLAUDE.md § Migrating a Lift Endpoint to http4s` for the full Rule 1–5 reference. The Lift `APIMethodsXYZ.scala` files are retained as **commented-out source-of-truth** for the ResourceDoc parity audit (see below) and as the frozen STABLE API surface for `FrozenClassTest`; they are comments, not active routes. -| Milestone | Condition | +--- + +## What was migrated + +### Per-version files (bottom-up; each has a path-rewriting bridge to the version below) + +| # | File | Own endpoints | http4s file | +|---|---|---|---| +| 1 | `APIMethods121` | 70 | `Http4s121.scala` — all 323 API1_2_1Test scenarios pass | +| 2 | `APIMethods130` | 3 | `Http4s130.scala` — bridge to `Http4s121` | +| 3 | `APIMethods140` | 11 | `Http4s140.scala` — bridge to `Http4s130` | +| 4 | `APIMethods200` | 40 | `Http4s200.scala` — 37 own + bridge to `Http4s140` | +| 5 | `APIMethods210` | 28 | `Http4s210.scala` — 25 own + bridge to `Http4s200`; 79 tests pass | +| 6 | `APIMethods220` | 19 | `Http4s220.scala` — 18 own + bridge to `Http4s210`; 27 tests pass | +| 7 | `APIMethods300` | 47 | `Http4s300.scala` — bridge to `Http4s220`; 86 tests pass | +| 8 | `APIMethods310` | 102 | `Http4s310.scala` — 100 functional + bridge to `Http4s300`; 181 tests pass. `getObpConnectorLoopback` is a native http4s route (returns 400 NotImplemented); `getMessageDocsSwagger` routing is owned by `Http4sResourceDocs` (in-file `HttpRoutes.empty` stub kept only so `nameOf(...)` compiles for `FrozenClassTest`). | +| 9 | `APIMethods400` | 258 | **258 / 258 (100%)**. `Http4s400.scala` — 253 unique handlers + 8 ResourceDoc aliases for transaction-request-type variants (shared `createTransactionRequest` wildcard handler; `literalAllCapsSegments` in `Http4sSupport.scala` dispatches the matcher to the per-type doc). All 35/35 v4-over-older URL+verb overrides migrated (avoids the bridge-cascade hijack). | +| 10 | `APIMethods500` | 10 | `Http4s500.scala` — all v5.0.0 originals | +| 11 | `APIMethods510` | 111 | `Http4s510.scala` — `createConsent` exposed as `createConsentImplicit` (one handler, `scaMethod ∈ {EMAIL, SMS, IMPLICIT}` guard covers all three SCA-method URLs) | +| 12 | `APIMethods600` | 243 (35 overrides + 208 originals) | **243 / 243 (100%)**. `Http4s600.scala` — introduced the **lazy val + helper-def init pattern** to dodge the JVM 64KB `` method-size limit (`val xxx` ⇒ `lazy val xxx`; `resourceDocs += ResourceDoc(...)` grouped into `private def initXxxResourceDocs(): Unit` blocks). All later per-version files adopt this from the start. | + +> **JVM 64KB `` limit**: around the 140-endpoint mark a per-version object's `` hits the JVM method-size limit. The fix (shipped in `Http4s600`/`Http4s400`): `lazy val` endpoints (lambda materialisation moves into per-field `lzycompute`) + `resourceDocs +=` grouped into `initXxx()` helper defs (each with its own 64KB budget). + +### Open-banking standards + +| Standard | Location | Status | +|---|---|---| +| **Berlin Group v1.3** | `code/api/berlin/group/v1_3/Http4sBGv13{,AIS,PIS,PIIS,SigningBaskets,Alias}.scala` — 6 http4s files | ✅ http4s, wired into `Http4sApp` (`Http4sBGv13` + `Http4sBGv13Alias`) | +| **Berlin Group v2** | `code/api/berlin/group/v2/Http4sBGv2.scala` | ✅ http4s | +| **UK Open Banking v2.0.0** | `code/api/UKOpenBanking/v2_0_0/Http4sUKOBv200{,AIS}.scala` | ✅ http4s (`/open-banking/v2.0/*`) | +| **UK Open Banking v3.1.0** | `code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310*.scala` — 21 http4s files | ✅ http4s (`/open-banking/v3.1/*`) | +| Bahrain OBF v1.0.0 | `code/api/BahrainOBF/v1_0_0/*` — 22 files | 🗑 commented-out dead code (whole files `//`-commented in `d19af2b92`, 2026-05-22). No routes, no http4s port. Since the bridge is gone, these are unreachable. | +| AU OpenBanking v1.0.0 | `code/api/AUOpenBanking/v1_0_0/*` — 11 files | 🗑 commented-out dead code (`d19af2b92`) | +| STET v1.4 | `code/api/STET/v1_4/*` — 5 files | 🗑 commented-out dead code (`d19af2b92`) | +| MxOF / CNBV9 v1.0.0 | `code/api/MxOF/*` — 4 files | 🗑 commented-out dead code (`d19af2b92`) | +| Polish v2.1.1.1 | `code/api/Polish/v2_1_1_1/*` — 5 files | 🗑 commented-out dead code (`d19af2b92`) | +| Sandbox | `code/api/sandbox/SandboxApiCalls.scala` | 🗑 commented-out dead code (`7f3c51f5e`) | + +The five retired standards + Sandbox are **commented-out source files with no route registration**. The `code.api.*.ApiCollector` / `OBP_*` `ScannedApis` classes inside them are inert (the code is `//`-commented, so `ClassScanUtils` can't discover them and `APIUtil`'s `allResourceDocs` aggregation no longer references them). A future cleanup PR can delete the files outright, or — if any standard is wanted back — port it to http4s the way BG v1.3 / UK OB were. + +### Auth stack + +| Handler | Path | Status | +|---|---|---| +| `DirectLogin` | `POST /my/logins/direct` | ✅ `code.api.DirectLoginRoutes` serves the bare path (gated on `allow_direct_login`); versioned path served by each `Http4sXxx`. `LiftRules.statelessDispatch.append(DirectLogin)` removed from `Boot.scala`. | +| `OpenIdConnect` | `GET\|POST /auth/openid-connect/callback{,-1,-2}` | ✅ **`code.api.Http4sOpenIdConnect`** — native http4s. **Portal-session decision resolved as fork (a) "drop portal-login":** the success branch no longer calls `AuthUser.logUserIn` / `S.redirectTo`; it issues an OBP DirectLogin token via `DirectLogin.issueTokenForUser(...)` and returns it. The old `openidconnect.scala` is fully commented out. Pure route tests live in `Http4sOpenIdConnectRoutesTest`. | +| `AliveCheck` | `GET /alive` | ✅ `code.api.AliveCheckRoutes`; Lift dispatch removed. | +| `GatewayLogin` | gateway JWT exchange | ✅ Library-only validator (no routes). Vestigial `extends RestHelper` removed. | +| `DAuth` | dAuth JWT exchange | ✅ Library-only validator (no routes). Vestigial `extends RestHelper` removed. | +| `OAuth2` (`OAuth2Login`) | Bearer-token validator | ✅ Library-only (Google / Yahoo / Azure / Keycloak / OBPOIDC / Hydra). Vestigial `extends RestHelper` removed. | +| `OAuth 1.0a` | — | ✅ **Removed entirely** in `51820c75e` (2026-02-20). `oauth1.0.scala` deleted, `OAuthHandshake` unregistered, header detection removed from `OBPRestHelper.scala`. `getConsumerFromDirectLoginToken` / `getUserFromDirectLoginToken` took over consumer/user lookup. | +### ~~Prerequisite~~ Prerequisite (done): aggregation bug fix + +> Kept on purpose: `code/model/OAuth.scala` (backs the general `Consumer` entity used by all auth methods) and `APIUtil.OAuth` (misnamed but live **test** infrastructure — the `<@` signer adds `Authorization: DirectLogin token=...` headers and is imported by hundreds of test files; renaming is a separate cleanup). +~~`V7ResourceDocsAggregationTest` is intentionally failing.~~ **Fixed in `efb97531e` (2026-05-19)** — *"fix(resource-docs): correct v7 aggregation specifiedUrl and remove shadowed v7 handler"*. Two root causes addressed: (1) `ResourceDocs1_4_0` registered the same `(GET, /resource-docs/API_VERSION/obp)` doc twice, so v7 aggregation surfaced a duplicate; (2) `getAllResourceDocsObpCached` cached `specifiedUrl` per dynamic-endpoint doc with `case Some(_) => it`, so the first caller froze the URL and every later request inherited it. `getResourceDocsObpV700` now calls `getResourceDocsList`, which aggregates the full cascade (~949 docs on a live server). The centralized service must preserve this contract — `V7ResourceDocsAggregationTest` now acts as the regression guard. + +### Dynamic dispatch, resource-docs, and singletons + +| Component | Status | |---|---| -| Version file done | All functional endpoints are `HttpRoutes[IO]`; suite green. Workstream-owned stubs (resource-docs / auth / leftovers) don't block. | -| Lift bridge removable | All 12 APIMethods done + auth stack done + resource-docs done + dynamic-endpoint ported; remaining stubs deleted in the bridge-removal PR. | -| Lift Web removed | `lift-webkit` out of `pom.xml`; `Http4sLiftWebBridge` deleted; `Boot.scala` reduced to DB init + scheduler. | -| Lift removed | `net.liftweb:*` fully out — requires the multi-month `lift-mapper` replacement (Doobie/Slick or similar). | +| **DynamicEntity** (`/obp/dynamic-entity/*`) | ✅ `code.api.dynamic.entity.Http4sDynamicEntity` — native http4s, replaces the Lift `OBPAPIDynamicEntity` dispatch. | +| **DynamicEndpoint** (`/obp/dynamic-endpoint/*`) | ✅ `code.api.dynamic.endpoint.Http4sDynamicEndpoint` — fully native (no Lift `Req`, `S.init`, `buildLiftReq`, or `liftResponseToHttp4s`). | +| **Resource-docs** (`/obp/*/resource-docs/{API_VERSION}/{obp,swagger,openapi,openapi.yaml}`) | ✅ Centralized `code.api.util.http4s.Http4sResourceDocs`, matched before any per-version service (version-polymorphic: the `API_VERSION` path segment controls output). Retired 10 `LiftRules.statelessDispatch.append(ResourceDocs140..600)` entries + the raw `openapi.yaml` Lift `serve {...}` block. The `getResourceDocsObpV700` aggregation bug is fixed (`V7ResourceDocsAggregationTest` passes). ResourceDocsTest (63) + SwaggerDocsTest (10) green. | +| **message-docs** (`/obp/*/message-docs/{CONNECTOR}/swagger2.0`) | ✅ `Http4sResourceDocs.handleGetMessageDocsSwagger` via wildcard route. | +| `ImporterAPI` | ✅ **Retired** — legacy `POST /obp_transactions_saver/api/transactions` shared-secret bulk-insert endpoint, its `TransactionInserter` LiftActor, and the connector helpers it relied on all removed. | +| `testResourceDoc` (`APIMethods140` `/dummy`) | ✅ Removed — dev-mode-only stub, no production behaviour. | +Currently served via a raw Lift `serve { case Req(..., "openapi.yaml", ...) }` block that bypasses `registerRoutes` entirely. Needs a dedicated http4s route (no ResourceDocMiddleware) added to the centralized service. + +### Caching + +`Caching.getStaticSwaggerDocCache()` / `setStaticSwaggerDocCache()` are framework-agnostic and already used from within the http4s path. No migration work needed. + +### Steps + +1. ~~Fix aggregation bug in `getResourceDocsObpV700` → make `V7ResourceDocsAggregationTest` pass.~~ **Done** in `efb97531e` (2026-05-19). See the Prerequisite section above. +2. Extract shared handler logic into `Http4sResourceDocs` service; wire into `Http4sApp`. +3. Add `openapi.yaml` route to the same service. +4. ~~Port `getMessageDocsSwagger` from `APIMethods310` into the same service~~ — **Done.** Now served by `Http4sResourceDocs.handleGetMessageDocsSwagger` via the wildcard `/obp/*/message-docs/{CONNECTOR}/swagger2.0` route matched before any per-version service. The `val getMessageDocsSwagger: HttpRoutes[IO] = HttpRoutes.empty` stub in `Http4s310.scala` exists only to satisfy the `FrozenClassTest` API-surface check. +5. Remove resource-docs from the per-version Lift objects (`ResourceDocs140`–`ResourceDocs600`) once the centralized service covers them. + +--- + +## ResourceDoc parity (content workstream — independent of serving) + +This is a **separate workstream** from the serving migration above (which is complete). It covers the **content** of each migrated `ResourceDoc(...)` declaration: the goal is for every http4s `ResourceDoc(...)` to render identically to its Lift original, so the public API docs aren't silently degraded. The figures below are the last recorded audit (2026-05-21) and may have moved since; re-run the audit script for current numbers. -**"Lift Web removed" ≠ "Lift removed".** The first means the HTTP path no longer touches Lift (lift-mapper still the ORM); the second means no `net.liftweb:*` at all. Decide which bar a release hits before announcing — conflating them invites an overstatement or an avoidable months-long delay. +### Principle + +**`APIMethodsXYZ.scala` (Lift) is the source of truth.** The commented-out Lift ResourceDocs inside each `APIMethodsXYZ.scala` are the canonical reference for what the http4s version should render: URL templates, verb casing, summaries, descriptions, example bodies, error lists, tags. **Do NOT edit those files to make the audit pass** — the audit compares http4s against the Lift source-of-truth. When the audit flags a diff, the resolution is either (a) update http4s to match Lift, or (b) document the difference at the http4s site as a known intentional drift (placeholder rename for middleware, upstream-driven case-class shift, etc.). Rewriting the Lift comments runs the comparison backwards and erases the historical record. (Mistakes in commits `d95c1df01` and `6154bf2cc` did this; reverted in `27f48af72`.) + +**Stub fidelity verified.** Commits `810589330` (v6) and `88f46f854` (v5.1) replaced live Lift code with commented-out stubs: **0 field diffs across 243/243 v6 docs and 111/111 v5.1 docs**. The stubs are an exact preservation of the original Lift ResourceDocs. + +### Tooling (`scripts/`) + +| Script | Role | +|---|---| +| `check_lift_http4s_resource_doc_parity.py` | Read-only audit. Parses both files, matches by `nameOf(...)`, reports per-field diffs. `--field=X`, `--list-only`. | +| `rehydrate_resource_docs.py` | Lifts positional args 7/8/9 (description, exampleRequestBody, successResponseBody) from commented Lift blocks into http4s. `split-init` subcommand for the JVM 64KB workaround. | +| `restore_resource_doc_bodies.py` | Restores any subset of (summary, description, exampleRequestBody, successResponseBody, errorResponseBodies, tags) from Lift into http4s. `--fields=X,Y`, `--only=ep`. | + +### Last recorded drift (audit 2026-05-21) + +| Version | shared | mismatch | only-lift | only-http4s | Status | +|---|---|---|---|---|---| +| v1_2_1 | 70 | 6 | 0 | 0 | semantic fields restored; 6 structural drifts remain | +| v1_3_0 | 3 | 0 | 0 | 0 | clean | +| v1_4_0 | 10 | 1 | 0 | 0 | one minor | +| v2_0_0 | 37 | 1 | 0 | 0 | 1 structural drift remains | +| v2_1_0 | 23 | 1 | 5 | 2 | 1 structural drift remains | +| v2_2_0 | 18 | 0 | 0 | 18 | Lift trait fully retired upstream (`71892f5cb`); audited via git history; 3 middleware URL renames remain | +| v3_0_0 | 47 | 4 | 0 | 0 | 4 middleware-driven URL renames remain | +| v3_1_0 | 102 | 5 | 0 | 0 | 5 placeholder renames remain | +| v4_0_0 | 254 | 20 | 2 | 5 | 20 structural drifts (placeholder renames + 1 verb fix) remain | +| v5_0_0 | 39 | 8 | 0 | 3 | descriptions restored; structural/errors remain | +| v5_1_0 | 111 | 1 | 1 | 2 | one verb-casing drift | +| v6_0_0 | 243 | 12 | 0 | 1 | 11 placeholder renames + 1 routing-shape upstream change | +| **Total** | **956** | **60** | | | | + +The per-version drift breakdowns (v6 COUNTERPARTY_ID renames, v4 GRANT_VIEW_ID / DYNAMIC_RESOURCE_DOC_ID, v3 firehose `FIREHOSE_*` renames, v5 system-view error-accuracy improvements, etc.) are middleware-driven placeholder renames or deliberate http4s improvements. The two only-lift v4 endpoints (`getAllAuthenticationTypeValidationsPublic`, `getAllJsonSchemaValidationsPublic`) are a known **migration gap** — port them or confirm they're intentionally dropped. + +### Strategy for each remaining drift + +1. **Default**: fix http4s to match Lift verbatim (`restore_resource_doc_bodies.py`). +2. **Documented exception**: where the drift is a deliberate http4s improvement or required by middleware semantics, leave it and add a `// Lift had X; we use Y because Z` comment at the http4s ResourceDoc site. +3. **Never**: edit `APIMethodsXYZ.scala` to make the audit pass — the Lift comments are the canonical record. + +Reserved ALL_CAPS placeholders in middleware (`BANK_ID`, `ACCOUNT_ID`, `VIEW_ID`, `COUNTERPARTY_ID`) plus the literal SCA/transaction-type segments in `literalAllCapsSegments` drive most renames: when an endpoint needs a same-shape var without middleware lookup, it's renamed to a non-reserved variant (e.g. `COUNTERPARTY_ID_PARAM`, `NEW_ACCOUNT_ID`, `FIREHOSE_BANK_ID`) in **both** the http4s and Lift ResourceDocs. + +--- + +## Lift Web teardown — completed + +The full "remove Lift Web" milestone is done. For the record, what landed: + +1. **`Http4sLiftWebBridge` deleted** — there is no request bridge; the chain ends in `notFoundCatchAll`. The bridge-traffic audit instrumentation (`Http4sLiftBridgeTraffic`, `GET /admin/lift-bridge-traffic`) that was used to prove `real_work[]` had drained is gone with it. +2. **`lift-webkit` removed from `pom.xml`** — the Lift web library is no longer a dependency. +3. **`Boot.scala` request-path hooks removed** — all `LiftRules.statelessDispatch.append(...)` (DirectLogin, ResourceDocs140–600, aliveCheck), `LiftRules.dispatch.append(OpenIdConnect)`, `addToPackages`, `exceptionHandler`/`uriNotFound`/`early`/`supplementalHeaders` request-path hooks are gone. Boot now does ORM init + connector/config setup + the Mapper schemifier + shutdown hooks only. +4. **OpenID Connect migrated** (fork a — drop portal-login). The one hard Lift-Web dependency in the request path (`AuthUser.logUserIn` / `S.redirectTo` seeding a Lift `SessionVar` portal session) was resolved by issuing a DirectLogin token instead. +5. **0 `net.liftweb.http` references anywhere in `obp-api/src`** — code, dead import comments, and doc-strings all removed. The previously-vestigial `net.liftweb.http.S.redirectTo(homePage)` in `AuthUser.logout` (dead code, never called) has been deleted, together with the 91 commented-out `//import net.liftweb.http...` lines. The only `net.liftweb.http.*` left in the running system is the inherited, unreachable `MegaProtoUser.logout` inside the Lift library jar — not OBP source. + +> `APIUtil.SS.init(...)` wrappers (e.g. in `Http4s400.scala`) are **not** Lift-Web code — `SS` is a thread-local that the `lift-mapper`-based `LocalMappedConnectorInternal` reads (`SS.user`). It's a legitimate adapter for the ORM layer, which stays until lift-mapper is replaced. + +> **Known gap — connector-export endpoint not migrated.** The prop-gated +> `connector.name.export.as.endpoints` feature was removed with the Lift teardown and +> **not** ported to http4s. At `d5f8716`, `Boot.scala` conditionally called +> `ConnectorEndpoints.registerConnectorEndpoints`, which served `/connector/{methodName}` +> via Lift `oauthServe` (role-gated by `canGetConnectorEndpoint`, reflectively invoking the +> active connector's methods), plus a startup `assert` validating the prop value. That Lift +> endpoint + the Boot registration + the validation are gone; there is no http4s replacement +> (the http4s `/connector/loopback` and `/management/connector/metrics` are different +> endpoints). It is off by default — deployments that set the prop silently lose both the +> endpoint and the startup validation. Recorded here so it isn't lost; migrate to an +> `/obp/.../connector/...` route only if a deployment actually needs it. + +--- + +## What remains — `lift-mapper` + +**Out of scope for this migration.** `net.liftweb.mapper.*` is still the ORM across the codebase (100+ files): `AuthUser extends MegaProtoUser`, `Schemifier.schemify` in `Boot.scala`, all `MappedXxx` entities. Replacing it (with Doobie / Slick or similar) is a separate multi-month effort. + +**"Lift Web removed" ≠ "Lift removed."** + +- *Lift Web removed* (✅ **done**) — the HTTP request path no longer touches Lift: `lift-webkit` out of `pom.xml`, `Http4sLiftWebBridge` deleted, `Boot.scala` request-path hooks gone. `lift-mapper` is still the ORM. +- *Lift removed* (not done) — `net.liftweb:*` fully out of the dependency graph; requires the lift-mapper replacement above. + +Decide which bar a release is hitting before announcing it; conflating them invites either an overstatement or an avoidable months-long delay. + +--- + +## Reusable lessons + +1. **JVM 64KB `` limit** — adopt `lazy val xxx: HttpRoutes[IO] = ...` + `private def initXxxResourceDocs(): Unit` blocks in every per-version file from the start; don't wait until you hit the wall. +2. **`S.request`-bound Lift handlers** need an http4s-friendly entry point that accepts pre-parsed parameters. DirectLogin's `createTokenFuture` ignored its argument and re-read from `S.request` via `getAllParameters`; the fix threaded params through `validatorFutureWithParams`. Audit any handler for `S.request`/`S.param`/`S.queryString` reads before designing its http4s entry point. +3. **`Future.failed(new Exception)` produces 500** — use `unboxFullOrFail(Empty, ..., 400)` or `NewStyle.function.tryons(msg, 400, ...)` to return the intended 4xx. +4. **`isStatisticallyTooPermissive` is sample-pool-dependent** — locally, a fresh test DB with a single user causes spurious ABAC rejections. Seed enough users. +5. **Reserved ALL_CAPS placeholders** in middleware — when an endpoint needs a same-shape var without middleware lookup, rename to a non-reserved variant (e.g. `COUNTERPARTY_ID_PARAM`) in both the http4s and Lift ResourceDocs. +6. **Bridge-cascade hijack** — when a new version overrides an older URL+verb, migrate the override into the new version's own routes *before* wiring it into the chain, or the request cascades down the path-rewriting bridges to the older handler. (Now that the chain ends in `notFoundCatchAll`, an un-migrated override cascades to an older http4s handler or 404s — there is no Lift safety net.) + +--- + +## Why http4s? + +- **Non-blocking I/O** — small fixed thread pool (CPU cores), fibres suspend on I/O. Thousands of concurrent requests without thread-pool tuning. +- **Lower memory** — no thread-per-request overhead. +- **Modern Scala ecosystem** — first-class Cats Effect, fs2 streaming, functional patterns. +- **No servlet container** — Jetty and WAR packaging gone entirely. + +--- ## Running @@ -116,4 +310,16 @@ MAVEN_OPTS="-Xms3G -Xmx6G -XX:MaxMetaspaceSize=2G" \ mvn -pl obp-api -am clean package -DskipTests=true -Dmaven.test.skip=true && \ java -jar obp-api/target/obp-api.jar ``` -Binds to `hostname` / `dev.port` from your props file (defaults `127.0.0.1:8080`). + +Binds to `hostname` / `dev.port` from your props file (defaults: `127.0.0.1:8080`). + +--- + +## Done Criteria + +| Milestone | Condition | Status | +|---|---|---| +| Version file done | All functional endpoints are `HttpRoutes[IO]`; the version's test suite is green. | ✅ all 12 | +| Lift bridge removed | All APIMethods files + auth stack + resource-docs done; `Http4sLiftWebBridge` deleted. | ✅ done | +| Lift Web removed | `lift-webkit` out of `pom.xml`; `Boot.scala` reduced to DB init + scheduler/shutdown. | ✅ done | +| `lift-mapper` removed | `net.liftweb:*` fully out of the dependency graph. | ⏳ separate long-term effort | diff --git a/README.md b/README.md index f6cf7d375c..9f06c7d7b3 100644 --- a/README.md +++ b/README.md @@ -388,7 +388,7 @@ To populate the OBP database with sandbox data: ## Production Options -OBP-API runs on http4s Ember. Standard security headers (Cache-Control, X-Frame-Options, Correlation-Id, etc.) are applied automatically by `Http4sLiftWebBridge.withStandardHeaders` to all responses. Cookie flags and other session-related settings can be configured via the props file. +OBP-API runs on http4s Ember. Standard security headers (Cache-Control, X-Frame-Options, Correlation-Id, etc.) are applied automatically by `Http4sStandardHeaders` (wired into `Http4sApp.httpApp`) to all responses. Cookie flags and other session-related settings can be configured via the props file. ## Server Mode Configuration (Removed) @@ -419,8 +419,6 @@ server_mode=apis **For portal/UI functionality:** Deploy the separate [OBP-Portal](https://github.com/OpenBankProject/OBP-Portal) application. -For migration instructions, see `.kiro/specs/remove-lift-portal-pages/MIGRATION_GUIDE.md` - ## Using Akka remote storage Most internal OBP model data access now occurs over Akka. This is so the machine that has JDBC access to the OBP database can be physically separated from the OBP API layer. In this configuration we run two instances of OBP-API on two different machines and they communicate over Akka. Please see README.Akka.md for instructions. @@ -976,13 +974,11 @@ The same as `Frozen APIs`, if a related unit test fails, make sure whether the m OBP-API uses the following core technologies: - **HTTP Server:** [http4s](https://http4s.org/) with [Cats Effect](https://typelevel.org/cats-effect/) (`IOApp`). The server runs on http4s Ember in a single process on a single port. -- **Routing:** Priority-based routing defined in `Http4sApp.scala`: - 1. Native http4s routes for v5.0.0, v7.0.0, and Berlin Group v2 - 2. A Lift bridge fallback (`Http4sLiftWebBridge`) for all other API versions +- **Routing:** Priority-based routing defined in `Http4sApp.scala` (`baseServices`). Every API version (v1.2.1 → v7.0.0), Berlin Group (v1.3 + v2), UK Open Banking (v2.0 + v3.1), dynamic entity/endpoint dispatch, resource-docs, and the auth handlers (DirectLogin, OpenID Connect, AliveCheck) are served by native http4s `HttpRoutes[IO]`. Any unmatched `/obp/*` path returns a JSON 404 from `notFoundCatchAll` — there is no Lift fallback. - **ORM / Database:** [Lift Mapper](http://www.liftweb.net/) for database access and schema management. -- **JSON:** Lift JSON utilities are used in some areas alongside native http4s JSON handling. +- **JSON:** Lift JSON utilities (`net.liftweb.json`) are used for parsing/serialization alongside native http4s handling. -For details on how the http4s and Lift layers coexist, see [LIFT_HTTP4S_COEXISTENCE.md](LIFT_HTTP4S_COEXISTENCE.md). +For the full Lift → http4s migration history, see [LIFT_HTTP4S_MIGRATION.md](LIFT_HTTP4S_MIGRATION.md). Liftweb architecture: [http://exploring.liftweb.net/master/index-9.html](http://exploring.liftweb.net/master/index-9.html). diff --git a/obp-api/src/main/resources/props/sample.props.template b/obp-api/src/main/resources/props/sample.props.template index b0d8cdba07..af90c7ecc0 100644 --- a/obp-api/src/main/resources/props/sample.props.template +++ b/obp-api/src/main/resources/props/sample.props.template @@ -817,7 +817,10 @@ super_admin_user_ids=USER_ID1,USER_ID2, ## Note: The email address used for login must match one ## registered on OBP localy. # openid_connect.enabled=false -# openid_connect.check_session_state=true +# CONFIG CAVEAT: portal-login was removed, so there is no server-side session state to compare. +# The code default is true (fail-closed) and will reject every real (non-empty) state with 401 — +# OIDC deployments MUST set this to false (or reintroduce state storage): +# openid_connect.check_session_state=false # openid_connect.show_tokens=false # Response mode # possible values: query, fragment, form_post, query.jwt, fragment.jwt, form_post.jwt, jwt diff --git a/obp-api/src/main/scala/bootstrap/liftweb/Boot.scala b/obp-api/src/main/scala/bootstrap/liftweb/Boot.scala index 9c76228a1d..f8c8be873c 100644 --- a/obp-api/src/main/scala/bootstrap/liftweb/Boot.scala +++ b/obp-api/src/main/scala/bootstrap/liftweb/Boot.scala @@ -137,7 +137,7 @@ import code.usercustomerlinks.MappedUserCustomerLink import code.customerlinks.CustomerLink import code.userlocks.UserLocks import code.users._ -import code.util.Helper.{MdcLoggable, ObpS, SILENCE_IS_GOLDEN} +import code.util.Helper.MdcLoggable import code.util.HydraUtil import code.validation.JsonSchemaValidation import code.views.Views @@ -149,8 +149,6 @@ import com.openbankproject.commons.util.Functions.Implicits._ import com.openbankproject.commons.util.{ApiVersion, Functions} import net.liftweb.common._ import net.liftweb.db.{DB, DBLogEntry} -import net.liftweb.http.LiftRules.DispatchPF -import net.liftweb.http._ import net.liftweb.json.Extraction import net.liftweb.mapper.{DefaultConnectionIdentifier => _, _} // SiteMap imports removed - API-only mode, no portal pages @@ -209,8 +207,7 @@ class Boot extends MdcLoggable { } yield { Props.toTry.map { f => { - val contextPath = LiftRules.context.path - val name = propsPath + contextPath + f() + "props" + val name = propsPath + f() + "props" name -> { () => tryo{new FileInputStream(new File(name))} } } } @@ -388,8 +385,10 @@ class Boot extends MdcLoggable { // } // } - LiftRules.unloadHooks.append(APIUtil.vendor.closeAllConnections_! _) - LiftRules.unloadHooks.append(Redis.jedisPoolDestroy _) + // NOTE: DB/Redis shutdown is registered together with the gRPC server stop in a + // single ORDERED shutdown hook at the end of boot (after the gRPC block) — see there. + // JVM runs every addShutdownHook thread CONCURRENTLY with no ordering guarantee, so a + // separate DB-close hook could race a still-draining gRPC server that touches the DB. // LiftRules.statelessDispatch.prepend { // case _ if tryo(DB.use(DefaultConnectionIdentifier){ conn => conn}.isClosed).isEmpty => // Props.mode match { @@ -406,8 +405,7 @@ class Boot extends MdcLoggable { //If use_custom_webapp=true, this will copy all the files from `OBP-API/obp-api/src/main/webapp` to `OBP-API/obp-api/src/main/resources/custom_webapp` if (APIUtil.getPropsAsBoolValue("use_custom_webapp", false)){ - //this `LiftRules.getResource` will get the path of `OBP-API/obp-api/src/main/webapp`: - LiftRules.getResource("/").map { url => + Option(getClass.getClassLoader.getResource("./")).map { url => // this following will get the path of `OBP-API/obp-api/src/main/resources/custom_webapp` val source = if (getClass().getClassLoader().getResource("custom_webapp") == null) throw new RuntimeException("If you set `use_custom_webapp = true`, custom_webapp folder can not be Empty!!") @@ -455,19 +453,6 @@ class Boot extends MdcLoggable { case _ => // Do nothing } - // where to search snippets - LiftRules.addToPackages("code") - - - // H2 web console - // Help accessing H2 from outside Lift, and be able to run any queries against it. - // It's enabled only in Dev and Test mode - if (Props.devMode || Props.testMode) { - LiftRules.liftRequest.append({case r if (r.path.partPath match { - case "console" :: _ => true - case _ => false} - ) => false}) - } @@ -501,11 +486,6 @@ class Boot extends MdcLoggable { // dispatches were retired in the http4s migration; any prop gates // (e.g. `openid_connect.enabled`, `allow_direct_login`) live with those routes. - - - //LiftRules.statelessDispatch.append(AccountsAPI) - - ////////////////////////////////////////////////////////////////////////////////////////////////// // Resource Docs are used in the process of surfacing endpoints so we enable them explicitly // to avoid a circular dependency. @@ -544,52 +524,6 @@ class Boot extends MdcLoggable { // SiteMap removed - API-only mode, all routing via statelessDispatch - // Force the request to be UTF-8 - LiftRules.early.append(_.setCharacterEncoding("UTF-8")) - - LiftRules.explicitlyParsedSuffixes = Helpers.knownSuffixes &~ (Set("com")) - - val locale = I18NUtil.getDefaultLocale() - // Locale.setDefault(locale) // TODO Explain why this line of code introduce weird side effects - logger.info("Default Project Locale is :" + locale) - - // Cookie name - val localeCookieName = "SELECTED_LOCALE" - LiftRules.localeCalculator = { - case fullReq @ Full(req) => { - // Check against a set cookie, or the locale sent in the request - def currentLocale : Locale = { - S.findCookie(localeCookieName).flatMap { - cookie => cookie.value.map(I18NUtil.computeLocale) - } openOr locale - } - - // Check to see if the user explicitly requests a new locale - // In case it's true we use that value to set up a new cookie value - ObpS.param(PARAM_LOCALE) match { - case Full(requestedLocale) if requestedLocale != null && APIUtil.checkShortString(requestedLocale)==SILENCE_IS_GOLDEN => { - val computedLocale: Locale = I18NUtil.computeLocale(requestedLocale) - // Simon: if we are not using resource_user.last_used_local we don't need to set it. It is not returned in the Agent User endpoint. Thus, for now, we don't need to set it in the database. - // val sessionId = S.session.map(_.uniqueId).openOr("") - // AuthUser.updateComputedLocale(sessionId, computedLocale.toString()) - computedLocale - } - case _ => currentLocale - } - } - case _ => locale - } - - - //for XSS vulnerability, set X-Frame-Options header as DENY - LiftRules.supplementalHeaders.default.set( - ("X-Frame-Options", "DENY") :: - Nil - ) - - // Make a transaction span the whole HTTP request - S.addAround(DB.buildLoanWrapper) - logger.info("Note: We added S.addAround(DB.buildLoanWrapper) so each HTTP request uses ONE database transaction.") try { val useMessageQueue = APIUtil.getPropsAsBoolValue("messageQueue.createBankAccounts", false) @@ -599,44 +533,6 @@ class Boot extends MdcLoggable { case e: ExceptionInInitializerError => logger.warn(s"BankAccountCreationListener Exception: $e") } - LiftRules.exceptionHandler.prepend{ - case(_, r, e) if e.isInstanceOf[NullPointerException] && e.getMessage.contains("Looking for Connection Identifier") => { - logger.error(s"Exception being returned to browser when processing url is ${r.request.uri}, method is ${r.request.method}, exception detail is $e", e) - JsonResponse( - Extraction.decompose(ErrorMessage(code = 500, message = s"${ErrorMessages.DatabaseConnectionClosedError}")), - 500 - ) - } - case(Props.RunModes.Development, r, e) => { - logger.error(s"Exception being returned to browser when processing url is ${r.request.uri}, method is ${r.request.method}, exception detail is $e", e) - JsonResponse( - Extraction.decompose(ErrorMessage(code = 500, message = s"${ErrorMessages.InternalServerError} ${showExceptionAtJson(e)}")), - 500 - ) - } - case (_, r , e) => { - sendExceptionEmail(e) - logger.error(s"Exception being returned to browser when processing url is ${r.request.uri}, method is ${r.request.method}, exception detail is $e", e) - JsonResponse( - Extraction.decompose(ErrorMessage(code = 500, message = s"${ErrorMessages.InternalServerError}")), - 500 - ) - } - } - - LiftRules.uriNotFound.prepend{ - case (r, _) if r.uri.contains(ConstantsBG.berlinGroupVersion1.urlPrefix) => NotFoundAsResponse(errorJsonResponse( - s"${ErrorMessages.InvalidUri}Current Url is (${r.uri.toString}), Current Content-Type Header is (${r.headers.find(_._1.equals("Content-Type")).map(_._2).getOrElse("")})", - 405, - Some(CallContextLight(url = r.uri)) - ) - ) - case (r, _) => NotFoundAsResponse(errorJsonResponse( - s"${ErrorMessages.InvalidUri}Current Url is (${r.uri.toString}), Current Content-Type Header is (${r.headers.find(_._1.equals("Content-Type")).map(_._2).getOrElse("")})", - 404) - ) - } - if ( !APIUtil.getPropsAsLongValue("transaction_request_status_scheduler_delay").isEmpty ) { val delay = APIUtil.getPropsAsLongValue("transaction_request_status_scheduler_delay").openOrThrowException("Incorrect value for transaction_request_status_scheduler_delay, please provide number of seconds.") TransactionRequestStatusScheduler.start(delay) @@ -657,75 +553,13 @@ class Boot extends MdcLoggable { case false => // Do not start it } - object UsernameLockedChecker { - def onBeginServicing(session: LiftSession, req: Req): Unit = { - logger.debug(s"Hello from UsernameLockedChecker.onBeginServicing") - checkIsLocked() - logger.debug(s"Bye from UsernameLockedChecker.onBeginServicing") - } - def onSessionActivate(session: LiftSession): Unit = { - logger.debug(s"Hello from UsernameLockedChecker.onSessionActivate") - checkIsLocked() - logger.debug(s"Bye from UsernameLockedChecker.onSessionActivate") - } - def onSessionPassivate(session: LiftSession): Unit = { - logger.debug(s"Hello from UsernameLockedChecker.onSessionPassivate") - checkIsLocked() - logger.debug(s"Bye from UsernameLockedChecker.onSessionPassivate") - } - private def checkIsLocked(): Unit = { - AuthUser.currentUser match { - case Full(user) => - LoginAttempt.userIsLocked(localIdentityProvider, user.username.get) match { - case true => - AuthUser.logoutCurrentUser - logger.warn(s"checkIsLocked says: User ${user.username.get} has been logged out because it is locked.") - case false => // Do nothing - logger.debug(s"checkIsLocked says: User ${user.username.get} is not locked.") - } - case _ => // No user found - logger.debug(s"checkIsLocked says: No User Found.") - } - } - } - LiftSession.onBeginServicing = UsernameLockedChecker.onBeginServicing _ :: LiftSession.onBeginServicing - LiftSession.onSessionActivate = UsernameLockedChecker.onSessionActivate _ :: LiftSession.onSessionActivate - LiftSession.onSessionPassivate = UsernameLockedChecker.onSessionPassivate _ :: LiftSession.onSessionPassivate - - // export one Connector's methods as endpoints, it is just for develop - APIUtil.getPropsValue("connector.name.export.as.endpoints").foreach { connectorName => - // validate whether "connector.name.export.as.endpoints" have set a correct value - code.api.Constant.CONNECTOR match { - case Full("star") => - val starConnectorTypes = APIUtil.getPropsValue("starConnector_supported_types","mapped") - .trim - .split("""\s*,\s*""") - - val allSupportedConnectors: List[String] = Connector.nameToConnector.keys.toList - .filter(it => starConnectorTypes.exists(it.startsWith(_))) - - assert(allSupportedConnectors.contains(connectorName), s"connector.name.export.as.endpoints=$connectorName, this value should be one of ${allSupportedConnectors.mkString(",")}") - - case _ if connectorName == "mapped" => - Functions.doNothing - case Full(connector) => - assert(connector == connectorName, s"When 'connector=$connector', this props must be: connector.name.export.as.endpoints=$connector, but current it is $connectorName") - } - - ConnectorEndpoints.registerConnectorEndpoints - } + // ConnectorEndpoints (connector.name.export.as.endpoints) registered via Lift statelessDispatch + // which is no longer reachable (Lift bridge removed in Phase B). Disabled until migrated to http4s. if(HydraUtil.integrateWithHydra && HydraUtil.mirrorConsumerInHydra) { createHydraClients() } - Props.get("session_inactivity_timeout_in_seconds") match { - case Full(x) if tryo(x.toLong).isDefined => - LiftRules.sessionInactivityTimeout.default.set(Full((x.toLong.minutes): Long)) - case _ => - // Do not change default value - } - } // create Hydra client if exists active consumer but missing Hydra client @@ -759,53 +593,6 @@ class Boot extends MdcLoggable { code.chat.ChatRoomTrait.chatRoomProvider.vend.getOrCreateDefaultRoom() } - private def showExceptionAtJson(error: Throwable): String = { - val formattedError = "Message: " + error.toString + error.getStackTrace.map(_.toString).mkString(" ") - - val formattedCause = error.getCause match { - case null => "" - case cause: Throwable => "Caught and thrown by: " + showExceptionAtJson(cause) - } - - formattedError + formattedCause - } - - private def sendExceptionEmail(exception: Throwable): Unit = { - - import net.liftweb.util.Helpers.now - - val outputStream = new java.io.ByteArrayOutputStream - val printStream = new java.io.PrintStream(outputStream) - exception.printStackTrace(printStream) - val currentTime = now.toString - val stackTrace = new String(outputStream.toByteArray) - val error = currentTime + ": " + stackTrace - val host = Constant.HostName - - val mailSent = for { - from <- APIUtil.getPropsValue("mail.exception.sender.address") ?~ "Could not send mail: Missing props param for 'from'" - // no spaces, comma separated e.g. mail.api.consumer.registered.notification.addresses=notify@example.com,notify2@example.com,notify3@example.com - toAddressesString <- APIUtil.getPropsValue("mail.exception.registered.notification.addresses") ?~ "Could not send mail: Missing props param for 'to'" - } yield { - - //technically doesn't work for all valid email addresses so this will mess up if someone tries to send emails to "foo,bar"@example.com - val to = toAddressesString.split(",").toList - - val emailContent = CommonsEmailWrapper.EmailContent( - from = from, - to = to, - subject = s"you got an exception on $host", - textContent = Some(error) - ) - - //this is an async call∆∆ - CommonsEmailWrapper.sendTextEmail(emailContent) - } - - if(mailSent.isEmpty) - logger.warn(s"Exception notification failed: $mailSent") - } - /** * there will be a default bank and two default accounts in obp mapped mode. * These bank and accounts will be used for the payments. @@ -1104,7 +891,7 @@ class Boot extends MdcLoggable { } -object ToSchemify { +object ToSchemify extends MdcLoggable { val models: List[MetaMapper[_]] = List( AuthUser, JobScheduler, @@ -1250,10 +1037,26 @@ object ToSchemify { ) // start grpc server - if (APIUtil.getPropsAsBoolValue("grpc.server.enabled", false)) { - val server = new ObpGrpcServer(ExecutionContext.global) - server.start() - LiftRules.unloadHooks.append(server.stop) - } + // start grpc server (optional) + val grpcServerOpt: Option[ObpGrpcServer] = + if (APIUtil.getPropsAsBoolValue("grpc.server.enabled", false)) { + val server = new ObpGrpcServer(ExecutionContext.global) + server.start() + Some(server) + } else None + + // Single ORDERED shutdown hook (replaces the former two CONCURRENT hooks: the DB/Redis + // close that used to sit earlier in boot, and the gRPC stop here). JVM runs every + // addShutdownHook thread concurrently with no ordering guarantee, so the old pair could + // race: gRPC might still be serving an in-flight request that touches the DB while the + // connection pool is being closed. Here we stop gRPC FIRST (drains in-flight requests), + // THEN close DB + Redis. Each step is guarded so one failure doesn't skip the rest. + Runtime.getRuntime.addShutdownHook(new Thread(() => { + grpcServerOpt.foreach { s => + try s.stop() catch { case e: Throwable => logger.warn("gRPC server.stop() failed during shutdown", e) } + } + try APIUtil.vendor.closeAllConnections_!() catch { case e: Throwable => logger.warn("DB closeAllConnections_!() failed during shutdown", e) } + try Redis.jedisPoolDestroy catch { case e: Throwable => logger.warn("Redis jedisPoolDestroy failed during shutdown", e) } + })) } diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/AccountsApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/AccountsApi.scala index 7bc13a98fb..4dc41a19aa 100644 --- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/AccountsApi.scala +++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/AccountsApi.scala @@ -9,7 +9,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ApiCollector.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ApiCollector.scala index 04f771d673..07f5f73e31 100644 --- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ApiCollector.scala +++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ApiCollector.scala @@ -78,5 +78,5 @@ // // Make them available for use! // registerRoutes(routes, allResourceDocs, apiPrefix) // -// logger.info(s"version $version has been run! There are ${routes.length} routes.") +// logger.info(s"version $version has been run!") //} diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/BankingApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/BankingApi.scala index 0c191b7d7a..8b8ec49e57 100644 --- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/BankingApi.scala +++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/BankingApi.scala @@ -11,7 +11,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.model.{AccountId, BankId} //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CommonApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CommonApi.scala index 55bb5453ad..cfb811b752 100644 --- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CommonApi.scala +++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CommonApi.scala @@ -9,7 +9,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CustomerApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CustomerApi.scala index 0487b7d497..97f214edc8 100644 --- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CustomerApi.scala +++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CustomerApi.scala @@ -9,7 +9,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DirectDebitsApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DirectDebitsApi.scala index 5158073f89..0c0b61be94 100644 --- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DirectDebitsApi.scala +++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DirectDebitsApi.scala @@ -9,7 +9,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DiscoveryApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DiscoveryApi.scala index 15dcfea8ab..4d93a65d34 100644 --- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DiscoveryApi.scala +++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DiscoveryApi.scala @@ -9,7 +9,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/PayeesApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/PayeesApi.scala index 4f0d794fad..ca0a6220fa 100644 --- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/PayeesApi.scala +++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/PayeesApi.scala @@ -9,7 +9,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ProductsApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ProductsApi.scala index d9a9bc1dc8..798af3b913 100644 --- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ProductsApi.scala +++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ProductsApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ScheduledPaymentsApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ScheduledPaymentsApi.scala index 9e85df182e..82a3b3448f 100644 --- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ScheduledPaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ScheduledPaymentsApi.scala @@ -9,7 +9,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountAccessConsentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountAccessConsentsApi.scala index 51067de2e3..d2dd7445cc 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountAccessConsentsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountAccessConsentsApi.scala @@ -9,7 +9,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountsApi.scala index 82c95ad57c..e883d65959 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountsApi.scala @@ -9,7 +9,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/ApiCollector.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/ApiCollector.scala index bfd6172cab..6f475c46a0 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/ApiCollector.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/ApiCollector.scala @@ -104,5 +104,5 @@ // // Make them available for use! // registerRoutes(routes, allResourceDocs, apiPrefix) // -// logger.info(s"version $version has been run! There are ${routes.length} routes.") +// logger.info(s"version $version has been run!") //} diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BalancesApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BalancesApi.scala index abb7f866b5..9065f848aa 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BalancesApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BalancesApi.scala @@ -9,7 +9,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BeneficiariesApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BeneficiariesApi.scala index 3335c78f22..41a2376d2d 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BeneficiariesApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BeneficiariesApi.scala @@ -9,7 +9,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DirectDebitsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DirectDebitsApi.scala index 767b4c23e4..5f39798d1b 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DirectDebitsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DirectDebitsApi.scala @@ -9,7 +9,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentConsentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentConsentsApi.scala index 663a4524f4..37cf586329 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentConsentsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentConsentsApi.scala @@ -9,7 +9,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentsApi.scala index 1dd76717c0..5ebd8b6f43 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentsApi.scala @@ -9,7 +9,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsApi.scala index 035f182108..c5f9a85497 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsApi.scala @@ -9,7 +9,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsConsentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsConsentsApi.scala index cb74deaee2..370b12a9c4 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsConsentsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsConsentsApi.scala @@ -9,7 +9,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/EventNotificationApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/EventNotificationApi.scala index 45be040fe7..e63bc9f9cd 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/EventNotificationApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/EventNotificationApi.scala @@ -10,7 +10,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentConsentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentConsentsApi.scala index 318bb40079..3ee1913a15 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentConsentsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentConsentsApi.scala @@ -9,7 +9,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentsApi.scala index 3593733924..366e30e2bd 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentsApi.scala @@ -9,7 +9,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FutureDatedPaymentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FutureDatedPaymentsApi.scala index e708b7873c..92b8bdfecb 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FutureDatedPaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FutureDatedPaymentsApi.scala @@ -9,7 +9,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentConsentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentConsentsApi.scala index e17b1f7f82..1ee4ce2ab9 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentConsentsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentConsentsApi.scala @@ -9,7 +9,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentsApi.scala index 99ed2c2142..9b146ae096 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentsApi.scala @@ -9,7 +9,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/OffersApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/OffersApi.scala index a7a4fd8f2a..40d3ffb41a 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/OffersApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/OffersApi.scala @@ -9,7 +9,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/PartiesApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/PartiesApi.scala index 89b356de50..67d5c9d445 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/PartiesApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/PartiesApi.scala @@ -9,7 +9,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StandingOrdersApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StandingOrdersApi.scala index 455305240c..9f6b956d40 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StandingOrdersApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StandingOrdersApi.scala @@ -9,7 +9,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StatementsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StatementsApi.scala index b3eb0627a7..fbd17a1f4e 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StatementsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StatementsApi.scala @@ -9,7 +9,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/SupplementaryAccountInfoApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/SupplementaryAccountInfoApi.scala index d0a2bedf79..b115b3f6ca 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/SupplementaryAccountInfoApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/SupplementaryAccountInfoApi.scala @@ -9,7 +9,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/TransactionsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/TransactionsApi.scala index 730f07461b..9fb39fca2b 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/TransactionsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/TransactionsApi.scala @@ -9,7 +9,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/GatewayLogin.scala b/obp-api/src/main/scala/code/api/GatewayLogin.scala index 63bc6472fe..72e908a29c 100755 --- a/obp-api/src/main/scala/code/api/GatewayLogin.scala +++ b/obp-api/src/main/scala/code/api/GatewayLogin.scala @@ -38,7 +38,6 @@ import code.util.Helper.MdcLoggable import com.nimbusds.jwt.JWTClaimsSet import com.openbankproject.commons.model.{InboundAccount, User} import net.liftweb.common._ -import net.liftweb.http._ import net.liftweb.json._ import net.liftweb.util.Helpers @@ -145,9 +144,9 @@ object GatewayLogin extends MdcLoggable { } // Check if the request (access token or request token) is valid and return a tuple - def validator(request: Box[Req]) : (Int, String, Map[String,String]) = { - // First we try to extract all parameters from a Request - val parameters: Map[String, String] = getAllParameters(request) + def validator(authorizationHeader: Box[String]) : (Int, String, Map[String,String]) = { + // First we try to extract all parameters from the Authorization header + val parameters: Map[String, String] = getAllParameters(authorizationHeader) val emptyMap = Map[String, String]() parameters.get("error") match { @@ -400,7 +399,7 @@ object GatewayLogin extends MdcLoggable { } // Return a Map containing the GatewayLogin parameter : token -> value - def getAllParameters(request: Box[Req]): Map[String, String] = { + def getAllParameters(authorizationHeader: Box[String]): Map[String, String] = { def toMap(parametersList: String) = { //transform the string "GatewayLogin token="value"" //to a tuple (GatewayLogin_parameter,Decoded(value)) @@ -427,17 +426,14 @@ object GatewayLogin extends MdcLoggable { params } - request match { - case Full(a) => a.header("Authorization") match { - case Full(header) => { - if (header.contains("GatewayLogin")) - toMap(header) - else - Map("error" -> "Missing GatewayLogin in header!") - } - case _ => Map("error" -> "Missing Authorization header!") + authorizationHeader match { + case Full(header) => { + if (header.contains("GatewayLogin")) + toMap(header) + else + Map("error" -> "Missing GatewayLogin in header!") } - case _ => Map("error" -> "Request is incorrect!") + case _ => Map("error" -> "Missing Authorization header!") } } @@ -492,7 +488,7 @@ object GatewayLogin extends MdcLoggable { } def getUser : Box[User] = { - val (httpCode, message, parameters) = GatewayLogin.validator(S.request) + val (httpCode, message, parameters) = GatewayLogin.validator(Empty) httpCode match { case 200 => val payload = GatewayLogin.parseJwt(parameters) diff --git a/obp-api/src/main/scala/code/api/Http4sOpenIdConnect.scala b/obp-api/src/main/scala/code/api/Http4sOpenIdConnect.scala index 19d14020f4..0d0c5747f5 100644 --- a/obp-api/src/main/scala/code/api/Http4sOpenIdConnect.scala +++ b/obp-api/src/main/scala/code/api/Http4sOpenIdConnect.scala @@ -41,10 +41,12 @@ import code.users.Users import code.util.Helper.MdcLoggable import com.openbankproject.commons.model.User import net.liftweb.common._ +import net.liftweb.db.DB import net.liftweb.json import net.liftweb.json.JsonAST.prettyRender import net.liftweb.json.{Extraction, Formats} import net.liftweb.mapper.By +import net.liftweb.util.DefaultConnectionIdentifier import net.liftweb.util.Helpers import net.liftweb.util.Helpers._ import org.http4s._ @@ -107,7 +109,7 @@ object OpenIdConnectConfig { * * Gating: the route only fires when `openid_connect.enabled=true` (default * false); otherwise the pattern guard fails and the request falls through to - * the Lift bridge (404), matching prior behaviour. A second runtime gate + * `notFoundCatchAll` (JSON 404), matching prior behaviour. A second runtime gate * `allow_openid_connect` (default true) returns 401 when set false. */ object Http4sOpenIdConnect extends MdcLoggable { @@ -157,6 +159,12 @@ object Http4sOpenIdConnect extends MdcLoggable { } } + // CONFIG CAVEAT: portal-login was removed, so nothing stores the OIDC `state` server-side; + // `sessionState` is always "" (see processCallback). With the default + // openid_connect.check_session_state=true this fail-closed gate rejects every real (non-empty) + // state with 401 InvalidOpenIDConnectState — so OIDC deployments MUST set + // openid_connect.check_session_state=false (or reintroduce server-side state storage). + // Default kept true (fail-closed) on purpose. Long-term fix: stateless CSRF (PKCE / signed state). private def checkSessionState(state: String, sessionState: String): Boolean = if (getPropsAsBoolValue("openid_connect.check_session_state", true)) state == sessionState else true @@ -176,33 +184,41 @@ object Http4sOpenIdConnect extends MdcLoggable { case Full((idToken, accessToken, tokenType, expiresIn, refreshToken, scope)) => JwtUtil.validateIdToken(idToken, OpenIdConnectConfig.get(identityProvider).jwks_uri) match { case Full(_) => - getOrCreateResourceUser(idToken) match { - case Full(user) if LoginAttempt.userIsLocked(user.provider, user.name) => - Left((401, ErrorMessages.UsernameHasBeenLocked)) - case Full(user) => - getOrCreateAuthUser(user) match { - case Full(authUser) => - // Grant roles according to the props email_domain_to_space_mappings - AuthUser.grantEmailDomainEntitlementsToUser(authUser) - AuthUser.grantEntitlementsToUseDynamicEndpointsInSpaces(authUser) - // User init actions - AfterApiAuth.innerLoginUserInitAction(Full(authUser)) - getOrCreateConsumer(idToken, user.userId) match { - case Full(consumer) => - saveAuthorizationToken(tokenType, accessToken, idToken, refreshToken, scope, expiresIn, authUser.id.get) match { - case Full(_) => - // Mint a usable OBP DirectLogin token bound to the provisioned user + consumer. - DirectLogin.issueTokenForUser(user.userPrimaryKey.value, consumer.key.get) match { - case Full(token) => Right(token) - case _ => Left((500, ErrorMessages.CouldNotHandleOpenIDConnectData + "issueToken")) - } - case _ => Left((401, ErrorMessages.CouldNotHandleOpenIDConnectData + "saveAuthorizationToken")) - } - case _ => Left((401, ErrorMessages.CouldNotHandleOpenIDConnectData + "getOrCreateConsumer")) - } - case _ => Left((401, ErrorMessages.CouldNotHandleOpenIDConnectData + "getOrCreateAuthUser")) - } - case _ => Left((401, ErrorMessages.CouldNotSaveOpenIDConnectUser)) + // Restore the single-connection-per-request semantics that Lift's removed + // S.addAround(DB.buildLoanWrapper) gave: all provisioning writes share one + // connection and commit together; a thrown DB error rolls the whole set back + // (same primitive as deletion.DeletionUtil.databaseAtomicTask). The network + // steps above (token exchange + JWKS validation) are kept OUTSIDE the tx so no + // DB connection is held during remote HTTP calls. + DB.use(DefaultConnectionIdentifier) { _ => + getOrCreateResourceUser(idToken) match { + case Full(user) if LoginAttempt.userIsLocked(user.provider, user.name) => + Left((401, ErrorMessages.UsernameHasBeenLocked)) + case Full(user) => + getOrCreateAuthUser(user) match { + case Full(authUser) => + // Grant roles according to the props email_domain_to_space_mappings + AuthUser.grantEmailDomainEntitlementsToUser(authUser) + AuthUser.grantEntitlementsToUseDynamicEndpointsInSpaces(authUser) + // User init actions + AfterApiAuth.innerLoginUserInitAction(Full(authUser)) + getOrCreateConsumer(idToken, user.userId) match { + case Full(consumer) => + saveAuthorizationToken(tokenType, accessToken, idToken, refreshToken, scope, expiresIn, authUser.id.get) match { + case Full(_) => + // Mint a usable OBP DirectLogin token bound to the provisioned user + consumer. + DirectLogin.issueTokenForUser(user.userPrimaryKey.value, consumer.key.get) match { + case Full(token) => Right(token) + case _ => Left((500, ErrorMessages.CouldNotHandleOpenIDConnectData + "issueToken")) + } + case _ => Left((401, ErrorMessages.CouldNotHandleOpenIDConnectData + "saveAuthorizationToken")) + } + case _ => Left((401, ErrorMessages.CouldNotHandleOpenIDConnectData + "getOrCreateConsumer")) + } + case _ => Left((401, ErrorMessages.CouldNotHandleOpenIDConnectData + "getOrCreateAuthUser")) + } + case _ => Left((401, ErrorMessages.CouldNotSaveOpenIDConnectUser)) + } } case _ => Left((401, ErrorMessages.CouldNotValidateIDToken)) } @@ -270,14 +286,14 @@ object Http4sOpenIdConnect extends MdcLoggable { "redirect_uri=" + config.callback_url + "&" + "code=" + authorizationCode + "&" + "grant_type=authorization_code" - logger.debug("Request parameters: " + data) - logger.debug("Token endpoint: " + config.token_endpoint) + // Do NOT log `data` — it contains client_secret. Log the endpoint URL only. + logger.debug("Token exchange POST to: " + config.token_endpoint) val response: Box[String] = fromUrl(String.format("%s", config.token_endpoint), data, "POST") - logger.debug("Response: " + response) + // Do NOT log the raw response — it contains id/access/refresh tokens. + logger.debug("Token endpoint response received (success=" + response.isDefined + ")") response match { case Full(value) => val tokenResponse = json.parse(value) - logger.debug("Token response: " + tokenResponse) for { idToken <- tryo{(tokenResponse \ "id_token").extractOrElse[String]("")} accessToken <- tryo{(tokenResponse \ "access_token").extractOrElse[String]("")} @@ -286,7 +302,8 @@ object Http4sOpenIdConnect extends MdcLoggable { refreshToken <- tryo{(tokenResponse \ "refresh_token").extractOrElse[String]("")} scope <- tryo{(tokenResponse \ "scope").extractOrElse[String]("")} } yield { - logger.debug(s"(idToken: $idToken, accessToken: $accessToken, tokenType: $tokenType, expiresIn.toLong: ${expiresIn.toLong}, refreshToken: $refreshToken, scope: $scope)") + // Do NOT log token values (id/access/refresh). Non-sensitive metadata only. + logger.debug(s"OIDC token parsed (tokenType=$tokenType, expiresIn=${expiresIn.toLong}, scope=$scope)") (idToken, accessToken, tokenType, expiresIn.toLong, refreshToken, scope) } case badObject@Failure(_, _, _) => diff --git a/obp-api/src/main/scala/code/api/MxOF/APIMethods_AtmsApi.scala b/obp-api/src/main/scala/code/api/MxOF/APIMethods_AtmsApi.scala index 0565657291..014bb8d69a 100644 --- a/obp-api/src/main/scala/code/api/MxOF/APIMethods_AtmsApi.scala +++ b/obp-api/src/main/scala/code/api/MxOF/APIMethods_AtmsApi.scala @@ -16,8 +16,6 @@ //import com.openbankproject.commons.util.{ApiVersion, ScannedApiVersion} //import dispatch.Future //import net.liftweb.common.{Box, Empty, Full} -//import net.liftweb.http.Req -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/MxOF/CNBV9_1_0_0.scala b/obp-api/src/main/scala/code/api/MxOF/CNBV9_1_0_0.scala index ce6872dc43..fee3a6bf1a 100644 --- a/obp-api/src/main/scala/code/api/MxOF/CNBV9_1_0_0.scala +++ b/obp-api/src/main/scala/code/api/MxOF/CNBV9_1_0_0.scala @@ -25,5 +25,5 @@ // // Make them available for use! // registerRoutes(routes, allResourceDocs, apiPrefix) // -// logger.info(s"version $version has been run! There are ${routes.length} routes.") +// logger.info(s"version $version has been run!") //} diff --git a/obp-api/src/main/scala/code/api/MxOF/OBP_MXOF_1_0_0.scala b/obp-api/src/main/scala/code/api/MxOF/OBP_MXOF_1_0_0.scala index 419980362e..1e527909a1 100644 --- a/obp-api/src/main/scala/code/api/MxOF/OBP_MXOF_1_0_0.scala +++ b/obp-api/src/main/scala/code/api/MxOF/OBP_MXOF_1_0_0.scala @@ -59,5 +59,5 @@ // // Make them available for use! // registerRoutes(routes, allResourceDocs, apiPrefix) // -// logger.info(s"version $version has been run! There are ${routes.length} routes.") +// logger.info(s"version $version has been run!") //} diff --git a/obp-api/src/main/scala/code/api/OBPRestHelper.scala b/obp-api/src/main/scala/code/api/OBPRestHelper.scala index 5886520b02..e3c177810d 100644 --- a/obp-api/src/main/scala/code/api/OBPRestHelper.scala +++ b/obp-api/src/main/scala/code/api/OBPRestHelper.scala @@ -31,31 +31,32 @@ import scala.language.reflectiveCalls import scala.language.implicitConversions import code.api.Constant._ import code.api.util.APIUtil._ -import code.api.util.ErrorMessages.{InvalidDAuthHeaderToken, UserIsDeleted, UsernameHasBeenLocked, attemptedToOpenAnEmptyBox} import code.api.util._ -import code.api.v4_0_0.OBPAPI4_0_0 -import code.api.v5_0_0.OBPAPI5_0_0 -import code.api.v5_1_0.OBPAPI5_1_0 -import code.api.v6_0_0.OBPAPI6_0_0 -import code.loginattempts.LoginAttempt -import code.model.dataAccess.AuthUser -import code.util.Helper.{MdcLoggable, ObpS} +import code.util.Helper.MdcLoggable import com.alibaba.ttl.TransmittableThreadLocal import com.openbankproject.commons.model.ErrorMessage -import com.openbankproject.commons.util.{ApiVersion, ReflectUtils, ScannedApiVersion} +import com.openbankproject.commons.util.{ApiVersion, ScannedApiVersion} import net.liftweb.common._ -import net.liftweb.http.rest.RestHelper -import net.liftweb.http.{JsonResponse, LiftResponse, LiftRules, Req, S, TransientRequestMemoize} import net.liftweb.json.Extraction import net.liftweb.json.JsonAST.JValue -import net.liftweb.util.Helpers.tryo -import net.liftweb.util.{Helpers, NamedPF, Props, ThreadGlobal} -import java.net.URLDecoder -import java.util.{Locale, ResourceBundle} +import java.util.{Locale, MissingResourceException, ResourceBundle} import scala.collection.mutable.ArrayBuffer import scala.util.control.NoStackTrace -import scala.xml.{Node, NodeSeq} + +/** + * Lightweight JSON HTTP response carrier (replaces the former Lift JsonResponse). + * Carries a JSON body + HTTP headers + status code; the http4s middleware reads these to + * build the real org.http4s.Response[IO]. Cookies are accepted but ignored (http4s path + * never sets Lift cookies). + */ +case class JsonResponse(body: JValue, + headers: List[(String, String)], + cookies: List[Any], + code: Int) +object JsonResponse { + def apply(body: JValue, code: Int): JsonResponse = JsonResponse(body, Nil, Nil, code) +} trait APIFailure{ val msg : String @@ -76,86 +77,32 @@ case class APIFailureNewStyle(failMsg: String, ccl: Option[CallContextLight] = None ){ def translatedErrorMessage = { - val errorCode = extractErrorMessageCode(failMsg) val errorBody = extractErrorMessageBody(failMsg) - - val localeUrlParameter = getHttpRequestUrlParam(ccl.map(_.url).getOrElse(""),PARAM_LOCALE) + + val localeUrlParameter = getHttpRequestUrlParam(ccl.map(_.url).getOrElse(""), PARAM_LOCALE) val localeFromUrl = I18NUtil.computeLocale(localeUrlParameter) - - - val locale: Locale = - if(localeFromUrl.toString.equals("")) //if the url local parameter is invalid, then we use the default Locale. - I18NUtil.getDefaultLocale() - else - localeFromUrl - - val liftCoreResourceBundle = tryo(ResourceBundle.getBundle(LiftRules.liftCoreResourceName, locale)).toList - - val _resBundle = new ThreadGlobal[List[ResourceBundle]] - object resourceValueCache extends TransientRequestMemoize[(String, Locale), String] - - def resourceBundles(loc: Locale): List[ResourceBundle] = { - _resBundle.box match { - case Full(bundles) => bundles - case _ => { - _resBundle.set( - LiftRules.resourceForCurrentLoc.vend() ::: - LiftRules.resourceNames.flatMap(name => tryo{ - if (Props.devMode) { - tryo{ - val clz = this.getClass.getClassLoader.loadClass("java.util.ResourceBundle") - val meth = clz.getDeclaredMethods. - filter{m => m.getName == "clearCache" && m.getParameterTypes.length == 0}. - toList.head - meth.invoke(null) - } - } - List(ResourceBundle.getBundle(name, loc)) - }.openOr( - NamedPF.applyBox((name, loc), LiftRules.resourceBundleFactories.toList).map(List(_)) openOr Nil - ))) - _resBundle.value - } - } - } - - - def resourceBundleList: List[ResourceBundle] = resourceBundles(locale) ++ liftCoreResourceBundle - - def ?!(str: String, resBundle: List[ResourceBundle]): String = - resBundle.flatMap( - r => tryo( - r.getObject(str) match { - case s: String => Full(s) - case n: Node => Full(n.text) - case ns: NodeSeq => Full(ns.text) - case _ => Empty - }) - .flatMap(s => s)).find(s => true) getOrElse { - LiftRules.localizationLookupFailureNotice.foreach(_ (str, locale)); - str - } - - def ?(str: String, locale: Locale): String = resourceValueCache.get( - str -> - locale, - if(locale.toString.startsWith("en") || ?!(str, resourceBundleList)==str) //If can not find the value from props or the local is `en`, then return - errorBody - else { - val originalErrorMessageFromScalaCode = ErrorMessages.getValueMatches(_.startsWith(errorCode)).getOrElse("") - // we need to keep the extra message, - // eg: OBP-20006: usuario le faltan uno o más roles': CanGetUserInvitation for BankId(gh.29.uk). - if(failMsg.contains(originalErrorMessageFromScalaCode)){ - s": ${?!(str, resourceBundleList)}"+failMsg.replace(originalErrorMessageFromScalaCode,"") - } else{ - s": ${?!(str, resourceBundleList)}" - } - } + val locale: Locale = + if (localeFromUrl.toString.equals("")) I18NUtil.getDefaultLocale() + else localeFromUrl + + val bundles: List[ResourceBundle] = + try { ResourceBundle.getBundle("i18n.lift-core", locale) :: Nil } + catch { case _: MissingResourceException => Nil } + + def lookup(key: String): Option[String] = + bundles.flatMap(b => try { Some(b.getString(key)) } catch { case _: MissingResourceException => None }).headOption - ) - - val translatedErrorBody = ?(errorCode, locale) + val translatedErrorBody: String = lookup(errorCode) match { + case None => errorBody + case Some(translated) if locale.toString.startsWith("en") || translated == errorCode => errorBody + case Some(translated) => + val originalErrorMessageFromScalaCode = ErrorMessages.getValueMatches(_.startsWith(errorCode)).getOrElse("") + if (failMsg.contains(originalErrorMessageFromScalaCode)) + s": $translated" + failMsg.replace(originalErrorMessageFromScalaCode, "") + else + s": $translated" + } s"$errorCode$translatedErrorBody" } } @@ -239,7 +186,7 @@ object JsonResponseException { } } -trait OBPRestHelper extends RestHelper with MdcLoggable { +trait OBPRestHelper extends MdcLoggable { implicit def errorToJson(error: ErrorMessage): JValue = Extraction.decompose(error) @@ -247,404 +194,6 @@ trait OBPRestHelper extends RestHelper with MdcLoggable { val versionStatus : String // TODO this should be property of ApiVersion //def vDottedVersion = vDottedApiVersion(version) - def apiPrefix: OBPEndpoint => OBPEndpoint = version match { - case ScannedApiVersion(urlPrefix, _, _) => - (urlPrefix / version.vDottedApiVersion).oPrefix(_) - case _ => - (ApiPathZero / version.vDottedApiVersion).oPrefix(_) - } - - /* - An implicit function to convert magically between a Boxed JsonResponse and a JsonResponse - If we have something good, return it. Else log and return an error. - Please note that behaviour of this function depends on property display_internal_errors=true/false in case of Failure - # When is disabled we show only last message which should be a user friendly one. For instance: - # { - # "error": "OBP-30001: Bank not found. Please specify a valid value for BANK_ID." - # } - # When is disabled we also do filtering. Every message which does not contain "OBP-" is considered as internal and as that is not shown. - # In case the filtering implies an empty response we provide a generic one: - # { - # "error": "OBP-50005: An unspecified or internal error occurred." - # } - # When is enabled we show all messages in a chain. For instance: - # { - # "error": "OBP-30001: Bank not found. Please specify a valid value for BANK_ID. <- Full(TimeoutExceptionjava.util.concurrent.TimeoutException: The stream has not been completed in 1550 milliseconds.)" - # } - */ - implicit def jsonResponseBoxToJsonResponse(box: Box[JsonResponse]): JsonResponse = { - box match { - case Full(r) => r - case ParamFailure(_, _, _, apiFailure : APIFailure) => { - logger.error("jsonResponseBoxToJsonResponse case ParamFailure says: API Failure: " + apiFailure.msg + " ($apiFailure.responseCode)") - errorJsonResponse(apiFailure.msg, apiFailure.responseCode) - } - case obj@Failure(_, _, _) => { - val failuresMsg = filterMessage(obj) - logger.debug("jsonResponseBoxToJsonResponse case Failure API Failure: " + failuresMsg) - errorJsonResponse(failuresMsg) - } - case Empty => { - logger.error(s"jsonResponseBoxToJsonResponse case Empty : ${ErrorMessages.ScalaEmptyBoxToLiftweb}") - errorJsonResponse(ErrorMessages.ScalaEmptyBoxToLiftweb) - } - case _ => { - logger.error("jsonResponseBoxToJsonResponse case Unknown !") - errorJsonResponse(ErrorMessages.UnknownError) - } - } - } - - /* - A method which takes - a Request r - and - a partial function h - which takes - a Request - and - a User - and returns a JsonResponse - and returns a JsonResponse (but what about the User?) - - - */ - def failIfBadJSON(r: Req, h: (OBPEndpoint)): CallContext => Box[JsonResponse] = { - // Check if the content-type is text/json or application/json - r.json_? match { - case true => - //logger.debug("failIfBadJSON says: Cool, content-type is json") - r.json match { - case Failure(msg, _, _) => (x: CallContext) => Full(errorJsonResponse(ErrorMessages.InvalidJsonFormat + s"$msg")) - case _ => h(r) - } - case false => h(r) - } - } - - - /** - * Function which inspect does an Endpoint use Akka's Future in non-blocking way i.e. without using Await.result - * @param rd Resource Document which contains all description of an Endpoint - * @return true if some endpoint is written as a new style one - */ - // TODO Remove Option type in case of Resource Doc - def isNewStyleEndpoint(rd: Option[ResourceDoc]) : Boolean = { - rd match { - case Some(e) if e.tags.exists(_ == ApiTag.apiTagOldStyle) => - false - case None => - logger.error("Function isNewStyleEndpoint received empty resource doc") - true - case _ => - true - } - } - - def failIfBadAuthorizationHeader(rd: Option[ResourceDoc])(function: CallContext => Box[JsonResponse]) : JsonResponse = { - // Check is it a user deleted or locked - def fn(callContext: CallContext): Box[JsonResponse] = { - callContext.user match { - case Full(u) => // There is a user. Check it. - if(u.isDeleted.getOrElse(false)) { - Failure(UserIsDeleted) // The user is DELETED. - } else { - LoginAttempt.userIsLocked(u.provider, u.name) match { - case true => Failure(UsernameHasBeenLocked) // The user is LOCKED. - case false => function(callContext) // All good - } - } - case _ => // There is no user. Just forward the result. - function(callContext) - } - } - - val authorization = S.request.map(_.header("Authorization")).flatten - val directLogin: Box[String] = S.request.map(_.header("DirectLogin")).flatten - val body: Box[String] = getRequestBody(S.request) - val implementedInVersion = S.request.openOrThrowException(attemptedToOpenAnEmptyBox).view - val verb = S.request.openOrThrowException(attemptedToOpenAnEmptyBox).requestType.method - val url = URLDecoder.decode(ObpS.uriAndQueryString.getOrElse(""),"UTF-8") - val correlationId = getCorrelationId() - val reqHeaders = S.request.openOrThrowException(attemptedToOpenAnEmptyBox).request.headers - val remoteIpAddress = getRemoteIpAddress() - val cc = CallContext( - resourceDocument = rd, - startTime = Some(Helpers.now), - authReqHeaderField = authorization, - implementedInVersion = implementedInVersion, - verb = verb, - httpBody = body, - correlationId = correlationId, - url = url, - ipAddress = remoteIpAddress, - requestHeaders = reqHeaders, - operationId = rd.map(_.operationId) - ) - - // before authentication interceptor build response - val maybeJsonResponse: Box[JsonResponse] = rd.flatMap(it => beforeAuthenticateInterceptResult(Option(cc), it.operationId)) - - if(maybeJsonResponse.isDefined) { - maybeJsonResponse - } else if(isNewStyleEndpoint(rd)) { - fn(cc) - } else if (APIUtil.hasConsentJWT(reqHeaders)) { - val (usr, callContext) = Consent.applyRulesOldStyle(APIUtil.getConsentJWT(reqHeaders), cc) - usr match { - case Full(u) => fn(callContext.copy(user = Full(u))) // Authentication is successful - case ParamFailure(a, b, c, apiFailure : APIFailure) => ParamFailure(a, b, c, apiFailure : APIFailure) - case Failure(msg, t, c) => Failure(msg, t, c) - case _ => Failure("Consent error") - } - } else if (hasAnOAuth2Header(authorization)) { - val (user, callContext) = OAuth2Login.getUser(cc) - user match { - case Full(u) => - AuthUser.refreshUserLegacy(u, callContext) - fn(cc.copy(user = Full(u))) // Authentication is successful - case Empty => fn(cc.copy(user = Empty)) // Anonymous access - case ParamFailure(a, b, c, apiFailure : APIFailure) => ParamFailure(a, b, c, apiFailure : APIFailure) - case Failure(msg, t, c) => Failure(msg, t, c) - case unhandled => - logger.debug(unhandled) - Failure("oauth error") - } - } - // Direct Login Deprecated i.e Authorization: DirectLogin token=eyJhbGciOiJIUzI1NiJ9.eyIiOiIifQ.Y0jk1EQGB4XgdqmYZUHT6potmH3mKj5mEaA9qrIXXWQ - else if (APIUtil.getPropsAsBoolValue("allow_direct_login", true) && directLogin.isDefined) { - DirectLogin.getUser match { - case Full(u) => { - val consumer = DirectLogin.getConsumer - fn(cc.copy(user = Full(u), consumer=consumer)) - }// Authentication is successful - case _ => { - var (httpCode, message, directLoginParameters) = DirectLogin.validator("protectedResource") - Full(errorJsonResponse(message, httpCode)) - } - } - } - // Direct Login i.e DirectLogin: token=eyJhbGciOiJIUzI1NiJ9.eyIiOiIifQ.Y0jk1EQGB4XgdqmYZUHT6potmH3mKj5mEaA9qrIXXWQ - else if (APIUtil.getPropsAsBoolValue("allow_direct_login", true) && hasDirectLoginHeader(authorization)) { - DirectLogin.getUser match { - case Full(u) => { - val consumer = DirectLogin.getConsumer - fn(cc.copy(user = Full(u), consumer=consumer)) - }// Authentication is successful - case _ => { - var (httpCode, message, directLoginParameters) = DirectLogin.validator("protectedResource") - Full(errorJsonResponse(message, httpCode)) - } - } - } - else if (hasGatewayHeader(authorization)) { - if (!APIUtil.getPropsAsBoolValue("allow_gateway_login", false)) { - Full(errorJsonResponse(ErrorMessages.GatewayLoginIsDisabled, 401)) - } else { - logger.info("allow_gateway_login-getRemoteIpAddress: " + remoteIpAddress ) - APIUtil.getPropsValue("gateway.host") match { - case Full(h) if h.split(",").toList.exists(_.equalsIgnoreCase(remoteIpAddress) == true) => // Only addresses from white list can use this feature - val s = S - val (httpCode, message, parameters) = GatewayLogin.validator(s.request) - httpCode match { - case 200 => - val payload = GatewayLogin.parseJwt(parameters) - payload match { - case Full(payload) => - val s = S - GatewayLogin.getOrCreateResourceUser(payload: String, Some(cc)) match { - case Full((u, cbsToken, callContext)) => // Authentication is successful - val consumer = GatewayLogin.getOrCreateConsumer(payload, u) - setGatewayResponseHeader(s) {GatewayLogin.createJwt(payload, cbsToken)} - val jwt = GatewayLogin.createJwt(payload, cbsToken) - val callContextUpdated = ApiSession.updateCallContext(GatewayLoginResponseHeader(Some(jwt)), callContext) - fn(callContextUpdated.map( callContext =>callContext.copy(user = Full(u), consumer = consumer)).getOrElse(callContext.getOrElse(cc).copy(user = Full(u), consumer = consumer))) - case Failure(msg, t, c) => Failure(msg, t, c) - case _ => Full(errorJsonResponse(payload, httpCode)) - } - case Failure(msg, t, c) => - Failure(msg, t, c) - case _ => - Failure(ErrorMessages.GatewayLoginUnknownError) - } - case _ => - Failure(message) - } - case Full(h) if h.split(",").toList.exists(_.equalsIgnoreCase(remoteIpAddress) == false) => // All other addresses will be rejected - Failure(ErrorMessages.GatewayLoginWhiteListAddresses) - case Empty => - Failure(ErrorMessages.GatewayLoginHostPropertyMissing) // There is no gateway.host in props file - case Failure(msg, t, c) => - Failure(msg, t, c) - case _ => - Failure(ErrorMessages.GatewayLoginUnknownError) - } - } - } - else if (hasDAuthHeader(cc.requestHeaders)) { - if (!APIUtil.getPropsAsBoolValue("allow_dauth", false)) { - Full(errorJsonResponse(ErrorMessages.DAuthIsDisabled, 401)) - } else { - logger.info("allow_dauth-getRemoteIpAddress: " + remoteIpAddress ) - APIUtil.getPropsValue("dauth.host") match { - case Full(h) if h.split(",").toList.exists(_.equalsIgnoreCase(remoteIpAddress) == true) => // Only addresses from white list can use this feature - val dauthToken = DAuth.getDAuthToken(cc.requestHeaders) - dauthToken match { - case Some(token :: _) => - val payload = DAuth.parseJwt(token) - payload match { - case Full(payload) => - DAuth.getOrCreateResourceUser(payload: String, Some(cc)) match { - case Full((u, callContext)) => // Authentication is successful - val consumer = DAuth.getConsumerByConsumerKey(payload)//TODO, need to verify the key later. - val jwt = DAuth.createJwt(payload) - val callContextUpdated = ApiSession.updateCallContext(DAuthResponseHeader(Some(jwt)), callContext) - fn(callContextUpdated.map( callContext =>callContext.copy(user = Full(u), consumer = consumer)).getOrElse(callContext.getOrElse(cc).copy(user = Full(u), consumer = consumer))) - case Failure(msg, t, c) => Failure(msg, t, c) - case _ => Full(errorJsonResponse(payload)) - } - case Failure(msg, t, c) => - Failure(msg, t, c) - case _ => - Failure(ErrorMessages.DAuthUnknownError) - } - case _ => - Failure(InvalidDAuthHeaderToken) - } - case Full(h) if h.split(",").toList.exists(_.equalsIgnoreCase(remoteIpAddress) == false) => // All other addresses will be rejected - Failure(ErrorMessages.DAuthWhiteListAddresses) - case Empty => - Failure(ErrorMessages.DAuthHostPropertyMissing) // There is no dauth.host in props file - case Failure(msg, t, c) => - Failure(msg, t, c) - case _ => - Failure(ErrorMessages.DAuthUnknownError) - } - } - } - else { - fn(cc) - } - } - - class RichStringList(list: List[String]) { - val listLen = list.length - - /** - * Normally we would use ListServeMagic's prefix function, but it works with PartialFunction[Req, () => Box[LiftResponse]] - * instead of the PartialFunction[Req, Box[User] => Box[JsonResponse]] that we need. This function does the same thing, really. - */ - def oPrefix(pf: OBPEndpoint): OBPEndpoint = - new OBPEndpoint { - def isDefinedAt(req: Req): Boolean = - req.path.partPath.startsWith(list) && { - pf.isDefinedAt(req.withNewPath(req.path.drop(listLen))) - } - - def apply(req: Req): CallContext => Box[JsonResponse] = { - val function: CallContext => Box[JsonResponse] = pf.apply(req.withNewPath(req.path.drop(listLen))) - - callContext: CallContext => { - // set endpoint apiVersion - ApiVersionHolder.setApiVersion(version) - val value = function(callContext) - ApiVersionHolder.removeApiVersion() - value match { - case Failure(_, Full(JsonResponseException(jsonResponse)), _) => - Full(jsonResponse) - case v => v - } - } - } - } - } - - //Give all lists of strings in OBPRestHelpers the oPrefix method - implicit def stringListToRichStringList(list : List[String]) : RichStringList = new RichStringList(list) - - /* - oauthServe wraps many get calls and probably all calls that post (and put and delete) json data. - Since the URL path matching will fail if there is invalid JsonPost, and this leads to a generic 404 response which is confusing to the developer, - we want to detect invalid json *before* matching on the url so we can fail with a more specific message. - See SandboxApiCalls for an example of JsonPost being used. - The down side is that we might be validating json more than once per request and we're doing work before authentication is completed - (possible DOS vector?) - - TODO: should this be moved to def serve() further down? - */ - - def oauthServe(handler: PartialFunction[Req, CallContext => Box[JsonResponse]], rd: Option[ResourceDoc] = None): Unit = { - serve(buildOAuthHandler(handler, rd)) - } - - /** - * Build the oauth-wrapped Lift handler that `oauthServe` would otherwise register directly into - * Lift's statelessDispatch. Extracted as a public method so the in-process Lift adapter in - * code.api.dynamic.endpoint.Http4sDynamicEndpoint can construct the exact same wrapped form - * (failIfBadAuthorizationHeader { failIfBadJSON } + endpoint metric) for the dynamic-endpoint - * routes and apply it directly — without registering into statelessDispatch. Behaviour for the - * normal oauthServe path is unchanged (oauthServe now just `serve(buildOAuthHandler(...))`). - */ - def buildOAuthHandler(handler: PartialFunction[Req, CallContext => Box[JsonResponse]], rd: Option[ResourceDoc] = None): PartialFunction[Req, () => Box[LiftResponse]] = { - new PartialFunction[Req, () => Box[LiftResponse]] { - def apply(r : Req): () => Box[LiftResponse] = { - //check (in that order): - //if request is correct json - //if request matches PartialFunction cases for each defined url - //if request has correct oauth headers - val startTime = Helpers.now - val response = failIfBadAuthorizationHeader(rd) { - failIfBadJSON(r, handler) - } - val endTime = Helpers.now - WriteMetricUtil.writeEndpointMetric(startTime, endTime.getTime - startTime.getTime, rd) - response - } - def isDefinedAt(r : Req) = { - //if the content-type is json and json parsing failed, simply accept call but then fail in apply() before - //the url cases don't match because json failed - r.json_? match { - case true => - //Try to evaluate the json - r.json match { - case Failure(msg, _, _) => true - case _ => handler.isDefinedAt(r) - } - case false => handler.isDefinedAt(r) - } - } - } - } - - override protected def serve(handler: PartialFunction[Req, () => Box[LiftResponse]]) : Unit = { - val obpHandler : PartialFunction[Req, () => Box[LiftResponse]] = { - new PartialFunction[Req, () => Box[LiftResponse]] { - def apply(r : Req) = { - //Wraps the partial function with some logging - try { - handler(r) - } catch { - case JsonResponseException(jsonResponse) => - Full(jsonResponse) - } - } - def isDefinedAt(r : Req) = handler.isDefinedAt(r) - } - } - super.serve(obpHandler) - } - - /** - * collect endpoints from APIMethodsxxx type - * @param obj APIMethodsxxx instance - * @return all collect endpoints - */ - protected def getEndpoints(obj: AnyRef): Set[OBPEndpoint] = { - ReflectUtils.getFieldsNameToValue[OBPEndpoint](obj) - .values - .toSet - } - /** * collect ResourceDoc objects * Note: if new version ResourceDoc's endpoint have the same 'requestUrl' and 'requestVerb' with old version, old version ResourceDoc will be omitted @@ -671,14 +220,11 @@ trait OBPRestHelper extends RestHelper with MdcLoggable { result } - def isAutoValidate(doc: ResourceDoc, autoValidateAll: Boolean): Boolean = { //note: auto support v4.0.0 and later versions + def isAutoValidate(doc: ResourceDoc, autoValidateAll: Boolean): Boolean = { doc.isValidateEnabled || (autoValidateAll && !doc.isValidateDisabled && { - // Auto support v4.0.0 and all later versions val docVersion = doc.implementedInApiVersion - // Check if the version is v4.0.0 or later by comparing the version string docVersion match { case v: ScannedApiVersion => - // Extract version numbers and compare val versionStr = v.apiShortVersion.replace("v", "") val parts = versionStr.split("\\.") if (parts.length >= 2) { @@ -692,30 +238,4 @@ trait OBPRestHelper extends RestHelper with MdcLoggable { } }) } - - protected def registerRoutes(routes: List[OBPEndpoint], - allResourceDocs: ArrayBuffer[ResourceDoc], - apiPrefix:OBPEndpoint => OBPEndpoint, - autoValidateAll: Boolean = false): Unit = { - for(route <- routes) { - // one endpoint can have multiple ResourceDocs, so here use filter instead of find, e.g APIMethods400.Implementations400.createTransactionRequest - val resourceDocs = allResourceDocs.filter(_.partialFunction == route) - - if(resourceDocs.isEmpty) { - oauthServe(apiPrefix(route), None) - } else { - val (autoValidateDocs, other) = resourceDocs.partition(isAutoValidate(_, autoValidateAll)) - // autoValidateAll or doc isAutoValidate, just wrapped to auth check endpoint - autoValidateDocs.foreach { doc => - val wrappedEndpoint = doc.wrappedWithAuthCheck(route) - oauthServe(apiPrefix(wrappedEndpoint), Some(doc)) - } - //just register once for those not auto validate endpoints . - if (other.nonEmpty) { - oauthServe(apiPrefix(route), other.headOption) - } - } - } - - } } \ No newline at end of file diff --git a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/AISApi.scala b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/AISApi.scala index 47aa107990..652400693f 100644 --- a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/AISApi.scala +++ b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/AISApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/ASApi.scala b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/ASApi.scala index 29622c9e32..05a8207fe1 100644 --- a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/ASApi.scala +++ b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/ASApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/CAFApi.scala b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/CAFApi.scala index 4df682fe57..e81d1eea4c 100644 --- a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/CAFApi.scala +++ b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/CAFApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/OBP_PAPI_2_1_1_1.scala b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/OBP_PAPI_2_1_1_1.scala index 1c132b0a52..5e5f193ae6 100644 --- a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/OBP_PAPI_2_1_1_1.scala +++ b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/OBP_PAPI_2_1_1_1.scala @@ -68,5 +68,5 @@ // // Make them available for use! // registerRoutes(routes, allResourceDocs, apiPrefix) // -// logger.info(s"version $version has been run! There are ${routes.length} routes.") +// logger.info(s"version $version has been run!") //} diff --git a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/PISApi.scala b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/PISApi.scala index 7e3bffbc6a..e8d5aef9f7 100644 --- a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/PISApi.scala +++ b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/PISApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocs140.scala b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocs140.scala index adc268ec90..fecb0ff77b 100644 --- a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocs140.scala +++ b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocs140.scala @@ -46,7 +46,6 @@ object ResourceDocs300 extends OBPRestHelper with ResourceDocsAPIMethods with Md //import code.util.Helper.{MdcLoggable, SILENCE_IS_GOLDEN} //import com.openbankproject.commons.model.enums.ContentParam.{DYNAMIC, STATIC} //import com.openbankproject.commons.util.{ApiVersion, ApiVersionStatus} -//import net.liftweb.http.{GetRequest, InMemoryResponse, PlainTextResponse, Req, S} // // //object ResourceDocs140 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable { diff --git a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala index 102b8cf1e9..2bbcab180d 100644 --- a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala +++ b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala @@ -33,8 +33,6 @@ import com.openbankproject.commons.model.{BankId, ListResult, User} import com.openbankproject.commons.util.ApiStandards._ import com.openbankproject.commons.util.{ApiVersion, ScannedApiVersion} import net.liftweb.common.{Box, Empty, Full} -import net.liftweb.http.{LiftRules, S} -import net.liftweb.http.{InMemoryResponse, LiftRules, PlainTextResponse} import net.liftweb.json import net.liftweb.json.JsonAST.{JField, JString, JValue} import net.liftweb.json._ @@ -135,7 +133,6 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth } localResourceDocs += ResourceDoc( - null, implementedInApiVersion, "getResourceDocsObp", "GET", @@ -150,7 +147,6 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth ) localResourceDocs += ResourceDoc( - null, implementedInApiVersion, "getBankLevelDynamicResourceDocsObp", "GET", @@ -165,7 +161,6 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth ) localResourceDocs += ResourceDoc( - null, implementedInApiVersion, "getResourceDocsSwagger", "GET", @@ -201,7 +196,6 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth ) localResourceDocs += ResourceDoc( - null, implementedInApiVersion, "getResourceDocsOpenAPI31", "GET", @@ -301,13 +295,14 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth // The format of the file should be mark down. val filename = s"/special_instructions_for_resources/${partialFunctionName}.md" logger.trace(s"getSpecialInstructions getting $filename") - val source = LiftRules.loadResourceAsString(filename) + val source = Option(getClass.getResourceAsStream(filename)) + .map(is => scala.io.Source.fromInputStream(is, "UTF-8").mkString) logger.trace(s"getSpecialInstructions source is $source") source match { - case Full(payload) => + case Some(payload) => logger.trace(s"getSpecialInstructions payload is $payload") Some(payload) - case _ => + case None => logger.trace(s"getSpecialInstructions Could not find / load $filename") None } @@ -339,18 +334,18 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth case ApiVersion.v7_0_0 => code.api.v7_0_0.Http4s700.allResourceDocs // Use aggregated docs for v7.0.0 case ConstantsBG.`berlinGroupVersion1` => code.api.berlin.group.v1_3.Http4sBGv13.resourceDocs case ConstantsBG.`berlinGroupVersion2` => code.api.berlin.group.v2.Http4sBGv2.resourceDocs - case ApiVersion.v6_0_0 => OBPAPI6_0_0.allResourceDocs - case ApiVersion.v5_1_0 => OBPAPI5_1_0.allResourceDocs - case ApiVersion.v5_0_0 => OBPAPI5_0_0.allResourceDocs - case ApiVersion.v4_0_0 => OBPAPI4_0_0.allResourceDocs - case ApiVersion.v3_1_0 => OBPAPI3_1_0.allResourceDocs - case ApiVersion.v3_0_0 => OBPAPI3_0_0.allResourceDocs - case ApiVersion.v2_2_0 => OBPAPI2_2_0.allResourceDocs - case ApiVersion.v2_1_0 => OBPAPI2_1_0.allResourceDocs - case ApiVersion.v2_0_0 => OBPAPI2_0_0.allResourceDocs - case ApiVersion.v1_4_0 => OBPAPI1_4_0.allResourceDocs - case ApiVersion.v1_3_0 => OBPAPI1_3_0.allResourceDocs - case ApiVersion.v1_2_1 => code.api.v1_2_1.Http4s121.resourceDocs + case ApiVersion.v6_0_0 => code.api.util.http4s.Http4sResourceDocAggregation.v600 + case ApiVersion.v5_1_0 => code.api.util.http4s.Http4sResourceDocAggregation.v510 + case ApiVersion.v5_0_0 => code.api.util.http4s.Http4sResourceDocAggregation.v500 + case ApiVersion.v4_0_0 => code.api.util.http4s.Http4sResourceDocAggregation.v400 + case ApiVersion.v3_1_0 => code.api.util.http4s.Http4sResourceDocAggregation.v310 + case ApiVersion.v3_0_0 => code.api.util.http4s.Http4sResourceDocAggregation.v300 + case ApiVersion.v2_2_0 => code.api.util.http4s.Http4sResourceDocAggregation.v220 + case ApiVersion.v2_1_0 => code.api.util.http4s.Http4sResourceDocAggregation.v210 + case ApiVersion.v2_0_0 => code.api.util.http4s.Http4sResourceDocAggregation.v200 + case ApiVersion.v1_4_0 => code.api.util.http4s.Http4sResourceDocAggregation.v140 + case ApiVersion.v1_3_0 => code.api.util.http4s.Http4sResourceDocAggregation.v130 + case ApiVersion.v1_2_1 => code.api.util.http4s.Http4sResourceDocAggregation.v121 case ApiVersion.`dynamic-endpoint` => OBPAPIDynamicEndpoint.allResourceDocs case ApiVersion.`dynamic-entity` => OBPAPIDynamicEntity.allResourceDocs case version: ScannedApiVersion => ScannedApis.versionMapScannedApis.get(version).map(_.allResourceDocs).getOrElse(ArrayBuffer.empty[ResourceDoc]) @@ -359,36 +354,6 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth logger.debug(s"There are ${resourceDocs.length} resource docs available to $requestedApiVersion") - val versionRoutes = requestedApiVersion match { - case ApiVersion.v7_0_0 => Nil - case ConstantsBG.`berlinGroupVersion1` => Nil - case ConstantsBG.`berlinGroupVersion2` => Nil - case ApiVersion.v6_0_0 => OBPAPI6_0_0.routes - case ApiVersion.v5_1_0 => OBPAPI5_1_0.routes - case ApiVersion.v5_0_0 => OBPAPI5_0_0.routes - case ApiVersion.v4_0_0 => OBPAPI4_0_0.routes - case ApiVersion.v3_1_0 => OBPAPI3_1_0.routes - case ApiVersion.v3_0_0 => OBPAPI3_0_0.routes - case ApiVersion.v2_2_0 => OBPAPI2_2_0.routes - case ApiVersion.v2_1_0 => OBPAPI2_1_0.routes - case ApiVersion.v2_0_0 => OBPAPI2_0_0.routes - case ApiVersion.v1_4_0 => OBPAPI1_4_0.routes - case ApiVersion.v1_3_0 => OBPAPI1_3_0.routes - case ApiVersion.v1_2_1 => Nil - case ApiVersion.`dynamic-endpoint` => OBPAPIDynamicEndpoint.routes - case ApiVersion.`dynamic-entity` => OBPAPIDynamicEntity.routes - case version: ScannedApiVersion => ScannedApis.versionMapScannedApis.get(version).map(_.routes).getOrElse(Nil) - case _ => Nil - } - - logger.debug(s"There are ${versionRoutes.length} routes available to $requestedApiVersion") - - - // We only want the resource docs for which a API route exists else users will see 404s - // Get a list of the partial function classes represented in the routes available to this version. - val versionRoutesClasses = versionRoutes.map { vr => vr.getClass } - - // Only return the resource docs that have available routes val activeResourceDocs = requestedApiVersion match { case ApiVersion.v7_0_0 => resourceDocs case ConstantsBG.`berlinGroupVersion1` => resourceDocs // fully on http4s — no Lift route filter @@ -409,7 +374,7 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth case ApiVersion.`dynamic-endpoint` => resourceDocs // dispatch now on Http4sDynamicEndpoint (proxy + native Piece C); routes carry only the stub, skip Lift-route filter case ApiVersion.ukOpenBankingV20 => resourceDocs // fully on http4s — no Lift route filter case ApiVersion.ukOpenBankingV31 => resourceDocs // fully on http4s — no Lift route filter - case _ => resourceDocs.filter(rd => versionRoutesClasses.contains(rd.partialFunction.getClass)) + case _ => resourceDocs } logger.debug(s"There are ${activeResourceDocs.length} resource docs available to $requestedApiVersion") diff --git a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala index a6ec60c4da..67d1e0f4fe 100644 --- a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala +++ b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala @@ -4559,7 +4559,7 @@ object SwaggerDefinitionsJSON { bank_id = bankIdExample.value ) - lazy val httpParam = net.liftweb.http.provider.HTTPParam( + lazy val httpParam = HTTPParam( name = "tags", values = List("static") ) diff --git a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerJSONFactory.scala b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerJSONFactory.scala index ae2f203d85..18ecdc734f 100644 --- a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerJSONFactory.scala +++ b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerJSONFactory.scala @@ -2,7 +2,7 @@ package code.api.ResourceDocs1_4_0 import java.util.{Date, Objects} -import code.api.util.APIUtil.{EmptyBody, JArrayBody, PrimaryDataBody, ResourceDoc} +import code.api.util.APIUtil.{HTTPParam, EmptyBody, JArrayBody, PrimaryDataBody, ResourceDoc} import code.api.util.ErrorMessages._ import code.api.util._ import com.openbankproject.commons.util.{ApiVersion, EnumValue, JsonAble, JsonUtils, OBPEnumeration, ReflectUtils, ScannedApiVersion} @@ -33,7 +33,6 @@ import com.openbankproject.commons.model.ListResult import code.util.Helper.MdcLoggable import net.liftweb.common.Box.tryo import net.liftweb.common.{EmptyBox, Full} -import net.liftweb.http.provider.HTTPParam import net.liftweb.json import scala.collection.GenTraversableLike diff --git a/obp-api/src/main/scala/code/api/STET/v1_4/AISPApi.scala b/obp-api/src/main/scala/code/api/STET/v1_4/AISPApi.scala index 8c017739cf..b6f37d8880 100644 --- a/obp-api/src/main/scala/code/api/STET/v1_4/AISPApi.scala +++ b/obp-api/src/main/scala/code/api/STET/v1_4/AISPApi.scala @@ -18,7 +18,6 @@ //import com.openbankproject.commons.ExecutionContext.Implicits.global //import com.openbankproject.commons.model.{AccountId, BankId, BankIdAccountId} //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/STET/v1_4/CBPIIApi.scala b/obp-api/src/main/scala/code/api/STET/v1_4/CBPIIApi.scala index b74d4a6259..2accece1a5 100644 --- a/obp-api/src/main/scala/code/api/STET/v1_4/CBPIIApi.scala +++ b/obp-api/src/main/scala/code/api/STET/v1_4/CBPIIApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/STET/v1_4/OBP_STET_1_4.scala b/obp-api/src/main/scala/code/api/STET/v1_4/OBP_STET_1_4.scala index df35dc4299..9577a4ce5e 100644 --- a/obp-api/src/main/scala/code/api/STET/v1_4/OBP_STET_1_4.scala +++ b/obp-api/src/main/scala/code/api/STET/v1_4/OBP_STET_1_4.scala @@ -66,5 +66,5 @@ // // Make them available for use! // registerRoutes(routes, allResourceDocs, apiPrefix) // -// logger.info(s"version $version has been run! There are ${routes.length} routes.") +// logger.info(s"version $version has been run!") //} diff --git a/obp-api/src/main/scala/code/api/STET/v1_4/PISPApi.scala b/obp-api/src/main/scala/code/api/STET/v1_4/PISPApi.scala index da0172ae83..f3be004974 100644 --- a/obp-api/src/main/scala/code/api/STET/v1_4/PISPApi.scala +++ b/obp-api/src/main/scala/code/api/STET/v1_4/PISPApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v2_0_0/APIMethods_UKOpenBanking_200.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v2_0_0/APIMethods_UKOpenBanking_200.scala index 520520577b..57811e4ecc 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v2_0_0/APIMethods_UKOpenBanking_200.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v2_0_0/APIMethods_UKOpenBanking_200.scala @@ -13,7 +13,6 @@ //import com.openbankproject.commons.ExecutionContext.Implicits.global //import com.openbankproject.commons.model.{AccountId, BankId, BankIdAccountId} //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper // //import scala.collection.mutable.ArrayBuffer //import scala.concurrent.Future diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v2_0_0/Http4sUKOBv200AIS.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v2_0_0/Http4sUKOBv200AIS.scala index fba4040ecf..4e263394c3 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v2_0_0/Http4sUKOBv200AIS.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v2_0_0/Http4sUKOBv200AIS.scala @@ -4,7 +4,7 @@ import cats.data.{Kleisli, OptionT} import cats.effect.IO import code.api.APIFailureNewStyle import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON -import code.api.util.APIUtil.{EmptyBody, ResourceDoc, createQueriesByHttpParams, fullBoxOrException, unboxFull} +import code.api.util.APIUtil.{HTTPParam, EmptyBody, ResourceDoc, createQueriesByHttpParams, fullBoxOrException, unboxFull} import code.api.util.ApiTag._ import code.api.util.CustomJsonFormats import code.api.util.ErrorMessages.{AuthenticatedUserIsRequired, UnknownError} @@ -19,7 +19,6 @@ import com.openbankproject.commons.ExecutionContext.Implicits.global import com.openbankproject.commons.model.{AccountId, BankIdAccountId} import com.openbankproject.commons.util.{ApiVersion, ScannedApiVersion} import net.liftweb.common.Full -import net.liftweb.http.provider.HTTPParam import net.liftweb.json.Formats import org.http4s._ import org.http4s.dsl.io._ @@ -58,7 +57,6 @@ object Http4sUKOBv200AIS extends MdcLoggable { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountList), "GET", @@ -84,7 +82,6 @@ object Http4sUKOBv200AIS extends MdcLoggable { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccount), "GET", @@ -110,7 +107,6 @@ object Http4sUKOBv200AIS extends MdcLoggable { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBalances), "GET", @@ -138,7 +134,6 @@ object Http4sUKOBv200AIS extends MdcLoggable { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountBalances), "GET", @@ -170,7 +165,6 @@ object Http4sUKOBv200AIS extends MdcLoggable { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountTransactions), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v2_0_0/OBP_UKOpenBanking_200.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v2_0_0/OBP_UKOpenBanking_200.scala index bdce830088..98bdfeea63 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v2_0_0/OBP_UKOpenBanking_200.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v2_0_0/OBP_UKOpenBanking_200.scala @@ -1,7 +1,7 @@ package code.api.UKOpenBanking.v2_0_0 import code.api.OBPRestHelper -import code.api.util.APIUtil.{OBPEndpoint, ResourceDoc} +import code.api.util.APIUtil.ResourceDoc import code.api.util.ScannedApis import code.util.Helper.MdcLoggable import com.openbankproject.commons.util.{ApiVersion, ApiVersionStatus, ScannedApiVersion} @@ -21,8 +21,6 @@ object OBP_UKOpenBanking_200 extends OBPRestHelper with MdcLoggable with Scanned val versionStatus: String = ApiVersionStatus.DRAFT.toString override val allResourceDocs: ArrayBuffer[ResourceDoc] = Http4sUKOBv200.resourceDocs - - override val routes: List[OBPEndpoint] = Nil } // ─── Original Lift aggregator (commented out) ──────────────────────────────── @@ -43,4 +41,4 @@ object OBP_UKOpenBanking_200 extends OBPRestHelper with MdcLoggable with Scanned // override val routes : List[OBPEndpoint] = getAllowedEndpoints(allEndpoints, resourceDocs) // // registerRoutes(routes, allResourceDocs, apiPrefix) -// logger.info(s"version $version has been run! There are ${routes.length} routes.") +// logger.info(s"version $version has been run!") diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountAccessApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountAccessApi.scala index 1535213331..f720dddc39 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountAccessApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountAccessApi.scala @@ -13,8 +13,6 @@ //import com.openbankproject.commons.ExecutionContext.Implicits.global //import com.openbankproject.commons.model.User //import net.liftweb.common.{Empty, Full} -//import net.liftweb.http.js.JE.JsRaw -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountsApi.scala index 21b5062a63..5d7829e0ac 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountsApi.scala @@ -11,7 +11,6 @@ //import com.github.dwickern.macros.NameOf.nameOf //import com.openbankproject.commons.model.{AccountAttribute, AccountId, BankAccount, BankIdAccountId, View, ViewId} //import net.liftweb.common.{Box, Empty, Full} -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BalancesApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BalancesApi.scala index d647155407..bd6a8b43be 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BalancesApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BalancesApi.scala @@ -12,7 +12,6 @@ //import com.openbankproject.commons.ExecutionContext.Implicits.global //import com.openbankproject.commons.model.{AccountId, BankIdAccountId, View, ViewId} //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BeneficiariesApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BeneficiariesApi.scala index 97ff4e1d1b..984540c0ca 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BeneficiariesApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BeneficiariesApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DirectDebitsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DirectDebitsApi.scala index 3b65bf8d8c..55c90ae3dc 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DirectDebitsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DirectDebitsApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticPaymentsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticPaymentsApi.scala index eb5ac2a8f4..83fd57cb02 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticPaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticPaymentsApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticScheduledPaymentsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticScheduledPaymentsApi.scala index 4772556013..cc9a30d21c 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticScheduledPaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticScheduledPaymentsApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticStandingOrdersApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticStandingOrdersApi.scala index 9262c1523c..78eb39ecc9 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticStandingOrdersApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticStandingOrdersApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FilePaymentsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FilePaymentsApi.scala index 869571a827..1b7bb6d736 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FilePaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FilePaymentsApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FundsConfirmationsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FundsConfirmationsApi.scala index 051b2d109e..0844f5fbdb 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FundsConfirmationsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FundsConfirmationsApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310AccountAccess.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310AccountAccess.scala index 0f776598f7..138a4c05d5 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310AccountAccess.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310AccountAccess.scala @@ -93,7 +93,6 @@ object Http4sUKOBv310AccountAccess extends MdcLoggable { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createAccountAccessConsents), "POST", @@ -156,7 +155,6 @@ object Http4sUKOBv310AccountAccess extends MdcLoggable { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteAccountAccessConsentsConsentId), "DELETE", @@ -208,7 +206,6 @@ object Http4sUKOBv310AccountAccess extends MdcLoggable { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountAccessConsentsConsentId), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Accounts.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Accounts.scala index 30cfa5f364..776ad426e0 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Accounts.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Accounts.scala @@ -66,7 +66,6 @@ object Http4sUKOBv310Accounts extends MdcLoggable { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccounts), "GET", @@ -130,7 +129,6 @@ object Http4sUKOBv310Accounts extends MdcLoggable { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsAccountId), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Balances.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Balances.scala index 97505a2959..9aba7d293e 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Balances.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Balances.scala @@ -118,7 +118,6 @@ object Http4sUKOBv310Balances extends MdcLoggable { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsAccountIdBalances), "GET", @@ -142,7 +141,6 @@ object Http4sUKOBv310Balances extends MdcLoggable { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBalances), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Beneficiaries.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Beneficiaries.scala index c82bc4ea50..5caf67a1a8 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Beneficiaries.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Beneficiaries.scala @@ -41,7 +41,6 @@ object Http4sUKOBv310Beneficiaries extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsAccountIdBeneficiaries), "GET", @@ -129,7 +128,6 @@ object Http4sUKOBv310Beneficiaries extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBeneficiaries), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310DirectDebits.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310DirectDebits.scala index cb324abee6..ee80a79628 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310DirectDebits.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310DirectDebits.scala @@ -36,7 +36,6 @@ object Http4sUKOBv310DirectDebits extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsAccountIdDirectDebits), "GET", @@ -92,7 +91,6 @@ object Http4sUKOBv310DirectDebits extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getDirectDebits), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310DomesticPayments.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310DomesticPayments.scala index 36421058c9..13b2c207ce 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310DomesticPayments.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310DomesticPayments.scala @@ -36,7 +36,6 @@ object Http4sUKOBv310DomesticPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createDomesticPaymentConsents), "POST", @@ -146,7 +145,6 @@ object Http4sUKOBv310DomesticPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createDomesticPayments), "POST", @@ -246,7 +244,6 @@ object Http4sUKOBv310DomesticPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getDomesticPaymentConsentsConsentIdFundsConfirmation), "GET", @@ -284,7 +281,6 @@ object Http4sUKOBv310DomesticPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getDomesticPaymentConsentsConsentId), "GET", @@ -394,7 +390,6 @@ object Http4sUKOBv310DomesticPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getDomesticPaymentsDomesticPaymentId), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310DomesticScheduledPayments.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310DomesticScheduledPayments.scala index 6a077b7339..481776f60f 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310DomesticScheduledPayments.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310DomesticScheduledPayments.scala @@ -36,7 +36,6 @@ object Http4sUKOBv310DomesticScheduledPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createDomesticScheduledPaymentConsents), "POST", @@ -148,7 +147,6 @@ object Http4sUKOBv310DomesticScheduledPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createDomesticScheduledPayments), "POST", @@ -248,7 +246,6 @@ object Http4sUKOBv310DomesticScheduledPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getDomesticScheduledPaymentConsentsConsentId), "GET", @@ -360,7 +357,6 @@ object Http4sUKOBv310DomesticScheduledPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getDomesticScheduledPaymentsDomesticScheduledPaymentId), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310DomesticStandingOrders.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310DomesticStandingOrders.scala index 16dc8bf3ee..28841a4654 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310DomesticStandingOrders.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310DomesticStandingOrders.scala @@ -36,7 +36,6 @@ object Http4sUKOBv310DomesticStandingOrders extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createDomesticStandingOrderConsents), "POST", @@ -139,7 +138,6 @@ object Http4sUKOBv310DomesticStandingOrders extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createDomesticStandingOrders), "POST", @@ -230,7 +228,6 @@ object Http4sUKOBv310DomesticStandingOrders extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getDomesticStandingOrderConsentsConsentId), "GET", @@ -333,7 +330,6 @@ object Http4sUKOBv310DomesticStandingOrders extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getDomesticStandingOrdersDomesticStandingOrderId), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310FilePayments.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310FilePayments.scala index f5db8cd04c..fbb28182ea 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310FilePayments.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310FilePayments.scala @@ -37,7 +37,6 @@ object Http4sUKOBv310FilePayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createFilePaymentConsentsConsentIdFile), "POST", @@ -56,7 +55,6 @@ object Http4sUKOBv310FilePayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createFilePaymentConsents), "POST", @@ -133,7 +131,6 @@ object Http4sUKOBv310FilePayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createFilePayments), "POST", @@ -213,7 +210,6 @@ object Http4sUKOBv310FilePayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getFilePaymentConsentsConsentIdFile), "GET", @@ -232,7 +228,6 @@ object Http4sUKOBv310FilePayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getFilePaymentConsentsConsentId), "GET", @@ -309,7 +304,6 @@ object Http4sUKOBv310FilePayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getFilePaymentsFilePaymentIdReportFile), "GET", @@ -328,7 +322,6 @@ object Http4sUKOBv310FilePayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getFilePaymentsFilePaymentId), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310FundsConfirmations.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310FundsConfirmations.scala index 2ea23ef127..c92c707745 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310FundsConfirmations.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310FundsConfirmations.scala @@ -40,7 +40,6 @@ object Http4sUKOBv310FundsConfirmations extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createFundsConfirmationConsents), "POST", @@ -84,7 +83,6 @@ object Http4sUKOBv310FundsConfirmations extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createFundsConfirmations), "POST", @@ -127,7 +125,6 @@ object Http4sUKOBv310FundsConfirmations extends MdcLoggable { EndpointHelpers.withUserDelete(req) { (_, _) => Future.successful(()) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteFundsConfirmationConsentsConsentId), "DELETE", @@ -146,7 +143,6 @@ object Http4sUKOBv310FundsConfirmations extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getFundsConfirmationConsentsConsentId), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310InternationalPayments.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310InternationalPayments.scala index 7de05c9d6e..e2fa27b7a5 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310InternationalPayments.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310InternationalPayments.scala @@ -36,7 +36,6 @@ object Http4sUKOBv310InternationalPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createInternationalPaymentConsents), "POST", @@ -182,7 +181,6 @@ object Http4sUKOBv310InternationalPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createInternationalPayments), "POST", @@ -318,7 +316,6 @@ object Http4sUKOBv310InternationalPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getInternationalPaymentConsentsConsentIdFundsConfirmation), "GET", @@ -356,7 +353,6 @@ object Http4sUKOBv310InternationalPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getInternationalPaymentConsentsConsentId), "GET", @@ -502,7 +498,6 @@ object Http4sUKOBv310InternationalPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getInternationalPaymentsInternationalPaymentId), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310InternationalScheduledPayments.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310InternationalScheduledPayments.scala index 914427c35e..5bed4d829c 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310InternationalScheduledPayments.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310InternationalScheduledPayments.scala @@ -36,7 +36,6 @@ object Http4sUKOBv310InternationalScheduledPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createInternationalScheduledPaymentConsents), "POST", @@ -184,7 +183,6 @@ object Http4sUKOBv310InternationalScheduledPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createInternationalScheduledPayments), "POST", @@ -321,7 +319,6 @@ object Http4sUKOBv310InternationalScheduledPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getInternationalScheduledPaymentConsentsConsentIdFundsConfirmation), "GET", @@ -359,7 +356,6 @@ object Http4sUKOBv310InternationalScheduledPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getInternationalScheduledPaymentConsentsConsentId), "GET", @@ -507,7 +503,6 @@ object Http4sUKOBv310InternationalScheduledPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getInternationalScheduledPaymentsInternationalScheduledPaymentId), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310InternationalStandingOrders.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310InternationalStandingOrders.scala index edb773200b..3b7f19a6b8 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310InternationalStandingOrders.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310InternationalStandingOrders.scala @@ -36,7 +36,6 @@ object Http4sUKOBv310InternationalStandingOrders extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createInternationalStandingOrderConsents), "POST", @@ -166,7 +165,6 @@ object Http4sUKOBv310InternationalStandingOrders extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createInternationalStandingOrders), "POST", @@ -284,7 +282,6 @@ object Http4sUKOBv310InternationalStandingOrders extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getInternationalStandingOrderConsentsConsentId), "GET", @@ -414,7 +411,6 @@ object Http4sUKOBv310InternationalStandingOrders extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getInternationalStandingOrdersInternationalStandingOrderPaymentId), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Offers.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Offers.scala index 83ce4a6b17..7ee56d27a6 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Offers.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Offers.scala @@ -36,7 +36,6 @@ object Http4sUKOBv310Offers extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsAccountIdOffers), "GET", @@ -108,7 +107,6 @@ object Http4sUKOBv310Offers extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getOffers), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Partys.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Partys.scala index 271ed49e4f..39e16850f4 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Partys.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Partys.scala @@ -36,7 +36,6 @@ object Http4sUKOBv310Partys extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsAccountIdParty), "GET", @@ -97,7 +96,6 @@ object Http4sUKOBv310Partys extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getParty), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Products.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Products.scala index 23553086fb..c6669b331e 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Products.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Products.scala @@ -47,7 +47,6 @@ object Http4sUKOBv310Products extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsAccountIdProduct), "GET", @@ -67,7 +66,6 @@ object Http4sUKOBv310Products extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getProducts), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310ScheduledPayments.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310ScheduledPayments.scala index ab33d7fdd5..1312d06381 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310ScheduledPayments.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310ScheduledPayments.scala @@ -36,7 +36,6 @@ object Http4sUKOBv310ScheduledPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsAccountIdScheduledPayments), "GET", @@ -110,7 +109,6 @@ object Http4sUKOBv310ScheduledPayments extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getScheduledPayments), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310StandingOrders.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310StandingOrders.scala index 46d31be218..adbc7167c3 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310StandingOrders.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310StandingOrders.scala @@ -36,7 +36,6 @@ object Http4sUKOBv310StandingOrders extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsAccountIdStandingOrders), "GET", @@ -134,7 +133,6 @@ object Http4sUKOBv310StandingOrders extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getStandingOrders), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Statements.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Statements.scala index 7d964dbe32..29c7b98f4d 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Statements.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Statements.scala @@ -40,7 +40,6 @@ object Http4sUKOBv310Statements extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsAccountIdStatements), "GET", @@ -251,7 +250,6 @@ object Http4sUKOBv310Statements extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsAccountIdStatementsStatementIdFile), "GET", @@ -270,7 +268,6 @@ object Http4sUKOBv310Statements extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsAccountIdStatementsStatementIdTransactions), "GET", @@ -512,7 +509,6 @@ object Http4sUKOBv310Statements extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsAccountIdStatementsStatementId), "GET", @@ -722,7 +718,6 @@ object Http4sUKOBv310Statements extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getStatements), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Transactions.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Transactions.scala index 2636d41e26..49003d0597 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Transactions.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/Http4sUKOBv310Transactions.scala @@ -4,7 +4,7 @@ import cats.data.{Kleisli, OptionT} import cats.effect.IO import code.api.APIFailureNewStyle import code.api.Constant -import code.api.util.APIUtil.{EmptyBody, ResourceDoc, createQueriesByHttpParams, defaultBankId, fullBoxOrException, mockedDataText, passesPsd2Aisp, unboxFull} +import code.api.util.APIUtil.{HTTPParam, EmptyBody, ResourceDoc, createQueriesByHttpParams, defaultBankId, fullBoxOrException, mockedDataText, passesPsd2Aisp, unboxFull} import code.api.util.ApiTag import code.api.util.ApiTag._ import code.api.util.CustomJsonFormats @@ -21,7 +21,6 @@ import com.openbankproject.commons.model.{AccountId, BankId, BankIdAccountId, Tr import com.openbankproject.commons.util.{ApiVersion, ScannedApiVersion} import net.liftweb.common.Full import code.model.{BankAccountExtended, UserExtended} -import net.liftweb.http.provider.HTTPParam import net.liftweb.json import net.liftweb.json.Formats import org.http4s._ @@ -61,7 +60,6 @@ object Http4sUKOBv310Transactions extends MdcLoggable { EndpointHelpers.withUser(req) { (_, _) => Future.successful(ErrorMessages.NotImplemented) } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsAccountIdStatementsStatementIdTransactions), "GET", @@ -331,7 +329,6 @@ object Http4sUKOBv310Transactions extends MdcLoggable { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsAccountIdTransactions), "GET", @@ -592,7 +589,6 @@ object Http4sUKOBv310Transactions extends MdcLoggable { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactions), "GET", diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalPaymentsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalPaymentsApi.scala index 98b1f034ea..3bda543769 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalPaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalPaymentsApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalScheduledPaymentsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalScheduledPaymentsApi.scala index 61dfdc78cb..65c8694e0d 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalScheduledPaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalScheduledPaymentsApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalStandingOrdersApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalStandingOrdersApi.scala index a5f90d47ef..0d16bae532 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalStandingOrdersApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalStandingOrdersApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/OBP_UKOpenBanking_310.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/OBP_UKOpenBanking_310.scala index b9a24b718f..47924c07ff 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/OBP_UKOpenBanking_310.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/OBP_UKOpenBanking_310.scala @@ -1,7 +1,7 @@ package code.api.UKOpenBanking.v3_1_0 import code.api.OBPRestHelper -import code.api.util.APIUtil.{OBPEndpoint, ResourceDoc} +import code.api.util.APIUtil.ResourceDoc import code.api.util.ScannedApis import code.util.Helper.MdcLoggable import com.openbankproject.commons.util.{ApiVersion, ApiVersionStatus, ScannedApiVersion} @@ -24,8 +24,6 @@ object OBP_UKOpenBanking_310 extends OBPRestHelper with MdcLoggable with Scanned val versionStatus: String = ApiVersionStatus.DRAFT.toString override val allResourceDocs: ArrayBuffer[ResourceDoc] = Http4sUKOBv310.resourceDocs - - override val routes: List[OBPEndpoint] = Nil } // ─── Original Lift aggregator (commented out) ──────────────────────────────── @@ -82,4 +80,4 @@ object OBP_UKOpenBanking_310 extends OBPRestHelper with MdcLoggable with Scanned // // override val routes : List[OBPEndpoint] = getAllowedEndpoints(endpoints, allResourceDocs) // registerRoutes(routes, allResourceDocs, apiPrefix) -// logger.info(s"version $version has been run! There are ${routes.length} routes.") +// logger.info(s"version $version has been run!") diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/OffersApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/OffersApi.scala index a4567846b6..41f3cf2f28 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/OffersApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/OffersApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/PartysApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/PartysApi.scala index d235d9b32a..4cd10cd039 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/PartysApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/PartysApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ProductsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ProductsApi.scala index 8206ad1be9..082443c285 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ProductsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ProductsApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ScheduledPaymentsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ScheduledPaymentsApi.scala index 40aeb0c868..85a4c492d2 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ScheduledPaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ScheduledPaymentsApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StandingOrdersApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StandingOrdersApi.scala index 989d41ee84..4975cb89d9 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StandingOrdersApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StandingOrdersApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StatementsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StatementsApi.scala index 5e66be73e3..64297498a0 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StatementsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StatementsApi.scala @@ -8,7 +8,6 @@ //import code.api.util.ErrorMessages._ //import com.github.dwickern.macros.NameOf.nameOf //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/TransactionsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/TransactionsApi.scala index 765f496a60..0aaa4f04f0 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/TransactionsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/TransactionsApi.scala @@ -15,7 +15,6 @@ //import com.openbankproject.commons.ExecutionContext.Implicits.global //import com.openbankproject.commons.model._ //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/aliveCheck.scala b/obp-api/src/main/scala/code/api/aliveCheck.scala deleted file mode 100644 index dadd4e0a58..0000000000 --- a/obp-api/src/main/scala/code/api/aliveCheck.scala +++ /dev/null @@ -1,40 +0,0 @@ -/** -Open Bank Project - API -Copyright (C) 2011-2019, TESOBE GmbH - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see . - -Email: contact@tesobe.com -TESOBE GmbH. -Osloer Strasse 16/17 -Berlin 13359, Germany - -This product includes software developed at -TESOBE (http://www.tesobe.com/) - - */ -package code.api - -import code.util.Helper.MdcLoggable -import net.liftweb.http._ -import net.liftweb.http.rest.RestHelper -import net.liftweb.json.Extraction - - -object aliveCheck extends RestHelper with MdcLoggable { - serve { - case Req("alive" :: Nil, _, GetRequest) => - JsonResponse(Extraction.decompose(true), Nil, Nil, 200) - } -} diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/AccountInformationServiceAISApi.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/AccountInformationServiceAISApi.scala index 24157a0db4..2a87bd31e1 100644 --- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/AccountInformationServiceAISApi.scala +++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/AccountInformationServiceAISApi.scala @@ -26,9 +26,6 @@ //import com.openbankproject.commons.model.enums.{ChallengeType, StrongCustomerAuthenticationStatus, SuppliedAnswerType} //import net.liftweb //import net.liftweb.common.{Empty, Full} -//import net.liftweb.http.js.JE.JsRaw -//import net.liftweb.http.provider.HTTPParam -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/CommonServicesApi.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/CommonServicesApi.scala index cb483306c4..7f70636ea7 100644 --- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/CommonServicesApi.scala +++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/CommonServicesApi.scala @@ -8,7 +8,6 @@ //import code.api.builder.SigningBasketsApi.APIMethods_SigningBasketsApi //import code.api.util.APIUtil._ //import com.openbankproject.commons.util.ApiVersion -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json._ // //import scala.collection.immutable.Nil diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/ConfirmationOfFundsServicePIISApi.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/ConfirmationOfFundsServicePIISApi.scala index b649ba3c3a..6c48249395 100644 --- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/ConfirmationOfFundsServicePIISApi.scala +++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/ConfirmationOfFundsServicePIISApi.scala @@ -14,7 +14,6 @@ //import com.openbankproject.commons.ExecutionContext.Implicits.global //import com.openbankproject.commons.util.ApiVersion //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/Http4sBGv13AIS.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/Http4sBGv13AIS.scala index f536dcad48..195c7fe285 100644 --- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/Http4sBGv13AIS.scala +++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/Http4sBGv13AIS.scala @@ -619,7 +619,6 @@ object Http4sBGv13AIS extends MdcLoggable { private def initConsentResourceDocs(): Unit = { resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createConsent), "POST", @@ -687,7 +686,6 @@ recurringIndicator: ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteConsent), "DELETE", @@ -704,7 +702,6 @@ recurringIndicator: ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsentInformation), "GET", @@ -743,7 +740,6 @@ where the consent was directly managed between ASPSP and PSU e.g. in a re-direct ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsentStatus), "GET", @@ -802,7 +798,6 @@ using the extended forms as indicated above. }""") resourceDocs += ResourceDoc( - null, implementedInApiVersion, "startConsentAuthorisationTransactionAuthorisation", "POST", @@ -817,7 +812,6 @@ using the extended forms as indicated above. ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, "startConsentAuthorisationUpdatePsuAuthentication", "POST", @@ -832,7 +826,6 @@ using the extended forms as indicated above. ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, "startConsentAuthorisationSelectPsuAuthenticationMethod", "POST", @@ -876,7 +869,6 @@ Maybe in a later version the access path will change. """ resourceDocs += ResourceDoc( - null, implementedInApiVersion, "updateConsentsPsuDataTransactionAuthorisation", "PUT", @@ -894,7 +886,6 @@ Maybe in a later version the access path will change. ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, "updateConsentsPsuDataUpdatePsuAuthentication", "PUT", @@ -914,7 +905,6 @@ Maybe in a later version the access path will change. ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, "updateConsentsPsuDataUpdateSelectPsuAuthenticationMethod", "PUT", @@ -942,7 +932,6 @@ Maybe in a later version the access path will change. ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, "updateConsentsPsuDataUpdateAuthorisationConfirmation", "PUT", @@ -965,7 +954,6 @@ Maybe in a later version the access path will change. private def initAccountResourceDocs(): Unit = { resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountList), "GET", @@ -1013,7 +1001,6 @@ of the PSU at this ASPSP. ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBalances), "GET", @@ -1051,7 +1038,6 @@ The account-id is constant at least throughout the lifecycle of a given consent. ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCardAccounts), "GET", @@ -1091,7 +1077,6 @@ respectively the OAuth2 access token. ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCardAccountBalances), "GET", @@ -1129,7 +1114,6 @@ This account-id then can be retrieved by the ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCardAccountTransactionList), "GET", @@ -1158,7 +1142,6 @@ Reads account data from a given card account addressed by "account-id". ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsentAuthorisation), "GET", @@ -1179,7 +1162,6 @@ This function returns an array of hyperlinks to all generated authorisation sub- ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsentScaStatus), "GET", @@ -1198,7 +1180,6 @@ This method returns the SCA status of a consent initiation's authorisation sub-r ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionDetails), "GET", @@ -1234,7 +1215,6 @@ of the "Read Transaction List" call within the _links subfield. ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionList), "GET", @@ -1265,7 +1245,6 @@ The ASPSP might add balance information, if transaction lists without balances a ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountDetails), "GET", @@ -1302,7 +1281,6 @@ Give detailed information about the addressed account together with balance info ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(readCardAccount), "GET", diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/Http4sBGv13PIIS.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/Http4sBGv13PIIS.scala index 3af72af80c..302f7db8ae 100644 --- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/Http4sBGv13PIIS.scala +++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/Http4sBGv13PIIS.scala @@ -86,7 +86,6 @@ object Http4sBGv13PIIS extends MdcLoggable { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(checkAvailabilityOfFunds), "POST", diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/Http4sBGv13PIS.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/Http4sBGv13PIS.scala index 43993fa87d..38b8c964ac 100644 --- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/Http4sBGv13PIS.scala +++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/Http4sBGv13PIS.scala @@ -779,7 +779,7 @@ It may authorise a payment within the Embedded SCA Approach where needed. private def initCancelAndGetResourceDocs(): Unit = { resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(cancelPayment), + implementedInApiVersion, nameOf(cancelPayment), "DELETE", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENTID", "Payment Cancellation Request", s"""${mockedDataText(false)} @@ -807,7 +807,7 @@ or * access method is generally applicable, but further authorisation processes ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPaymentCancellationScaStatus), + implementedInApiVersion, nameOf(getPaymentCancellationScaStatus), "GET", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENTID/cancellation-authorisations/CANCELLATIONID", "Read the SCA status of the payment cancellation's authorisation.", s"""${mockedDataText(false)} @@ -821,7 +821,7 @@ This method returns the SCA status of a payment initiation's authorisation sub-r ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPaymentInformation), + implementedInApiVersion, nameOf(getPaymentInformation), "GET", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENTID", "Get Payment Information", s"""${mockedDataText(false)} @@ -846,7 +846,7 @@ Returns the content of a payment object""", ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPaymentInitiationAuthorisation), + implementedInApiVersion, nameOf(getPaymentInitiationAuthorisation), "GET", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENTID/authorisations", "Get Payment Initiation Authorisation Sub-Resources Request", s"""${mockedDataText(false)} @@ -867,7 +867,7 @@ This function returns an array of hyperlinks to all generated authorisation sub- ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPaymentInitiationCancellationAuthorisationInformation), + implementedInApiVersion, nameOf(getPaymentInitiationCancellationAuthorisationInformation), "GET", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENTID/cancellation-authorisations", "Get Cancellation Authorisation Sub-Resources Request", s"""${mockedDataText(false)} @@ -881,7 +881,7 @@ Retrieve a list of all created cancellation authorisation sub-resources. ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPaymentInitiationScaStatus), + implementedInApiVersion, nameOf(getPaymentInitiationScaStatus), "GET", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENT_ID/authorisations/AUTHORISATION_ID", "Read the SCA Status of the payment authorisation", s"""${mockedDataText(false)} @@ -895,7 +895,7 @@ This method returns the SCA status of a payment initiation's authorisation sub-r ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPaymentInitiationStatus), + implementedInApiVersion, nameOf(getPaymentInitiationStatus), "GET", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENT_ID/status", "Payment initiation status request", s"""${mockedDataText(false)} @@ -927,7 +927,7 @@ Check the transaction status of a payment initiation.""", }""") resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(initiatePayments), + implementedInApiVersion, nameOf(initiatePayments), "POST", "/payments/PAYMENT_PRODUCT", "Payment initiation request(payments)", s"""${mockedDataText(false)} @@ -941,7 +941,7 @@ $generalPaymentSummaryText""", ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(initiatePeriodicPayments), + implementedInApiVersion, nameOf(initiatePeriodicPayments), "POST", "/periodic-payments/PAYMENT_PRODUCT", "Payment initiation request(periodic-payments)", s"""${mockedDataText(false)} @@ -974,7 +974,7 @@ $generalPaymentSummaryText""", ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(initiateBulkPayments), + implementedInApiVersion, nameOf(initiateBulkPayments), "POST", "/bulk-payments/PAYMENT_PRODUCT", "Payment initiation request(bulk-payments)", s"""${mockedDataText(true)} @@ -1013,7 +1013,7 @@ $generalPaymentSummaryText""", private def initStartAuthorisationResourceDocs(): Unit = { // POST /PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENT_ID/authorisations — 3 body variants resourceDocs += ResourceDoc( - null, implementedInApiVersion, + implementedInApiVersion, "startPaymentAuthorisationUpdatePsuAuthentication", "POST", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENT_ID/authorisations", "Start the authorisation process for a payment initiation (updatePsuAuthentication)", @@ -1025,7 +1025,7 @@ $generalPaymentSummaryText""", http4sPartialFunction = Some(startPaymentAuthorisationAll) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, + implementedInApiVersion, "startPaymentAuthorisationSelectPsuAuthenticationMethod", "POST", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENT_ID/authorisations", "Start the authorisation process for a payment initiation (selectPsuAuthenticationMethod)", @@ -1037,7 +1037,7 @@ $generalPaymentSummaryText""", http4sPartialFunction = Some(startPaymentAuthorisationAll) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, + implementedInApiVersion, "startPaymentAuthorisationTransactionAuthorisation", "POST", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENT_ID/authorisations", "Start the authorisation process for a payment initiation (transactionAuthorisation)", @@ -1054,7 +1054,7 @@ The message might in addition transmit authentication and authorisation related // POST /PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENT_ID/cancellation-authorisations — 3 body variants resourceDocs += ResourceDoc( - null, implementedInApiVersion, + implementedInApiVersion, "startPaymentInitiationCancellationAuthorisationTransactionAuthorisation", "POST", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENT_ID/cancellation-authorisations", "Start the authorisation process for the cancellation of the addressed payment (transactionAuthorisation)", @@ -1073,7 +1073,7 @@ Creates an authorisation sub-resource and start the authorisation process of the http4sPartialFunction = Some(startPaymentInitiationCancellationAuthorisationAll) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, + implementedInApiVersion, "startPaymentInitiationCancellationAuthorisationUpdatePsuAuthentication", "POST", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENT_ID/cancellation-authorisations", "Start the authorisation process for the cancellation of the addressed payment (updatePsuAuthentication)", @@ -1085,7 +1085,7 @@ Creates an authorisation sub-resource and start the authorisation process of the http4sPartialFunction = Some(startPaymentInitiationCancellationAuthorisationAll) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, + implementedInApiVersion, "startPaymentInitiationCancellationAuthorisationSelectPsuAuthenticationMethod", "POST", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENT_ID/cancellation-authorisations", "Start the authorisation process for the cancellation of the addressed payment (selectPsuAuthenticationMethod)", @@ -1101,7 +1101,7 @@ Creates an authorisation sub-resource and start the authorisation process of the private def initUpdatePsuDataResourceDocs(): Unit = { // PUT /PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENT_ID/cancellation-authorisations/AUTHORISATION_ID — 4 variants resourceDocs += ResourceDoc( - null, implementedInApiVersion, + implementedInApiVersion, "updatePaymentCancellationPsuDataTransactionAuthorisation", "PUT", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENT_ID/cancellation-authorisations/AUTHORISATION_ID", "Update PSU Data for payment initiation cancellation (transactionAuthorisation)", @@ -1119,7 +1119,7 @@ This method updates PSU data on the cancellation authorisation resource if neede http4sPartialFunction = Some(updatePaymentCancellationPsuDataAll) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, + implementedInApiVersion, "updatePaymentCancellationPsuDataUpdatePsuAuthentication", "PUT", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENT_ID/cancellation-authorisations/AUTHORISATION_ID", "Update PSU Data for payment initiation cancellation (updatePsuAuthentication)", @@ -1134,7 +1134,7 @@ This method updates PSU data on the cancellation authorisation resource if neede http4sPartialFunction = Some(updatePaymentCancellationPsuDataAll) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, + implementedInApiVersion, "updatePaymentCancellationPsuDataSelectPsuAuthenticationMethod", "PUT", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENT_ID/cancellation-authorisations/AUTHORISATION_ID", "Update PSU Data for payment initiation cancellation (selectPsuAuthenticationMethod)", @@ -1151,7 +1151,7 @@ This method updates PSU data on the cancellation authorisation resource if neede http4sPartialFunction = Some(updatePaymentCancellationPsuDataAll) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, + implementedInApiVersion, "updatePaymentCancellationPsuDataAuthorisationConfirmation", "PUT", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENT_ID/cancellation-authorisations/AUTHORISATION_ID", "Update PSU Data for payment initiation cancellation (authorisationConfirmation)", @@ -1168,7 +1168,7 @@ This method updates PSU data on the cancellation authorisation resource if neede // PUT /PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENT_ID/authorisations/AUTHORISATION_ID — 4 variants resourceDocs += ResourceDoc( - null, implementedInApiVersion, + implementedInApiVersion, "updatePaymentPsuDataTransactionAuthorisation", "PUT", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENT_ID/authorisations/AUTHORISATION_ID", "Update PSU data for payment initiation (transactionAuthorisation)", @@ -1184,7 +1184,7 @@ This method updates PSU data on the cancellation authorisation resource if neede http4sPartialFunction = Some(updatePaymentPsuDataAll) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, + implementedInApiVersion, "updatePaymentPsuDataUpdatePsuAuthentication", "PUT", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENT_ID/authorisations/AUTHORISATION_ID", "Update PSU data for payment initiation (updatePsuAuthentication)", @@ -1199,7 +1199,7 @@ This method updates PSU data on the cancellation authorisation resource if neede http4sPartialFunction = Some(updatePaymentPsuDataAll) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, + implementedInApiVersion, "updatePaymentPsuDataSelectPsuAuthenticationMethod", "PUT", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENT_ID/authorisations/AUTHORISATION_ID", "Update PSU data for payment initiation (selectPsuAuthenticationMethod)", @@ -1216,7 +1216,7 @@ This method updates PSU data on the cancellation authorisation resource if neede http4sPartialFunction = Some(updatePaymentPsuDataAll) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, + implementedInApiVersion, "updatePaymentPsuDataAuthorisationConfirmation", "PUT", "/PAYMENT_SERVICE/PAYMENT_PRODUCT/PAYMENT_ID/authorisations/AUTHORISATION_ID", "Update PSU data for payment initiation (authorisationConfirmation)", diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/Http4sBGv13SigningBaskets.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/Http4sBGv13SigningBaskets.scala index 3a42a2e592..7c8e3b581e 100644 --- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/Http4sBGv13SigningBaskets.scala +++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/Http4sBGv13SigningBaskets.scala @@ -70,7 +70,6 @@ object Http4sBGv13SigningBaskets extends MdcLoggable { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createSigningBasket), "POST", @@ -127,7 +126,6 @@ The resource identifications of these transactions are contained in the payload } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteSigningBasket), "DELETE", @@ -164,7 +162,6 @@ Nevertheless, single transactions might be cancelled on an individual basis on t } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSigningBasket), "GET", @@ -198,7 +195,6 @@ Returns the content of an signing basket object.""", } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSigningBasketAuthorisation), "GET", @@ -237,7 +233,6 @@ This function returns an array of hyperlinks to all generated authorisation sub- } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSigningBasketScaStatus), "GET", @@ -272,7 +267,6 @@ This method returns the SCA status of a signing basket's authorisation sub-resou } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSigningBasketStatus), "GET", @@ -319,7 +313,6 @@ Returns the status of a signing basket object. } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(startSigningBasketAuthorisation), "POST", @@ -461,7 +454,6 @@ This applies in the following scenarios: } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateSigningBasketPsuData), "PUT", diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/OBP_BERLIN_GROUP_1_3.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/OBP_BERLIN_GROUP_1_3.scala index 9aa60b48c0..6f6a1a4fad 100644 --- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/OBP_BERLIN_GROUP_1_3.scala +++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/OBP_BERLIN_GROUP_1_3.scala @@ -33,7 +33,7 @@ package code.api.berlin.group.v1_3 import code.api.OBPRestHelper import code.api.berlin.group.ConstantsBG -import code.api.util.APIUtil.{OBPEndpoint, ResourceDoc} +import code.api.util.APIUtil.ResourceDoc import code.api.util.ScannedApis import code.util.Helper.MdcLoggable import com.openbankproject.commons.util.{ApiVersionStatus, ScannedApiVersion} @@ -56,8 +56,6 @@ object OBP_BERLIN_GROUP_1_3 extends OBPRestHelper with MdcLoggable with ScannedA val versionStatus: String = ApiVersionStatus.DRAFT.toString override val allResourceDocs: ArrayBuffer[ResourceDoc] = Http4sBGv13.resourceDocs - - override val routes: List[OBPEndpoint] = Nil } // ─── Original Lift aggregator (commented out) ──────────────────────────────── @@ -82,4 +80,4 @@ object OBP_BERLIN_GROUP_1_3 extends OBPRestHelper with MdcLoggable with ScannedA // // override val routes : List[OBPEndpoint] = getAllowedEndpoints(endpoints, allResourceDocs) // registerRoutes(routes, allResourceDocs, apiPrefix) -// logger.info(s"version $version has been run! There are ${routes.length} routes.") +// logger.info(s"version $version has been run!") diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/OBP_BERLIN_GROUP_1_3_Alias.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/OBP_BERLIN_GROUP_1_3_Alias.scala index 7f23087689..2beba04807 100644 --- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/OBP_BERLIN_GROUP_1_3_Alias.scala +++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/OBP_BERLIN_GROUP_1_3_Alias.scala @@ -32,7 +32,7 @@ package code.api.berlin.group.v1_3 import code.api.OBPRestHelper -import code.api.util.APIUtil.{OBPEndpoint, ResourceDoc, berlinGroupV13AliasPath} +import code.api.util.APIUtil.{ResourceDoc, berlinGroupV13AliasPath} import code.api.util.ScannedApis import code.util.Helper.MdcLoggable import com.openbankproject.commons.util.{ApiVersionStatus, ScannedApiVersion} @@ -53,8 +53,6 @@ object OBP_BERLIN_GROUP_1_3_Alias extends OBPRestHelper with MdcLoggable with Sc val versionStatus: String = ApiVersionStatus.DRAFT.toString override val allResourceDocs: ArrayBuffer[ResourceDoc] = Http4sBGv13Alias.resourceDocs - - override val routes: List[OBPEndpoint] = Nil } // ─── Original Lift aggregator (commented out) ──────────────────────────────── diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/PaymentInitiationServicePISApi.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/PaymentInitiationServicePISApi.scala index 6364c32440..5333135d1a 100644 --- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/PaymentInitiationServicePISApi.scala +++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/PaymentInitiationServicePISApi.scala @@ -22,8 +22,6 @@ //import net.liftweb //import net.liftweb.common.Box.tryo //import net.liftweb.common.Full -//import net.liftweb.http.js.JE.JsRaw -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/SigningBasketsApi.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/SigningBasketsApi.scala index 0a2d91a34b..fe19268bbc 100644 --- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/SigningBasketsApi.scala +++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/SigningBasketsApi.scala @@ -20,8 +20,6 @@ //import com.openbankproject.commons.model.{ChallengeTrait, TransactionRequestId} //import com.openbankproject.commons.util.ApiVersion //import net.liftweb.common.{Box, Empty, Full} -//import net.liftweb.http.js.JE.JsRaw -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/berlin/group/v2/Http4sBGv2AIS.scala b/obp-api/src/main/scala/code/api/berlin/group/v2/Http4sBGv2AIS.scala index dd4c307661..88bbe4794a 100644 --- a/obp-api/src/main/scala/code/api/berlin/group/v2/Http4sBGv2AIS.scala +++ b/obp-api/src/main/scala/code/api/berlin/group/v2/Http4sBGv2AIS.scala @@ -32,7 +32,6 @@ object Http4sBGv2AIS extends MdcLoggable { // ── GET /v2/accounts ────────────────────────────────────────────── resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountList), "GET", @@ -54,7 +53,6 @@ object Http4sBGv2AIS extends MdcLoggable { // ── GET /v2/accounts/{account-id} ───────────────────────────────── resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountDetails), "GET", @@ -76,7 +74,6 @@ object Http4sBGv2AIS extends MdcLoggable { // ── GET /v2/accounts/{account-id}/balances ──────────────────────── resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountBalances), "GET", @@ -98,7 +95,6 @@ object Http4sBGv2AIS extends MdcLoggable { // ── GET /v2/accounts/{account-id}/transactions ──────────────────── resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionList), "GET", @@ -120,7 +116,6 @@ object Http4sBGv2AIS extends MdcLoggable { // ── GET /v2/accounts/{account-id}/transactions/{transactionId} ──── resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionDetails), "GET", @@ -142,7 +137,6 @@ object Http4sBGv2AIS extends MdcLoggable { // ── GET /v2/card-accounts ───────────────────────────────────────── resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCardAccountList), "GET", @@ -164,7 +158,6 @@ object Http4sBGv2AIS extends MdcLoggable { // ── GET /v2/card-accounts/{account-id} ──────────────────────────── resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCardAccountDetails), "GET", @@ -186,7 +179,6 @@ object Http4sBGv2AIS extends MdcLoggable { // ── GET /v2/card-accounts/{account-id}/balances ─────────────────── resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCardAccountBalances), "GET", @@ -208,7 +200,6 @@ object Http4sBGv2AIS extends MdcLoggable { // ── GET /v2/card-accounts/{account-id}/transactions ─────────────── resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCardAccountTransactionList), "GET", diff --git a/obp-api/src/main/scala/code/api/berlin/group/v2/Http4sBGv2PIIS.scala b/obp-api/src/main/scala/code/api/berlin/group/v2/Http4sBGv2PIIS.scala index 73aa960ed3..70df81864e 100644 --- a/obp-api/src/main/scala/code/api/berlin/group/v2/Http4sBGv2PIIS.scala +++ b/obp-api/src/main/scala/code/api/berlin/group/v2/Http4sBGv2PIIS.scala @@ -32,7 +32,6 @@ object Http4sBGv2PIIS extends MdcLoggable { // ── POST /v2/funds-confirmations ────────────────────────────────── resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(postConfirmationOfFunds), "POST", diff --git a/obp-api/src/main/scala/code/api/berlin/group/v2/Http4sBGv2PIS.scala b/obp-api/src/main/scala/code/api/berlin/group/v2/Http4sBGv2PIS.scala index 3b27a81d22..bbb999f444 100644 --- a/obp-api/src/main/scala/code/api/berlin/group/v2/Http4sBGv2PIS.scala +++ b/obp-api/src/main/scala/code/api/berlin/group/v2/Http4sBGv2PIS.scala @@ -32,7 +32,6 @@ object Http4sBGv2PIS extends MdcLoggable { // ── POST /v2/payments/{payment-product} ─────────────────────────── resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(initiatePayment), "POST", @@ -54,7 +53,6 @@ object Http4sBGv2PIS extends MdcLoggable { // ── POST /v2/bulk-payments/{payment-product} ────────────────────── resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(initiateBulkPayment), "POST", @@ -76,7 +74,6 @@ object Http4sBGv2PIS extends MdcLoggable { // ── POST /v2/periodic-payments/{payment-product} ────────────────── resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(initiatePeriodicPayment), "POST", @@ -99,7 +96,6 @@ object Http4sBGv2PIS extends MdcLoggable { // Must be before generic 4-segment patterns resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBulkPaymentExtendedStatus), "GET", @@ -121,7 +117,6 @@ object Http4sBGv2PIS extends MdcLoggable { // ── GET /v2/{payment-service}/{payment-product}/{paymentId}/status ─ resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPaymentStatus), "GET", @@ -144,7 +139,6 @@ object Http4sBGv2PIS extends MdcLoggable { // ── GET /v2/{payment-service}/{payment-product}/{paymentId} ─────── resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPayment), "GET", @@ -167,7 +161,6 @@ object Http4sBGv2PIS extends MdcLoggable { // ── DELETE /v2/{payment-service}/{payment-product}/{paymentId} ──── resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deletePayment), "DELETE", @@ -190,7 +183,6 @@ object Http4sBGv2PIS extends MdcLoggable { // ── POST /v2/{resource-path}/{resourceId}/{authorisation-category} ─ resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(startAuthorisation), "POST", @@ -215,7 +207,6 @@ object Http4sBGv2PIS extends MdcLoggable { // ── GET /v2/{resource-path}/{resourceId}/{authorisation-category} ── resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAuthorisationSubResources), "GET", @@ -240,7 +231,6 @@ object Http4sBGv2PIS extends MdcLoggable { // ── GET /v2/{resource-path}/{resourceId}/{auth-category}/{authId} ── resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAuthorisationStatus), "GET", @@ -264,7 +254,6 @@ object Http4sBGv2PIS extends MdcLoggable { // ── PUT /v2/{resource-path}/{resourceId}/{auth-category}/{authId} ── resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updatePsuData), "PUT", @@ -288,7 +277,6 @@ object Http4sBGv2PIS extends MdcLoggable { // ── PUT /v2/{resource-path}/{resourceId} ────────────────────────── resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateResourceWithDebtorAccount), "PUT", diff --git a/obp-api/src/main/scala/code/api/dauth.scala b/obp-api/src/main/scala/code/api/dauth.scala index 70437e6cbf..97a414dbd6 100755 --- a/obp-api/src/main/scala/code/api/dauth.scala +++ b/obp-api/src/main/scala/code/api/dauth.scala @@ -35,10 +35,9 @@ import code.util.Helper.MdcLoggable import com.nimbusds.jwt.JWTClaimsSet import com.openbankproject.commons.model.User import net.liftweb.common._ -import net.liftweb.http._ import net.liftweb.json._ import com.openbankproject.commons.ExecutionContext.Implicits.global -import net.liftweb.http.provider.HTTPParam +import code.api.util.APIUtil.HTTPParam import scala.collection.immutable.List import scala.concurrent.Future @@ -219,7 +218,7 @@ object DAuth extends MdcLoggable { } def getUser : Box[User] = { - val token = S.getRequestHeader(APIUtil.DAuthHeaderKey) + val token: Box[String] = Empty // S.getRequestHeader not available in http4s path val payload = token.map(DAuth.parseJwt).flatten payload match { case Full(payload) => diff --git a/obp-api/src/main/scala/code/api/directlogin.scala b/obp-api/src/main/scala/code/api/directlogin.scala index ea5a0ff7e0..dc28977a05 100644 --- a/obp-api/src/main/scala/code/api/directlogin.scala +++ b/obp-api/src/main/scala/code/api/directlogin.scala @@ -30,6 +30,7 @@ import java.util.Date import code.api.util.APIUtil._ import code.api.util.ErrorMessages.{InvalidDirectLoginParameters, attemptedToOpenAnEmptyBox} +import code.api.util.NewStyle.HttpCode import code.api.util._ import code.consumer.Consumers._ import code.model.dataAccess.AuthUser @@ -42,7 +43,6 @@ import com.nimbusds.jwt.JWTClaimsSet import com.openbankproject.commons.ExecutionContext.Implicits.global import com.openbankproject.commons.model.User import net.liftweb.common._ -import net.liftweb.http._ import net.liftweb.mapper.{By, By_>, Descending, OrderBy} import net.liftweb.util.Helpers import net.liftweb.util.Helpers.tryo @@ -79,6 +79,7 @@ object JSONFactory { object DirectLogin extends MdcLoggable { + def grantEntitlementsToUseDynamicEndpointsInSpacesInDirectLogin(userId:Long) = { try { val resourceUser = UserX.findByResourceUserId(userId).openOrThrowException(s"$InvalidDirectLoginParameters can not find the resourceUser!") @@ -98,10 +99,7 @@ object DirectLogin extends MdcLoggable { * @return httpCode and token value */ def createTokenFuture(allParameters: Map[String, String]): Future[(Int, String, Long)] = { - val httpMethod = S.request match { - case Full(r) => r.request.method - case _ => "GET" - } + val httpMethod = "POST" //Extract the directLogin parameters from the header and test if the request is valid for ( (httpCode, message, directLoginParameters) <- validatorFuture("authorizationToken", httpMethod) @@ -159,13 +157,7 @@ object DirectLogin extends MdcLoggable { (httpCode, message, userId) } - def getHttpMethod = S.request match { - case Full(s) => s.post_? match { - case true => "POST" - case _ => "ERROR" - } - case _ => "ERROR" - } + def getHttpMethod = "POST" /**Validate user supplied Direct Login parameters before they are used further, * guard maximum length and content of strings (a-z, 0-9 etc.) */ @@ -228,22 +220,9 @@ object DirectLogin extends MdcLoggable { params } - S.request match { - // Recommended header style i.e. DirectLogin: username=s, password=s, consumer_key=s - case Full(a) if a.header("DirectLogin").isDefined == true => - toMap(a.header("DirectLogin").openOrThrowException(attemptedToOpenAnEmptyBox + " => getAllParameters")) - // Deprecated header style i.e. Authorization: DirectLogin username=s, password=s, consumer_key=s - case Full(a) => a.header("Authorization") match { - case Full(header) => { - if (header.contains("DirectLogin")) - toMap(header) - else - Map("error" -> ErrorMessages.InvalidDirectLoginHeader) - } - case _ => Map("error" -> ErrorMessages.MissingDirectLoginHeader) - } - case _ => Map("error" -> ErrorMessages.MissingDirectLoginHeader) - } + // S.request is not available in the http4s path; Lift bridge removed. + // Callers on the http4s path use validatorFutureWithParams instead. + Map("error" -> ErrorMessages.MissingDirectLoginHeader) } @@ -508,10 +487,7 @@ object DirectLogin extends MdcLoggable { } def getUser : Box[User] = { - val httpMethod = S.request match { - case Full(r) => r.request.method - case _ => "GET" - } + val httpMethod = "GET" val (httpCode, message, directLoginParameters) = validator("protectedResource") if (httpCode == 400 || httpCode == 401) @@ -529,18 +505,14 @@ object DirectLogin extends MdcLoggable { } def getUserFromDirectLoginHeaderFuture(sc: CallContext) : Future[(Box[User], Option[CallContext])] = { - val httpMethod = if (sc.verb.nonEmpty) sc.verb else S.request match { - case Full(r) => r.request.method - case _ => "GET" - } - // Prefer directLoginParams from CallContext (http4s), fall back to S.request (Lift) + val httpMethod = if (sc.verb.nonEmpty) sc.verb else "GET" + // Prefer directLoginParams from CallContext (http4s) val directLoginParamsFromCC = sc.directLoginParams for { (httpCode, message, directLoginParameters) <- if (directLoginParamsFromCC.nonEmpty && directLoginParamsFromCC.contains("token")) { // Use params from CallContext (http4s path) validatorFutureWithParams("protectedResource", httpMethod, directLoginParamsFromCC) } else { - // Fall back to S.request (Lift path), e.g. we still use Lift to generate the token and secret, so we need to maintain backward compatibility here. validatorFuture("protectedResource", httpMethod) } _ <- Future { if (httpCode == 400 || httpCode == 401) Empty else Full("ok") } map { x => fullBoxOrException(x ?~! message) } @@ -601,11 +573,6 @@ object DirectLogin extends MdcLoggable { def getConsumer: Box[Consumer] = { logger.debug("DirectLogin header correct ") - val httpMethod = S.request match { - case Full(r) => r.request.method - case _ => "GET" - } - val (httpCode, message, directLoginParameters) = validator("protectedResource") val consumer: Option[Consumer] = for { diff --git a/obp-api/src/main/scala/code/api/dynamic/endpoint/APIMethodsDynamicEndpoint.scala b/obp-api/src/main/scala/code/api/dynamic/endpoint/APIMethodsDynamicEndpoint.scala index cf533c9ced..985c4fed9b 100644 --- a/obp-api/src/main/scala/code/api/dynamic/endpoint/APIMethodsDynamicEndpoint.scala +++ b/obp-api/src/main/scala/code/api/dynamic/endpoint/APIMethodsDynamicEndpoint.scala @@ -17,7 +17,6 @@ import com.openbankproject.commons.model.enums.DynamicEntityOperation._ import com.openbankproject.commons.model.enums._ import com.openbankproject.commons.util.{ApiVersion, JsonUtils} import net.liftweb.common._ -import net.liftweb.http.rest.RestHelper import net.liftweb.json.JsonAST.JValue import net.liftweb.json.JsonDSL._ import net.liftweb.json._ @@ -29,7 +28,6 @@ import scala.collection.mutable.ArrayBuffer import scala.concurrent.Future trait APIMethodsDynamicEndpoint { - self: RestHelper => val ImplementationsDynamicEndpoint = new ImplementationsDynamicEndpoint() @@ -230,7 +228,7 @@ trait APIMethodsDynamicEndpoint { } } -object APIMethodsDynamicEndpoint extends RestHelper with APIMethodsDynamicEndpoint { +object APIMethodsDynamicEndpoint extends APIMethodsDynamicEndpoint { lazy val newStyleEndpoints: List[(String, String)] = ImplementationsDynamicEndpoint.resourceDocs.map { rd => (rd.partialFunctionName, rd.implementedInApiVersion.toString()) }.toList diff --git a/obp-api/src/main/scala/code/api/dynamic/endpoint/OBPAPIDynamicEndpoint.scala b/obp-api/src/main/scala/code/api/dynamic/endpoint/OBPAPIDynamicEndpoint.scala index 782c2104ff..d3dd7b4700 100644 --- a/obp-api/src/main/scala/code/api/dynamic/endpoint/OBPAPIDynamicEndpoint.scala +++ b/obp-api/src/main/scala/code/api/dynamic/endpoint/OBPAPIDynamicEndpoint.scala @@ -29,9 +29,7 @@ package code.api.dynamic.endpoint import APIMethodsDynamicEndpoint.ImplementationsDynamicEndpoint import code.api.OBPRestHelper import code.api.dynamic.endpoint.helper.DynamicEndpoints -import code.api.util.APIUtil.OBPEndpoint import code.api.util.{APIUtil, VersionedOBPApis} -import code.api.v5_0_0.OBPAPI5_0_0.{allResourceDocs, apiPrefix, registerRoutes, routes} import code.util.Helper.MdcLoggable import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus} import net.liftweb.common.{Box, Full} @@ -49,23 +47,7 @@ object OBPAPIDynamicEndpoint extends OBPRestHelper with MdcLoggable with Version // if old version ResourceDoc objects have the same name endpoint with new version, omit old version ResourceDoc. def allResourceDocs = collectResourceDocs(ImplementationsDynamicEndpoint.resourceDocs) - // dynamic-endpoint dispatch is fully native (code.api.dynamic.endpoint.Http4sDynamicEndpoint): - // - Piece B (proxy): Http4sDynamicEndpoint.proxy -> APIMethodsDynamicEndpoint.proxyHandle - // - Piece C (runtime-compiled): DynamicEndpoints.findEndpoint -> ResourceDoc.dynamicHttp4sFunction - // The former Lift `OBPEndpoint`s (ImplementationsDynamicEndpoint.dynamicEndpoint via DynamicReq, - // and DynamicEndpoints.dynamicEndpoint) have been removed. `routes` keeps only the no-op stub; it - // is no longer used for resource-doc filtering (ResourceDocsAPIMethods returns the dynamic-endpoint - // resourceDocs unfiltered, like dynamic-entity). - val routes : List[OBPEndpoint] = List(APIUtil.dynamicEndpointStub) - - // dynamic-endpoint dispatch migrated to native http4s (code.api.dynamic.endpoint.Http4sDynamicEndpoint). - // The Http4sDynamicEndpoint adapter rebuilds the wrapped form from `routes` directly - // (routes.map(apiPrefix andThen buildOAuthHandler)) and applies it in-process, so the Lift - // statelessDispatch self-registration below is no longer used. `routes` itself is kept — it is - // the adapter's source list and is also read by ResourceDocs aggregation. - // routes.map(endpoint => oauthServe(apiPrefix{endpoint}, None)) - - logger.info(s"version $version has been run! There are ${routes.length} routes.") + logger.info(s"version $version has been run!") // OPTIONS / CORS for dynamic-endpoint is now handled globally by Http4sApp.corsHandler (which // short-circuits all OPTIONS ahead of the version routes). The Lift OPTIONS serve below became // dead once dynamic-endpoint left statelessDispatch — kept commented for reference. diff --git a/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicCompileEndpoint.scala b/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicCompileEndpoint.scala index 8e8c56c0d2..47c104a49e 100644 --- a/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicCompileEndpoint.scala +++ b/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicCompileEndpoint.scala @@ -2,7 +2,7 @@ package code.api.dynamic.endpoint.helper import scala.language.implicitConversions import cats.effect.IO -import code.api.util.APIUtil.{OBPEndpointIO, OBPReturnType} +import code.api.util.APIUtil.{Http4sEndpointIO, OBPReturnType} import code.api.util.DynamicUtil.{Sandbox, Validation} import code.api.util.{CallContext, CustomJsonFormats, DynamicUtil} import org.http4s.{Request, Response} @@ -12,7 +12,7 @@ import org.http4s.{Request, Response} * and supplies the `process` method body. * * Native http4s contract (replaces the former Lift one - * `process(callContext, request: net.liftweb.http.Req, pathParams): Box[JsonResponse]`): the body + * `process(callContext, request: Req, pathParams): Box[JsonResponse]`): the body * receives the http4s `Request[IO]` and returns an `IO[Response[IO]]`. The implicit * [[DynamicCompileEndpoint.obpReturnTypeToIOResponse]] lets a body whose last expression is an * `OBPReturnType[T]` (the familiar `Future.successful((json, HttpCode.\`200\`(cc)))` style) be used @@ -26,7 +26,7 @@ trait DynamicCompileEndpoint { protected def process(callContext: CallContext, request: Request[IO], pathParams: Map[String, String]): IO[Response[IO]] - val endpoint: OBPEndpointIO = new OBPEndpointIO { + val endpoint: Http4sEndpointIO = new Http4sEndpointIO { override def isDefinedAt(x: Request[IO]): Boolean = true override def apply(request: Request[IO]): CallContext => IO[Response[IO]] = { cc => diff --git a/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicEndpointHelper.scala b/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicEndpointHelper.scala index 9f43203a94..76b66b6cad 100644 --- a/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicEndpointHelper.scala +++ b/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicEndpointHelper.scala @@ -17,7 +17,6 @@ import io.swagger.v3.oas.models.responses.{ApiResponse, ApiResponses} import io.swagger.v3.oas.models.{OpenAPI, Operation, PathItem} import io.swagger.v3.parser.OpenAPIV3Parser import net.liftweb.common.{Box, Full} -import net.liftweb.http.rest.RestHelper import net.liftweb.json import net.liftweb.json.JsonAST.{JArray, JField, JNothing, JObject, JValue} import net.liftweb.json.JsonAST._ @@ -43,8 +42,8 @@ import scala.collection.mutable import scala.collection.mutable.{ArrayBuffer, ListBuffer} -object DynamicEndpointHelper extends RestHelper { - protected override implicit def formats: Formats = CustomJsonFormats.formats +object DynamicEndpointHelper { + implicit val formats: Formats = CustomJsonFormats.formats /** * dynamic endpoints url prefix @@ -356,7 +355,6 @@ object DynamicEndpointHelper extends RestHelper { )) } val doc = ResourceDoc( - APIUtil.dynamicEndpointStub, implementedInApiVersion, partialFunctionName, requestVerb, diff --git a/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicEndpoints.scala b/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicEndpoints.scala index 9d343d84ff..8ed2b20487 100644 --- a/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicEndpoints.scala +++ b/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicEndpoints.scala @@ -4,7 +4,7 @@ import cats.effect.IO import code.api.dynamic.endpoint.helper.practise.{DynamicEndpointCodeGenerator, PractiseEndpointGroup} import code.api.dynamic.endpoint.helper.practise.PractiseEndpointGroup import code.api.util.DynamicUtil.{Sandbox, Validation} -import code.api.util.APIUtil.{BooleanBody, DoubleBody, EmptyBody, LongBody, OBPEndpointIO, PrimaryDataBody, ResourceDoc, StringBody, getDisabledEndpointOperationIds} +import code.api.util.APIUtil.{BooleanBody, DoubleBody, EmptyBody, LongBody, Http4sEndpointIO, PrimaryDataBody, ResourceDoc, StringBody, getDisabledEndpointOperationIds} import code.api.util.{CallContext, DynamicUtil} import net.liftweb.common.{Box, Failure, Full} import net.liftweb.json.{JNothing, JValue} @@ -86,7 +86,7 @@ case class CompiledObjects(exampleRequestBody: Option[JValue], successResponseBo } val successResponse: Product = toCaseObject(successResponseBody) - private val partialFunction: OBPEndpointIO = { + private val partialFunction: Http4sEndpointIO = { //If the requestBody is PrimaryDataBody, return None. otherwise, return the exampleRequestBody:Option[JValue] // In side OBP resourceDoc, requestBody and successResponse must be Product type， @@ -132,7 +132,7 @@ case class CompiledObjects(exampleRequestBody: Option[JValue], successResponseBo | |$responseBodyCaseClasses | - |val endpoint: code.api.util.APIUtil.OBPEndpointIO = { + |val endpoint: code.api.util.APIUtil.Http4sEndpointIO = { | case request => { callContext => | val Some(pathParams) = callContext.resourceDocument.map(_.getPathParams(request.uri.path.segments.toList.map(_.encoded))) | $decodedMethodBody @@ -142,7 +142,7 @@ case class CompiledObjects(exampleRequestBody: Option[JValue], successResponseBo |endpoint | |""".stripMargin - val endpointMethod = DynamicUtil.compileScalaCode[OBPEndpointIO](code) + val endpointMethod = DynamicUtil.compileScalaCode[Http4sEndpointIO](code) endpointMethod match { case Full(func) => func @@ -164,14 +164,14 @@ case class CompiledObjects(exampleRequestBody: Option[JValue], successResponseBo * all the obp partialFunctions will be wrapped into the sandbox which under the permission control. * */ - def sandboxEndpoint(bankId: Option[String]) : OBPEndpointIO = { + def sandboxEndpoint(bankId: Option[String]) : Http4sEndpointIO = { val sandbox = bankId match { case Some(v) if StringUtils.isNotBlank(v) => Sandbox.sandbox(v) case _ => Sandbox.sandbox("*") } - new OBPEndpointIO { + new Http4sEndpointIO { override def isDefinedAt(req: Request[IO]): Boolean = partialFunction.isDefinedAt(req) // run dynamic code in sandbox diff --git a/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicResourceDocsEndpointGroup.scala b/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicResourceDocsEndpointGroup.scala index f46ea9df05..8e6350494b 100644 --- a/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicResourceDocsEndpointGroup.scala +++ b/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicResourceDocsEndpointGroup.scala @@ -53,7 +53,6 @@ object DynamicResourceDocsEndpointGroup extends EndpointGroup with code.util.Hel ResourceDoc( // partialFunction is a no-op stub — the runtime dispatch uses the native handler in // dynamicHttp4sFunction (the compiled artifact is OBPEndpointIO, not the Lift OBPEndpoint). - partialFunction = APIUtil.dynamicEndpointStub, dynamicHttp4sFunction = Some(compiledObjects.sandboxEndpoint(dynamicDoc.bankId)), implementedInApiVersion = apiVersion, partialFunctionName = dynamicDoc.partialFunctionName + "_" + (dynamicDoc.requestVerb + dynamicDoc.requestUrl).hashCode, diff --git a/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/practise/PractiseEndpointGroup.scala b/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/practise/PractiseEndpointGroup.scala index 3fd21c7310..80cd7d56bd 100644 --- a/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/practise/PractiseEndpointGroup.scala +++ b/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/practise/PractiseEndpointGroup.scala @@ -18,9 +18,6 @@ object PractiseEndpointGroup extends EndpointGroup{ override protected lazy val urlPrefix: String = "test-dynamic-resource-doc" override protected def resourceDocs: List[APIUtil.ResourceDoc] = ResourceDoc( - // partialFunction is a no-op stub — the runtime dispatch uses the native handler in - // dynamicHttp4sFunction below (the compiled artifact is OBPEndpointIO, not the Lift OBPEndpoint). - APIUtil.dynamicEndpointStub, ApiVersion.v4_0_0, "test-dynamic-resource-doc", PractiseEndpoint.requestMethod, diff --git a/obp-api/src/main/scala/code/api/dynamic/entity/APIMethodsDynamicEntity.scala b/obp-api/src/main/scala/code/api/dynamic/entity/APIMethodsDynamicEntity.scala index a8aa600f91..8c54c55380 100644 --- a/obp-api/src/main/scala/code/api/dynamic/entity/APIMethodsDynamicEntity.scala +++ b/obp-api/src/main/scala/code/api/dynamic/entity/APIMethodsDynamicEntity.scala @@ -14,8 +14,6 @@ import com.openbankproject.commons.model.enums.DynamicEntityOperation._ import com.openbankproject.commons.model.enums._ import com.openbankproject.commons.util.{ApiVersion, JsonUtils} import net.liftweb.common._ -import net.liftweb.http.rest.RestHelper -import net.liftweb.http.{JsonResponse, Req} import net.liftweb.json.JsonAST.JValue import net.liftweb.json.JsonDSL._ import net.liftweb.json._ @@ -26,7 +24,6 @@ import scala.collection.mutable.ArrayBuffer import scala.concurrent.Future trait APIMethodsDynamicEntity { - self: RestHelper => val ImplementationsDynamicEntity = new ImplementationsDynamicEntity() @@ -54,476 +51,10 @@ trait APIMethodsDynamicEntity { box.openOrThrowException("impossible error") } - //TODO temp solution to support query by field name and value - private def filterDynamicObjects(resultList: JArray, req: Req): JArray = { - req.params match { - case map if map.isEmpty => resultList - case params => - val filteredWithFieldValue = resultList.arr.filter { jValue => - params.filter(_._1!=PARAM_LOCALE).forall { kv => - val (path, values) = kv - values.exists(JsonUtils.isFieldEquals(jValue, path, _)) - } - } - - JArray(filteredWithFieldValue) - } - } - - /* DISABLED — DynamicEntity runtime CRUD migrated to code.api.dynamic.entity.Http4sDynamicEntity - (wired into Http4sApp.baseServices). These Lift OBPEndpoint handlers are no longer registered - (OBPAPIDynamicEntity.routes = Nil and dynamic-entity removed from LiftRules.statelessDispatch). - Retained, commented out, for historical reference per the repo's revert-and-comment convention. - - lazy val genericEndpoint: OBPEndpoint = { - case EntityName(bankId, entityName, id, isPersonalEntity) JsonGet req => { cc => - val listName = StringHelpers.snakify(entityName).replaceFirst("[-_]*$", "_list") - val singleName = StringHelpers.snakify(entityName).replaceFirst("[-_]*$", "") - val isGetAll = StringUtils.isBlank(id) - - val splitName = entityName - val splitNameWithBankId = if (bankId.isDefined) - s"""$splitName(${bankId.getOrElse("")})""" - else - s"""$splitName""" - val mySplitNameWithBankId = s"My$splitNameWithBankId" - - val operation: DynamicEntityOperation = if (StringUtils.isBlank(id)) GET_ALL else GET_ONE - val resourceDoc = if(isPersonalEntity) - DynamicEntityHelper.operationToResourceDoc.get(operation -> mySplitNameWithBankId) - else - DynamicEntityHelper.operationToResourceDoc.get(operation -> splitNameWithBankId) - val operationId = resourceDoc.map(_.operationId).orNull - val callContext = cc.copy(operationId = Some(operationId), resourceDocument = resourceDoc) - // process before authentication interceptor, get intercept result - val beforeInterceptResult: Box[JsonResponse] = beforeAuthenticateInterceptResult(Option(callContext), operationId) - if (beforeInterceptResult.isDefined) beforeInterceptResult - else for { - (Full(u), callContext) <- authenticatedAccess(callContext) // Inject operationId into Call Context. It's used by Rate Limiting. - - (_, callContext) <- - if (bankId.isDefined) { //if it is the bank level entity, we need to check the bankId - NewStyle.function.getBank(bankId.map(BankId(_)).orNull, callContext) - } else { - Future.successful { - ("", callContext) - } - } - - personalRequiresRole = DynamicEntityHelper.definitionsMap.get((bankId, entityName)).exists(_.personalRequiresRole) - _ <- if (isPersonalEntity && !personalRequiresRole) { - Future.successful(true) - } else { - NewStyle.function.hasEntitlement(bankId.getOrElse(""), u.userId, DynamicEntityInfo.canGetRole(entityName, bankId), callContext) - } - - // process after authentication interceptor, get intercept result - jsonResponse: Box[ErrorMessage] = afterAuthenticateInterceptResult(callContext, operationId).collect({ - case JsonResponseExtractor(message, code) => ErrorMessage(code, message) - }) - _ <- Helper.booleanToFuture(failMsg = jsonResponse.map(_.message).orNull, failCode = jsonResponse.map(_.code).openOr(400), cc = callContext) { - jsonResponse.isEmpty - } - - (box, _) <- NewStyle.function.invokeDynamicConnector(operation, entityName, None, Option(id).filter(StringUtils.isNotBlank), bankId, None, - Some(u.userId), - isPersonalEntity, - Some(cc) - ) - - _ <- Helper.booleanToFuture( - s"$EntityNotFoundByEntityId Entity: '$entityName', entityId: '${id}'" + bankId.map(bid => s", bank_id: '$bid'").getOrElse(""), - 404, - cc = callContext - ) { - box.isDefined - } - } yield { - val jValue = if (isGetAll) { - val resultList: JArray = unboxResult(box.asInstanceOf[Box[JArray]], entityName) - if (bankId.isDefined) { - val bankIdJobject: JObject = ("bank_id" -> bankId.getOrElse("")) - val result: JObject = (listName -> filterDynamicObjects(resultList, req)) - bankIdJobject merge result - } else { - val result: JObject = (listName -> filterDynamicObjects(resultList, req)) - result - } - } else { - val singleObject: JValue = unboxResult(box.asInstanceOf[Box[JValue]], entityName) - if (bankId.isDefined) { - val bankIdJobject: JObject = ("bank_id" -> bankId.getOrElse("")) - val result: JObject = (singleName -> singleObject) - bankIdJobject merge result - } else { - val result: JObject = (singleName -> singleObject) - result - } - } - (jValue, HttpCode.`200`(Some(cc))) - } - } - case EntityName(bankId, entityName, _, isPersonalEntity) JsonPost json -> _ => { cc => - val singleName = StringHelpers.snakify(entityName).replaceFirst("[-_]*$", "") - val operation: DynamicEntityOperation = CREATE - val splitName = entityName - val splitNameWithBankId = if (bankId.isDefined) - s"""$splitName(${bankId.getOrElse("")})""" - else - s"""$splitName""" - val mySplitNameWithBankId = s"My$splitNameWithBankId" - - val resourceDoc = if(isPersonalEntity) - DynamicEntityHelper.operationToResourceDoc.get(operation -> mySplitNameWithBankId) - else - DynamicEntityHelper.operationToResourceDoc.get(operation -> splitNameWithBankId) - - val operationId = resourceDoc.map(_.operationId).orNull - val callContext = cc.copy(operationId = Some(operationId), resourceDocument = resourceDoc) - - // process before authentication interceptor, get intercept result - val beforeInterceptResult: Box[JsonResponse] = beforeAuthenticateInterceptResult(Option(callContext), operationId) - if (beforeInterceptResult.isDefined) beforeInterceptResult - else for { - (Full(u), callContext) <- authenticatedAccess(callContext) // Inject operationId into Call Context. It's used by Rate Limiting. - (_, callContext) <- - if (bankId.isDefined) { //if it is the bank level entity, we need to check the bankId - NewStyle.function.getBank(bankId.map(BankId(_)).orNull, callContext) - } else { - Future.successful { - ("", callContext) - } - } - - personalRequiresRole = DynamicEntityHelper.definitionsMap.get((bankId, entityName)).exists(_.personalRequiresRole) - _ <- if (isPersonalEntity && !personalRequiresRole) { - Future.successful(true) - } else { - NewStyle.function.hasEntitlement(bankId.getOrElse(""), u.userId, DynamicEntityInfo.canCreateRole(entityName, bankId), callContext) - } - - // process after authentication interceptor, get intercept result - jsonResponse: Box[ErrorMessage] = afterAuthenticateInterceptResult(callContext, operationId).collect({ - case JsonResponseExtractor(message, code) => ErrorMessage(code, message) - }) - _ <- Helper.booleanToFuture(failMsg = jsonResponse.map(_.message).orNull, failCode = jsonResponse.map(_.code).openOr(400), cc = callContext) { - jsonResponse.isEmpty - } - - // Pass userId for all authenticated requests - personal records are filtered by userId - (box, _) <- NewStyle.function.invokeDynamicConnector(operation, entityName, Some(json.asInstanceOf[JObject]), None, bankId, None, Some(u.userId), isPersonalEntity, Some(cc)) - singleObject: JValue = unboxResult(box.asInstanceOf[Box[JValue]], entityName) - } yield { - val result: JObject = (singleName -> singleObject) - val entity = if (bankId.isDefined) { - val bankIdJobject: JObject = ("bank_id" -> bankId.getOrElse("")) - bankIdJobject merge result - } else { - result - } - (entity, HttpCode.`201`(Some(cc))) - } - } - case EntityName(bankId, entityName, id, isPersonalEntity) JsonPut json -> _ => { cc => - val singleName = StringHelpers.snakify(entityName).replaceFirst("[-_]*$", "") - val operation: DynamicEntityOperation = UPDATE - val splitName = entityName - val splitNameWithBankId = if (bankId.isDefined) - s"""$splitName(${bankId.getOrElse("")})""" - else - s"""$splitName""" - val mySplitNameWithBankId = s"My$splitNameWithBankId" - - val resourceDoc = if(isPersonalEntity) - DynamicEntityHelper.operationToResourceDoc.get(operation -> mySplitNameWithBankId) - else - DynamicEntityHelper.operationToResourceDoc.get(operation -> splitNameWithBankId) - - val operationId = resourceDoc.map(_.operationId).orNull - val callContext = cc.copy(operationId = Some(operationId), resourceDocument = resourceDoc) - - // process before authentication interceptor, get intercept result - val beforeInterceptResult: Box[JsonResponse] = beforeAuthenticateInterceptResult(Option(callContext), operationId) - if (beforeInterceptResult.isDefined) beforeInterceptResult - else for { - (Full(u), callContext) <- authenticatedAccess(callContext) // Inject operationId into Call Context. It's used by Rate Limiting. - (_, callContext) <- - if (bankId.isDefined) { //if it is the bank level entity, we need to check the bankId - NewStyle.function.getBank(bankId.map(BankId(_)).orNull, callContext) - } else { - Future.successful { - ("", callContext) - } - } - personalRequiresRole = DynamicEntityHelper.definitionsMap.get((bankId, entityName)).exists(_.personalRequiresRole) - _ <- if (isPersonalEntity && !personalRequiresRole) { - Future.successful(true) - } else { - NewStyle.function.hasEntitlement(bankId.getOrElse(""), u.userId, DynamicEntityInfo.canUpdateRole(entityName, bankId), callContext) - } - - // process after authentication interceptor, get intercept result - jsonResponse: Box[ErrorMessage] = afterAuthenticateInterceptResult(callContext, operationId).collect({ - case JsonResponseExtractor(message, code) => ErrorMessage(code, message) - }) - _ <- Helper.booleanToFuture(failMsg = jsonResponse.map(_.message).orNull, failCode = jsonResponse.map(_.code).openOr(400), cc = callContext) { - jsonResponse.isEmpty - } - - (box, _) <- NewStyle.function.invokeDynamicConnector(GET_ONE, entityName, None, Some(id), bankId, None, - Some(u.userId), - isPersonalEntity, - Some(cc)) - _ <- Helper.booleanToFuture( - s"$EntityNotFoundByEntityId Entity: '$entityName', entityId: '$id'" + bankId.map(bid => s", bank_id: '$bid'").getOrElse(""), - 404, - cc = callContext - ) { - box.isDefined - } - (box: Box[JValue], _) <- NewStyle.function.invokeDynamicConnector(operation, entityName, Some(json.asInstanceOf[JObject]), Some(id), bankId, None, - Some(u.userId), - isPersonalEntity, - Some(cc)) - singleObject: JValue = unboxResult(box.asInstanceOf[Box[JValue]], entityName) - } yield { - val result: JObject = (singleName -> singleObject) - val entity = if (bankId.isDefined) { - val bankIdJobject: JObject = ("bank_id" -> bankId.getOrElse("")) - bankIdJobject merge result - } else { - result - } - (entity, HttpCode.`200`(Some(cc))) - } - } - case EntityName(bankId, entityName, id, isPersonalEntity) JsonDelete _ => { cc => - val operation: DynamicEntityOperation = DELETE - val splitName = entityName - val splitNameWithBankId = if (bankId.isDefined) - s"""$splitName(${bankId.getOrElse("")})""" - else - s"""$splitName""" - val mySplitNameWithBankId = s"My$splitNameWithBankId" - - val resourceDoc = if(isPersonalEntity) - DynamicEntityHelper.operationToResourceDoc.get(operation -> mySplitNameWithBankId) - else - DynamicEntityHelper.operationToResourceDoc.get(operation -> splitNameWithBankId) - - val operationId = resourceDoc.map(_.operationId).orNull - val callContext = cc.copy(operationId = Some(operationId), resourceDocument = resourceDoc) - - // process before authentication interceptor, get intercept result - val beforeInterceptResult: Box[JsonResponse] = beforeAuthenticateInterceptResult(Option(callContext), operationId) - if (beforeInterceptResult.isDefined) beforeInterceptResult - else for { - (Full(u), callContext) <- authenticatedAccess(callContext) // Inject operationId into Call Context. It's used by Rate Limiting. - (_, callContext) <- - if (bankId.isDefined) { //if it is the bank level entity, we need to check the bankId - NewStyle.function.getBank(bankId.map(BankId(_)).orNull, callContext) - } else { - Future.successful { - ("", callContext) - } - } - - personalRequiresRole = DynamicEntityHelper.definitionsMap.get((bankId, entityName)).exists(_.personalRequiresRole) - _ <- if (isPersonalEntity && !personalRequiresRole) { - Future.successful(true) - } else { - NewStyle.function.hasEntitlement(bankId.getOrElse(""), u.userId, DynamicEntityInfo.canDeleteRole(entityName, bankId), callContext) - } - - // process after authentication interceptor, get intercept result - jsonResponse: Box[ErrorMessage] = afterAuthenticateInterceptResult(callContext, operationId).collect({ - case JsonResponseExtractor(message, code) => ErrorMessage(code, message) - }) - _ <- Helper.booleanToFuture(failMsg = jsonResponse.map(_.message).orNull, failCode = jsonResponse.map(_.code).openOr(400), cc = callContext) { - jsonResponse.isEmpty - } - - (box, _) <- NewStyle.function.invokeDynamicConnector(GET_ONE, entityName, None, Some(id), bankId, None, - Some(u.userId), - isPersonalEntity, - Some(cc) - ) - _ <- Helper.booleanToFuture( - s"$EntityNotFoundByEntityId Entity: '$entityName', entityId: '$id'" + bankId.map(bid => s", bank_id: '$bid'").getOrElse(""), - 404, - cc = callContext - ) { - box.isDefined - } - (box, _) <- NewStyle.function.invokeDynamicConnector(operation, entityName, None, Some(id), bankId, None, - Some(u.userId), - isPersonalEntity, - Some(cc) - ) - deleteResult: JBool = unboxResult(box.asInstanceOf[Box[JBool]], entityName) - } yield { - (deleteResult, HttpCode.`200`(Some(cc))) - } - } - } - - // Public endpoint for dynamic entities with hasPublicAccess = true - // Read-only (GET only), no authentication required, no role checks - lazy val publicEndpoint: OBPEndpoint = { - case PublicEntityName(bankId, entityName, id) JsonGet req => { cc => - val listName = StringHelpers.snakify(entityName).replaceFirst("[-_]*$", "_list") - val singleName = StringHelpers.snakify(entityName).replaceFirst("[-_]*$", "") - val isGetAll = StringUtils.isBlank(id) - - val splitName = entityName - val splitNameWithBankId = if (bankId.isDefined) - s"""$splitName(${bankId.getOrElse("")})""" - else - s"""$splitName""" - val publicSplitNameWithBankId = s"Public$splitNameWithBankId" - - val operation: DynamicEntityOperation = if (StringUtils.isBlank(id)) GET_ALL else GET_ONE - val resourceDoc = DynamicEntityHelper.operationToResourceDoc.get(operation -> publicSplitNameWithBankId) - val operationId = resourceDoc.map(_.operationId).orNull - val callContext = cc.copy(operationId = Some(operationId), resourceDocument = resourceDoc) - // process before authentication interceptor, get intercept result - val beforeInterceptResult: Box[JsonResponse] = beforeAuthenticateInterceptResult(Option(callContext), operationId) - if (beforeInterceptResult.isDefined) beforeInterceptResult - else for { - (_, callContext) <- anonymousAccess(callContext) - - (_, callContext) <- - if (bankId.isDefined) { - NewStyle.function.getBank(bankId.map(BankId(_)).orNull, callContext) - } else { - Future.successful { - ("", callContext) - } - } - - // No entitlement checks for public endpoints - // Pass userId=None and isPersonalEntity=false - (box, _) <- NewStyle.function.invokeDynamicConnector(operation, entityName, None, Option(id).filter(StringUtils.isNotBlank), bankId, None, - None, - false, - Some(cc) - ) - - _ <- Helper.booleanToFuture( - s"$EntityNotFoundByEntityId Entity: '$entityName', entityId: '${id}'" + bankId.map(bid => s", bank_id: '$bid'").getOrElse(""), - 404, - cc = callContext - ) { - box.isDefined - } - } yield { - val jValue = if (isGetAll) { - val resultList: JArray = unboxResult(box.asInstanceOf[Box[JArray]], entityName) - if (bankId.isDefined) { - val bankIdJobject: JObject = ("bank_id" -> bankId.getOrElse("")) - val result: JObject = (listName -> filterDynamicObjects(resultList, req)) - bankIdJobject merge result - } else { - val result: JObject = (listName -> filterDynamicObjects(resultList, req)) - result - } - } else { - val singleObject: JValue = unboxResult(box.asInstanceOf[Box[JValue]], entityName) - if (bankId.isDefined) { - val bankIdJobject: JObject = ("bank_id" -> bankId.getOrElse("")) - val result: JObject = (singleName -> singleObject) - bankIdJobject merge result - } else { - val result: JObject = (singleName -> singleObject) - result - } - } - (jValue, HttpCode.`200`(Some(cc))) - } - } - } - - // Community endpoint for dynamic entities with hasCommunityAccess = true - // Read-only (GET only), authentication required, CanGet role required - // Returns ALL records (personal + non-personal from all users) - lazy val communityEndpoint: OBPEndpoint = { - case CommunityEntityName(bankId, entityName, id) JsonGet req => { cc => - val listName = StringHelpers.snakify(entityName).replaceFirst("[-_]*$", "_list") - val singleName = StringHelpers.snakify(entityName).replaceFirst("[-_]*$", "") - val isGetAll = StringUtils.isBlank(id) - - val splitName = entityName - val splitNameWithBankId = if (bankId.isDefined) - s"""$splitName(${bankId.getOrElse("")})""" - else - s"""$splitName""" - val communitySplitNameWithBankId = s"Community$splitNameWithBankId" - - val operation: DynamicEntityOperation = if (StringUtils.isBlank(id)) GET_ALL else GET_ONE - val resourceDoc = DynamicEntityHelper.operationToResourceDoc.get(operation -> communitySplitNameWithBankId) - val operationId = resourceDoc.map(_.operationId).orNull - val callContext = cc.copy(operationId = Some(operationId), resourceDocument = resourceDoc) - // process before authentication interceptor, get intercept result - val beforeInterceptResult: Box[JsonResponse] = beforeAuthenticateInterceptResult(Option(callContext), operationId) - if (beforeInterceptResult.isDefined) beforeInterceptResult - else for { - (Full(u), callContext) <- authenticatedAccess(callContext) - - (_, callContext) <- - if (bankId.isDefined) { - NewStyle.function.getBank(bankId.map(BankId(_)).orNull, callContext) - } else { - Future.successful { - ("", callContext) - } - } - - _ <- NewStyle.function.hasEntitlement(bankId.getOrElse(""), u.userId, DynamicEntityInfo.canGetRole(entityName, bankId), callContext) - - // process after authentication interceptor, get intercept result - jsonResponse: Box[ErrorMessage] = afterAuthenticateInterceptResult(callContext, operationId).collect({ - case JsonResponseExtractor(message, code) => ErrorMessage(code, message) - }) - _ <- Helper.booleanToFuture(failMsg = jsonResponse.map(_.message).orNull, failCode = jsonResponse.map(_.code).openOr(400), cc = callContext) { - jsonResponse.isEmpty - } - } yield { - val jValue = if (isGetAll) { - val resultList: List[JObject] = DynamicDataProvider.connectorMethodProvider.vend.getAllDataJsonCommunity(bankId, entityName) - val resultArray = JArray(resultList) - if (bankId.isDefined) { - val bankIdJobject: JObject = ("bank_id" -> bankId.getOrElse("")) - val result: JObject = (listName -> filterDynamicObjects(resultArray, req)) - bankIdJobject merge result - } else { - val result: JObject = (listName -> filterDynamicObjects(resultArray, req)) - result - } - } else { - val singleResult = DynamicDataProvider.connectorMethodProvider.vend.getCommunity(bankId, entityName, id) - val singleObject: JValue = singleResult match { - case Full(data) => net.liftweb.json.parse(data.dataJson) - case _ => throw new RuntimeException(s"$EntityNotFoundByEntityId Entity: '$entityName', entityId: '$id'" + bankId.map(bid => s", bank_id: '$bid'").getOrElse("")) - } - if (bankId.isDefined) { - val bankIdJobject: JObject = ("bank_id" -> bankId.getOrElse("")) - val result: JObject = (singleName -> singleObject) - bankIdJobject merge result - } else { - val result: JObject = (singleName -> singleObject) - result - } - } - (jValue, HttpCode.`200`(Some(cc))) - } - } - } - */ - // end DISABLED handlers (migrated to Http4sDynamicEntity) } } -object APIMethodsDynamicEntity extends RestHelper with APIMethodsDynamicEntity { +object APIMethodsDynamicEntity extends APIMethodsDynamicEntity { lazy val newStyleEndpoints: List[(String, String)] = ImplementationsDynamicEntity.resourceDocs.map { rd => (rd.partialFunctionName, rd.implementedInApiVersion.toString()) }.toList diff --git a/obp-api/src/main/scala/code/api/dynamic/entity/OBPAPIDynamicEntity.scala b/obp-api/src/main/scala/code/api/dynamic/entity/OBPAPIDynamicEntity.scala index 416f1ab25f..d531d5bc2f 100644 --- a/obp-api/src/main/scala/code/api/dynamic/entity/OBPAPIDynamicEntity.scala +++ b/obp-api/src/main/scala/code/api/dynamic/entity/OBPAPIDynamicEntity.scala @@ -29,14 +29,9 @@ package code.api.dynamic.entity import APIMethodsDynamicEntity.ImplementationsDynamicEntity import code.api.OBPRestHelper import code.api.dynamic.endpoint.helper.DynamicEndpoints -import code.api.util.APIUtil.OBPEndpoint import code.api.util.{APIUtil, VersionedOBPApis} -import code.api.v5_0_0.OBPAPI5_0_0.{allResourceDocs, apiPrefix, registerRoutes, routes} import code.util.Helper.MdcLoggable import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus} -import net.liftweb.common.{Box, Full} -import net.liftweb.http.{LiftResponse, PlainTextResponse} -import org.apache.http.HttpStatus /* This file defines which endpoints from all the versions are available in v4.0.0 @@ -54,12 +49,11 @@ object OBPAPIDynamicEntity extends OBPRestHelper with MdcLoggable with Versioned // Http4sApp.baseServices). routes reduced to Nil — the Lift OBPEndpoint handlers are no // longer registered with Lift. This object is retained only as an accessor for // allResourceDocs / routes referenced by ResourceDocsAPIMethods.getResourceDocsList. - val routes : List[OBPEndpoint] = Nil // val routes : List[OBPEndpoint] = List(ImplementationsDynamicEntity.publicEndpoint, ImplementationsDynamicEntity.communityEndpoint, ImplementationsDynamicEntity.genericEndpoint) // routes.map(endpoint => oauthServe(apiPrefix{endpoint}, None)) // no Lift dispatch registration — served by Http4sDynamicEntity - logger.info(s"version $version has been run! There are ${routes.length} routes.") + logger.info(s"version $version has been run!") // OPTIONS / CORS is handled by Http4sApp.corsHandler — the Lift OPTIONS serve below is disabled. // private val corsResponse: Box[LiftResponse] = Full{ diff --git a/obp-api/src/main/scala/code/api/dynamic/entity/helper/DynamicEntityHelper.scala b/obp-api/src/main/scala/code/api/dynamic/entity/helper/DynamicEntityHelper.scala index 5ee3f1ea3d..505d4e4ea6 100644 --- a/obp-api/src/main/scala/code/api/dynamic/entity/helper/DynamicEntityHelper.scala +++ b/obp-api/src/main/scala/code/api/dynamic/entity/helper/DynamicEntityHelper.scala @@ -208,14 +208,12 @@ object DynamicEntityHelper { val resourceDocUrl = if(bankId.isDefined) s"/banks/${bankId.getOrElse("")}/$entityName" else s"/$entityName" val myResourceDocUrl = if(bankId.isDefined) s"/banks/${bankId.getOrElse("")}/my/$entityName" else s"/my/$entityName" - val endPoint = APIUtil.dynamicEndpointStub // (operationType, entityName) -> ResourceDoc val resourceDocs = scala.collection.mutable.Map[(DynamicEntityOperation, String),ResourceDoc]() val apiTag: ResourceDocTag = fun(entityName,splitNameWithBankId) resourceDocs += (DynamicEntityOperation.GET_ALL, splitNameWithBankId) -> ResourceDoc( - endPoint, implementedInApiVersion, buildGetAllFunctionName(bankId, entityName), "GET", @@ -247,7 +245,6 @@ object DynamicEntityHelper { ) resourceDocs += (DynamicEntityOperation.GET_ONE, splitNameWithBankId) -> ResourceDoc( - endPoint, implementedInApiVersion, buildGetOneFunctionName(bankId, entityName), "GET", @@ -275,7 +272,6 @@ object DynamicEntityHelper { ) resourceDocs += (DynamicEntityOperation.CREATE, splitNameWithBankId) -> ResourceDoc( - endPoint, implementedInApiVersion, buildCreateFunctionName(bankId, entityName), "POST", @@ -305,7 +301,6 @@ object DynamicEntityHelper { ) resourceDocs += (DynamicEntityOperation.UPDATE, splitNameWithBankId) -> ResourceDoc( - endPoint, implementedInApiVersion, buildUpdateFunctionName(bankId, entityName), "PUT", @@ -335,7 +330,6 @@ object DynamicEntityHelper { ) resourceDocs += (DynamicEntityOperation.DELETE, splitNameWithBankId) -> ResourceDoc( - endPoint, implementedInApiVersion, buildDeleteFunctionName(bankId, entityName), "DELETE", @@ -367,7 +361,6 @@ object DynamicEntityHelper { val myErrorMessagesWithJson = if(personalRequiresRole) List(AuthenticatedUserIsRequired, UserHasMissingRoles, InvalidJsonFormat, UnknownError) else List(AuthenticatedUserIsRequired, InvalidJsonFormat, UnknownError) resourceDocs += (DynamicEntityOperation.GET_ALL, mySplitNameWithBankId) -> ResourceDoc( - endPoint, implementedInApiVersion, buildGetAllFunctionName(bankId, s"My$entityName"), "GET", @@ -395,7 +388,6 @@ object DynamicEntityHelper { ) resourceDocs += (DynamicEntityOperation.GET_ONE, mySplitNameWithBankId) -> ResourceDoc( - endPoint, implementedInApiVersion, buildGetOneFunctionName(bankId, s"My$entityName"), "GET", @@ -419,7 +411,6 @@ object DynamicEntityHelper { ) resourceDocs += (DynamicEntityOperation.CREATE, mySplitNameWithBankId) -> ResourceDoc( - endPoint, implementedInApiVersion, buildCreateFunctionName(bankId, s"My$entityName"), "POST", @@ -444,7 +435,6 @@ object DynamicEntityHelper { ) resourceDocs += (DynamicEntityOperation.UPDATE, mySplitNameWithBankId) -> ResourceDoc( - endPoint, implementedInApiVersion, buildUpdateFunctionName(bankId, s"My$entityName"), "PUT", @@ -469,7 +459,6 @@ object DynamicEntityHelper { ) resourceDocs += (DynamicEntityOperation.DELETE, mySplitNameWithBankId) -> ResourceDoc( - endPoint, implementedInApiVersion, buildDeleteFunctionName(bankId, s"My$entityName"), "DELETE", @@ -497,7 +486,6 @@ object DynamicEntityHelper { val publicSplitNameWithBankId = s"Public$splitNameWithBankId" resourceDocs += (DynamicEntityOperation.GET_ALL, publicSplitNameWithBankId) -> ResourceDoc( - endPoint, implementedInApiVersion, buildGetAllFunctionName(bankId, s"Public$entityName"), "GET", @@ -526,7 +514,6 @@ object DynamicEntityHelper { ) resourceDocs += (DynamicEntityOperation.GET_ONE, publicSplitNameWithBankId) -> ResourceDoc( - endPoint, implementedInApiVersion, buildGetOneFunctionName(bankId, s"Public$entityName"), "GET", @@ -557,7 +544,6 @@ object DynamicEntityHelper { val communitySplitNameWithBankId = s"Community$splitNameWithBankId" resourceDocs += (DynamicEntityOperation.GET_ALL, communitySplitNameWithBankId) -> ResourceDoc( - endPoint, implementedInApiVersion, buildGetAllFunctionName(bankId, s"Community$entityName"), "GET", @@ -589,7 +575,6 @@ object DynamicEntityHelper { ) resourceDocs += (DynamicEntityOperation.GET_ONE, communitySplitNameWithBankId) -> ResourceDoc( - endPoint, implementedInApiVersion, buildGetOneFunctionName(bankId, s"Community$entityName"), "GET", diff --git a/obp-api/src/main/scala/code/api/openidconnect.scala b/obp-api/src/main/scala/code/api/openidconnect.scala index c74d853f9a..b8c491d9ab 100644 --- a/obp-api/src/main/scala/code/api/openidconnect.scala +++ b/obp-api/src/main/scala/code/api/openidconnect.scala @@ -39,7 +39,6 @@ //import com.openbankproject.commons.model.User //import com.openbankproject.commons.util.{ApiVersion, ApiVersionStatus} //import net.liftweb.common._ -//import net.liftweb.http._ //import net.liftweb.json //import net.liftweb.json.JValue //import net.liftweb.mapper.By diff --git a/obp-api/src/main/scala/code/api/sandbox/SandboxApiCalls.scala b/obp-api/src/main/scala/code/api/sandbox/SandboxApiCalls.scala index 9adab10c73..8390eb2dd5 100644 --- a/obp-api/src/main/scala/code/api/sandbox/SandboxApiCalls.scala +++ b/obp-api/src/main/scala/code/api/sandbox/SandboxApiCalls.scala @@ -8,8 +8,6 @@ //import code.util.Helper //import code.util.Helper.MdcLoggable //import com.openbankproject.commons.util.ApiVersion -//import net.liftweb.http.S -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json.Extraction //import net.liftweb.util.Helpers._ // diff --git a/obp-api/src/main/scala/code/api/util/APIUtil.scala b/obp-api/src/main/scala/code/api/util/APIUtil.scala index f7c704beac..9981d6168b 100644 --- a/obp-api/src/main/scala/code/api/util/APIUtil.scala +++ b/obp-api/src/main/scala/code/api/util/APIUtil.scala @@ -82,10 +82,7 @@ import javassist.expr.{ExprEditor, MethodCall} import javassist.{CannotCompileException, ClassPool, LoaderClassPath} import net.liftweb.actor.LAFuture import net.liftweb.common._ -import net.liftweb.http._ -import net.liftweb.http.js.JE.JsRaw -import net.liftweb.http.provider.HTTPParam -import net.liftweb.http.rest.RestContinuation +import code.api.JsonResponse import net.liftweb.json import net.liftweb.json.JsonAST.{JField, JNothing, JObject, JString, JValue} import net.liftweb.json.JsonParser.ParseException @@ -116,6 +113,12 @@ import scala.xml.{Elem, XML} object APIUtil extends MdcLoggable with CustomJsonFormats{ + /** HTTP query/form parameter (name + values) — same shape as the former Lift HTTPParam, no Lift-Web dep. */ + case class HTTPParam(name: String, values: List[String]) + object HTTPParam { + def apply(name: String, value: String): HTTPParam = new HTTPParam(name, List(value)) + } + /** * Deobfuscate a Jetty-style OBF: password string. * Replaces org.eclipse.jetty.util.security.Password.deobfuscate @@ -199,11 +202,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ lazy val initPasswd = try {System.getenv("UNLOCK")} catch {case _:Throwable => ""} import code.api.util.ErrorMessages._ - def httpMethod : String = - S.request match { - case Full(r) => r.request.method - case _ => "GET" - } + def httpMethod : String = "GET" def hasDirectLoginHeader(authorization: Box[String]): Boolean = hasHeader("DirectLogin", authorization) @@ -637,19 +636,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ */ def nameOfSpellingParam(): String = "spelling" - def getSpellingParam(): Box[String] = { - S.request match { - case Full(r) => - r.header(nameOfSpellingParam()) match { - case Full(h) => - Full(h) - case _ => - ObpS.param(nameOfSpellingParam()) - } - case _ => - ObpS.param(nameOfSpellingParam()) - } - } + def getSpellingParam(): Box[String] = ObpS.param(nameOfSpellingParam()) def getHeadersCommonPart() = headers ::: List((ResponseHeader.`Correlation-Id`, getCorrelationId())) @@ -673,7 +660,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ //Note: changed noContent--> defaultSuccess, because of the Swagger format. (Not support empty in DataType, maybe fix it latter.) def noContentJsonResponse(implicit headers: CustomResponseHeaders = CustomResponseHeaders(Nil)) : JsonResponse = - JsonResponse(JsRaw(""), getHeaders() ::: headers.list, Nil, 204) + JsonResponse(JNull, getHeaders() ::: headers.list, Nil, 204) def successJsonResponse(json: JsonAST.JValue, httpCode : Int = 200)(implicit headers: CustomResponseHeaders = CustomResponseHeaders(Nil)) : JsonResponse = { val cc = ApiSession.updateCallContext(Spelling(getSpellingParam()), None) @@ -717,21 +704,21 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ val httpBody = None val jwsHeaders = getSignRequestHeadersNewStyle(callContext,httpBody).list val responseHeaders = getRequestHeadersNewStyle(callContext,httpBody).list - JsonResponse(JsRaw(""), getHeaders() ::: headers.list ::: jwsHeaders ::: responseHeaders, Nil, 204) + JsonResponse(JNull, getHeaders() ::: headers.list ::: jwsHeaders ::: responseHeaders, Nil, 204) case Some(c) if c.httpCode.isDefined => val httpBody = Full(JsonAST.compactRender(jsonValue)) val jwsHeaders = getSignRequestHeadersNewStyle(callContext,httpBody).list val responseHeaders = getRequestHeadersNewStyle(callContext,httpBody).list val code = checkConditionalRequest(callContext, c.verb, c.httpCode.get, httpBody) if(code == 304) - JsonResponse(JsRaw(""), getHeaders() ::: headers.list ::: jwsHeaders ::: responseHeaders, Nil, code) + JsonResponse(JNull, getHeaders() ::: headers.list ::: jwsHeaders ::: responseHeaders, Nil, code) else JsonResponse(jsonValue, getHeaders() ::: headers.list ::: jwsHeaders ::: responseHeaders, Nil, code) case Some(c) if c.verb.toUpperCase() == "DELETE" => val httpBody = None val jwsHeaders = getSignRequestHeadersNewStyle(callContext,httpBody).list val responseHeaders = getRequestHeadersNewStyle(callContext,httpBody).list - JsonResponse(JsRaw(""), getHeaders() ::: headers.list ::: jwsHeaders ::: responseHeaders, Nil, 204) + JsonResponse(JNull, getHeaders() ::: headers.list ::: jwsHeaders ::: responseHeaders, Nil, 204) case _ => val httpBody = Full(JsonAST.compactRender(jsonValue)) val jwsHeaders = getSignRequestHeadersNewStyle(callContext,httpBody).list @@ -807,12 +794,13 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ def oauthHeaderRequiredJsonResponse(implicit headers: CustomResponseHeaders = CustomResponseHeaders(Nil)) : JsonResponse = JsonResponse(Extraction.decompose(ErrorMessage(message = "Authentication via OAuth is required", code = 400)), getHeaders() ::: headers.list, Nil, 400) - lazy val CurrencyIsoCodeFromXmlFile: Elem = LiftRules.getResource("/media/xml/ISOCurrencyCodes.xml").map{ url => - val input: InputStream = url.openStream() - val xml = XML.load(input) - if (input != null) input.close() + lazy val CurrencyIsoCodeFromXmlFile: Elem = { + val is = getClass.getResourceAsStream("/media/xml/ISOCurrencyCodes.xml") + if (is == null) throw new RuntimeException(s"$UnknownError,ISOCurrencyCodes.xml is missing in OBP server. ") + val xml = XML.load(is) + is.close() xml - }.openOrThrowException(s"$UnknownError,ISOCurrencyCodes.xml is missing in OBP server. ") + } /** check the currency ISO code from the ISOCurrencyCodes.xml file */ def isValidCurrencyISOCode(currencyCode: String): Boolean = { @@ -1551,11 +1539,6 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ case class BigIntBody(value: BigInt) extends PrimaryDataBody[BigInt] case class JArrayBody(value: JArray) extends PrimaryDataBody[JArray] - /** - * Any dynamic endpoint's ResourceDoc, it's partialFunction should set this stub endpoint. - */ - val dynamicEndpointStub: OBPEndpoint = Functions.doNothing - object ResourceDoc{ private val operationIdToResourceDoc: ConcurrentHashMap[String, ResourceDoc] = new ConcurrentHashMap[String, ResourceDoc] @@ -1589,7 +1572,6 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ // Used to document the API calls case class ResourceDoc( - partialFunction: OBPEndpoint, // PartialFunction[Req, Box[User] => Box[JsonResponse]], implementedInApiVersion: ScannedApiVersion, // TODO: Use ApiVersion enumeration instead of string partialFunctionName: String, // The string name of the partial function that implements this resource. Could use it to link to the source code that implements the call requestVerb: String, // GET, POST etc. TODO: Constrain to GET, POST etc. @@ -1614,8 +1596,8 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ http4sPartialFunction: Http4sEndpoint = None, // http4s endpoint handler // Native http4s handler for runtime-compiled dynamic endpoints (Piece C). Defaulted to None so // no existing construction site changes. Set by DynamicResourceDocsEndpointGroup / practise group - // (with partialFunction = dynamicEndpointStub); run by code.api.dynamic.endpoint.Http4sDynamicEndpoint. - dynamicHttp4sFunction: Option[OBPEndpointIO] = None + // run by code.api.dynamic.endpoint.Http4sDynamicEndpoint. + dynamicHttp4sFunction: Option[Http4sEndpointIO] = None ) { // this code block will be merged to constructor. { @@ -1681,12 +1663,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ private var _isEndpointAuthCheck = false def isNotEndpointAuthCheck = !_isEndpointAuthCheck -// code.api.util.APIUtil.ResourceDoc.connectorMethods - // set dependent connector methods - var connectorMethods: List[String] = getDependentConnectorMethods(partialFunction) - .map( - value => ("obp."+value).intern() // - ) // add prefix "obp.", as MessageDoc#process + var connectorMethods: List[String] = Nil // add connector method to endpoint info addEndpointInfos(connectorMethods, partialFunctionName, implementedInApiVersion) @@ -1843,236 +1820,6 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ } } - /** - * According errorResponseBodies whether contains AuthenticatedUserIsRequired and UserHasMissingRoles do validation. - * So can avoid duplicate code in endpoint body for expression do check. - * Note: maybe this will be misused, So currently just comment out. - */ - //lazy val wrappedEndpoint: OBPEndpoint = wrappedWithAuthCheck(partialFunction) - - /** - * wrapped an endpoint to a new one, let it do auth check before execute the endpoint body - * - * @param obpEndpoint original endpoint - * @return wrapped endpoint - */ - def wrappedWithAuthCheck(obpEndpoint: OBPEndpoint): OBPEndpoint = { - _isEndpointAuthCheck = true - - def checkAuth(cc: CallContext): Future[(Box[User], Option[CallContext])] = authMode match { - case UserOnly | UserAndApplication => - if (AuthCheckIsRequired) authenticatedAccessFun(cc) else anonymousAccessFun(cc) - case ApplicationOnly | UserOrApplication => - applicationAccessFun(cc) - } - - def checkObpIds(obpKeyValuePairs: List[(String, String)], callContext: Option[CallContext]): Future[Option[CallContext]] = { - Future{ - val allInvalidValueParis = obpKeyValuePairs - .filter( - keyValuePair => - !checkObpId(keyValuePair._2).equals(SILENCE_IS_GOLDEN) - ) - if(allInvalidValueParis.nonEmpty){ - throw new RuntimeException(s"$InvalidJsonFormat Here are all invalid values: $allInvalidValueParis") - }else{ - callContext - } - } - } - - def checkRoles(bankId: Option[BankId], user: Box[User], cc: Option[CallContext]):Future[Box[Unit]] = { - if (isNeedCheckRoles) { - val bankIdStr = bankId.map(_.value).getOrElse("") - val userIdStr = user.map(_.userId).openOr("") - val consumerId = APIUtil.getConsumerPrimaryKey(cc) - val errorMessage = if (rolesForCheck.filter(_.requiresBankId).isEmpty) - UserHasMissingRoles + rolesForCheck.mkString(" or ") - else - UserHasMissingRoles + rolesForCheck.mkString(" or ") + s" for BankId($bankIdStr)." - Helper.booleanToFuture(errorMessage, cc = cc) { - APIUtil.handleAccessControlWithAuthMode(bankIdStr, userIdStr, consumerId, rolesForCheck, authMode) - } - } else { - Future.successful(Full(Unit)) - } - } - - def checkBank(bankId: Option[BankId], callContext: Option[CallContext]): Future[(Bank, Option[CallContext])] = { - if (isNeedCheckBank && bankId.isDefined) { - checkBankFun(bankId.get)(callContext) - } else { - Future.successful(null.asInstanceOf[Bank] -> callContext) - } - } - - def checkAccount(bankId: Option[BankId], accountId: Option[AccountId], callContext: Option[CallContext]): Future[(BankAccount, Option[CallContext])] = { - if(isNeedCheckAccount && bankId.isDefined && accountId.isDefined) { - checkAccountFun(bankId.get)(accountId.get, callContext) - } else { - Future.successful(null.asInstanceOf[BankAccount] -> callContext) - } - } - - def checkView(viewId: Option[ViewId], - bankId: Option[BankId], - accountId: Option[AccountId], - boxUser: Box[User], - callContext: Option[CallContext]): Future[View] = { - if(isNeedCheckView && bankId.isDefined && accountId.isDefined && viewId.isDefined) { - val bankIdAccountId = BankIdAccountId(bankId.get, accountId.get) - checkViewFun(viewId.get)(bankIdAccountId, boxUser, callContext) - } else { - Future.successful(null.asInstanceOf[View]) - } - } - - def checkCounterparty(counterpartyId: Option[CounterpartyId], callContext: Option[CallContext]): OBPReturnType[CounterpartyTrait] = { - if(isNeedCheckCounterparty && counterpartyId.isDefined) { - checkCounterpartyFun(counterpartyId.get)(callContext) - } else { - Future.successful(null.asInstanceOf[CounterpartyTrait] -> callContext) - } - } - // reset connectorMethods - { - val checkerFunctions = mutable.ListBuffer[PartialFunction[_, _]]() - authMode match { - case UserOnly | UserAndApplication => - if (AuthCheckIsRequired) checkerFunctions += authenticatedAccessFun - else checkerFunctions += anonymousAccessFun - case ApplicationOnly | UserOrApplication => - checkerFunctions += applicationAccessFun - } - if (isNeedCheckRoles) { - checkerFunctions += checkRolesFun - } - if (isNeedCheckBank) { - checkerFunctions += checkBankFun - } - if (isNeedCheckAccount) { - checkerFunctions += checkAccountFun - } - if (isNeedCheckView) { - checkerFunctions += checkViewFun - } - if (isNeedCheckCounterparty) { - checkerFunctions += checkCounterpartyFun - } - val addedMethods: List[String] = checkerFunctions.toList.flatMap(getDependentConnectorMethods(_)) - .map(value =>("obp." +value).intern()) - - // add connector method to endpoint info - addEndpointInfos(addedMethods, partialFunctionName, implementedInApiVersion) - - this.connectorMethods = this.connectorMethods match { - case x if addedMethods.nonEmpty => (addedMethods ::: x).distinct - case x => x - } - } - - - val isUrlMatchesResourceDocUrl: List[String] => Boolean = { - val urlInDoc = StringUtils.split(this.requestUrl, '/') - val pathVariableNames = findPathVariableNames(this.requestUrl) - - (requestUrl: List[String]) => { - if (requestUrl == urlInDoc) { - true - } else { - (requestUrl.size == urlInDoc.size) && - urlInDoc.zip(requestUrl).forall { - case (k, v) => - k == v || pathVariableNames.contains(k) - } - } - } - } - - new OBPEndpoint { - override def isDefinedAt(x: Req): Boolean = - obpEndpoint.isDefinedAt(x) && isUrlMatchesResourceDocUrl(x.path.partPath) - - override def apply(req: Req): CallContext => Box[JsonResponse] = { - val originFn: CallContext => Box[JsonResponse] = obpEndpoint.apply(req) - - val pathParams = getPathParams(req.path.partPath) - - val allObpKeyValuePairs = if(req.request.method =="POST" &&req.json.isDefined) - getAllObpIdKeyValuePairs(req.json.getOrElse(JString(""))) - else Nil - - val bankId = pathParams.get("BANK_ID").map(BankId(_)) - val accountId = pathParams.get("ACCOUNT_ID").map(AccountId(_)) - val viewId = pathParams.get("VIEW_ID").map(ViewId(_)) - val counterpartyId = pathParams.get("COUNTERPARTY_ID").map(CounterpartyId(_)) - - val request: Box[Req] = S.request - val session: Box[LiftSession] = S.session - - /** - * Please note the order of validations: - * 1. authentication - * 2. check bankId - * 3. roles check - * 4. check accountId - * 5. view access - * 6. check counterpartyId - * - * A Bank MUST be checked before Roles. - * In opposite case we get next paradox: - * - We set non existing bank - * - We get error message that we don't have a proper role - * - We cannot assign the role to non existing bank - */ - cc: CallContext => { - implicit val ec = EndpointContext(Some(cc)) // Supply call context in case of saving row to the metric table - // if authentication check, do authorizedAccess, else do Rate Limit check - for { - (boxUser, callContext) <- checkAuth(cc) - - _ <- checkObpIds(allObpKeyValuePairs, callContext) - - // check bankId is valid - (bank, callContext) <- checkBank(bankId, callContext) - - // roles check - _ <- checkRoles(bankId, boxUser, callContext) - - // check accountId is valid - (account, callContext) <- checkAccount(bankId, accountId, callContext) - - // check user access permission of this viewId corresponding view - view <- checkView(viewId, bankId, accountId, boxUser, callContext) - - counterparty <- checkCounterparty(counterpartyId, callContext) - - } yield { - val newCallContext = if(boxUser.isDefined) callContext.map(_.copy(user=boxUser)) else callContext - - // process after authentication interceptor, get intercept result - val jsonResponse:Box[JsonResponse] = afterAuthenticateInterceptResult(newCallContext, operationId) - - jsonResponse match { - case response @Full(_) => - // directly return response, not go to endpoint body - (response, newCallContext) - case _ => - //pass session and request to endpoint body - val boxResponse: Box[JsonResponse] = S.init(request, session.orNull) { - // pass user, bank, account and view to endpoint body - SS.init(boxUser, bank, account, view, newCallContext) { - originFn(newCallContext.orNull) - } - } - (boxResponse, newCallContext) - } - } - } - } - } - - } } def buildOperationId(apiVersion: ScannedApiVersion, partialFunctionName: String) = @@ -2206,19 +1953,10 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ ) // Define relations between API end points. Used to create _links in the JSON and maybe later for API Explorer browsing - case class ApiRelation( - fromPF : OBPEndpoint, - toPF : OBPEndpoint, - rel : String - ) + case class ApiRelation(rel: String) // Populated from Resource Doc and ApiRelation - case class InternalApiLink( - fromPF : OBPEndpoint, - toPF : OBPEndpoint, - rel : String, - requestUrl: String - ) + case class InternalApiLink(rel: String, requestUrl: String) // Used to pass context of current API call to the function that generates links for related Api calls. case class DataContext( @@ -2230,9 +1968,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ transactionId: Option[TransactionId] ) - case class CallerContext( - caller : OBPEndpoint - ) + case class CallerContext(caller: String) case class CodeContext( resourceDocsArrayBuffer : ArrayBuffer[ResourceDoc], @@ -2386,33 +2122,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ def getApiLinkTemplates(callerContext: CallerContext, codeContext: CodeContext - ) : List[InternalApiLink] = { - - - - // Relations of the API version where the caller is defined. - val relations = codeContext.relationsArrayBuffer.toList - - // Resource Docs - // Note: This doesn't allow linking to calls in earlier versions of the API - // TODO: Fix me - val resourceDocs = codeContext.resourceDocsArrayBuffer - - val pf = callerContext.caller - - val internalApiLinks: List[InternalApiLink] = for { - relation <- relations.filter(r => r.fromPF == pf) - toResourceDoc <- resourceDocs.find(rd => rd.partialFunction == relation.toPF) - } - yield new InternalApiLink( - pf, - toResourceDoc.partialFunction, - relation.rel, - // Add the vVersion to the documented url - s"/${toResourceDoc.implementedInApiVersion.vDottedApiVersion}${toResourceDoc.requestUrl}" - ) - internalApiLinks - } + ) : List[InternalApiLink] = Nil @@ -2728,16 +2438,10 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ result } - /** - * The POST or PUT body. This will be empty if the content - * type is application/x-www-form-urlencoded or a multipart mime. - * It will also be empty if rawInputStream is accessed - */ - def getRequestBody(req: Box[Req]) = req.flatMap(_.body).map(_.map(_.toChar)).map(_.mkString) /** * @return - the HTTP session ID */ - def getCorrelationId(): String = S.containerSession.map(_.sessionId).openOr("") + def getCorrelationId(): String = "" /** * @return - the trusted client IP address. * @@ -2745,34 +2449,24 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ * When `trust.proxy.enabled = true`, consults `trust.proxy.header` (default "X-Real-IP"). * See [[RemoteIpUtil]] for configuration details and proxy-trust caveats. */ - def getRemoteIpAddress(): String = { - val socketPeer = S.containerRequest.map(_.remoteAddress).openOr("Unknown") - RemoteIpUtil.resolveClientIp(socketPeer, getLiftRequestHeader) - } + def getRemoteIpAddress(): String = "Unknown" - private def getLiftRequestHeader(name: String): Option[String] = { - S.request.toOption.flatMap { req => - req.request.headers - .find(_.name.equalsIgnoreCase(name)) - .flatMap(_.values.headOption) - } - } /** * @return - the fully qualified name of the client host or last seen proxy */ - def getRemoteHost(): String = S.containerRequest.map(_.remoteHost).openOr("Unknown") + def getRemoteHost(): String = "Unknown" /** * @return - the source port of the client or last seen proxy. */ - def getRemotePort(): Int = S.containerRequest.map(_.remotePort).openOr(0) + def getRemotePort(): Int = 0 /** * @return - the server port */ - def getServerPort(): Int = S.containerRequest.map(_.serverPort).openOr(0) + def getServerPort(): Int = 0 /** * @return - the host name of the server */ - def getServerName(): String = S.containerRequest.map(_.serverName).openOr("Unknown") + def getServerName(): String = "Unknown" /** * Defines Gateway Custom Response Header. @@ -2781,16 +2475,10 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ /** * Set value of Gateway Custom Response Header. */ - def setGatewayResponseHeader(s: S)(value: String) = s.setSessionAttribute(gatewayResponseHeaderName, value) /** * @return - Gateway Custom Response Header. */ - def getGatewayResponseHeader() = { - S.getSessionAttribute(gatewayResponseHeaderName) match { - case Full(h) => List((gatewayResponseHeaderName, h)) - case _ => Nil - } - } + def getGatewayResponseHeader(): List[(String, String)] = Nil def getGatewayLoginJwt(): Option[String] = { getGatewayResponseHeader() match { case x :: Nil => @@ -2936,35 +2624,11 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ def enableVersionIfAllowed(version: ScannedApiVersion) : Boolean = { val allowed: Boolean = if (versionIsAllowed(version) ) { - version match { - // case ApiVersion.v1_0 => LiftRules.statelessDispatch.append(v1_0.OBPAPI1_0) - // case ApiVersion.v1_1 => LiftRules.statelessDispatch.append(v1_1.OBPAPI1_1) - // case ApiVersion.v1_2 => LiftRules.statelessDispatch.append(v1_2.OBPAPI1_2) - // Can we depreciate the above? - case ApiVersion.v1_2_1 => LiftRules.statelessDispatch.append(v1_2_1.OBPAPI1_2_1) - case ApiVersion.v1_3_0 => LiftRules.statelessDispatch.append(v1_3_0.OBPAPI1_3_0) - case ApiVersion.v1_4_0 => LiftRules.statelessDispatch.append(v1_4_0.OBPAPI1_4_0) - case ApiVersion.v2_0_0 => LiftRules.statelessDispatch.append(v2_0_0.OBPAPI2_0_0) - case ApiVersion.v2_1_0 => LiftRules.statelessDispatch.append(v2_1_0.OBPAPI2_1_0) - case ApiVersion.v2_2_0 => LiftRules.statelessDispatch.append(v2_2_0.OBPAPI2_2_0) - case ApiVersion.v3_0_0 => LiftRules.statelessDispatch.append(v3_0_0.OBPAPI3_0_0) - case ApiVersion.v3_1_0 => LiftRules.statelessDispatch.append(v3_1_0.OBPAPI3_1_0) - case ApiVersion.v4_0_0 => LiftRules.statelessDispatch.append(v4_0_0.OBPAPI4_0_0) - case ApiVersion.v5_0_0 => LiftRules.statelessDispatch.append(v5_0_0.OBPAPI5_0_0) - case ApiVersion.v5_1_0 => LiftRules.statelessDispatch.append(v5_1_0.OBPAPI5_1_0) - case ApiVersion.v6_0_0 => LiftRules.statelessDispatch.append(v6_0_0.OBPAPI6_0_0) - // dynamic-endpoint dispatch migrated to Http4sDynamicEndpoint (wired into Http4sApp.baseServices). - // Keep the case label with an empty body so ApiVersion.`dynamic-endpoint` does NOT fall through - // to the ScannedApiVersion branch below (which would re-append it via ScannedApis). - case ApiVersion.`dynamic-endpoint` => // LiftRules.statelessDispatch.append(OBPAPIDynamicEndpoint) - // dynamic-entity endpoints migrated to Http4sDynamicEntity (wired into Http4sApp.baseServices). - // Keep the case label with an empty body so ApiVersion.`dynamic-entity` does NOT fall through - // to the ScannedApiVersion branch below (which would re-append it via ScannedApis). - case ApiVersion.`dynamic-entity` => // LiftRules.statelessDispatch.append(OBPAPIDynamicEntity) - case version: ScannedApiVersion => - ScannedApis.versionMapScannedApis.get(version).foreach(api => LiftRules.statelessDispatch.append(api)) - case _ => logger.info(s"There is no ${version.toString}") - } + // All endpoint dispatch is served natively by http4s (Http4sApp.baseServices). The Lift + // `statelessDispatch.append(...)` registrations for v1.2.1–v6.0.0 and the ScannedApis + // standards were retired in the Lift-Web teardown — every aggregator/standard was already a + // `routes = Nil` empty shell, so the bridge never served them. This method now only gates and + // logs version enablement (consumed via `versionIsAllowed` / version discovery). logger.info(s"${version.fullyQualifiedVersion} was ENABLED") @@ -2977,45 +2641,13 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ } - type OBPEndpoint = PartialFunction[Req, CallContext => Box[JsonResponse]] type OBPReturnType[T] = Future[(T, Option[CallContext])] type Http4sEndpoint = Option[HttpRoutes[IO]] - // Native http4s endpoint type for runtime-compiled dynamic endpoints (Piece C). Distinct from - // OBPEndpoint (which is Lift-typed and shared by every static endpoint, so must not change): - // the dynamic-code template compiles to this, and Http4sDynamicEndpoint runs it directly. - type OBPEndpointIO = PartialFunction[org.http4s.Request[IO], CallContext => IO[org.http4s.Response[IO]]] - - - def getAllowedEndpoints (endpoints : Iterable[OBPEndpoint], resourceDocs: ArrayBuffer[ResourceDoc]) : List[OBPEndpoint] = { - - val allowedResourceDocs: ArrayBuffer[ResourceDoc] = getAllowedResourceDocs(endpoints, resourceDocs) - - allowedResourceDocs.map(_.partialFunction).toList - } - - def getAllowedResourceDocs(endpoints: Iterable[OBPEndpoint], resourceDocs: ArrayBuffer[ResourceDoc]): ArrayBuffer[ResourceDoc] = { - // Endpoint Operation Ids - val disabledEndpointOperationIds = getDisabledEndpointOperationIds - - // Endpoint Operation Ids - val enabledEndpointOperationIds = getEnabledEndpointOperationIds + // Native http4s endpoint type for runtime-compiled dynamic endpoints (Piece C). + // The dynamic-code template compiles to this, and Http4sDynamicEndpoint runs it directly. + type Http4sEndpointIO = PartialFunction[org.http4s.Request[IO], CallContext => IO[org.http4s.Response[IO]]] - val routes = for ( - item <- resourceDocs - if - // Remove any Resource Doc / endpoint mentioned in Disabled endpoints in Props - !disabledEndpointOperationIds.contains(item.operationId) && - // Only allow Resource Doc / endpoints mentioned in enabled endpoints - unless none are mentioned in which case ignore. - (enabledEndpointOperationIds.contains(item.operationId) || enabledEndpointOperationIds.isEmpty) && - // Only allow Resource Doc if it matches one of the pre selected endpoints from the version list. - // i.e. this function may receive more Resource Docs than version endpoints - endpoints.exists(_ == item.partialFunction) - ) - yield item - routes - } - def extractToCaseClass[T](in: String)(implicit ev: Manifest[T]): Box[T] = { try { val parseJValue: JValue = parse(in) @@ -3065,161 +2697,6 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ } } - /** - * @param in LAFuture with a useful payload. Payload is tuple(Case Class, Option[SessionContext]) - * @return value of type JsonResponse - * - * Process a request asynchronously. The thread will not - * block until there's a response. The parameter is a function - * that takes a function as it's parameter. The function is invoked - * when the calculation response is ready to be rendered: - * RestContinuation.async { - * reply => { - * myActor ! DoCalc(123, answer => reply{XmlResponse({answer})}) - * } - * } - * The body of the function will be executed on a separate thread. - * When the answer is ready, apply the reply function... the function - * body will be executed in the scope of the current request (the - * current session and the current Req object). - */ - def futureToResponse[T](in: LAFuture[(T, Option[CallContext])]): JsonResponse = { - RestContinuation.async(reply => { - in.onSuccess( - t => writeMetricEndpointTiming(t._1, t._2.map(_.toLight))(reply.apply(successJsonResponseNewStyle(cc = t._1, t._2)(getHeadersNewStyle(t._2.map(_.toLight))))) - ) - in.onFail { - case Failure(_, Full(JsonResponseException(jsonResponse)), _) => - reply.apply(jsonResponse) - case Failure(null, e, _) => - e.foreach(logger.error("", _)) - val errorResponse = getFilteredOrFullErrorMessage(e) - Full(reply.apply(errorResponse)) - case Failure(msg, _, _) => - extractAPIFailureNewStyle(msg) match { - case Some(af) => - val callContextLight = af.ccl.map(_.copy(httpCode = Some(af.failCode))) - writeMetricEndpointTiming(af.failMsg, callContextLight)(reply.apply(errorJsonResponse(af.failMsg, af.failCode, callContextLight)(getHeadersNewStyle(af.ccl)))) - case _ => - val errorResponse: JsonResponse = errorJsonResponse(msg) - reply.apply(errorResponse) - } - case _ => - val errorResponse: JsonResponse = errorJsonResponse(UnknownError) - reply.apply(errorResponse) - } - }) - } - - - /** - * @param in LAFuture with a useful payload. Payload is tuple(Case Class, Option[SessionContext]) - * @return value of type Box[JsonResponse] - * - * Process a request asynchronously. The thread will not - * block until there's a response. The parameter is a function - * that takes a function as it's parameter. The function is invoked - * when the calculation response is ready to be rendered: - * RestContinuation.async { - * reply => { - * myActor ! DoCalc(123, answer => reply{XmlResponse({answer})}) - * } - * } - * The body of the function will be executed on a separate thread. - * When the answer is ready, apply the reply function... the function - * body will be executed in the scope of the current request (the - * current session and the current Req object). - */ - def futureToBoxedResponse[T](in: LAFuture[(T, Option[CallContext])]): Box[JsonResponse] = { - RestContinuation.async(reply => { - in.onSuccess{ _ match { - case (Full(jsonResponse: JsonResponse), _: Option[_]) => - reply(jsonResponse) - case t => Full( - writeMetricEndpointTiming(t._1, t._2.map(_.toLight))( - reply.apply(successJsonResponseNewStyle(t._1, t._2)(getHeadersNewStyle(t._2.map(_.toLight)))) - ) - ) - } - } - in.onFail { - case Failure("Continuation", Full(e), _) if e.isInstanceOf[LiftFlowOfControlException] => - val f: ((=> LiftResponse) => Unit) => Unit = ReflectUtils.getFieldByType(e, "f") - f(reply(_)) - - case Failure(_, Full(JsonResponseException(jsonResponse)), _) => - reply.apply(jsonResponse) - - case Failure(null, e, _) => - e.foreach(logger.error("", _)) - val errorResponse = getFilteredOrFullErrorMessage(e) - Full(reply.apply(errorResponse)) - case Failure(msg, e, _) => - e.foreach(logger.error(msg, _)) - extractAPIFailureNewStyle(msg) match { - case Some(af) => - val callContextLight = af.ccl.map(_.copy(httpCode = Some(af.failCode))) - Full(writeMetricEndpointTiming(af.failMsg, callContextLight)(reply.apply(errorJsonResponse(af.failMsg, af.failCode, callContextLight)(getHeadersNewStyle(af.ccl))))) - case _ => - val errorResponse: JsonResponse = errorJsonResponse(msg) - Full((reply.apply(errorResponse))) - } - case _ => - val errorResponse: JsonResponse = errorJsonResponse(UnknownError) - Full(reply.apply(errorResponse)) - } - }) - } - - private def getFilteredOrFullErrorMessage[T](e: Box[Throwable]): JsonResponse = { - def findObpMessage(t: Throwable): Option[String] = { - if (t == null) None - else Option(t.getMessage).filter(_.startsWith("OBP-")) - .orElse(findObpMessage(t.getCause)) - } - getPropsAsBoolValue("display_internal_errors", false) match { - case true => // Show all error in a chain - errorJsonResponse( - e.map { error => - val leadMessage = findObpMessage(error).getOrElse(AnUnspecifiedOrInternalErrorOccurred) - leadMessage + " -> " + error.getStackTrace().mkString(";") - }.getOrElse(AnUnspecifiedOrInternalErrorOccurred) - ) - case false => // Do not display internal errors - val obpMessage = e.flatMap(error => findObpMessage(error)) - errorJsonResponse(obpMessage.getOrElse(AnUnspecifiedOrInternalErrorOccurred)) - } - } - - implicit def scalaFutureToJsonResponse[T](scf: OBPReturnType[T])(implicit m: Manifest[T]): JsonResponse = { - futureToResponse(scalaFutureToLaFuture(scf)) - } - - /** - * This function is implicitly used at Endpoints to transform a Scala Future to Box[JsonResponse] for instance next part of code - * for { - users <- Future { someComputation } - } yield { - users - } - will be translated by Scala compiler to - APIUtil.scalaFutureToBoxedJsonResponse( - for { - users <- Future { someComputation } - } yield { - users - } - ) - * @param scf - * @param m - * @tparam T - * @return - */ - implicit def scalaFutureToBoxedJsonResponse[T](scf: OBPReturnType[T])(implicit t: EndpointTimeout, context: EndpointContext, m: Manifest[T]): Box[JsonResponse] = { - futureToBoxedResponse(scalaFutureToLaFuture(FutureUtil.futureWithTimeout(scf))) - } - - /** * TODO: Update this Doc string: * This function is planed to be used at an endpoint in order to get a User based on Authorization Header data @@ -3228,25 +2705,23 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ * @return A Tuple of an User wrapped into a Future and optional session context data */ def getUserAndSessionContextFuture(cc: CallContext): OBPReturnType[Box[User]] = { - val s = S val spelling = getSpellingParam() - - // NEW: Prefer CallContext fields, fall back to S.request for Lift compatibility - // This allows http4s to use the same auth chain by populating CallContext fields + + // In the http4s path, cc.* fields are always populated by Http4sSupport. val body: Box[String] = cc.httpBody match { case Some(b) => Full(b) - case None => getRequestBody(S.request) + case None => Empty } - - val implementedInVersion = if (cc.implementedInVersion.nonEmpty) - cc.implementedInVersion - else - S.request.openOrThrowException(attemptedToOpenAnEmptyBox).view - - val verb = if (cc.verb.nonEmpty) - cc.verb - else - S.request.openOrThrowException(attemptedToOpenAnEmptyBox).requestType.method + + val implementedInVersion = if (cc.implementedInVersion.nonEmpty) + cc.implementedInVersion + else + "" + + val verb = if (cc.verb.nonEmpty) + cc.verb + else + "GET" val url = if (cc.url.nonEmpty) cc.url @@ -3258,10 +2733,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ else getCorrelationId() - val reqHeaders = if (cc.requestHeaders.nonEmpty) - cc.requestHeaders - else - S.request.map(_.request.headers).openOr(Nil) + val reqHeaders = cc.requestHeaders val remoteIpAddress = if (cc.ipAddress.nonEmpty) cc.ipAddress @@ -3376,7 +2848,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ else if (getPropsAsBoolValue("allow_gateway_login", false) && hasGatewayHeader(cc.authReqHeaderField)) { APIUtil.getPropsValue("gateway.host") match { case Full(h) if h.split(",").toList.exists(_.equalsIgnoreCase(remoteIpAddress) == true) => // Only addresses from white list can use this feature - val (httpCode, message, parameters) = GatewayLogin.validator(s.request) + val (httpCode, message, parameters) = GatewayLogin.validator(cc.authReqHeaderField) httpCode match { case 200 => val payload = GatewayLogin.parseJwt(parameters) @@ -3911,20 +3383,18 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ // Use brand in parameter (query or form) val brand: Option[String] = ObpS.param(brandParameter) match { case Full(value) => { - // If found, and has a valid format, set the session. + // If found, and has a valid format, return it. if (isValidID(value)) { - S.setSessionAttribute(brandParameter, value) - logger.debug(s"activeBrand says: I found a $brandParameter param. $brandParameter session has been set to: ${S.getSessionAttribute(brandParameter)}") + logger.debug(s"activeBrand says: I found a $brandParameter param with value: $value") Some(value) } else { logger.warn(s"activeBrand says: ${ErrorMessages.InvalidBankIdFormat}") None } } - case _ => { - // Else look in the session - S.getSessionAttribute(brandParameter) - } + case _ => + // No brand in session (Lift sessions not available in http4s path) + None } brand } @@ -4297,7 +3767,6 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ def toResourceDoc(messageDoc: MessageDoc): ResourceDoc = { val connectorMethodName = {messageDoc.process.replaceAll("obp.","").replace(".","")} ResourceDoc( - null, ApiVersion.v3_1_0, connectorMethodName, requestVerb = { @@ -4767,7 +4236,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ } } - lazy val loginButtonText = getWebUiPropsValue("webui_login_button_text", S.?("log.in")) + lazy val loginButtonText = getWebUiPropsValue("webui_login_button_text", "Log In") // the follow PartialFunction just delegate one method, in this way will be compiled to a class, in order to trace call whitch connector methods private val authenticatedAccessFun: PartialFunction[CallContext, OBPReturnType[Box[User]]] = { @@ -5034,7 +4503,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ val errorMsg = s"""$AuthenticationTypeIllegal allowed authentication types: ${v.authTypes.mkString("[", ", ", "]")}, current request auth type: $authType""" val errorCode = 400 val errorResponse = ("code", errorCode) ~ ("message", errorMsg) - val jsonResponse = JsonResponse(errorResponse, errorCode).asInstanceOf[JsonResponse] + val jsonResponse = JsonResponse(errorResponse, errorCode) // add correlatedId to header val newHeader = (ResponseHeader.`Correlation-Id` -> callContext.correlationId) :: jsonResponse.headers Some(jsonResponse.copy(headers = newHeader)) @@ -5089,7 +4558,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ object JsonResponseExtractor { def unapply(jsonResponse: JsonResponse): Option[(String, Int)] = jsonResponse match { case JsonResponse(bodyJson, _, _, code) => - val responseBody = bodyJson.toJsCmd + val responseBody = net.liftweb.json.compactRender(bodyJson) (parse(responseBody) \ "message") match { case JString(message) => Some(message -> code) @@ -5199,57 +4668,6 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ } ) - /** - * call an endpoint method - * @param endpoint endpoint method - * @param endpointPartPath endpoint method url slices, it is for endpoint the first case expression - * @param requestType http request method - * @param requestBody http request body - * @param addlParams append request parameters - * @return result of call endpoint method - */ - def callEndpoint(endpoint: OBPEndpoint, endpointPartPath: List[String], requestType: RequestType, requestBody: String = "", addlParams: Map[String, String] = Map.empty): Either[(String, Int), String] = { - val req: Req = S.request.openOrThrowException("no request object can be extract.") - val pathOrigin = req.path - val forwardPath = pathOrigin.copy(partPath = endpointPartPath) - - val body = Full(BodyOrInputStream(IOUtils.toInputStream(requestBody))) - - val paramCalcInfo = ParamCalcInfo(req.paramNames, req._params, Nil, body) - val newRequest = new Req(forwardPath, req.contextPath, requestType, Full("application/json"), req.request, req.nanoStart, req.nanoEnd, false, () => paramCalcInfo, addlParams) - - val user = AuthUser.getCurrentUser - val result = tryo { - - endpoint(newRequest)(CallContext(user = user)) - } - - val func: ((=> LiftResponse) => Unit) => Unit = result match { - case Failure("Continuation", Full(continueException), _) => ReflectUtils.getCallByNameValue(continueException, "f").asInstanceOf[((=> LiftResponse) => Unit) => Unit] - case _ => null - } - - val future = new LAFuture[LiftResponse] - val satisfyFutureFunction: (=> LiftResponse) => Unit = liftResponse => future.satisfy(liftResponse) - func(satisfyFutureFunction) - - val timeoutOfEndpointMethod = 60 * 1000L // endpoint is async, but html template must not async, So here need wait for endpoint value. - - future.get(timeoutOfEndpointMethod) match { - case Full(JsonResponse(jsExp, _, _, code)) if (code.toString.startsWith("20")) => Right(jsExp.toJsCmd) - case Full(JsonResponse(jsExp, _, _, code)) => { - val message = json.parse(jsExp.toJsCmd) - .asInstanceOf[JObject] - .obj - .find(_.name == "message") - .map(_.value.asInstanceOf[JString].s) - .getOrElse("") - Left((message, code)) - } - case Empty => Left((FutureTimeoutException, 500)) - } - } - val berlinGroupV13AliasPath = APIUtil.getPropsValue("berlin_group_v1_3_alias_path","").split("/").toList.map(_.trim) val getAtmsIsPublic = APIUtil.getPropsAsBoolValue("apiOptions.getAtmsIsPublic", true) @@ -5349,7 +4767,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ val allowedAnswerTransactionRequestChallengeAttempts = APIUtil.getPropsAsIntValue("answer_transactionRequest_challenge_allowed_attempts").openOr(3) - lazy val allStaticResourceDocs = (OBPAPI6_0_0.allResourceDocs + lazy val allStaticResourceDocs = (code.api.util.http4s.Http4sResourceDocAggregation.v600 ++ OBP_UKOpenBanking_200.allResourceDocs ++ OBP_UKOpenBanking_310.allResourceDocs // Commented out: Lift endpoints migrated off / removed (Polish, STET, AUOpenBanking, MxOF/CNBV9, BahrainOBF) diff --git a/obp-api/src/main/scala/code/api/util/ApiSession.scala b/obp-api/src/main/scala/code/api/util/ApiSession.scala index 37e36b7ac3..a9d6e0517f 100644 --- a/obp-api/src/main/scala/code/api/util/ApiSession.scala +++ b/obp-api/src/main/scala/code/api/util/ApiSession.scala @@ -16,7 +16,6 @@ import code.views.Views import com.openbankproject.commons.model._ import com.openbankproject.commons.util.{EnumValue, OBPEnumeration} import net.liftweb.common.{Box, Empty} -import net.liftweb.http.provider.HTTPParam import net.liftweb.json.JsonAST.JValue import net.liftweb.util.Helpers import net.liftweb.util.Helpers.tryo diff --git a/obp-api/src/main/scala/code/api/util/AuthorisationUtil.scala b/obp-api/src/main/scala/code/api/util/AuthorisationUtil.scala index ebc7a961c7..45bb3079d6 100644 --- a/obp-api/src/main/scala/code/api/util/AuthorisationUtil.scala +++ b/obp-api/src/main/scala/code/api/util/AuthorisationUtil.scala @@ -1,7 +1,7 @@ package code.api.util import code.api.RequestHeader._ -import net.liftweb.http.provider.HTTPParam +import code.api.util.APIUtil.HTTPParam object AuthorisationUtil { def getAuthorisationHeaders(requestHeaders: List[HTTPParam]): List[String] = { diff --git a/obp-api/src/main/scala/code/api/util/BerlinGroupCheck.scala b/obp-api/src/main/scala/code/api/util/BerlinGroupCheck.scala index 6abb90f692..98026bf4ff 100644 --- a/obp-api/src/main/scala/code/api/util/BerlinGroupCheck.scala +++ b/obp-api/src/main/scala/code/api/util/BerlinGroupCheck.scala @@ -3,14 +3,13 @@ package code.api.util import code.api.berlin.group.ConstantsBG import code.api.berlin.group.v1_3.BgSpecValidation import code.api.{APIFailureNewStyle, RequestHeader} -import code.api.util.APIUtil.{OBPReturnType, fullBoxOrException} +import code.api.util.APIUtil.{HTTPParam, OBPReturnType, fullBoxOrException} import code.api.util.BerlinGroupSigning.{getCertificateFromTppSignatureCertificate, getHeaderValue} import code.metrics.MappedMetric import code.util.Helper.MdcLoggable import com.openbankproject.commons.model.User import com.openbankproject.commons.util.ApiVersion import net.liftweb.common.{Box, Empty} -import net.liftweb.http.provider.HTTPParam import scala.concurrent.Future import com.openbankproject.commons.ExecutionContext.Implicits.global diff --git a/obp-api/src/main/scala/code/api/util/BerlinGroupSigning.scala b/obp-api/src/main/scala/code/api/util/BerlinGroupSigning.scala index 6029defbb5..0ea72011a7 100644 --- a/obp-api/src/main/scala/code/api/util/BerlinGroupSigning.scala +++ b/obp-api/src/main/scala/code/api/util/BerlinGroupSigning.scala @@ -1,6 +1,6 @@ package code.api.util -import code.api.util.APIUtil.OBPReturnType +import code.api.util.APIUtil.{HTTPParam, OBPReturnType} import code.api.util.ErrorUtil.apiFailure import code.api.util.newstyle.RegulatedEntityNewStyle.getRegulatedEntitiesNewStyle import code.api.{ObpApiFailure, RequestHeader} @@ -10,7 +10,6 @@ import code.util.Helper.MdcLoggable import com.openbankproject.commons.ExecutionContext.Implicits.global import com.openbankproject.commons.model.{RegulatedEntityTrait, User} import net.liftweb.common.{Box, Failure, Full} -import net.liftweb.http.provider.HTTPParam import net.liftweb.util.Helpers import java.nio.charset.StandardCharsets diff --git a/obp-api/src/main/scala/code/api/util/ConsentUtil.scala b/obp-api/src/main/scala/code/api/util/ConsentUtil.scala index 0b1ade51ab..6bbccf001c 100644 --- a/obp-api/src/main/scala/code/api/util/ConsentUtil.scala +++ b/obp-api/src/main/scala/code/api/util/ConsentUtil.scala @@ -3,7 +3,7 @@ package code.api.util import code.accountholders.AccountHolders import code.api.berlin.group.ConstantsBG import code.api.berlin.group.v1_3.JSONFactory_BERLIN_GROUP_1_3.{ConsentAccessJson, PostConsentJson} -import code.api.util.APIUtil.fullBoxOrException +import code.api.util.APIUtil.{HTTPParam, fullBoxOrException} import code.api.util.ApiRole.{canCreateEntitlementAtAnyBank, canCreateEntitlementAtOneBank} import code.api.util.BerlinGroupSigning.getHeaderValue import code.api.util.ErrorMessages._ @@ -29,7 +29,6 @@ import com.openbankproject.commons.ExecutionContext.Implicits.global import com.openbankproject.commons.model._ import com.openbankproject.commons.util.ApiStandards import net.liftweb.common._ -import net.liftweb.http.provider.HTTPParam import net.liftweb.json.JsonParser.ParseException import net.liftweb.json.{Extraction, MappingException, compactRender, parse} import net.liftweb.mapper.By diff --git a/obp-api/src/main/scala/code/api/util/CurrencyUtil.scala b/obp-api/src/main/scala/code/api/util/CurrencyUtil.scala index 42f0c1fd2e..959bb67755 100644 --- a/obp-api/src/main/scala/code/api/util/CurrencyUtil.scala +++ b/obp-api/src/main/scala/code/api/util/CurrencyUtil.scala @@ -1,7 +1,5 @@ package code.api.util -import net.liftweb.common.Full -import net.liftweb.http.LiftRules import net.liftweb.json.parse object CurrencyUtil { @@ -15,14 +13,9 @@ object CurrencyUtil { ) def getCurrencies(): Option[CurrenciesJson] = { val filename = s"/currency/currency.json" - val source = LiftRules.loadResourceAsString(filename) - - source match { - case Full(payload) => - val currencies = parse(payload).extract[CurrenciesJson] - Some(currencies) - case _ => None - } + Option(getClass.getResourceAsStream(filename)) + .map(is => scala.io.Source.fromInputStream(is, "UTF-8").mkString) + .map(payload => parse(payload).extract[CurrenciesJson]) } def getCurrencyCodes(): List[String] = { diff --git a/obp-api/src/main/scala/code/api/util/I18NUtil.scala b/obp-api/src/main/scala/code/api/util/I18NUtil.scala index 1dbb7e532b..49533ef5a5 100644 --- a/obp-api/src/main/scala/code/api/util/I18NUtil.scala +++ b/obp-api/src/main/scala/code/api/util/I18NUtil.scala @@ -2,15 +2,10 @@ package code.api.util import code.api.Constant.PARAM_LOCALE import code.util.Helper.{MdcLoggable, ObpS, SILENCE_IS_GOLDEN} - -import java.util.{Date, Locale} - -import code.util.Helper.MdcLoggable import code.webuiprops.MappedWebUiPropsProvider.getWebUiPropsValue import com.openbankproject.commons.model.enums.I18NResourceDocField -import net.liftweb.common.Full -import net.liftweb.http.S -import net.liftweb.http.provider.HTTPCookie + +import java.util.{Date, Locale} object I18NUtil extends MdcLoggable { // Copied from Sofit @@ -27,20 +22,12 @@ object I18NUtil extends MdcLoggable { }.headOption.getOrElse(new Locale(ApiPropsWithAlias.defaultLocale)) def currentLocale() : Locale = { - // Cookie name - val localeCookieName = "SELECTED_LOCALE" ObpS.param(PARAM_LOCALE) match { - // 1st choice: Use query parameter as a source of truth if any - case Full(requestedLocale) if requestedLocale != null && APIUtil.checkShortString(requestedLocale) == SILENCE_IS_GOLDEN => { - val computedLocale = I18NUtil.computeLocale(requestedLocale) - S.addCookie(HTTPCookie(localeCookieName, requestedLocale)) - computedLocale - } - // 2nd choice: Otherwise use the cookie + // Use query parameter as a source of truth if any + case net.liftweb.common.Full(requestedLocale) if requestedLocale != null && APIUtil.checkShortString(requestedLocale) == SILENCE_IS_GOLDEN => + I18NUtil.computeLocale(requestedLocale) case _ => - S.findCookie(localeCookieName).flatMap { - cookie => cookie.value.map(computeLocale) - } openOr getDefaultLocale() + getDefaultLocale() } } // Properly convert a language tag to a Locale diff --git a/obp-api/src/main/scala/code/api/util/JwsUtil.scala b/obp-api/src/main/scala/code/api/util/JwsUtil.scala index f067114846..8cc1b090e8 100644 --- a/obp-api/src/main/scala/code/api/util/JwsUtil.scala +++ b/obp-api/src/main/scala/code/api/util/JwsUtil.scala @@ -8,7 +8,7 @@ import com.nimbusds.jose.util.JSONObjectUtils import com.nimbusds.jose.{JWSAlgorithm, JWSHeader, JWSObject, Payload} import com.openbankproject.commons.model.User import net.liftweb.common.{Box, Failure, Full} -import net.liftweb.http.provider.HTTPParam +import code.api.util.APIUtil.HTTPParam import net.liftweb.json import net.liftweb.util.SecurityHelpers diff --git a/obp-api/src/main/scala/code/api/util/NewStyle.scala b/obp-api/src/main/scala/code/api/util/NewStyle.scala index 231dce369b..4dc515935f 100644 --- a/obp-api/src/main/scala/code/api/util/NewStyle.scala +++ b/obp-api/src/main/scala/code/api/util/NewStyle.scala @@ -55,8 +55,7 @@ import com.openbankproject.commons.model.enums.{SuppliedAnswerType, _} import com.openbankproject.commons.util.JsonUtils import com.tesobe.CacheKeyFromArguments import net.liftweb.common._ -import net.liftweb.http.JsonResponse -import net.liftweb.http.provider.HTTPParam +import code.api.JsonResponse import net.liftweb.json.JsonDSL._ import net.liftweb.json._ import net.liftweb.util.Helpers.tryo diff --git a/obp-api/src/main/scala/code/api/util/OBPParam.scala b/obp-api/src/main/scala/code/api/util/OBPParam.scala index 74f3ea4f16..dbd370eca3 100644 --- a/obp-api/src/main/scala/code/api/util/OBPParam.scala +++ b/obp-api/src/main/scala/code/api/util/OBPParam.scala @@ -4,7 +4,6 @@ import java.util.Date import code.api.util.APIUtil._ import net.liftweb.common.Box -import net.liftweb.http.provider.HTTPParam import org.apache.commons.lang3.StringUtils import scala.collection.immutable.List diff --git a/obp-api/src/main/scala/code/api/util/RequestHeadersUtil.scala b/obp-api/src/main/scala/code/api/util/RequestHeadersUtil.scala index 294f7cc06c..4d45ccc999 100644 --- a/obp-api/src/main/scala/code/api/util/RequestHeadersUtil.scala +++ b/obp-api/src/main/scala/code/api/util/RequestHeadersUtil.scala @@ -1,7 +1,7 @@ package code.api.util import code.api.RequestHeader._ -import net.liftweb.http.provider.HTTPParam +import code.api.util.APIUtil.HTTPParam object RequestHeadersUtil { def checkEmptyRequestHeaderValues(requestHeaders: List[HTTPParam]): List[String] = { diff --git a/obp-api/src/main/scala/code/api/util/ScannedApis.scala b/obp-api/src/main/scala/code/api/util/ScannedApis.scala index 2b5a800707..bfbc688985 100644 --- a/obp-api/src/main/scala/code/api/util/ScannedApis.scala +++ b/obp-api/src/main/scala/code/api/util/ScannedApis.scala @@ -1,20 +1,20 @@ package code.api.util -import code.api.util.APIUtil.{ApiRelation, OBPEndpoint, ResourceDoc} +import code.api.util.APIUtil.ResourceDoc import code.util.ClassScanUtils import com.openbankproject.commons.util.{ApiVersion, ScannedApiVersion} -import net.liftweb.http.LiftRules import scala.collection.mutable.ArrayBuffer /** - * any object extends this trait will be scanned and register the allResourceDocs and routes + * any object extends this trait will be scanned and register the allResourceDocs and routes. + * Endpoint dispatch is served natively by http4s; this trait is now only a discovery marker for + * version + resource-doc aggregation (no longer a Lift `LiftRules.DispatchPF`). */ -trait ScannedApis extends LiftRules.DispatchPF { +trait ScannedApis { val apiVersion: ScannedApiVersion lazy val version: ApiVersion = this.apiVersion val allResourceDocs: ArrayBuffer[ResourceDoc] - val routes: List[OBPEndpoint] // val apiRelations: ArrayBuffer[ApiRelation] } diff --git a/obp-api/src/main/scala/code/api/util/VersionedOBPApis.scala b/obp-api/src/main/scala/code/api/util/VersionedOBPApis.scala index cbc8dac8b3..c39bceb035 100644 --- a/obp-api/src/main/scala/code/api/util/VersionedOBPApis.scala +++ b/obp-api/src/main/scala/code/api/util/VersionedOBPApis.scala @@ -1,6 +1,6 @@ package code.api.util -import code.api.util.APIUtil.{OBPEndpoint, ResourceDoc} +import code.api.util.APIUtil.ResourceDoc import com.openbankproject.commons.util.ApiVersion import scala.collection.mutable.ArrayBuffer @@ -11,6 +11,4 @@ trait VersionedOBPApis { def versionStatus: String def allResourceDocs: ArrayBuffer[ResourceDoc] - - def routes: List[OBPEndpoint] } diff --git a/obp-api/src/main/scala/code/api/util/WriteMetricUtil.scala b/obp-api/src/main/scala/code/api/util/WriteMetricUtil.scala index 0f472095fb..77529a0be8 100644 --- a/obp-api/src/main/scala/code/api/util/WriteMetricUtil.scala +++ b/obp-api/src/main/scala/code/api/util/WriteMetricUtil.scala @@ -1,16 +1,9 @@ package code.api.util -import code.api.DirectLogin -import code.api.util.APIUtil.{ResourceDoc, buildOperationId, getCorrelationId, getPropsAsBoolValue, getPropsValue, hasDirectLoginHeader} -import code.api.util.ErrorMessages.attemptedToOpenAnEmptyBox +import code.api.util.APIUtil.{buildOperationId, getCorrelationId, getPropsAsBoolValue, getPropsValue} import code.metrics.APIMetrics import code.metricsstream.MetricsEventBus -import code.model.Consumer -import code.util.Helper.{MdcLoggable, ObpS} -import com.openbankproject.commons.model.User -import net.liftweb.common.{Box, Empty, Full} -import net.liftweb.http.S -import net.liftweb.util.TimeHelpers.TimeSpan +import code.util.Helper.MdcLoggable import java.util.Date import scala.collection.immutable @@ -97,96 +90,6 @@ object WriteMetricUtil extends MdcLoggable { } } - def writeEndpointMetric(date: TimeSpan, duration: Long, rd: Option[ResourceDoc]) = { - val authorization = S.request.map(_.header("Authorization")).flatten - val directLogin: Box[String] = S.request.map(_.header("DirectLogin")).flatten - if (getPropsAsBoolValue("write_metrics", false)) { - val user = - if (getPropsAsBoolValue("allow_direct_login", true) && directLogin.isDefined) { - DirectLogin.getUser match { - case Full(u) => Full(u) - case _ => Empty - } - } // Direct Login Deprecated - else if (getPropsAsBoolValue("allow_direct_login", true) && hasDirectLoginHeader(authorization)) { - DirectLogin.getUser match { - case Full(u) => Full(u) - case _ => Empty - } - } else { - Empty - } - - val consumer = - if (getPropsAsBoolValue("allow_direct_login", true) && directLogin.isDefined) { - DirectLogin.getConsumer match { - case Full(c) => Full(c) - case _ => Empty - } - } // Direct Login Deprecated - else if (getPropsAsBoolValue("allow_direct_login", true) && hasDirectLoginHeader(authorization)) { - DirectLogin.getConsumer match { - case Full(c) => Full(c) - case _ => Empty - } - } else { - Empty - } - - // TODO This should use Elastic Search not an RDBMS - val u: User = user.orNull - val userId = if (u != null) u.userId else "null" - val userName = if (u != null) u.name else "null" - - val c: Consumer = consumer.orNull - //The consumerId, not key - val consumerId = if (c != null) c.consumerId.get else "null" - var appName = if (u != null) c.name.toString() else "null" - var developerEmail = if (u != null) c.developerEmail.toString() else "null" - val implementedByPartialFunction = rd match { - case Some(r) => r.partialFunctionName - case _ => "" - } - //name of version where the call is implemented) -- S.request.get.view - val implementedInVersion = S.request.openOrThrowException(attemptedToOpenAnEmptyBox).view - //(GET, POST etc.) --S.request.get.requestType.method - val verb = S.request.openOrThrowException(attemptedToOpenAnEmptyBox).requestType.method - val url = ObpS.uriAndQueryString.getOrElse("") - val correlationId = getCorrelationId() - val reqHeaders = S.request.openOrThrowException(attemptedToOpenAnEmptyBox).request.headers - - val sourceIp = reqHeaders.find(_.name.toLowerCase() == "x-forwarded-for").map(_.values.mkString(",")).getOrElse("") - val targetIp = reqHeaders.find(_.name.toLowerCase() == "x-forwarded-host").map(_.values.mkString(",")).getOrElse("") - - //execute saveMetric in future, as we do not need to know result of operation - Future { - APIMetrics.apiMetrics.vend.saveMetric( - userId, - url, - date, - duration: Long, - userName, - appName, - developerEmail, - consumerId, - implementedByPartialFunction, - implementedInVersion, - verb, - None, - correlationId, - "Not enabled for old style endpoints", - sourceIp, - targetIp, - code.api.Constant.ApiInstanceId, - null // Old-style endpoints don't thread consent_reference_id through S.session yet. - ) - publishMetricEvent(userId, url, date, duration, userName, appName, developerEmail, consumerId, - implementedByPartialFunction, implementedInVersion, verb, None, correlationId, sourceIp, targetIp, - rd.map(_.operationId).getOrElse(""), null) - } - - } - } private val metricFormats = net.liftweb.json.DefaultFormats diff --git a/obp-api/src/main/scala/code/api/util/http4s/Http4sApp.scala b/obp-api/src/main/scala/code/api/util/http4s/Http4sApp.scala index c93347a37e..8f9f568857 100644 --- a/obp-api/src/main/scala/code/api/util/http4s/Http4sApp.scala +++ b/obp-api/src/main/scala/code/api/util/http4s/Http4sApp.scala @@ -4,37 +4,25 @@ import cats.data.{Kleisli, OptionT} import cats.effect.IO import code.api.util.APIUtil import code.api.util.http4s.Http4sRequestAttributes +import code.util.Helper.MdcLoggable import com.openbankproject.commons.util.{ApiVersion, ScannedApiVersion} import org.http4s._ import org.typelevel.ci.CIString /** * Shared HTTP4S Application Builder - * - * This object provides the httpApp configuration used by both: - * - Production server (Http4sServer) - * - Test server (Http4sTestServer) - * - * This ensures tests run against the exact same routing configuration as production, - * eliminating code duplication and ensuring we test the real server. - * - * Priority-based routing: - * 1. v5.0.0 native HTTP4S routes (checked first) - * 2. v7.0.0 native HTTP4S routes (checked second) - * 3. Http4sLiftWebBridge (fallback for all other API versions) - * 4. 404 Not Found (if no handler matches) + * + * Provides the httpApp used by both production (Http4sServer) and test (Http4sTestServer). + * All API versions (v1.2.1–v7.0.0, BG, UK OB) are served by native http4s handlers. + * Unmatched requests receive a JSON 404. */ -object Http4sApp { +object Http4sApp extends MdcLoggable { type HttpF[A] = OptionT[IO, A] - // Handles all OPTIONS (CORS preflight) requests before they reach the Lift bridge. - // - // Without this, OPTIONS falls through the Kleisli chain to Http4sLiftWebBridge → - // OBPAPI6_0_0's `this.serve({case OPTIONS => corsResponse})`, which pays full Lift - // overhead (body buffering, S.init) for every preflight. More critically, when the - // Lift bridge is eventually removed, CORS would break silently. Headers match the - // corsResponse defined in v4/v5/v6 Lift endpoints. + // Handles all OPTIONS (CORS preflight) requests by short-circuiting at the head of the + // Kleisli chain, before any version routes run. Returns 204 with the standard CORS headers + // so a browser preflight never pays the cost of entering the per-version handlers. private val corsHandler: HttpRoutes[IO] = HttpRoutes[IO] { req => if (req.method == Method.OPTIONS) { OptionT.liftF( @@ -80,14 +68,29 @@ object Http4sApp { // DynamicEndpoint dispatch (/obp/dynamic-endpoint/*) — fully-native http4s: proxy (DynamicReq) // + runtime-compiled resource docs, no Lift dispatch. Replaces the LiftRules.statelessDispatch // registration. Must sit AHEAD of the Lift bridge (the bridge no longer carries dynamic-endpoint). + // DynamicEndpoint dispatch (/obp/dynamic-endpoint/*) — proxy (DynamicReq) + runtime-compiled + // resource docs / practise. Runs the OBPAPIDynamicEndpoint.routes in-process via an adapter, + // replacing the former LiftRules.statelessDispatch registration. private val dynamicEndpointRoutes: HttpRoutes[IO] = gate(ApiVersion.`dynamic-endpoint`, code.api.dynamic.endpoint.Http4sDynamicEndpoint.wrappedRoutesDynamicEndpoint) // UK Open Banking (non-/obp prefixes /open-banking/v2.0 and /open-banking/v3.1) — native // http4s, replaces the classpath-scanned Lift ScannedApis. All endpoints (v2.0: 5, v3.1: ~67) - // are migrated to http4s; the Lift ScannedApis aggregators register `routes = Nil`, so Lift - // serves no UK path. Wired before the Lift bridge for ordering, but nothing falls through to it. + // are migrated to http4s. private val ukV20Routes: HttpRoutes[IO] = gate(ApiVersion.ukOpenBankingV20, code.api.UKOpenBanking.v2_0_0.Http4sUKOBv200.wrappedRoutes) private val ukV31Routes: HttpRoutes[IO] = gate(ApiVersion.ukOpenBankingV31, code.api.UKOpenBanking.v3_1_0.Http4sUKOBv310.wrappedRoutes) + // JSON 404 for all unmatched paths — terminal entry in baseServices. + private val notFoundCatchAll: HttpRoutes[IO] = HttpRoutes[IO] { req => + val contentType = req.headers.get(CIString("Content-Type")).map(_.head.value).getOrElse("") + val msg = s"${code.api.util.ErrorMessages.InvalidUri}Current Url is (${req.uri}), Current Content-Type Header is ($contentType)" + val escaped = msg.replace("\\", "\\\\").replace("\"", "\\\"") + val body = s"""{"code":404,"message":"$escaped"}""" + OptionT.liftF(IO.pure( + Response[IO](status = Status.NotFound) + .withEntity(body.getBytes("UTF-8")) + .withHeaders(Headers(Header.Raw(CIString("Content-Type"), "application/json; charset=utf-8"))) + )) + } + /** * Build the base HTTP4S routes with priority-based routing. * @@ -105,9 +108,9 @@ object Http4sApp { else if (noBodyMethods.contains(req.method)) IO.pure(req.withAttribute(Http4sRequestAttributes.cachedBodyKey, Option.empty[String])) else req.body.compile.to(Array).map { bytes => val cached: Option[String] = if (bytes.isEmpty) None else Some(new String(bytes, "UTF-8")) - // Replay the bytes on every subsequent stream read so the Lift fallback and any - // handler that still reads req.body sees the same payload. fs2.Stream.emits is - // pure — re-evaluating it yields a fresh stream of the same bytes. + // Replay the bytes on every subsequent stream read so any downstream cascade-bridge + // hop and any handler that still reads req.body sees the same payload. fs2.Stream.emits + // is pure — re-evaluating it yields a fresh stream of the same bytes. req .withBodyStream(fs2.Stream.emits(bytes).covary[IO]) .withAttribute(Http4sRequestAttributes.cachedBodyKey, cached) @@ -119,12 +122,6 @@ object Http4sApp { corsHandler.run(req) .orElse(AppsPage.routes.run(req)) .orElse(StatusPage.routes.run(req)) - // Bridge-retirement audit endpoint — exposes the in-memory tally of - // requests that have fallen through to Http4sLiftWebBridge so we can - // see exactly what still needs migrating before the bridge can be - // removed. Placed before the per-version routes so the admin path - // can't be shadowed by a version-prefixed handler. - .orElse(Http4sLiftBridgeTraffic.routes.run(req)) .orElse(Http4sResourceDocs.routes.run(req)) .orElse(v700Routes.run(req)) .orElse(v600Routes.run(req)) @@ -145,22 +142,29 @@ object Http4sApp { .orElse(v130Routes.run(req)) .orElse(v121Routes.run(req)) .orElse(dynamicEntityRoutes.run(req)) + .orElse(dynamicEndpointRoutes.run(req)) .orElse(code.api.DirectLoginRoutes.routes.run(req)) .orElse(code.api.Http4sOpenIdConnect.routes.run(req)) .orElse(code.api.AliveCheckRoutes.routes.run(req)) - .orElse(dynamicEndpointRoutes.run(req)) - .orElse(Http4sLiftWebBridge.routes.run(req)) + .orElse(notFoundCatchAll.run(req)) } } - /** - * Build the complete HTTP4S application with standard headers - */ def httpApp: HttpApp[IO] = { - val services: HttpRoutes[IO] = Http4sLiftWebBridge.withStandardHeaders(baseServices) - val app = services.orNotFound + val app = baseServices.orNotFound Kleisli { req: Request[IO] => - app.run(req).map(resp => Http4sLiftWebBridge.ensureStandardHeaders(req, resp)) + app.run(req) + .map(resp => Http4sStandardHeaders(req, resp)) + .handleErrorWith { e => + logger.error(s"[Http4sApp] Uncaught exception: ${req.method} ${req.uri} - ${e.getMessage}", e) + val errMsg = Option(e.getMessage).getOrElse("Internal Server Error") + .replace("\\", "\\\\").replace("\"", "\\\"") + val body = s"""{"code":500,"message":"$errMsg"}""" + IO.pure(Http4sStandardHeaders(req, + Response[IO](status = Status.InternalServerError) + .withEntity(body.getBytes("UTF-8")) + .withHeaders(Headers(Header.Raw(CIString("Content-Type"), "application/json; charset=utf-8"))))) + } } } } diff --git a/obp-api/src/main/scala/code/api/util/http4s/Http4sLiftWebBridge.scala b/obp-api/src/main/scala/code/api/util/http4s/Http4sLiftWebBridge.scala deleted file mode 100644 index 5677490019..0000000000 --- a/obp-api/src/main/scala/code/api/util/http4s/Http4sLiftWebBridge.scala +++ /dev/null @@ -1,583 +0,0 @@ -package code.api.util.http4s - -import cats.data.{Kleisli, OptionT} -import cats.effect.IO -import code.api.util.APIUtil -import code.api.{APIFailure, JsonResponseException, ResponseHeader} -import code.util.Helper.MdcLoggable -import com.openbankproject.commons.util.ReflectUtils -import net.liftweb.actor.LAFuture -import net.liftweb.common._ -import net.liftweb.http._ -import net.liftweb.http.provider._ -import org.http4s._ -import org.http4s.dsl.io._ -import org.http4s.headers.`Content-Type` -import org.typelevel.ci.CIString - -import java.io.{ByteArrayInputStream, ByteArrayOutputStream, InputStream} -import java.time.format.DateTimeFormatter -import java.time.{ZoneOffset, ZonedDateTime} -import java.util.concurrent.ConcurrentHashMap -import java.util.concurrent.atomic.AtomicLong -import java.util.{Locale, UUID} -import scala.collection.JavaConverters._ - -/** - * In-memory tally of which requests reach the Lift fallback bridge. - * - * Goal: data-driven prioritisation of remaining migration work. Every request - * that lands here means no http4s handler claimed it. Once an audit run shows - * which (method, path-bucket) pairs still hit the bridge, those buckets become - * the next migration targets. When the map is empty for a representative - * traffic window, the bridge can be retired. - * - * Path-bucket normalisation collapses common ID segments (long opaque tokens, - * UUIDs, numbers, version segments) so we don't fill the map with one entry - * per real-world ID value. The exact form of each bucket is logged the first - * time it is observed. - */ -object Http4sLiftBridgeTraffic extends MdcLoggable { - private val counts: ConcurrentHashMap[String, AtomicLong] = new ConcurrentHashMap() - private val UUID_RE = "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$".r - private val VERSION_RE = "^v\\d+(_\\d+){2}$|^v\\d+(\\.\\d+){2}$".r - private val NUMERIC_RE = "^\\d+$".r - - /** Buckets that look like opaque IDs: - * 1. Plain UUID → {uuid} - * 2. All-digits → {n} - * 3. Contains a `.` (e.g. `gh.29.uk`, `some.bank.io`, `127.0.0.1`) → {id} - * (API-version strings like `v6.0.0` are caught earlier and kept.) - * 4. Long-ish (≥ 12 chars) AND contains both letters & digits → {id} - * - * Keeps short path keywords like `openid-connect`, `callback-1`, - * `BANK_ID`, `accounts`, `views`. - */ - private def bucketSegment(seg: String): String = { - if (seg.isEmpty) return seg - if (VERSION_RE.findFirstIn(seg).isDefined) return seg - if (UUID_RE.findFirstIn(seg).isDefined) return "{uuid}" - if (NUMERIC_RE.findFirstIn(seg).isDefined) return "{n}" - if (seg.contains('.')) return "{id}" - val hasDigit = seg.exists(_.isDigit) - val hasLetter = seg.exists(_.isLetter) - if (seg.length >= 12 && hasDigit && hasLetter) return "{id}" - seg - } - - def bucket(path: String): String = - "/" + path.split('/').filter(_.nonEmpty).map(bucketSegment).mkString("/") - - /** Record one bridge dispatch with its outcome. Key is `METHOD BUCKET STATUS` - * so the snapshot can distinguish: - * - real Lift handler work (2xx/3xx/5xx) — actual migration targets - * - 404 fall-throughs — test code probing for non-existent endpoints, or - * stale callers; not migration work - */ - def observe(method: String, path: String, status: Int): Unit = { - val key = s"$method ${bucket(path)} $status" - val prev = counts.putIfAbsent(key, new AtomicLong(1L)) - if (prev == null) { - logger.info(s"[BRIDGE-AUDIT] first hit: $key (original path: $path)") - } else { - prev.incrementAndGet() - } - } - - /** Snapshot of (`METHOD BUCKET STATUS` → hit-count). */ - def snapshot(): Map[String, Long] = - counts.asScala.toMap.map { case (k, v) => k -> v.get() } - - /** Wipe the in-memory tally. Mostly for tests / a manual reset after a baseline. */ - def reset(): Unit = counts.clear() - - /** Split the key string `METHOD BUCKET STATUS` back into its parts. */ - private def splitKey(key: String): (String, String, Int) = { - // method is everything before the first space; status is the trailing int; - // bucket is the middle. - val firstSp = key.indexOf(' ') - val lastSp = key.lastIndexOf(' ') - if (firstSp <= 0 || lastSp <= firstSp) ("?", key, 0) - else { - val method = key.substring(0, firstSp) - val statusStr = key.substring(lastSp + 1) - val status = try statusStr.toInt catch { case _: Throwable => 0 } - val bucketStr = key.substring(firstSp + 1, lastSp) - (method, bucketStr, status) - } - } - - /** Admin route: `GET /admin/lift-bridge-traffic` returns the snapshot as JSON, - * grouped by `real_work` (non-404) vs `not_found` (404s — test probes / - * stale URLs / dead links). Entries inside each group are sorted by hit - * count desc. - * - * Wired into Http4sApp's baseServices ahead of the per-version routes so - * the admin path can't be shadowed. - */ - val routes: HttpRoutes[IO] = HttpRoutes.of[IO] { - case GET -> Root / "admin" / "lift-bridge-traffic" => - val rows = snapshot().toList.map { case (k, n) => - val (m, b, s) = splitKey(k) - (m, b, s, n) - } - val (notFound, realWork) = rows.partition { case (_, _, s, _) => s == 404 } - def renderGroup(group: List[(String, String, Int, Long)]): String = - group.sortBy { case (_, _, _, n) => -n }.map { case (m, b, s, n) => - s""" {"method": ${jsonString(m)}, "bucket": ${jsonString(b)}, "status": $s, "count": $n}""" - }.mkString(",\n") - val totalUnique = rows.length - val totalHits = rows.map(_._4).sum - val realHits = realWork.map(_._4).sum - val notFoundHits = notFound.map(_._4).sum - val body = - s"""{ - | "unique_buckets": $totalUnique, - | "total_hits": $totalHits, - | "summary": { - | "real_work": {"unique_buckets": ${realWork.length}, "total_hits": $realHits}, - | "not_found": {"unique_buckets": ${notFound.length}, "total_hits": $notFoundHits} - | }, - | "real_work": [ - |${renderGroup(realWork)} - | ], - | "not_found": [ - |${renderGroup(notFound)} - | ] - |} - |""".stripMargin - IO.pure(Response[IO]() - .withEntity(body.getBytes("UTF-8")) - .withHeaders(Headers(`Content-Type`(MediaType.application.json, Charset.`UTF-8`)))) - - case POST -> Root / "admin" / "lift-bridge-traffic" / "reset" => - reset() - IO.pure(Response[IO]() - .withEntity("""{"status":"reset"}""".getBytes("UTF-8")) - .withHeaders(Headers(`Content-Type`(MediaType.application.json, Charset.`UTF-8`)))) - } - - private def jsonString(s: String): String = { - val esc = s.flatMap { - case '"' => "\\\"" - case '\\' => "\\\\" - case '\n' => "\\n" - case '\r' => "\\r" - case '\t' => "\\t" - case c if c < 0x20 => f"\\u${c.toInt}%04x" - case c => c.toString - } - s""""$esc"""" - } -} - -object Http4sLiftWebBridge extends MdcLoggable { - type HttpF[A] = OptionT[IO, A] - - // Configurable timeout for continuation resolution (default: 60 seconds) - private lazy val continuationTimeoutMs: Long = - APIUtil.getPropsAsLongValue("http4s.continuation.timeout.ms", 60000L) - - private lazy val apiPathZero: String = APIUtil.getPropsValue("apiPathZero", "obp") - private lazy val v700Path: String = s"/$apiPathZero/v7.0.0" - // Version that the bridge falls back to for unmigrated v7.0.0 paths. - private lazy val fallbackVersion: String = APIUtil.getPropsValue("http4s.v700.fallback.version", "v6.0.0") - private lazy val fallbackPath: String = s"/$apiPathZero/$fallbackVersion" - - /** - * If the request targets a v7.0.0 path that was not claimed by any http4s handler - * (otherwise it would never reach this bridge), rewrite the URI to the configured - * fallback version (default v6.0.0) so Lift can serve it transparently. - * - * Returns the (possibly rewritten) request and the served version string to attach - * as X-OBP-Version-Served, or None when no rewrite was needed. - */ - private def rewriteIfV700(req: Request[IO]): (Request[IO], Option[String]) = { - val pathStr = req.uri.path.renderString - if (pathStr == v700Path || pathStr.startsWith(v700Path + "/")) { - val rewrittenPath = fallbackPath + pathStr.drop(v700Path.length) - logger.info(s"[BRIDGE] v7.0.0 fallback: $pathStr → $rewrittenPath (served by $fallbackVersion)") - val newUri = req.uri.withPath(Uri.Path.unsafeFromString(rewrittenPath)) - (req.withUri(newUri), Some(fallbackVersion)) - } else { - (req, None) - } - } - - def routes: HttpRoutes[IO] = HttpRoutes.of[IO] { - case req => dispatch(req) - } - - def withStandardHeaders(routes: HttpRoutes[IO]): HttpRoutes[IO] = { - Kleisli[HttpF, Request[IO], Response[IO]] { req: Request[IO] => - routes.run(req).map(resp => ensureStandardHeaders(req, resp)) - } - } - - def dispatch(req: Request[IO]): IO[Response[IO]] = { - val (effectiveReq, servedVersion) = rewriteIfV700(req) - val uri = req.uri.renderString - val method = req.method.name - val originalPath = req.uri.path.renderString - logger.debug(s"Http4sLiftBridge dispatching: $method $uri, S.inStatefulScope_? = ${S.inStatefulScope_?}") - val result = for { - bodyBytes <- effectiveReq.body.compile.to(Array) - liftReq = buildLiftReq(effectiveReq, bodyBytes) - liftResp <- IO { - val session = LiftRules.statelessSession.vend.apply(liftReq) - S.init(Full(liftReq), session) { - logger.debug(s"Http4sLiftBridge inside S.init, S.inStatefulScope_? = ${S.inStatefulScope_?}") - try { - runLiftDispatch(liftReq) - } catch { - case JsonResponseException(jsonResponse) => jsonResponse - case e if e.getClass.getName == "net.liftweb.http.rest.ContinuationException" => - resolveContinuation(e) - case e: Throwable => - logger.error( - s"[BRIDGE] Exception inside S.init for $method $uri" + - s" | thread=${Thread.currentThread().getName}" + - s" | exceptionClass=${e.getClass.getName}" + - s" | message=${e.getMessage}" + - s" | requestScopeProxy=${code.api.util.http4s.RequestScopeConnection.currentProxy.get()}", - e - ) - throw e - } - } - } - http4sResponse <- liftResponseToHttp4s(liftResp) - } yield { - logger.debug(s"[BRIDGE] Http4sLiftBridge completed: $method $uri -> ${http4sResponse.status.code}") - logger.debug(s"Http4sLiftBridge completed: $method $uri -> ${http4sResponse.status.code}") - val baseResp = ensureStandardHeaders(req, http4sResponse) - val finalResp = servedVersion.fold(baseResp)(v => baseResp.putHeaders(Header.Raw(CIString("X-OBP-Version-Served"), v))) - // Tally with the response status now known. 404s tell us "test probes / - // stale URLs"; non-404s are real Lift work still owned by the bridge. - Http4sLiftBridgeTraffic.observe(method, originalPath, finalResp.status.code) - finalResp - } - result.handleErrorWith { e => - logger.error(s"[BRIDGE] Uncaught exception in dispatch: $method $uri - ${e.getMessage}", e) - val errorBody = s"""{"error":"Internal Server Error","message":"${e.getMessage}"}""" - Http4sLiftBridgeTraffic.observe(method, originalPath, 500) - IO.pure(ensureStandardHeaders(req, Response[IO]( - status = org.http4s.Status.InternalServerError - ).withEntity(errorBody.getBytes("UTF-8")) - .withHeaders(Headers(Header.Raw(CIString("Content-Type"), "application/json; charset=utf-8"))))) - } - } - - private def runLiftDispatch(req: Req): LiftResponse = { - val handlers = LiftRules.statelessDispatch.toList ++ LiftRules.dispatch.toList - logger.debug(s"[BRIDGE] runLiftDispatch: ${req.request.method} ${req.request.uri}, handlers count: ${handlers.size}") - logger.debug(s"[BRIDGE] Request contentType: ${req.request.contentType}") - logger.debug(s"[BRIDGE] Request body available: ${req.body.isDefined}, json available: ${req.json.isDefined}") - logger.debug(s"[BRIDGE] Checking if any handler is defined for this request...") - handlers.zipWithIndex.foreach { case (pf, idx) => - val isDefined = pf.isDefinedAt(req) - if (isDefined) { - logger.debug(s"[BRIDGE] Handler $idx is defined for this request!") - } - } - logger.debug(s"Http4sLiftBridge runLiftDispatch: ${req.request.method} ${req.request.uri}, handlers count: ${handlers.size}") - val handler = handlers.collectFirst { case pf if pf.isDefinedAt(req) => pf(req) } - logger.debug(s"Http4sLiftBridge handler found: ${handler.isDefined}") - handler match { - case Some(run) => - try { - run() match { - case Full(resp) => - logger.debug(s"Http4sLiftBridge handler returned Full response") - resp - case ParamFailure(_, _, _, apiFailure: APIFailure) => - logger.debug(s"Http4sLiftBridge handler returned ParamFailure: ${apiFailure.msg}") - APIUtil.errorJsonResponse(apiFailure.msg, apiFailure.responseCode) - case Failure(msg, _, _) => - logger.debug(s"Http4sLiftBridge handler returned Failure: $msg") - APIUtil.errorJsonResponse(msg) - case Empty => - logger.debug(s"Http4sLiftBridge handler returned Empty - returning JSON 404") - val contentType = req.request.headers("Content-Type").headOption.getOrElse("") - APIUtil.errorJsonResponse(s"${code.api.util.ErrorMessages.InvalidUri}Current Url is (${req.request.uri}), Current Content-Type Header is ($contentType)", 404) - } - } catch { - case JsonResponseException(jsonResponse) => jsonResponse - case e if e.getClass.getName == "net.liftweb.http.rest.ContinuationException" => - resolveContinuation(e) - case e: Throwable => - logger.error( - s"[BRIDGE] Exception in handler run() for ${req.request.method} ${req.request.uri}" + - s" | thread=${Thread.currentThread().getName}" + - s" | exceptionClass=${e.getClass.getName}" + - s" | message=${e.getMessage}" + - s" | requestScopeProxy=${code.api.util.http4s.RequestScopeConnection.currentProxy.get()}" + - s" | stackTrace=${e.getStackTrace.take(10).mkString(" <- ")}", - e - ) - throw e - } - case None => - logger.debug(s"Http4sLiftBridge no handler found - returning JSON 404 for: ${req.request.method} ${req.request.uri}") - val contentType = req.request.headers("Content-Type").headOption.getOrElse("") - APIUtil.errorJsonResponse(s"${code.api.util.ErrorMessages.InvalidUri}Current Url is (${req.request.uri}), Current Content-Type Header is ($contentType)", 404) - } - } - - // Visibility raised from private to public so the in-process Lift adapter in - // code.api.dynamic.endpoint.Http4sDynamicEndpoint (a different package) can reuse the - // exact same Lift Req construction / response conversion / continuation resolution that - // this bridge uses. Signatures are unchanged. - def resolveContinuation(exception: Throwable): LiftResponse = { - logger.debug(s"Resolving ContinuationException for async Lift handler") - val func = - ReflectUtils - .getCallByNameValue(exception, "f") - .asInstanceOf[((=> LiftResponse) => Unit) => Unit] - val future = new LAFuture[LiftResponse] - val satisfy: (=> LiftResponse) => Unit = response => future.satisfy(response) - func(satisfy) - future.get(continuationTimeoutMs).openOr { - logger.warn(s"Continuation timeout after ${continuationTimeoutMs}ms, returning InternalServerError") - InternalServerErrorResponse() - } - } - - def buildLiftReq(req: Request[IO], body: Array[Byte]): Req = { - val headers = http4sHeadersToParams(req.headers.headers) - val params = http4sParamsToParams(req.uri.query.multiParams.toList) - val httpRequest = new Http4sLiftRequest( - req = req, - body = body, - headerParams = headers, - queryParams = params - ) - val liftReq = Req( - httpRequest, - LiftRules.statelessRewrite.toList, - Nil, - LiftRules.statelessReqTest.toList, - System.nanoTime() - ) - val contentType = headers.find(_.name.equalsIgnoreCase("Content-Type")).map(_.values.mkString(",")).getOrElse("none") - val authHeader = headers.find(_.name.equalsIgnoreCase("Authorization")).map(_.values.mkString(",")).getOrElse("none") - val bodySize = body.length - val bodyPreview = if (body.length > 0) new String(body.take(200), "UTF-8") else "empty" - logger.debug(s"[BRIDGE] buildLiftReq: method=${liftReq.request.method}, uri=${liftReq.request.uri}, path=${liftReq.path.partPath.mkString("/")}, wholePath=${liftReq.path.wholePath.mkString("/")}, contentType=$contentType, authHeader=$authHeader, bodySize=$bodySize, bodyPreview=$bodyPreview") - logger.debug(s"[BRIDGE] Req.json = ${liftReq.json}, Req.body = ${liftReq.body}") - logger.debug(s"Http4sLiftBridge buildLiftReq: method=${liftReq.request.method}, uri=${liftReq.request.uri}, path=${liftReq.path.partPath.mkString("/")}") - liftReq - } - - private def http4sHeadersToParams(headers: List[Header.Raw]): List[HTTPParam] = { - headers - .groupBy(_.name.toString) - .toList - .map { case (name, values) => - HTTPParam(name, values.map(_.value)) - } - } - - private def http4sParamsToParams(params: List[(String, collection.Seq[String])]): List[HTTPParam] = { - params.map { case (name, values) => - HTTPParam(name, values.toList) - } - } - - def liftResponseToHttp4s(response: LiftResponse): IO[Response[IO]] = { - response.toResponse match { - case InMemoryResponse(data, headers, _, code) => - IO.pure(buildHttp4sResponse(code, data, headers)) - case StreamingResponse(data, onEnd, _, headers, _, code) => - IO { - try { - val bytes = readAllBytes(data.asInstanceOf[InputStream]) - buildHttp4sResponse(code, bytes, headers) - } finally { - onEnd() - } - } - case OutputStreamResponse(out, _, headers, _, code) => - IO { - val baos = new ByteArrayOutputStream() - out(baos) - buildHttp4sResponse(code, baos.toByteArray, headers) - } - case basic: BasicResponse => - IO.pure(buildHttp4sResponse(basic.code, Array.emptyByteArray, basic.headers)) - } - } - - private def buildHttp4sResponse(code: Int, body: Array[Byte], headers: List[(String, String)]): Response[IO] = { - val hasContentType = headers.exists { case (name, _) => name.equalsIgnoreCase("Content-Type") } - val normalizedHeaders = if (hasContentType) { - headers - } else { - ("Content-Type", "application/json; charset=utf-8") :: headers - } - val http4sHeaders = Headers( - normalizedHeaders.map { case (name, value) => Header.Raw(CIString(name), value) } - ) - val status = org.http4s.Status.fromInt(code).getOrElse(org.http4s.Status.InternalServerError) - - // Log response construction for debugging protocol issues - if (code >= 400) { - val bodyPreview = if (body.length > 0) new String(body.take(100), "UTF-8") else "empty" - logger.debug(s"[BRIDGE] buildHttp4sResponse: code=$code, status=$status, bodySize=${body.length}, bodyPreview=$bodyPreview") - } - - Response[IO](status = status) - .withEntity(body) - .withHeaders(http4sHeaders) - } - - private def readAllBytes(input: InputStream): Array[Byte] = { - val buffer = new ByteArrayOutputStream() - val chunk = new Array[Byte](4096) - var read = input.read(chunk) - while (read != -1) { - buffer.write(chunk, 0, read) - read = input.read(chunk) - } - buffer.toByteArray - } - - def ensureStandardHeaders(req: Request[IO], resp: Response[IO]): Response[IO] = { - val now = ZonedDateTime.now(ZoneOffset.UTC).format(DateTimeFormatter.RFC_1123_DATE_TIME) - val existing = resp.headers.headers - def hasHeader(name: String): Boolean = - existing.exists(_.name.toString.equalsIgnoreCase(name)) - val existingCorrelationId = existing - .find(_.name.toString.equalsIgnoreCase(ResponseHeader.`Correlation-Id`)) - .map(_.value) - .getOrElse("") - val correlationId = - Option(existingCorrelationId).map(_.trim).filter(_.nonEmpty) - .orElse(req.headers.headers.find(_.name.toString.equalsIgnoreCase("X-Request-ID")).map(_.value)) - .getOrElse(UUID.randomUUID().toString) - val extraHeaders = List.newBuilder[Header.Raw] - if (existingCorrelationId.trim.isEmpty) { - extraHeaders += Header.Raw(CIString(ResponseHeader.`Correlation-Id`), correlationId) - } - if (!hasHeader("Cache-Control")) { - extraHeaders += Header.Raw(CIString("Cache-Control"), "no-cache, private, no-store") - } - if (!hasHeader("Pragma")) { - extraHeaders += Header.Raw(CIString("Pragma"), "no-cache") - } - if (!hasHeader("Expires")) { - extraHeaders += Header.Raw(CIString("Expires"), now) - } - if (!hasHeader("X-Frame-Options")) { - extraHeaders += Header.Raw(CIString("X-Frame-Options"), "DENY") - } - val headersToAdd = extraHeaders.result() - if (headersToAdd.isEmpty) resp - else { - val filtered = resp.headers.headers.filterNot(h => - h.name.toString.equalsIgnoreCase(ResponseHeader.`Correlation-Id`) && - h.value.trim.isEmpty - ) - resp.copy(headers = Headers(filtered) ++ Headers(headersToAdd)) - } - } - - private object Http4sLiftContext extends HTTPContext { - // Thread-safe attribute store using ConcurrentHashMap - private val attributesStore = new ConcurrentHashMap[String, Any]() - def path: String = "" - def resource(path: String): java.net.URL = null - def resourceAsStream(path: String): InputStream = null - def mimeType(path: String): net.liftweb.common.Box[String] = Empty - def initParam(name: String): net.liftweb.common.Box[String] = Empty - def initParams: List[(String, String)] = Nil - def attribute(name: String): net.liftweb.common.Box[Any] = Box(Option(attributesStore.get(name))) - def attributes: List[(String, Any)] = attributesStore.asScala.toList - def setAttribute(name: String, value: Any): Unit = attributesStore.put(name, value) - def removeAttribute(name: String): Unit = attributesStore.remove(name) - } - - private object Http4sLiftProvider extends HTTPProvider { - override protected def context: HTTPContext = Http4sLiftContext - } - - private final class Http4sLiftSession(val sessionId: String) extends HTTPSession { - // Thread-safe attribute store using ConcurrentHashMap - private val attributesStore = new ConcurrentHashMap[String, Any]() - @volatile private var maxInactive: Long = 0L - private val createdAt: Long = System.currentTimeMillis() - def link(liftSession: LiftSession): Unit = () - def unlink(liftSession: LiftSession): Unit = () - def maxInactiveInterval: Long = maxInactive - def setMaxInactiveInterval(interval: Long): Unit = { maxInactive = interval } - def lastAccessedTime: Long = createdAt - def setAttribute(name: String, value: Any): Unit = attributesStore.put(name, value) - def attribute(name: String): Any = attributesStore.get(name) - def removeAttribute(name: String): Unit = attributesStore.remove(name) - def terminate: Unit = () - } - - private final class Http4sLiftRequest( - req: Request[IO], - body: Array[Byte], - headerParams: List[HTTPParam], - queryParams: List[HTTPParam] - ) extends HTTPRequest { - private val sessionValue = new Http4sLiftSession(UUID.randomUUID().toString) - private val uriPath = req.uri.path.renderString - private val uriQuery = req.uri.query.renderString - private val remoteAddr = req.remoteAddr - def cookies: List[HTTPCookie] = Nil - def provider: HTTPProvider = Http4sLiftProvider - def authType: net.liftweb.common.Box[String] = Empty - def headers(name: String): List[String] = - headerParams.find(_.name.equalsIgnoreCase(name)).map(_.values).getOrElse(Nil) - def headers: List[HTTPParam] = headerParams - def contextPath: String = "" - def context: HTTPContext = Http4sLiftContext - def contentType: net.liftweb.common.Box[String] = { - // First try to get from http4s contentType - req.contentType match { - case Some(ct) => - // Content-Type header contains mediaType and optional charset - // Convert to string format that Lift expects (e.g., "application/json") - val mediaTypeStr = ct.mediaType.mainType + "/" + ct.mediaType.subType - val charsetStr = ct.charset.map(cs => s"; charset=${cs.nioCharset.name}").getOrElse("") - Full(mediaTypeStr + charsetStr) - case None => - // Fallback to Content-Type header - headerParams.find(_.name.equalsIgnoreCase("Content-Type")).flatMap(_.values.headOption) match { - case Some(ct) => Full(ct) - case None => Empty - } - } - } - def uri: String = uriPath - def url: String = req.uri.renderString - def queryString: net.liftweb.common.Box[String] = if (uriQuery.nonEmpty) Full(uriQuery) else Empty - def param(name: String): List[String] = queryParams.find(_.name == name).map(_.values).getOrElse(Nil) - def params: List[HTTPParam] = queryParams - def paramNames: List[String] = queryParams.map(_.name).distinct - def session: HTTPSession = sessionValue - def destroyServletSession(): Unit = () - def sessionId: net.liftweb.common.Box[String] = Full(sessionValue.sessionId) - def remoteAddress: String = remoteAddr.map(_.toUriString).getOrElse("") - def remotePort: Int = req.uri.port.getOrElse(0) - def remoteHost: String = remoteAddr.map(_.toUriString).getOrElse("") - def serverName: String = req.uri.host.map(_.value).getOrElse("localhost") - def scheme: String = req.uri.scheme.map(_.value).getOrElse("http") - def serverPort: Int = req.uri.port.getOrElse(0) - def method: String = req.method.name - def suspendResumeSupport_? : Boolean = false - def resumeInfo: Option[(Req, LiftResponse)] = None - def suspend(timeout: Long): RetryState.Value = RetryState.TIMED_OUT - def resume(what: (Req, LiftResponse)): Boolean = false - def inputStream: InputStream = new ByteArrayInputStream(body) - def multipartContent_? : Boolean = contentType.exists(_.toLowerCase.contains("multipart/")) - def extractFiles: List[net.liftweb.http.ParamHolder] = Nil - def locale: net.liftweb.common.Box[Locale] = Empty - def setCharacterEncoding(encoding: String): Unit = () - def snapshot: HTTPRequest = this - def userAgent: net.liftweb.common.Box[String] = header("User-Agent") - } -} diff --git a/obp-api/src/main/scala/code/api/util/http4s/Http4sResourceDocAggregation.scala b/obp-api/src/main/scala/code/api/util/http4s/Http4sResourceDocAggregation.scala new file mode 100644 index 0000000000..03353eafd0 --- /dev/null +++ b/obp-api/src/main/scala/code/api/util/http4s/Http4sResourceDocAggregation.scala @@ -0,0 +1,116 @@ +package code.api.util.http4s + +import code.api.util.APIUtil.ResourceDoc +import code.api.v1_2_1.Http4s121 +import code.api.v1_3_0.Http4s130 +import code.api.v1_4_0.Http4s140 +import code.api.v2_0_0.Http4s200 +import code.api.v2_1_0.Http4s210 +import code.api.v2_2_0.Http4s220 +import code.api.v3_0_0.Http4s300 +import code.api.v3_1_0.Http4s310 +import code.api.v4_0_0.Http4s400 +import code.api.v5_0_0.Http4s500 +import code.api.v5_1_0.Http4s510 +import code.api.v6_0_0.Http4s600 +import com.openbankproject.commons.util.ScannedApiVersion + +import scala.collection.mutable.ArrayBuffer + +/** + * Lift-free per-version resource-doc aggregation. + * + * Replaces the chain that used to live on the Lift `OBPAPIx_x_x` aggregator objects + * (`OBPAPINxx.allResourceDocs = collectResourceDocs(OBPAPI{prev}.allResourceDocs, Http4sNxx.resourceDocs)`). + * The aggregation logic is identical — same inputs (`Http4sNxx.resourceDocs`), same + * (requestUrl, requestVerb) dedup keeping the newest version, same per-version `excludeEndpoints` + * filter — so doc counts are unchanged. The point is that the computation no longer runs on an + * `OBPRestHelper`/Lift object, so `ResourceDocsAPIMethods` and `Http4s700` can source the catalog + * without touching the Lift dispatch aggregators (which are deleted in a later phase). + * + * NOTE: the `excludeEndpoints` lists are still referenced from the `OBPAPIx_x_x` objects (they are + * pure `List[String]` of partial-function names, not Lift dispatch). They move here when the + * aggregator objects are deleted. + */ +object Http4sResourceDocAggregation { + + // Descending sort by ApiVersion — identical to OBPRestHelper.collectResourceDocs. + private implicit val ordering: Ordering[ScannedApiVersion] = new Ordering[ScannedApiVersion] { + override def compare(x: ScannedApiVersion, y: ScannedApiVersion): Int = y.toString().compareTo(x.toString()) + } + + /** Lift-free copy of OBPRestHelper.collectResourceDocs: dedup by (requestUrl, requestVerb), keep newest. */ + def dedup(docs: ArrayBuffer[ResourceDoc]*): ArrayBuffer[ResourceDoc] = { + val sorted: Seq[ResourceDoc] = docs.flatten.sortBy(_.implementedInApiVersion) + val result = ArrayBuffer[ResourceDoc]() + val urlAndMethods = scala.collection.mutable.Set[(String, String)]() + for (doc <- sorted) { + val urlAndMethod = (doc.requestUrl, doc.requestVerb) + if (!urlAndMethods.contains(urlAndMethod)) { + urlAndMethods.add(urlAndMethod) + result += doc + } + } + result + } + + private def filterExcluded(docs: ArrayBuffer[ResourceDoc], excludeEndpoints: List[String]): ArrayBuffer[ResourceDoc] = + if (excludeEndpoints.isEmpty) docs + else docs.filterNot(it => it.partialFunctionName.matches(excludeEndpoints.mkString("|"))) + + // Each Http4sNxx.resourceDocs buffer is populated inside the nested ImplementationsNxx object body + // (resourceDocs += calls are non-lazy statements there). The wrappedRoutesVxxxServices in each Http4sNxx + // uses a Kleisli wrapper that defers ImplementationsNxx initialization to the first HTTP request, so + // resourceDocs is empty when Http4sResourceDocAggregation is first evaluated via a resource-docs request. + // Accessing the ImplementationsNxx object directly forces its initialization, populating the buffer. + // Http4s121 is the exception: its wrappedRoutesV121Services is a direct lazy val reference + // (not Kleisli-wrapped), so Implementations1_2_1 is always initialized by Http4sApp startup. + private def forceInit(impl: Any): Unit = () + + // The cumulative per-version catalogs (each = all docs from v1.2.1 up to and including this version). + lazy val v121: ArrayBuffer[ResourceDoc] = Http4s121.resourceDocs + lazy val v130: ArrayBuffer[ResourceDoc] = { + forceInit(Http4s130.Implementations1_3_0) + dedup(v121, Http4s130.resourceDocs) + } + lazy val v140: ArrayBuffer[ResourceDoc] = { + forceInit(Http4s140.Implementations1_4_0) + dedup(v130, Http4s140.resourceDocs) + } + lazy val v200: ArrayBuffer[ResourceDoc] = { + forceInit(Http4s200.Implementations2_0_0) + dedup(v140, Http4s200.resourceDocs) + } + lazy val v210: ArrayBuffer[ResourceDoc] = { + forceInit(Http4s210.Implementations2_1_0) + dedup(v200, Http4s210.resourceDocs) + } + lazy val v220: ArrayBuffer[ResourceDoc] = { + forceInit(Http4s220.Implementations2_2_0) + dedup(v210, Http4s220.resourceDocs) + } + lazy val v300: ArrayBuffer[ResourceDoc] = { + forceInit(Http4s300.Implementations3_0_0) + dedup(v220, Http4s300.resourceDocs) + } + lazy val v310: ArrayBuffer[ResourceDoc] = { + forceInit(Http4s310.Implementations3_1_0) + dedup(v300, Http4s310.resourceDocs) + } + lazy val v400: ArrayBuffer[ResourceDoc] = { + forceInit(Http4s400.Implementations4_0_0) + filterExcluded(dedup(v310, Http4s400.resourceDocs), code.api.v4_0_0.OBPAPI4_0_0.excludeEndpoints) + } + lazy val v500: ArrayBuffer[ResourceDoc] = { + forceInit(Http4s500.Implementations5_0_0) + dedup(v400, Http4s500.resourceDocs) + } + lazy val v510: ArrayBuffer[ResourceDoc] = { + forceInit(Http4s510.Implementations5_1_0) + filterExcluded(dedup(v500, Http4s510.resourceDocs), code.api.v5_1_0.OBPAPI5_1_0.excludeEndpoints) + } + lazy val v600: ArrayBuffer[ResourceDoc] = { + forceInit(Http4s600.Implementations6_0_0) + filterExcluded(dedup(v510, Http4s600.resourceDocs), code.api.v6_0_0.OBPAPI6_0_0.excludeEndpoints) + } +} diff --git a/obp-api/src/main/scala/code/api/util/http4s/Http4sStandardHeaders.scala b/obp-api/src/main/scala/code/api/util/http4s/Http4sStandardHeaders.scala new file mode 100644 index 0000000000..6481adc037 --- /dev/null +++ b/obp-api/src/main/scala/code/api/util/http4s/Http4sStandardHeaders.scala @@ -0,0 +1,60 @@ +package code.api.util.http4s + +import cats.data.{Kleisli, OptionT} +import cats.effect.IO +import code.api.ResponseHeader +import org.http4s._ +import org.typelevel.ci.CIString + +import java.time.format.DateTimeFormatter +import java.time.{ZoneOffset, ZonedDateTime} +import java.util.UUID + +/** + * Standard HTTP response headers applied to every response. + * + * Extracted from Http4sLiftWebBridge so Http4sApp can apply them + * without depending on the bridge at all. + */ +object Http4sStandardHeaders { + + def apply(req: Request[IO], resp: Response[IO]): Response[IO] = { + val now = ZonedDateTime.now(ZoneOffset.UTC).format(DateTimeFormatter.RFC_1123_DATE_TIME) + val existing = resp.headers.headers + def hasHeader(name: String): Boolean = + existing.exists(_.name.toString.equalsIgnoreCase(name)) + val existingCorrelationId = existing + .find(_.name.toString.equalsIgnoreCase(ResponseHeader.`Correlation-Id`)) + .map(_.value) + .getOrElse("") + val correlationId = + Option(existingCorrelationId).map(_.trim).filter(_.nonEmpty) + .orElse(req.headers.headers.find(_.name.toString.equalsIgnoreCase("X-Request-ID")).map(_.value)) + .getOrElse(UUID.randomUUID().toString) + val extraHeaders = List.newBuilder[Header.Raw] + if (existingCorrelationId.trim.isEmpty) { + extraHeaders += Header.Raw(CIString(ResponseHeader.`Correlation-Id`), correlationId) + } + if (!hasHeader("Cache-Control")) { + extraHeaders += Header.Raw(CIString("Cache-Control"), "no-cache, private, no-store") + } + if (!hasHeader("Pragma")) { + extraHeaders += Header.Raw(CIString("Pragma"), "no-cache") + } + if (!hasHeader("Expires")) { + extraHeaders += Header.Raw(CIString("Expires"), now) + } + if (!hasHeader("X-Frame-Options")) { + extraHeaders += Header.Raw(CIString("X-Frame-Options"), "DENY") + } + val headersToAdd = extraHeaders.result() + if (headersToAdd.isEmpty) resp + else { + val filtered = resp.headers.headers.filterNot(h => + h.name.toString.equalsIgnoreCase(ResponseHeader.`Correlation-Id`) && + h.value.trim.isEmpty + ) + resp.copy(headers = Headers(filtered) ++ Headers(headersToAdd)) + } + } +} diff --git a/obp-api/src/main/scala/code/api/util/http4s/Http4sSupport.scala b/obp-api/src/main/scala/code/api/util/http4s/Http4sSupport.scala index c2455e3d91..6974c979f6 100644 --- a/obp-api/src/main/scala/code/api/util/http4s/Http4sSupport.scala +++ b/obp-api/src/main/scala/code/api/util/http4s/Http4sSupport.scala @@ -1,13 +1,12 @@ package code.api.util.http4s import cats.effect._ -import code.api.util.APIUtil.{ResourceDoc, getPropsAsBoolValue} +import code.api.util.APIUtil.{HTTPParam, ResourceDoc, getPropsAsBoolValue} import code.api.util.ErrorMessages.{AuthenticatedUserIsRequired, InvalidJsonFormat} import code.api.util.{AuthHeaderParser, CallContext, RemoteIpUtil, WriteMetricUtil} import code.util.Helper.MdcLoggable import com.openbankproject.commons.model.{Bank, BankAccount, CounterpartyTrait, User, View} import net.liftweb.common.{Box, Empty, Full} -import net.liftweb.http.provider.HTTPParam import org.http4s._ import org.http4s.dsl.io._ import org.http4s.headers.`Content-Type` diff --git a/obp-api/src/main/scala/code/api/v1_2/OBPAPI1.2.scala b/obp-api/src/main/scala/code/api/v1_2/OBPAPI1.2.scala index 43d28fdcba..03309d4277 100644 --- a/obp-api/src/main/scala/code/api/v1_2/OBPAPI1.2.scala +++ b/obp-api/src/main/scala/code/api/v1_2/OBPAPI1.2.scala @@ -32,7 +32,6 @@ //package code.api.v1_2 // //import code.api.util.APIUtil -//import net.liftweb.http.rest._ //import net.liftweb.json.Extraction //import net.liftweb.json.JsonAST._ //import net.liftweb.common.{Box, Empty, Failure, Full} @@ -43,7 +42,6 @@ //import _root_.net.liftweb.util.Helpers._ // //import _root_.scala.xml._ -//import _root_.net.liftweb.http.S._ //import net.liftweb.mongodb.Skip //import com.mongodb._ //import code.bankconnectors.{OBPFromDate, OBPLimit, OBPOffset, OBPOrder, OBPOrdering, OBPQueryParam, OBPToDate} diff --git a/obp-api/src/main/scala/code/api/v1_2_1/APIMethods121.scala b/obp-api/src/main/scala/code/api/v1_2_1/APIMethods121.scala index cc0dfbf6fd..91b79858d9 100644 --- a/obp-api/src/main/scala/code/api/v1_2_1/APIMethods121.scala +++ b/obp-api/src/main/scala/code/api/v1_2_1/APIMethods121.scala @@ -1,9 +1,8 @@ package code.api.v1_2_1 -import net.liftweb.http.rest.RestHelper -trait APIMethods121 { self: RestHelper => } -object APIMethods121 extends RestHelper with APIMethods121 { +trait APIMethods121 +object APIMethods121 { val Implementations1_2_1 = Http4s121.Implementations1_2_1 } @@ -30,8 +29,6 @@ object APIMethods121 extends RestHelper with APIMethods121 { //import com.openbankproject.commons.util.ApiVersion //import com.tesobe.CacheKeyFromArguments //import net.liftweb.common._ -//import net.liftweb.http.JsonResponse -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json.Extraction //import net.liftweb.json.JsonAST.JValue //import net.liftweb.util.Helpers._ diff --git a/obp-api/src/main/scala/code/api/v1_2_1/Http4s121.scala b/obp-api/src/main/scala/code/api/v1_2_1/Http4s121.scala index 3e7f990db1..559081d765 100644 --- a/obp-api/src/main/scala/code/api/v1_2_1/Http4s121.scala +++ b/obp-api/src/main/scala/code/api/v1_2_1/Http4s121.scala @@ -22,7 +22,6 @@ import com.openbankproject.commons.ExecutionContext.Implicits.global import com.openbankproject.commons.model._ import com.openbankproject.commons.util.{ApiVersion, ApiVersionStatus, ScannedApiVersion} import net.liftweb.common.{Box, Full} -import net.liftweb.http.provider.HTTPParam import net.liftweb.json.{Extraction, Formats} import net.liftweb.util.Helpers._ import org.http4s._ @@ -129,7 +128,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(root), "GET", @@ -162,7 +160,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBanks), "GET", @@ -199,7 +196,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(bankById), "GET", @@ -232,7 +228,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPrivateAccountsAllBanks), "GET", @@ -264,7 +259,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(privateAccountsAllBanks), "GET", @@ -295,7 +289,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(publicAccountsAllBanks), "GET", @@ -328,7 +321,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPrivateAccountsAtOneBank), "GET", @@ -360,7 +352,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(privateAccountsAtOneBank), "GET", @@ -392,7 +383,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(publicAccountsAtOneBank), "GET", @@ -426,7 +416,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(accountById), "GET", @@ -485,7 +474,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateAccountLabel), "POST", @@ -522,7 +510,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getViewsForBankAccount), "GET", @@ -599,7 +586,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createViewForBankAccount), "POST", @@ -666,7 +652,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateViewForBankAccount), "PUT", @@ -707,7 +692,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteViewForBankAccount), "DELETE", @@ -739,7 +723,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPermissionsForBankAccount), "GET", @@ -779,7 +762,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPermissionForUserForBankAccount), "GET", @@ -823,7 +805,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addPermissionForUserForBankAccountForMultipleViews), "POST", @@ -862,7 +843,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addPermissionForUserForBankAccountForOneView), "POST", @@ -897,7 +877,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(removePermissionForUserForBankAccountForOneView), "DELETE", @@ -929,7 +908,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(removePermissionForUserForBankAccountForAllViews), "DELETE", @@ -959,7 +937,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getOtherAccountsForBankAccount), "GET", @@ -987,7 +964,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getOtherAccountByIdForBankAccount), "GET", @@ -1020,7 +996,6 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getOtherAccountMetadata), "GET", @@ -1051,7 +1026,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCounterpartyPublicAlias), "GET", + implementedInApiVersion, nameOf(getCounterpartyPublicAlias), "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/public_alias", "Get public alias of other bank account", s"""Returns the public alias of the other account OTHER_ACCOUNT_ID. @@ -1086,7 +1061,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addCounterpartyPublicAlias), "POST", + implementedInApiVersion, nameOf(addCounterpartyPublicAlias), "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/public_alias", "Add public alias to other bank account", s"""Creates the public alias for the other account OTHER_ACCOUNT_ID. | @@ -1130,7 +1105,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCounterpartyPublicAlias), "PUT", + implementedInApiVersion, nameOf(updateCounterpartyPublicAlias), "PUT", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/public_alias", "Update public alias of other bank account", s"""Updates the public alias of the other account / counterparty OTHER_ACCOUNT_ID. | @@ -1160,7 +1135,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCounterpartyPublicAlias), "DELETE", + implementedInApiVersion, nameOf(deleteCounterpartyPublicAlias), "DELETE", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/public_alias", "Delete Counterparty Public Alias", s"""Deletes the public alias of the other account OTHER_ACCOUNT_ID. | @@ -1193,7 +1168,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getOtherAccountPrivateAlias), "GET", + implementedInApiVersion, nameOf(getOtherAccountPrivateAlias), "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/private_alias", "Get Other Account Private Alias", s"""Returns the private alias of the other account OTHER_ACCOUNT_ID. | @@ -1223,7 +1198,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addOtherAccountPrivateAlias), "POST", + implementedInApiVersion, nameOf(addOtherAccountPrivateAlias), "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/private_alias", "Create Other Account Private Alias", s"""Creates a private alias for the other account OTHER_ACCOUNT_ID. | @@ -1253,7 +1228,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCounterpartyPrivateAlias), "PUT", + implementedInApiVersion, nameOf(updateCounterpartyPrivateAlias), "PUT", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/private_alias", "Update Counterparty Private Alias", s"""Updates the private alias of the counterparty (AKA other account) OTHER_ACCOUNT_ID. | @@ -1283,7 +1258,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCounterpartyPrivateAlias), "DELETE", + implementedInApiVersion, nameOf(deleteCounterpartyPrivateAlias), "DELETE", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/private_alias", "Delete Counterparty Private Alias", s"""Deletes the private alias of the other account OTHER_ACCOUNT_ID. | @@ -1313,7 +1288,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addCounterpartyMoreInfo), "POST", + implementedInApiVersion, nameOf(addCounterpartyMoreInfo), "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/metadata/more_info", "Add Counterparty More Info", // Intentional drift from Lift's APIMethods121.scala source-of-truth: @@ -1351,7 +1326,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCounterpartyMoreInfo), "PUT", + implementedInApiVersion, nameOf(updateCounterpartyMoreInfo), "PUT", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/metadata/more_info", "Update Counterparty More Info", // Intentional drift from Lift's APIMethods121.scala source-of-truth: @@ -1381,7 +1356,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCounterpartyMoreInfo), "DELETE", + implementedInApiVersion, nameOf(deleteCounterpartyMoreInfo), "DELETE", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/metadata/more_info", "Delete more info of other bank account", "", EmptyBody, EmptyBody, @@ -1408,7 +1383,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addCounterpartyUrl), "POST", + implementedInApiVersion, nameOf(addCounterpartyUrl), "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/metadata/url", "Add url to other bank account", "A url which represents the counterparty (home page url etc.)", urlJSON, successMessage, @@ -1435,7 +1410,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCounterpartyUrl), "PUT", + implementedInApiVersion, nameOf(updateCounterpartyUrl), "PUT", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/metadata/url", "Update url of other bank account", "A url which represents the counterparty (home page url etc.)", urlJSON, successMessage, @@ -1462,7 +1437,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCounterpartyUrl), "DELETE", + implementedInApiVersion, nameOf(deleteCounterpartyUrl), "DELETE", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/metadata/url", "Delete url of other bank account", "", EmptyBody, EmptyBody, @@ -1489,7 +1464,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addCounterpartyImageUrl), "POST", + implementedInApiVersion, nameOf(addCounterpartyImageUrl), "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/metadata/image_url", "Add image url to other bank account", "Add a url that points to the logo of the counterparty", imageUrlJSON, successMessage, @@ -1516,7 +1491,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCounterpartyImageUrl), "PUT", + implementedInApiVersion, nameOf(updateCounterpartyImageUrl), "PUT", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/metadata/image_url", "Update Counterparty Image Url", "Update the url that points to the logo of the counterparty", imageUrlJSON, successMessage, @@ -1550,7 +1525,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCounterpartyImageUrl), "DELETE", + implementedInApiVersion, nameOf(deleteCounterpartyImageUrl), "DELETE", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/metadata/image_url", "Delete Counterparty Image URL", "Delete image url of other bank account", EmptyBody, EmptyBody, @@ -1579,7 +1554,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addCounterpartyOpenCorporatesUrl), "POST", + implementedInApiVersion, nameOf(addCounterpartyOpenCorporatesUrl), "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/metadata/open_corporates_url", "Add Open Corporates URL to Counterparty", "Add open corporates url to other bank account", openCorporateUrlJSON, successMessage, @@ -1613,7 +1588,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCounterpartyOpenCorporatesUrl), "PUT", + implementedInApiVersion, nameOf(updateCounterpartyOpenCorporatesUrl), "PUT", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/metadata/open_corporates_url", "Update Open Corporates Url of Counterparty", "Update open corporate url of other bank account", openCorporateUrlJSON, successMessage, @@ -1640,7 +1615,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCounterpartyOpenCorporatesUrl), "DELETE", + implementedInApiVersion, nameOf(deleteCounterpartyOpenCorporatesUrl), "DELETE", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/metadata/open_corporates_url", "Delete Counterparty Open Corporates URL", "Delete open corporate url of other bank account", EmptyBody, EmptyBody, @@ -1668,7 +1643,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addCounterpartyCorporateLocation), "POST", + implementedInApiVersion, nameOf(addCounterpartyCorporateLocation), "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/metadata/corporate_location", "Add Corporate Location to Counterparty", "Add the geolocation of the counterparty's registered address", corporateLocationJSON, successMessage, @@ -1696,7 +1671,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCounterpartyCorporateLocation), "PUT", + implementedInApiVersion, nameOf(updateCounterpartyCorporateLocation), "PUT", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/metadata/corporate_location", "Update Counterparty Corporate Location", "Update the geolocation of the counterparty's registered address", corporateLocationJSON, successMessage, @@ -1723,7 +1698,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCounterpartyCorporateLocation), "DELETE", + implementedInApiVersion, nameOf(deleteCounterpartyCorporateLocation), "DELETE", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/metadata/corporate_location", "Delete Counterparty Corporate Location", "Delete corporate location of other bank account. Delete the geolocation of the counterparty's registered address", EmptyBody, EmptyBody, @@ -1751,7 +1726,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addCounterpartyPhysicalLocation), "POST", + implementedInApiVersion, nameOf(addCounterpartyPhysicalLocation), "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/metadata/physical_location", "Add physical location to other bank account", "Add geocoordinates of the counterparty's main location", physicalLocationJSON, successMessage, @@ -1779,7 +1754,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCounterpartyPhysicalLocation), "PUT", + implementedInApiVersion, nameOf(updateCounterpartyPhysicalLocation), "PUT", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/metadata/physical_location", "Update Counterparty Physical Location", "Update geocoordinates of the counterparty's main location", physicalLocationJSON, successMessage, @@ -1806,7 +1781,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCounterpartyPhysicalLocation), "DELETE", + implementedInApiVersion, nameOf(deleteCounterpartyPhysicalLocation), "DELETE", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/other_accounts/OTHER_ACCOUNT_ID/metadata/physical_location", "Delete Counterparty Physical Location", "Delete physical location of other bank account", EmptyBody, EmptyBody, @@ -1835,7 +1810,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionsForBankAccount), "GET", + implementedInApiVersion, nameOf(getTransactionsForBankAccount), "GET", "/banks/BANK_ID/accounts/BANK_ACCOUNT_ID/TRANSACTIONS_VIEW_ID/transactions", "Get Transactions for Account (Full)", s"""Returns transactions list of the account specified by ACCOUNT_ID and [moderated](#1_2_1-getViewsForBankAccount) by the view (VIEW_ID). @@ -1868,7 +1843,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionByIdForBankAccount), "GET", + implementedInApiVersion, nameOf(getTransactionByIdForBankAccount), "GET", "/banks/BANK_ID/accounts/BANK_ACCOUNT_ID/TRANSACTIONS_VIEW_ID/transactions/TRANSACTION_ID/transaction", "Get Transaction by Id", s"""Returns one transaction specified by TRANSACTION_ID of the account ACCOUNT_ID and [moderated](#1_2_1-getViewsForBankAccount) by the view (VIEW_ID). @@ -1899,7 +1874,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionNarrative), "GET", + implementedInApiVersion, nameOf(getTransactionNarrative), "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transactions/TRANSACTION_ID/metadata/narrative", "Get a Transaction Narrative", """Returns the account owner description of the transaction [moderated](#1_2_1-getViewsForBankAccount) by the view. @@ -1951,7 +1926,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addTransactionNarrative), "POST", + implementedInApiVersion, nameOf(addTransactionNarrative), "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transactions/TRANSACTION_ID/metadata/narrative", "Add a Transaction Narrative", // Intentional drift from Lift's APIMethods121.scala source-of-truth. @@ -2014,7 +1989,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateTransactionNarrative), "PUT", + implementedInApiVersion, nameOf(updateTransactionNarrative), "PUT", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transactions/TRANSACTION_ID/metadata/narrative", "Update a Transaction Narrative", """Updates the description of the transaction TRANSACTION_ID. @@ -2049,7 +2024,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteTransactionNarrative), "DELETE", + implementedInApiVersion, nameOf(deleteTransactionNarrative), "DELETE", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transactions/TRANSACTION_ID/metadata/narrative", "Delete a Transaction Narrative", """Deletes the description of the transaction TRANSACTION_ID. @@ -2076,7 +2051,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCommentsForViewOnTransaction), "GET", + implementedInApiVersion, nameOf(getCommentsForViewOnTransaction), "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transactions/TRANSACTION_ID/metadata/comments", "Get Transaction Comments", """Returns the transaction TRANSACTION_ID comments made on a [view](#1_2_1-getViewsForBankAccount) (VIEW_ID). @@ -2123,7 +2098,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addCommentForViewOnTransaction), "POST", + implementedInApiVersion, nameOf(addCommentForViewOnTransaction), "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transactions/TRANSACTION_ID/metadata/comments", "Add a Transaction Comment", """Posts a comment about a transaction TRANSACTION_ID on a [view](#1_2_1-getViewsForBankAccount) VIEW_ID. @@ -2155,7 +2130,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCommentForViewOnTransaction), "DELETE", + implementedInApiVersion, nameOf(deleteCommentForViewOnTransaction), "DELETE", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transactions/TRANSACTION_ID/metadata/comments/COMMENT_ID", "Delete a Transaction Comment", """Delete the comment COMMENT_ID about the transaction TRANSACTION_ID made on [view](#1_2_1-getViewsForBankAccount). @@ -2182,7 +2157,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTagsForViewOnTransaction), "GET", + implementedInApiVersion, nameOf(getTagsForViewOnTransaction), "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transactions/TRANSACTION_ID/metadata/tags", "Get Transaction Tags", """Returns the transaction TRANSACTION_ID tags made on a [view](#1_2_1-getViewsForBankAccount) (VIEW_ID). @@ -2234,7 +2209,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addTagForViewOnTransaction), "POST", + implementedInApiVersion, nameOf(addTagForViewOnTransaction), "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transactions/TRANSACTION_ID/metadata/tags", "Add a Transaction Tag", s"""Posts a tag about a transaction TRANSACTION_ID on a [view](#1_2_1-getViewsForBankAccount) VIEW_ID. @@ -2266,7 +2241,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteTagForViewOnTransaction), "DELETE", + implementedInApiVersion, nameOf(deleteTagForViewOnTransaction), "DELETE", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transactions/TRANSACTION_ID/metadata/tags/TAG_ID", "Delete a Transaction Tag", """Deletes the tag TAG_ID about the transaction TRANSACTION_ID made on [view](#1_2_1-getViewsForBankAccount). @@ -2298,7 +2273,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getImagesForViewOnTransaction), "GET", + implementedInApiVersion, nameOf(getImagesForViewOnTransaction), "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transactions/TRANSACTION_ID/metadata/images", "Get Transaction Images", """Returns the transaction TRANSACTION_ID images made on a [view](#1_2_1-getViewsForBankAccount) (VIEW_ID). @@ -2347,7 +2322,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addImageForViewOnTransaction), "POST", + implementedInApiVersion, nameOf(addImageForViewOnTransaction), "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transactions/TRANSACTION_ID/metadata/images", "Add a Transaction Image", s"""Posts an image about a transaction TRANSACTION_ID on a [view](#1_2_1-getViewsForBankAccount) VIEW_ID. @@ -2385,7 +2360,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteImageForViewOnTransaction), "DELETE", + implementedInApiVersion, nameOf(deleteImageForViewOnTransaction), "DELETE", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transactions/TRANSACTION_ID/metadata/images/IMAGE_ID", "Delete a Transaction Image", """Deletes the image IMAGE_ID about the transaction TRANSACTION_ID made on [view](#1_2_1-getViewsForBankAccount). @@ -2423,7 +2398,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getWhereTagForViewOnTransaction), "GET", + implementedInApiVersion, nameOf(getWhereTagForViewOnTransaction), "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transactions/TRANSACTION_ID/metadata/where", "Get a Transaction where Tag", """Returns the "where" Geo tag added to the transaction TRANSACTION_ID made on a [view](#1_2_1-getViewsForBankAccount) (VIEW_ID). @@ -2479,7 +2454,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addWhereTagForViewOnTransaction), "POST", + implementedInApiVersion, nameOf(addWhereTagForViewOnTransaction), "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transactions/TRANSACTION_ID/metadata/where", "Add a Transaction where Tag", s"""Creates a "where" Geo tag on a transaction TRANSACTION_ID in a [view](#1_2_1-getViewsForBankAccount). @@ -2531,7 +2506,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateWhereTagForViewOnTransaction), "PUT", + implementedInApiVersion, nameOf(updateWhereTagForViewOnTransaction), "PUT", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transactions/TRANSACTION_ID/metadata/where", "Update a Transaction where Tag", s"""Updates the "where" Geo tag on a transaction TRANSACTION_ID in a [view](#1_2_1-getViewsForBankAccount). @@ -2563,7 +2538,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteWhereTagForViewOnTransaction), "DELETE", + implementedInApiVersion, nameOf(deleteWhereTagForViewOnTransaction), "DELETE", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transactions/TRANSACTION_ID/metadata/where", "Delete a Transaction Tag", s"""Deletes the where tag of the transaction TRANSACTION_ID made on [view](#1_2_1-getViewsForBankAccount). @@ -2602,7 +2577,7 @@ object Http4s121 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getOtherAccountForTransaction), "GET", + implementedInApiVersion, nameOf(getOtherAccountForTransaction), "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transactions/TRANSACTION_ID/other_account", "Get Other Account of Transaction", """Get other account of a transaction. diff --git a/obp-api/src/main/scala/code/api/v1_2_1/OBPAPI1.2.1.scala b/obp-api/src/main/scala/code/api/v1_2_1/OBPAPI1.2.1.scala index f2821eb7a9..01eb680635 100644 --- a/obp-api/src/main/scala/code/api/v1_2_1/OBPAPI1.2.1.scala +++ b/obp-api/src/main/scala/code/api/v1_2_1/OBPAPI1.2.1.scala @@ -1,7 +1,6 @@ package code.api.v1_2_1 import code.api.OBPRestHelper -import code.api.util.APIUtil.OBPEndpoint import code.api.util.VersionedOBPApis import code.util.Helper.MdcLoggable import com.openbankproject.commons.util.{ApiVersion, ApiVersionStatus} @@ -20,9 +19,5 @@ object OBPAPI1_2_1 extends OBPRestHelper with MdcLoggable with VersionedOBPApis def allResourceDocs = Http4s121.resourceDocs - val routes: List[OBPEndpoint] = Nil - - registerRoutes(routes, allResourceDocs, apiPrefix, true) - - logger.info(s"version $version has been run! There are ${routes.length} routes, ${allResourceDocs.length} allResourceDocs.") + logger.info(s"version $version has been run! ${allResourceDocs.length} allResourceDocs.") } diff --git a/obp-api/src/main/scala/code/api/v1_3_0/APIMethods130.scala b/obp-api/src/main/scala/code/api/v1_3_0/APIMethods130.scala index d4418bb940..0794a6984b 100644 --- a/obp-api/src/main/scala/code/api/v1_3_0/APIMethods130.scala +++ b/obp-api/src/main/scala/code/api/v1_3_0/APIMethods130.scala @@ -1,8 +1,7 @@ package code.api.v1_3_0 -import net.liftweb.http.rest.RestHelper -trait APIMethods130 { self: RestHelper => } +trait APIMethods130 // //package code.api.v1_3_0 @@ -20,7 +19,6 @@ trait APIMethods130 { self: RestHelper => } //import com.openbankproject.commons.model.BankId //import com.openbankproject.commons.util.ApiVersion //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper // //import scala.collection.mutable.ArrayBuffer //import scala.concurrent.Future diff --git a/obp-api/src/main/scala/code/api/v1_3_0/Http4s130.scala b/obp-api/src/main/scala/code/api/v1_3_0/Http4s130.scala index da82178ec6..c3fe407a9e 100644 --- a/obp-api/src/main/scala/code/api/v1_3_0/Http4s130.scala +++ b/obp-api/src/main/scala/code/api/v1_3_0/Http4s130.scala @@ -46,7 +46,6 @@ object Http4s130 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(root), "GET", @@ -77,7 +76,6 @@ object Http4s130 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCards), "GET", @@ -106,7 +104,6 @@ object Http4s130 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCardsForBank), "GET", diff --git a/obp-api/src/main/scala/code/api/v1_3_0/OBPAPI1_3_0.scala b/obp-api/src/main/scala/code/api/v1_3_0/OBPAPI1_3_0.scala index f27c8c0d77..71cf6801f3 100644 --- a/obp-api/src/main/scala/code/api/v1_3_0/OBPAPI1_3_0.scala +++ b/obp-api/src/main/scala/code/api/v1_3_0/OBPAPI1_3_0.scala @@ -2,7 +2,6 @@ package code.api.v1_3_0 import scala.language.reflectiveCalls import code.api.OBPRestHelper -import code.api.util.APIUtil.OBPEndpoint import code.api.util.VersionedOBPApis import code.api.v1_2_1.OBPAPI1_2_1 import code.util.Helper.MdcLoggable @@ -22,9 +21,5 @@ object OBPAPI1_3_0 extends OBPRestHelper with MdcLoggable with VersionedOBPApis def allResourceDocs = collectResourceDocs(OBPAPI1_2_1.allResourceDocs, Http4s130.resourceDocs) - val routes: List[OBPEndpoint] = Nil - - registerRoutes(routes, allResourceDocs, apiPrefix, true) - - logger.info(s"version $version has been run! There are ${routes.length} routes, ${allResourceDocs.length} allResourceDocs.") + logger.info(s"version $version has been run! ${allResourceDocs.length} allResourceDocs.") } diff --git a/obp-api/src/main/scala/code/api/v1_4_0/APIMethods140.scala b/obp-api/src/main/scala/code/api/v1_4_0/APIMethods140.scala index f356ac1839..733d0e626d 100644 --- a/obp-api/src/main/scala/code/api/v1_4_0/APIMethods140.scala +++ b/obp-api/src/main/scala/code/api/v1_4_0/APIMethods140.scala @@ -1,9 +1,8 @@ package code.api.v1_4_0 -import net.liftweb.http.rest.RestHelper -trait APIMethods140 { self: RestHelper => } -object APIMethods140 extends RestHelper with APIMethods140 { +trait APIMethods140 +object APIMethods140 { val Implementations1_4_0 = Http4s140.Implementations1_4_0 } // @@ -31,7 +30,6 @@ object APIMethods140 extends RestHelper with APIMethods140 { //import com.openbankproject.commons.model._ //import com.openbankproject.commons.util.ApiVersion //import net.liftweb.common.{Box, Full} -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json.Extraction //import net.liftweb.json.JsonAST.JValue //import net.liftweb.util.Helpers.tryo diff --git a/obp-api/src/main/scala/code/api/v1_4_0/Http4s140.scala b/obp-api/src/main/scala/code/api/v1_4_0/Http4s140.scala index dce06d4b3a..1f5c17a58a 100644 --- a/obp-api/src/main/scala/code/api/v1_4_0/Http4s140.scala +++ b/obp-api/src/main/scala/code/api/v1_4_0/Http4s140.scala @@ -53,7 +53,6 @@ object Http4s140 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(root), "GET", @@ -89,7 +88,6 @@ object Http4s140 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomer), "GET", @@ -119,7 +117,6 @@ object Http4s140 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomersMessages), "GET", @@ -152,7 +149,6 @@ object Http4s140 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addCustomerMessage), "POST", @@ -186,7 +182,6 @@ object Http4s140 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBranches), "GET", @@ -231,7 +226,6 @@ object Http4s140 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAtms), "GET", @@ -270,7 +264,6 @@ object Http4s140 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getProducts), "GET", @@ -307,7 +300,6 @@ object Http4s140 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCrmEvents), "GET", @@ -351,7 +343,6 @@ object Http4s140 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionRequestTypes), "GET", @@ -438,7 +429,6 @@ object Http4s140 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addCustomer), "POST", diff --git a/obp-api/src/main/scala/code/api/v1_4_0/OBPAPI1_4_0.scala b/obp-api/src/main/scala/code/api/v1_4_0/OBPAPI1_4_0.scala index 29cfaf17bc..53ea446a95 100644 --- a/obp-api/src/main/scala/code/api/v1_4_0/OBPAPI1_4_0.scala +++ b/obp-api/src/main/scala/code/api/v1_4_0/OBPAPI1_4_0.scala @@ -2,7 +2,6 @@ package code.api.v1_4_0 import scala.language.reflectiveCalls import code.api.OBPRestHelper -import code.api.util.APIUtil.OBPEndpoint import code.api.util.VersionedOBPApis import code.api.v1_3_0.OBPAPI1_3_0 import code.util.Helper.MdcLoggable @@ -22,9 +21,5 @@ object OBPAPI1_4_0 extends OBPRestHelper with MdcLoggable with VersionedOBPApis def allResourceDocs = collectResourceDocs(OBPAPI1_3_0.allResourceDocs, Http4s140.resourceDocs) - val routes: List[OBPEndpoint] = Nil - - registerRoutes(routes, allResourceDocs, apiPrefix, true) - - logger.info(s"version $version has been run! There are ${routes.length} routes, ${allResourceDocs.length} allResourceDocs.") + logger.info(s"version $version has been run! ${allResourceDocs.length} allResourceDocs.") } diff --git a/obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala b/obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala index 0110e58def..7277fedacc 100644 --- a/obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala +++ b/obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala @@ -1,10 +1,9 @@ package code.api.v2_0_0 -import net.liftweb.http.rest.RestHelper -trait APIMethods200 { self: RestHelper => } +trait APIMethods200 -object APIMethods200 extends RestHelper with APIMethods200 { +object APIMethods200 { val Implementations2_0_0 = Http4s200.Implementations2_0_0 } // @@ -41,8 +40,6 @@ object APIMethods200 extends RestHelper with APIMethods200 { //import com.openbankproject.commons.model._ //import com.openbankproject.commons.util.ApiVersion //import net.liftweb.common._ -//import net.liftweb.http.CurrentReq -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json.JsonAST.JValue //import net.liftweb.mapper.By //import net.liftweb.util.Helpers.tryo diff --git a/obp-api/src/main/scala/code/api/v2_0_0/AccountsHelper.scala b/obp-api/src/main/scala/code/api/v2_0_0/AccountsHelper.scala index e67fb8621f..c02f039c01 100644 --- a/obp-api/src/main/scala/code/api/v2_0_0/AccountsHelper.scala +++ b/obp-api/src/main/scala/code/api/v2_0_0/AccountsHelper.scala @@ -1,15 +1,6 @@ package code.api.v2_0_0 -import code.api.util.ErrorMessages.InvalidFilterParameterFormat -import code.api.util.{CallContext, NewStyle} -import code.api.util.APIUtil.unboxFullOrFail -import com.openbankproject.commons.model.{BankIdAccountId, CoreAccount} -import net.liftweb.http.Req -import net.liftweb.util.Helpers.tryo - -import scala.collection.immutable.{List, Nil} -import scala.concurrent.Future -import com.openbankproject.commons.ExecutionContext.Implicits.global +import com.openbankproject.commons.model.CoreAccount /** * this helper is make sure some common value or function can be used by different APIMethodsXxx @@ -30,43 +21,4 @@ object AccountsHelper { """.stripMargin - /** - * get parameter of account_type_filter_operation and account_type_filter_operation, do filter with CoreAccount#accountType - * @param coreAccounts list of CoreAccount, to do filter - * @param req request - * @return result after do filter - */ - private def filterWithAccountType(coreAccounts: List[CoreAccount], req: Req): List[CoreAccount] = { - val filters = req.params.get("account_type_filter").map(_.flatMap(_.split(","))).getOrElse(Nil) - val filtersOperation = req.params.get("account_type_filter_operation").flatMap(_.headOption).getOrElse("INCLUDE") - - val failMsg = s"""${InvalidFilterParameterFormat}request parameter account_type_filter_operation must be either INCLUDE or EXCLUDE, current it is: ${filtersOperation} """ - - // validate account_type_filter_operation parameter - unboxFullOrFail(tryo { - assume(filtersOperation == "INCLUDE" || filtersOperation == "EXCLUDE") - }, None, failMsg) - - coreAccounts.filter({ account => - (filters, filtersOperation) match { - case (f, "INCLUDE") if f.nonEmpty => filters.contains(account.accountType) - case (f, "EXCLUDE") if f.nonEmpty => !filters.contains(account.accountType) - case _ => true - } - }) - } - - /** - * get CoreAccount and the result is filtered according request parameter: account_type_filter_operation and account_type_filter_operatio - * @param bankIdAcountIds list of BankIdAccountId - * @param req http request - * @param callContext callContext - * @return list of CoreAccount Future - */ - def getFilteredCoreAccounts(bankIdAcountIds: List[BankIdAccountId], req: Req, callContext: Option[CallContext]): Future[(List[CoreAccount], Option[CallContext])] = { - NewStyle.function.getCoreBankAccountsFuture(bankIdAcountIds, callContext) map { it => - val (coreAccounts, cc) = it - (filterWithAccountType(coreAccounts, req), cc) - } - } } diff --git a/obp-api/src/main/scala/code/api/v2_0_0/Http4s200.scala b/obp-api/src/main/scala/code/api/v2_0_0/Http4s200.scala index c054edc48f..7b35f7dba1 100644 --- a/obp-api/src/main/scala/code/api/v2_0_0/Http4s200.scala +++ b/obp-api/src/main/scala/code/api/v2_0_0/Http4s200.scala @@ -33,7 +33,6 @@ import com.openbankproject.commons.model.{AccountId, AmountOfMoneyJsonV121, Bank import com.openbankproject.commons.model.{AmountOfMoneyJsonV121 => AmountOfMoneyJSON121} import com.openbankproject.commons.util.{ApiVersion, ApiVersionStatus, ScannedApiVersion} import net.liftweb.common._ -import net.liftweb.http.InMemoryResponse import net.liftweb.json.JsonAST.JValue import net.liftweb.json.{Extraction, Formats} import net.liftweb.mapper.By @@ -80,7 +79,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(root), "GET", "/root", + implementedInApiVersion, nameOf(root), "GET", "/root", "Get API Info (root)", """Returns information about: | @@ -105,7 +104,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPrivateAccountsAllBanks), "GET", "/accounts", + implementedInApiVersion, nameOf(getPrivateAccountsAllBanks), "GET", "/accounts", "Get all Accounts at all Banks", s"""Get all accounts at all banks the User has access to. |Returns the list of accounts at that the user has access to at all banks. @@ -133,7 +132,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(corePrivateAccountsAllBanks), "GET", "/my/accounts", + implementedInApiVersion, nameOf(corePrivateAccountsAllBanks), "GET", "/my/accounts", "Get Accounts at all Banks (Private)", s"""Get private accounts at all banks (Authenticated access) |Returns the list of accounts containing private views for the user at all banks. @@ -166,7 +165,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(publicAccountsAllBanks), "GET", "/accounts/public", + implementedInApiVersion, nameOf(publicAccountsAllBanks), "GET", "/accounts/public", "Get Public Accounts at all Banks", s"""Get public accounts at all banks (Anonymous access). |Returns accounts that contain at least one public view (a view where is_public is true) @@ -217,7 +216,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPrivateAccountsAtOneBank), "GET", "/banks/BANK_ID/accounts", + implementedInApiVersion, nameOf(getPrivateAccountsAtOneBank), "GET", "/banks/BANK_ID/accounts", "Get Accounts at Bank", s""" |Returns the list of accounts at BANK_ID that the user has access to. @@ -268,7 +267,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(corePrivateAccountsAtOneBank), "GET", "/my/banks/BANK_ID/accounts", + implementedInApiVersion, nameOf(corePrivateAccountsAtOneBank), "GET", "/my/banks/BANK_ID/accounts", "Get Accounts at Bank (Private)", s"""Get private accounts at one bank (Authenticated access). |Returns the list of accounts containing private views for the user at BANK_ID. @@ -300,7 +299,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(privateAccountsAtOneBank), "GET", "/banks/BANK_ID/accounts/private", + implementedInApiVersion, nameOf(privateAccountsAtOneBank), "GET", "/banks/BANK_ID/accounts/private", "Get private accounts at one bank", s"""Returns the list of private accounts at BANK_ID that the user has access to. |For each account the API returns the ID and the available views. @@ -338,7 +337,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(publicAccountsAtOneBank), "GET", "/banks/BANK_ID/accounts/public", + implementedInApiVersion, nameOf(publicAccountsAtOneBank), "GET", "/banks/BANK_ID/accounts/public", "Get Public Accounts at Bank", s"""Returns a list of the public accounts (Anonymous access) at BANK_ID. |For each account the API returns the ID and the available views. @@ -365,7 +364,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getKycDocuments), "GET", "/customers/CUSTOMER_ID/kyc_documents", + implementedInApiVersion, nameOf(getKycDocuments), "GET", "/customers/CUSTOMER_ID/kyc_documents", "Get Customer KYC Documents", s"""Get KYC (know your customer) documents for a customer specified by CUSTOMER_ID |Get a list of documents that affirm the identity of the customer @@ -393,7 +392,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getKycMedia), "GET", "/customers/CUSTOMER_ID/kyc_media", + implementedInApiVersion, nameOf(getKycMedia), "GET", "/customers/CUSTOMER_ID/kyc_media", "Get KYC Media for a customer", s"""Get KYC media (scans, pictures, videos) that affirms the identity of the customer. | @@ -420,7 +419,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getKycChecks), "GET", "/customers/CUSTOMER_ID/kyc_checks", + implementedInApiVersion, nameOf(getKycChecks), "GET", "/customers/CUSTOMER_ID/kyc_checks", "Get Customer KYC Checks", s"""Get KYC checks for the Customer specified by CUSTOMER_ID. | @@ -447,7 +446,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getKycStatuses), "GET", "/customers/CUSTOMER_ID/kyc_statuses", + implementedInApiVersion, nameOf(getKycStatuses), "GET", "/customers/CUSTOMER_ID/kyc_statuses", "Get Customer KYC statuses", s"""Get the KYC statuses for a customer specified by CUSTOMER_ID over time. | @@ -476,7 +475,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSocialMediaHandles), "GET", + implementedInApiVersion, nameOf(getSocialMediaHandles), "GET", "/banks/BANK_ID/customers/CUSTOMER_ID/social_media_handles", "Get Customer Social Media Handles", s"""Get social media handles for a customer specified by CUSTOMER_ID. @@ -507,7 +506,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addKycDocument), "PUT", + implementedInApiVersion, nameOf(addKycDocument), "PUT", "/banks/BANK_ID/customers/CUSTOMER_ID/kyc_documents/KYC_DOCUMENT_ID", "Add KYC Document", "Add a KYC document for the customer specified by CUSTOMER_ID. KYC Documents contain the document type (e.g. passport), place of issue, expiry etc. ", @@ -536,7 +535,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addKycMedia), "PUT", + implementedInApiVersion, nameOf(addKycMedia), "PUT", "/banks/BANK_ID/customers/CUSTOMER_ID/kyc_media/KYC_MEDIA_ID", "Add KYC Media", "Add some KYC media for the customer specified by CUSTOMER_ID. KYC Media resources relate to KYC Documents and KYC Checks and contain media urls for scans of passports, utility bills etc", @@ -565,7 +564,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addKycCheck), "PUT", + implementedInApiVersion, nameOf(addKycCheck), "PUT", "/banks/BANK_ID/customers/CUSTOMER_ID/kyc_check/KYC_CHECK_ID", "Add KYC Check", "Add a KYC check for the customer specified by CUSTOMER_ID. KYC Checks store details of checks on a customer made by the KYC team, their comments and a satisfied status", @@ -593,7 +592,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addKycStatus), "PUT", + implementedInApiVersion, nameOf(addKycStatus), "PUT", "/banks/BANK_ID/customers/CUSTOMER_ID/kyc_statuses", "Add KYC Status", "Add a kyc_status for the customer specified by CUSTOMER_ID. KYC Status is a timeline of the KYC status of the customer", @@ -626,7 +625,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addSocialMediaHandle), "POST", + implementedInApiVersion, nameOf(addSocialMediaHandle), "POST", "/banks/BANK_ID/customers/CUSTOMER_ID/social_media_handles", "Create Customer Social Media Handle", "Create a customer social media handle for the customer specified by CUSTOMER_ID", @@ -653,7 +652,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCoreAccountById), "GET", + implementedInApiVersion, nameOf(getCoreAccountById), "GET", "/my/banks/BANK_ID/accounts/ACCOUNT_ID/account", "Get Account by Id (Core)", s"""Information returned about the account specified by ACCOUNT_ID: @@ -692,7 +691,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCoreTransactionsForBankAccount), "GET", + implementedInApiVersion, nameOf(getCoreTransactionsForBankAccount), "GET", "/my/banks/BANK_ID/accounts/ACCOUNT_ID/transactions", "Get Transactions for Account (Core)", s"""Returns transactions list (Core info) of the account specified by ACCOUNT_ID. @@ -727,7 +726,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(accountById), "GET", + implementedInApiVersion, nameOf(accountById), "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/account", "Get Account by Id (Full)", s"""Information returned about an account specified by ACCOUNT_ID as moderated by the view (VIEW_ID): @@ -774,7 +773,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPermissionsForBankAccount), "GET", + implementedInApiVersion, nameOf(getPermissionsForBankAccount), "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/permissions", "Get access", s"""Returns the list of the permissions at BANK_ID for account ACCOUNT_ID, with each time a pair composed of the user and the views that he has access to. @@ -817,7 +816,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPermissionForUserForBankAccount), "GET", + implementedInApiVersion, nameOf(getPermissionForUserForBankAccount), "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/permissions/PROVIDER/PROVIDER_ID", "Get Account access for User", s"""Returns the list of the views at BANK_ID for account ACCOUNT_ID that a user identified by PROVIDER_ID at their provider PROVIDER has access to. @@ -873,7 +872,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createAccount), "PUT", + implementedInApiVersion, nameOf(createAccount), "PUT", "/banks/BANK_ID/accounts/NEW_ACCOUNT_ID", "Create Account", """Create Account at bank specified by BANK_ID with Id specified by ACCOUNT_ID. @@ -912,7 +911,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionTypes), "GET", + implementedInApiVersion, nameOf(getTransactionTypes), "GET", "/banks/BANK_ID/transaction-types", "Get Transaction Types at Bank", // TODO get the documentation of the parameters from the scala doc of the case class we return @@ -974,7 +973,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createUser), "POST", "/users", + implementedInApiVersion, nameOf(createUser), "POST", "/users", "Create User", s"""Creates OBP user. | No authorisation required. @@ -1061,7 +1060,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createCustomer), "POST", + implementedInApiVersion, nameOf(createCustomer), "POST", "/banks/BANK_ID/customers", "Create Customer", s"""Add a customer linked to the user specified by user_id @@ -1089,7 +1088,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCurrentUser), "GET", "/users/current", + implementedInApiVersion, nameOf(getCurrentUser), "GET", "/users/current", "Get User (Current)", """Get the logged in user | @@ -1116,7 +1115,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUser), "GET", "/users/USER_EMAIL", + implementedInApiVersion, nameOf(getUser), "GET", "/users/USER_EMAIL", "Get Users by Email Address", """Get users by email address | @@ -1165,7 +1164,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createUserCustomerLinks), "POST", + implementedInApiVersion, nameOf(createUserCustomerLinks), "POST", "/banks/BANK_ID/user_customer_links", "Create User Customer Link", s"""Link a User to a Customer @@ -1220,7 +1219,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addEntitlement), "POST", + implementedInApiVersion, nameOf(addEntitlement), "POST", "/users/USER_ID/entitlements", "Add Entitlement for a User", """Create Entitlement. Grant Role to User. @@ -1260,7 +1259,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getEntitlements), "GET", + implementedInApiVersion, nameOf(getEntitlements), "GET", "/users/USER_ID/entitlements", "Get Entitlements for User", s"""${userAuthenticationMessage(true)}""", @@ -1297,7 +1296,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteEntitlement), "DELETE", + implementedInApiVersion, nameOf(deleteEntitlement), "DELETE", "/users/USER_ID/entitlement/ENTITLEMENT_ID", "Delete Entitlement", """Delete Entitlement specified by ENTITLEMENT_ID for an user specified by USER_ID @@ -1330,7 +1329,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAllEntitlements), "GET", "/entitlements", + implementedInApiVersion, nameOf(getAllEntitlements), "GET", "/entitlements", "Get all Entitlements", """Login is required.""", EmptyBody, entitlementJSONs, @@ -1351,18 +1350,13 @@ object Http4s200 { APIUtil.hasEntitlement("", user.userId, canSearchWarehouse) } } yield { - val liftResp = esw.searchProxy(user.userId, queryString) - liftResp.toResponse match { - case InMemoryResponse(data, _, _, _) => - net.liftweb.json.parse(new String(data, "UTF-8")) - case _ => net.liftweb.json.JNull - } + esw.searchProxy(user.userId, queryString) } } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(elasticSearchWarehouse), "GET", + implementedInApiVersion, nameOf(elasticSearchWarehouse), "GET", "/search/warehouse", "Search Warehouse Data Via Elasticsearch", """ @@ -1448,18 +1442,13 @@ object Http4s200 { APIUtil.hasEntitlement("", user.userId, canSearchMetrics) } } yield { - val liftResp = esm.searchProxy(user.userId, queryString) - liftResp.toResponse match { - case InMemoryResponse(data, _, _, _) => - net.liftweb.json.parse(new String(data, "UTF-8")) - case _ => net.liftweb.json.JNull - } + esm.searchProxy(user.userId, queryString) } } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(elasticSearchMetrics), "GET", + implementedInApiVersion, nameOf(elasticSearchMetrics), "GET", "/search/metrics", "Search API Metrics via Elasticsearch", """ @@ -1540,7 +1529,7 @@ object Http4s200 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomers), "GET", + implementedInApiVersion, nameOf(getCustomers), "GET", "/users/current/customers", "Get all customers for logged in user", """Information about the currently authenticated user. diff --git a/obp-api/src/main/scala/code/api/v2_0_0/OBPAPI2_0_0.scala b/obp-api/src/main/scala/code/api/v2_0_0/OBPAPI2_0_0.scala index e23410ca49..70eed6f12f 100644 --- a/obp-api/src/main/scala/code/api/v2_0_0/OBPAPI2_0_0.scala +++ b/obp-api/src/main/scala/code/api/v2_0_0/OBPAPI2_0_0.scala @@ -2,7 +2,6 @@ package code.api.v2_0_0 import scala.language.reflectiveCalls import code.api.OBPRestHelper -import code.api.util.APIUtil.OBPEndpoint import code.api.util.VersionedOBPApis import code.api.v1_4_0.OBPAPI1_4_0 import code.util.Helper.MdcLoggable @@ -22,9 +21,5 @@ object OBPAPI2_0_0 extends OBPRestHelper with MdcLoggable with VersionedOBPApis def allResourceDocs = collectResourceDocs(OBPAPI1_4_0.allResourceDocs, Http4s200.resourceDocs) - val routes: List[OBPEndpoint] = Nil - - registerRoutes(routes, allResourceDocs, apiPrefix, true) - - logger.info(s"version $version has been run! There are ${routes.length} routes, ${allResourceDocs.length} allResourceDocs.") + logger.info(s"version $version has been run! ${allResourceDocs.length} allResourceDocs.") } diff --git a/obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala b/obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala index 0dcf255693..727bf21a26 100644 --- a/obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala +++ b/obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala @@ -1,10 +1,9 @@ package code.api.v2_1_0 -import net.liftweb.http.rest.RestHelper -trait APIMethods210 { self: RestHelper => } +trait APIMethods210 -object APIMethods210 extends RestHelper with APIMethods210 { +object APIMethods210 { val Implementations2_1_0 = Http4s210.Implementations2_1_0 } // @@ -58,7 +57,6 @@ object APIMethods210 extends RestHelper with APIMethods210 { //import code.util.Helper //import com.openbankproject.commons.ExecutionContext.Implicits.global //import net.liftweb.common.{Box, Full} -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json.Serialization.write //import net.liftweb.json._ // diff --git a/obp-api/src/main/scala/code/api/v2_1_0/Http4s210.scala b/obp-api/src/main/scala/code/api/v2_1_0/Http4s210.scala index d80406219d..0add9393cd 100644 --- a/obp-api/src/main/scala/code/api/v2_1_0/Http4s210.scala +++ b/obp-api/src/main/scala/code/api/v2_1_0/Http4s210.scala @@ -91,7 +91,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(root), "GET", "/root", + implementedInApiVersion, nameOf(root), "GET", "/root", "Get API Info (root)", """Returns information about: | @@ -122,7 +122,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(sandboxDataImport), "POST", "/sandbox/data-import", + implementedInApiVersion, nameOf(sandboxDataImport), "POST", "/sandbox/data-import", "Create sandbox", s"""Import bulk data into the sandbox (Authenticated access). | @@ -161,7 +161,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionRequestTypesSupportedByBank), "GET", + implementedInApiVersion, nameOf(getTransactionRequestTypesSupportedByBank), "GET", "/banks/BANK_ID/transaction-request-types", "Get Transaction Request Types at Bank", s"""Get the list of the Transaction Request Types supported by the bank. @@ -214,7 +214,7 @@ object Http4s210 { TransactionDisabled, UnknownError) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createTransactionRequest) + "SandboxTan", "POST", + implementedInApiVersion, nameOf(createTransactionRequest) + "SandboxTan", "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/GRANT_VIEW_ID/transaction-request-types/SANDBOX_TAN/transaction-requests", "Create Transaction Request (SANDBOX_TAN)", s"""When using SANDBOX_TAN, the payee is set in the request body. @@ -225,7 +225,7 @@ object Http4s210 { http4sPartialFunction = Some(createTransactionRequest)) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createTransactionRequest) + "Counterparty", "POST", + implementedInApiVersion, nameOf(createTransactionRequest) + "Counterparty", "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/GRANT_VIEW_ID/transaction-request-types/COUNTERPARTY/transaction-requests", "Create Transaction Request (COUNTERPARTY)", s"""When using COUNTERPARTY, specify the counterparty_id in the body. @@ -236,7 +236,7 @@ object Http4s210 { http4sPartialFunction = Some(createTransactionRequest)) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createTransactionRequest) + "Sepa", "POST", + implementedInApiVersion, nameOf(createTransactionRequest) + "Sepa", "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/GRANT_VIEW_ID/transaction-request-types/SEPA/transaction-requests", "Create Transaction Request (SEPA)", s"""When using SEPA, specify the IBAN of a Counterparty in the body. @@ -247,7 +247,7 @@ object Http4s210 { http4sPartialFunction = Some(createTransactionRequest)) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createTransactionRequest) + "FreeForm", "POST", + implementedInApiVersion, nameOf(createTransactionRequest) + "FreeForm", "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/GRANT_VIEW_ID/transaction-request-types/FREE_FORM/transaction-requests", "Create Transaction Request (FREE_FORM)", s"""Create a FREE_FORM Transaction Request. @@ -442,7 +442,7 @@ object Http4s210 { v210SupportedTransactionRequestTypes.foreach { trType => resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(answerTransactionRequestChallenge) + trType.toLowerCase.capitalize, "POST", + implementedInApiVersion, nameOf(answerTransactionRequestChallenge) + trType.toLowerCase.capitalize, "POST", s"/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transaction-request-types/$trType/transaction-requests/TRANSACTION_REQUEST_ID/challenge", "Answer Transaction Request Challenge", """In Sandbox mode, any string that can be converted to a positive integer will be accepted as an answer. @@ -558,7 +558,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionRequests), "GET", + implementedInApiVersion, nameOf(getTransactionRequests), "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transaction-requests", "Get Transaction Requests.", """Returns transaction requests for account specified by ACCOUNT_ID at bank specified by BANK_ID. @@ -597,7 +597,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getRoles), "GET", "/roles", + implementedInApiVersion, nameOf(getRoles), "GET", "/roles", "Get Roles", s"""Returns all available roles | @@ -637,7 +637,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getEntitlementsByBankAndUser), "GET", + implementedInApiVersion, nameOf(getEntitlementsByBankAndUser), "GET", "/banks/BANK_ID/users/USER_ID/entitlements", "Get Entitlements for User at Bank", s"""Get Entitlements specified by BANK_ID and USER_ID @@ -667,7 +667,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsumer), "GET", + implementedInApiVersion, nameOf(getConsumer), "GET", "/management/consumers/CONSUMER_ID", "Get Consumer", s"""Get the Consumer specified by CONSUMER_ID.""", @@ -694,7 +694,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsumers), "GET", + implementedInApiVersion, nameOf(getConsumers), "GET", "/management/consumers", "Get Consumers", s"""Get the all Consumers.""", @@ -737,7 +737,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(enableDisableConsumers), "PUT", + implementedInApiVersion, nameOf(enableDisableConsumers), "PUT", "/management/consumers/CONSUMER_ID", "Enable or Disable Consumers", s"""Enable/Disable a Consumer specified by CONSUMER_ID.""", @@ -802,7 +802,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addCardForBank), "POST", + implementedInApiVersion, nameOf(addCardForBank), "POST", "/banks/BANK_ID/cards", "Create Card", s"""Create Card at bank specified by BANK_ID. @@ -831,7 +831,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUsers), "GET", "/users", + implementedInApiVersion, nameOf(getUsers), "GET", "/users", "Get all Users", s"""Get all users | @@ -871,7 +871,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createTransactionType), "PUT", + implementedInApiVersion, nameOf(createTransactionType), "PUT", "/banks/BANK_ID/transaction-types", "Create Transaction Type at bank", // TODO get the documentation of the parameters from the scala doc of the case class we return @@ -913,7 +913,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAtm), "GET", + implementedInApiVersion, nameOf(getAtm), "GET", "/banks/BANK_ID/atms/ATM_ID", "Get Bank ATM", s"""Returns information about ATM for a single bank specified by BANK_ID and ATM_ID including: @@ -949,7 +949,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBranch), "GET", + implementedInApiVersion, nameOf(getBranch), "GET", "/banks/BANK_ID/branches/BRANCH_ID", "Get Bank Branch", s"""Returns information about branches for a single bank specified by BANK_ID and BRANCH_ID including: @@ -983,7 +983,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getProduct), "GET", + implementedInApiVersion, nameOf(getProduct), "GET", "/banks/BANK_ID/products/PRODUCT_CODE", "Get Bank Product", s"""Returns information about the financial products offered by a bank specified by BANK_ID and PRODUCT_CODE including: @@ -1019,7 +1019,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getProducts), "GET", + implementedInApiVersion, nameOf(getProducts), "GET", "/banks/BANK_ID/products", "Get Bank Products", s"""Returns information about the financial products offered by a bank specified by BANK_ID including: @@ -1085,7 +1085,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createCustomer), "POST", + implementedInApiVersion, nameOf(createCustomer), "POST", "/banks/BANK_ID/customers", "Create Customer", s"""Add a customer linked to the user specified by user_id @@ -1116,7 +1116,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomersForUser), "GET", + implementedInApiVersion, nameOf(getCustomersForUser), "GET", "/users/current/customers", "Get Customers for Current User", """Gets all Customers that are linked to a User. @@ -1144,7 +1144,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomersForCurrentUserAtBank), "GET", + implementedInApiVersion, nameOf(getCustomersForCurrentUserAtBank), "GET", "/banks/BANK_ID/customers", "Get Customers for current User at Bank", s"""Returns a list of Customers at the Bank that are linked to the currently authenticated User. @@ -1184,7 +1184,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateBranch), "PUT", + implementedInApiVersion, nameOf(updateBranch), "PUT", "/banks/BANK_ID/branches/BRANCH_ID", "Update Branch", s"""Update an existing branch for a bank account (Authenticated access). @@ -1220,7 +1220,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createBranch), "POST", + implementedInApiVersion, nameOf(createBranch), "POST", "/banks/BANK_ID/branches", "Create Branch", s"""Create branch for the bank (Authenticated access). @@ -1262,7 +1262,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateConsumerRedirectUrl), "PUT", + implementedInApiVersion, nameOf(updateConsumerRedirectUrl), "PUT", "/management/consumers/CONSUMER_ID/consumer/redirect_url", "Update Consumer RedirectUrl", s"""Update an existing redirectUrl for a Consumer specified by CONSUMER_ID. @@ -1295,7 +1295,7 @@ object Http4s210 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMetrics), "GET", + implementedInApiVersion, nameOf(getMetrics), "GET", "/management/metrics", "Get Metrics", s"""Get the all metrics diff --git a/obp-api/src/main/scala/code/api/v2_1_0/OBPAPI2_1_0.scala b/obp-api/src/main/scala/code/api/v2_1_0/OBPAPI2_1_0.scala index 7ce814507a..1a60a3a2ec 100644 --- a/obp-api/src/main/scala/code/api/v2_1_0/OBPAPI2_1_0.scala +++ b/obp-api/src/main/scala/code/api/v2_1_0/OBPAPI2_1_0.scala @@ -2,7 +2,6 @@ package code.api.v2_1_0 import scala.language.reflectiveCalls import code.api.OBPRestHelper -import code.api.util.APIUtil.OBPEndpoint import code.api.util.VersionedOBPApis import code.api.v2_0_0.OBPAPI2_0_0 import code.util.Helper.MdcLoggable @@ -22,9 +21,5 @@ object OBPAPI2_1_0 extends OBPRestHelper with MdcLoggable with VersionedOBPApis def allResourceDocs = collectResourceDocs(OBPAPI2_0_0.allResourceDocs, Http4s210.resourceDocs) - val routes: List[OBPEndpoint] = Nil - - registerRoutes(routes, allResourceDocs, apiPrefix, true) - - logger.info(s"version $version has been run! There are ${routes.length} routes, ${allResourceDocs.length} allResourceDocs.") + logger.info(s"version $version has been run! ${allResourceDocs.length} allResourceDocs.") } diff --git a/obp-api/src/main/scala/code/api/v2_2_0/APIMethods220.scala b/obp-api/src/main/scala/code/api/v2_2_0/APIMethods220.scala index f8f9514b56..b1dfca58bf 100644 --- a/obp-api/src/main/scala/code/api/v2_2_0/APIMethods220.scala +++ b/obp-api/src/main/scala/code/api/v2_2_0/APIMethods220.scala @@ -1,10 +1,9 @@ package code.api.v2_2_0 -import net.liftweb.http.rest.RestHelper -trait APIMethods220 { self: RestHelper => } +trait APIMethods220 -object APIMethods220 extends RestHelper with APIMethods220 { +object APIMethods220 { val Implementations2_2_0 = Http4s220.Implementations2_2_0 } @@ -41,7 +40,6 @@ object APIMethods220 extends RestHelper with APIMethods220 { //import com.openbankproject.commons.model._ //import com.openbankproject.commons.util.ApiVersion //import net.liftweb.common.Full -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json.Extraction //import net.liftweb.util.Helpers.tryo //import net.liftweb.util.StringHelpers diff --git a/obp-api/src/main/scala/code/api/v2_2_0/Http4s220.scala b/obp-api/src/main/scala/code/api/v2_2_0/Http4s220.scala index 1b1e32849f..f777431b59 100644 --- a/obp-api/src/main/scala/code/api/v2_2_0/Http4s220.scala +++ b/obp-api/src/main/scala/code/api/v2_2_0/Http4s220.scala @@ -65,7 +65,7 @@ object Http4s220 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(root), "GET", "/root", + implementedInApiVersion, nameOf(root), "GET", "/root", "Get API Info (root)", """Returns information about: | @@ -95,7 +95,7 @@ object Http4s220 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getViewsForBankAccount), "GET", + implementedInApiVersion, nameOf(getViewsForBankAccount), "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/views", "Get Views for Account", s"""#Views @@ -153,7 +153,7 @@ object Http4s220 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createViewForBankAccount), "POST", + implementedInApiVersion, nameOf(createViewForBankAccount), "POST", "/banks/BANK_ID/accounts/VIEW_ACCOUNT_ID/views", "Create View", s"""#Create a view on bank account @@ -225,7 +225,7 @@ object Http4s220 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateViewForBankAccount), "PUT", + implementedInApiVersion, nameOf(updateViewForBankAccount), "PUT", "/banks/BANK_ID/accounts/ACCOUNT_ID/views/UPD_VIEW_ID", "Update View", s"""Update an existing view on a bank account @@ -291,7 +291,7 @@ object Http4s220 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCurrentFxRate), "GET", + implementedInApiVersion, nameOf(getCurrentFxRate), "GET", "/banks/BANK_ID/fx/FROM_CURRENCY_CODE/TO_CURRENCY_CODE", "Get Current FxRate", """Get the latest FX rate specified by BANK_ID, FROM_CURRENCY_CODE and TO_CURRENCY_CODE @@ -340,7 +340,7 @@ object Http4s220 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getExplicitCounterpartiesForAccount), "GET", + implementedInApiVersion, nameOf(getExplicitCounterpartiesForAccount), "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/counterparties", "Get Counterparties (Explicit)", s"""This endpoints gets the explicit Counterparties on an Account / View. @@ -373,7 +373,7 @@ object Http4s220 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getExplicitCounterpartyById), "GET", + implementedInApiVersion, nameOf(getExplicitCounterpartyById), "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/counterparties/COUNTERPARTY_ID", "Get Counterparty by Counterparty Id (Explicit)", s"""Information returned about the Counterparty specified by COUNTERPARTY_ID: @@ -402,7 +402,7 @@ object Http4s220 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMessageDocs), "GET", + implementedInApiVersion, nameOf(getMessageDocs), "GET", "/message-docs/CONNECTOR", "Get Message Docs", """These message docs provide example messages sent by OBP to the (RabbitMq) message queue for processing by the Core Banking / Payment system Adapter - together with an example expected response and possible error codes. @@ -461,7 +461,7 @@ object Http4s220 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createBank), "POST", + implementedInApiVersion, nameOf(createBank), "POST", "/banks", "Create Bank", s"""Create a new bank (Authenticated access). @@ -494,7 +494,7 @@ object Http4s220 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createBranch), "POST", + implementedInApiVersion, nameOf(createBranch), "POST", "/banks/BANK_ID/branches", "Create Branch", s"""Create Branch for the Bank. @@ -527,7 +527,7 @@ object Http4s220 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createAtm), "POST", + implementedInApiVersion, nameOf(createAtm), "POST", "/banks/BANK_ID/atms", "Create ATM", s"""Create ATM for the Bank. @@ -568,7 +568,7 @@ object Http4s220 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createProduct), "PUT", + implementedInApiVersion, nameOf(createProduct), "PUT", "/banks/BANK_ID/products", "Create Product", s"""Create or Update Product for the Bank. @@ -612,7 +612,7 @@ object Http4s220 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createFx), "PUT", + implementedInApiVersion, nameOf(createFx), "PUT", "/banks/BANK_ID/fx", "Create Fx", s"""Create or Update Fx for the Bank. @@ -676,7 +676,7 @@ object Http4s220 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createAccount), "PUT", + implementedInApiVersion, nameOf(createAccount), "PUT", "/banks/BANK_ID/accounts/NEW_ACCOUNT_ID", "Create Account", """Create Account at bank specified by BANK_ID with Id specified by ACCOUNT_ID. @@ -710,7 +710,7 @@ object Http4s220 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(config), "GET", + implementedInApiVersion, nameOf(config), "GET", "/config", "Get API Configuration", """Returns information about: @@ -740,7 +740,7 @@ object Http4s220 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConnectorMetrics), "GET", + implementedInApiVersion, nameOf(getConnectorMetrics), "GET", "/management/connector/metrics", "Get Connector Metrics", s"""Get the all metrics @@ -807,7 +807,7 @@ object Http4s220 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createConsumer), "POST", + implementedInApiVersion, nameOf(createConsumer), "POST", "/management/consumers", "Post a Consumer", s"""Create a Consumer (Authenticated access). @@ -866,7 +866,7 @@ object Http4s220 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createCounterparty), "POST", + implementedInApiVersion, nameOf(createCounterparty), "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/counterparties", "Create Counterparty (Explicit)", s"""Create Counterparty (Explicit) for an Account. diff --git a/obp-api/src/main/scala/code/api/v2_2_0/OBPAPI2_2_0.scala b/obp-api/src/main/scala/code/api/v2_2_0/OBPAPI2_2_0.scala index d8847ab52e..f87527dcfe 100644 --- a/obp-api/src/main/scala/code/api/v2_2_0/OBPAPI2_2_0.scala +++ b/obp-api/src/main/scala/code/api/v2_2_0/OBPAPI2_2_0.scala @@ -2,7 +2,6 @@ package code.api.v2_2_0 import scala.language.reflectiveCalls import code.api.OBPRestHelper -import code.api.util.APIUtil.OBPEndpoint import code.api.util.VersionedOBPApis import code.api.v2_0_0.Http4s200 import code.api.v2_1_0.OBPAPI2_1_0 @@ -24,11 +23,7 @@ object OBPAPI2_2_0 extends OBPRestHelper with MdcLoggable with VersionedOBPApis def allResourceDocs = collectResourceDocs(OBPAPI2_1_0.allResourceDocs, Http4s220.resourceDocs) - val routes: List[OBPEndpoint] = Nil - - registerRoutes(routes, allResourceDocs, apiPrefix, true) - - logger.info(s"version $version has been run! There are ${routes.length} routes, ${allResourceDocs.length} allResourceDocs.") + logger.info(s"version $version has been run! ${allResourceDocs.length} allResourceDocs.") } //package code.api.v2_2_0 @@ -245,6 +240,6 @@ object OBPAPI2_2_0 extends OBPRestHelper with MdcLoggable with VersionedOBPApis // // registerRoutes(routes, allResourceDocs, apiPrefix) // -// logger.info(s"version $version has been run! There are ${routes.length} routes.") +// logger.info(s"version $version has been run!") // //} \ No newline at end of file diff --git a/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala b/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala index 34f076d474..da3eba185a 100644 --- a/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala +++ b/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala @@ -1,6 +1,5 @@ package code.api.v3_0_0 -import net.liftweb.http.rest.RestHelper /* * All v3.0.0 endpoints have been migrated to Http4s300. This trait is retained @@ -11,9 +10,9 @@ import net.liftweb.http.rest.RestHelper * Use `Http4s300.Implementations3_0_0` directly (or `OBPAPI3_0_0.Implementations3_0_0`, * which is a re-export) for ResourceDoc / route access in tests. */ -trait APIMethods300 { self: RestHelper => } +trait APIMethods300 -object APIMethods300 extends RestHelper with APIMethods300 { +object APIMethods300 { // Re-export so callers using APIMethods300.Implementations3_0_0 // (e.g. v3_1_0/ConsentTest, v5_1_0/ConsentObpTest) continue to compile. val Implementations3_0_0 = Http4s300.Implementations3_0_0 @@ -59,8 +58,6 @@ object APIMethods300 extends RestHelper with APIMethods300 { //import com.openbankproject.commons.model._ //import com.openbankproject.commons.util.ApiVersion //import net.liftweb.common._ -//import net.liftweb.http.js.JE.JsRaw -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json.JsonAST.JField //import net.liftweb.json.compactRender //import net.liftweb.util.Helpers.tryo @@ -2528,7 +2525,7 @@ object APIMethods300 extends RestHelper with APIMethods300 { // // } //} -//object APIMethods300 extends RestHelper with APIMethods300 { +//object APIMethods300 { // lazy val oldStyleEndpoints = List( // nameOf(Implementations3_0_0.createBranch), // nameOf(Implementations3_0_0.updateBranch), diff --git a/obp-api/src/main/scala/code/api/v3_0_0/Http4s300.scala b/obp-api/src/main/scala/code/api/v3_0_0/Http4s300.scala index 74cc17d2fd..4559165e42 100644 --- a/obp-api/src/main/scala/code/api/v3_0_0/Http4s300.scala +++ b/obp-api/src/main/scala/code/api/v3_0_0/Http4s300.scala @@ -34,7 +34,6 @@ import com.openbankproject.commons.ExecutionContext.Implicits.global import com.openbankproject.commons.model._ import com.openbankproject.commons.util.{ApiVersion, ApiVersionStatus, ScannedApiVersion} import net.liftweb.common.{Empty, Failure, Full, ParamFailure} -import net.liftweb.http.provider.HTTPParam import net.liftweb.json.JsonAST.JField import net.liftweb.json.compactRender import net.liftweb.json.{Extraction, Formats, Serialization} @@ -72,7 +71,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(root), "GET", @@ -110,7 +108,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getViewsForBankAccount), "GET", @@ -171,7 +168,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createViewForBankAccount), "POST", @@ -242,7 +238,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateViewForBankAccount), "PUT", @@ -311,7 +306,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPermissionForUserForBankAccount), "GET", @@ -343,7 +337,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPrivateAccountById), "GET", @@ -388,7 +381,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPublicAccountById), "GET", @@ -436,7 +428,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCoreAccountById), "GET", @@ -480,7 +471,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(corePrivateAccountsAllBanks), "GET", @@ -553,7 +543,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getFirehoseAccountsAtOneBank), "GET", @@ -634,7 +623,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getFirehoseTransactionsForBankAccount), "GET", @@ -687,7 +675,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCoreTransactionsForBankAccount), "GET", @@ -732,7 +719,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionsForBankAccount), "GET", @@ -790,7 +776,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(dataWarehouseSearch), "POST", @@ -865,7 +850,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(dataWarehouseStatistics), "POST", @@ -922,7 +906,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUser), "GET", @@ -958,7 +941,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUserByUserId), "GET", @@ -994,7 +976,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUserByUsername), "GET", @@ -1028,7 +1009,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAdapterInfoForBank), "GET", @@ -1067,7 +1047,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createBranch), "POST", @@ -1110,7 +1089,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateBranch), "PUT", @@ -1149,7 +1127,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createAtm), "POST", @@ -1185,7 +1162,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBranch), "GET", @@ -1283,7 +1259,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBranches), "GET", @@ -1342,7 +1317,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAtm), "GET", @@ -1402,7 +1376,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAtms), "GET", @@ -1444,7 +1417,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUsers), "GET", @@ -1483,7 +1455,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomersForUser), "GET", @@ -1518,7 +1489,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCurrentUser), "GET", @@ -1550,7 +1520,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(privateAccountsAtOneBank), "GET", @@ -1587,7 +1556,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPrivateAccountIdsbyBankId), "GET", @@ -1624,7 +1592,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getOtherAccountsForBankAccount), "GET", @@ -1654,7 +1621,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getOtherAccountByIdForBankAccount), "GET", @@ -1697,7 +1663,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addEntitlementRequest), "POST", @@ -1744,7 +1709,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAllEntitlementRequests), "GET", @@ -1781,7 +1745,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getEntitlementRequests), "GET", @@ -1815,7 +1778,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getEntitlementRequestsForCurrentUser), "GET", @@ -1856,7 +1818,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteEntitlementRequest), "DELETE", @@ -1894,7 +1855,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getEntitlementsForCurrentUser), "GET", @@ -1933,7 +1893,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getApiGlossary), "GET", @@ -1976,7 +1935,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsHeld), "GET", @@ -2016,7 +1974,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAggregateMetrics), "GET", @@ -2106,7 +2063,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addScope), "POST", @@ -2156,7 +2112,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteScope), "DELETE", @@ -2195,7 +2150,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getScopes), "GET", @@ -2230,7 +2184,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBanks), "GET", @@ -2261,7 +2214,6 @@ object Http4s300 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(bankById), "GET", diff --git a/obp-api/src/main/scala/code/api/v3_0_0/OBPAPI3_0_0.scala b/obp-api/src/main/scala/code/api/v3_0_0/OBPAPI3_0_0.scala index 0afec6c314..f52a8f4c38 100644 --- a/obp-api/src/main/scala/code/api/v3_0_0/OBPAPI3_0_0.scala +++ b/obp-api/src/main/scala/code/api/v3_0_0/OBPAPI3_0_0.scala @@ -28,7 +28,6 @@ package code.api.v3_0_0 import scala.language.reflectiveCalls import code.api.OBPRestHelper -import code.api.util.APIUtil.OBPEndpoint import code.api.util.VersionedOBPApis import code.api.v2_2_0.{Http4s220, OBPAPI2_2_0} import code.util.Helper.MdcLoggable @@ -56,9 +55,5 @@ object OBPAPI3_0_0 extends OBPRestHelper with MdcLoggable with VersionedOBPApis Http4s300.resourceDocs ) - val routes: List[OBPEndpoint] = Nil - - registerRoutes(routes, allResourceDocs, apiPrefix, true) - - logger.info(s"version $version has been run! There are ${routes.length} routes, ${allResourceDocs.length} allResourceDocs.") + logger.info(s"version $version has been run! ${allResourceDocs.length} allResourceDocs.") } diff --git a/obp-api/src/main/scala/code/api/v3_0_0/custom/APIMethodsCustom300.scala b/obp-api/src/main/scala/code/api/v3_0_0/custom/APIMethodsCustom300.scala index c2f7806349..937de2969c 100644 --- a/obp-api/src/main/scala/code/api/v3_0_0/custom/APIMethodsCustom300.scala +++ b/obp-api/src/main/scala/code/api/v3_0_0/custom/APIMethodsCustom300.scala @@ -1,14 +1,9 @@ package code.api.v3_0_0.custom -import net.liftweb.http.rest.RestHelper - /* * CustomAPIMethods300 is retired. Its only endpoint was hard-coded to `null` * and its resourceDocs buffer was empty — there is no http4s migration target * because nothing was ever served. This stub remains in case `with CustomAPIMethods300` * appears in any legacy mixin chain. */ -trait CustomAPIMethods300 { self: RestHelper => } - -// ─── Original implementation (commented out) ───────────────────────────────── -// To view the full implementation history, use: git show HEAD~1:obp-api/src/main/scala/code/api/v3_0_0/custom/APIMethodsCustom300.scala +trait CustomAPIMethods300 diff --git a/obp-api/src/main/scala/code/api/v3_1_0/APIMethods310.scala b/obp-api/src/main/scala/code/api/v3_1_0/APIMethods310.scala index fcdd42a548..1608d4bac2 100644 --- a/obp-api/src/main/scala/code/api/v3_1_0/APIMethods310.scala +++ b/obp-api/src/main/scala/code/api/v3_1_0/APIMethods310.scala @@ -1,6 +1,5 @@ package code.api.v3_1_0 -import net.liftweb.http.rest.RestHelper /* * All v3.1.0 endpoints have been migrated to Http4s310. This trait is retained @@ -11,9 +10,9 @@ import net.liftweb.http.rest.RestHelper * Use `Http4s310.Implementations3_1_0` directly (or `OBPAPI3_1_0.Implementations3_1_0`, * which is a re-export) for ResourceDoc / route access in tests. */ -trait APIMethods310 { self: RestHelper => } +trait APIMethods310 -object APIMethods310 extends RestHelper with APIMethods310 { +object APIMethods310 { // Re-export so any caller that still imports APIMethods310.Implementations3_1_0 keeps compiling. val Implementations3_1_0 = Http4s310.Implementations3_1_0 } @@ -68,8 +67,6 @@ object APIMethods310 extends RestHelper with APIMethods310 { //import com.openbankproject.commons.model.enums.{AccountAttributeType, CardAttributeType, ProductAttributeType, StrongCustomerAuthentication} //import com.openbankproject.commons.util.{ApiVersion, ReflectUtils} //import net.liftweb.common.{Box, Empty, Full} -//import net.liftweb.http.provider.HTTPParam -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json._ //import net.liftweb.mapper.By @@ -6076,7 +6073,7 @@ object APIMethods310 extends RestHelper with APIMethods310 { // } //} // -//object APIMethods310 extends RestHelper with APIMethods310 { +//object APIMethods310 { // lazy val newStyleEndpoints: List[(String, String)] = Implementations3_1_0.resourceDocs.map { // rd => (rd.partialFunctionName, rd.implementedInApiVersion.toString()) // }.toList diff --git a/obp-api/src/main/scala/code/api/v3_1_0/Http4s310.scala b/obp-api/src/main/scala/code/api/v3_1_0/Http4s310.scala index 05c5ba15e5..ef3e4bdd6c 100644 --- a/obp-api/src/main/scala/code/api/v3_1_0/Http4s310.scala +++ b/obp-api/src/main/scala/code/api/v3_1_0/Http4s310.scala @@ -46,7 +46,6 @@ import com.openbankproject.commons.ExecutionContext.Implicits.global import com.openbankproject.commons.model._ import com.openbankproject.commons.util.{ApiVersion, ApiVersionStatus, ScannedApiVersion} import net.liftweb.common.{Empty, Full} -import net.liftweb.http.provider.HTTPParam import net.liftweb.json.Formats import net.liftweb.mapper.By import net.liftweb.util.{Helpers, Props} @@ -189,7 +188,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(root), "GET", @@ -223,7 +221,7 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCheckbookOrders), "GET", + implementedInApiVersion, nameOf(getCheckbookOrders), "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/checkbook/orders", "Get Checkbook orders", s"""${mockedDataText(false)}Get all checkbook orders""", @@ -248,7 +246,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getStatusOfCreditCardOrder), "GET", @@ -283,7 +280,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTopAPIs), "GET", @@ -358,7 +354,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMetricsTopConsumers), "GET", @@ -455,7 +450,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getFirehoseCustomers), "GET", @@ -499,7 +493,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBadLoginStatus), "GET", @@ -533,7 +526,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCallsLimit), "GET", @@ -567,7 +559,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsumer), "GET", @@ -597,7 +588,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsumersForCurrentUser), "GET", @@ -631,7 +621,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsumers), "GET", @@ -670,7 +659,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountWebhooks), "GET", @@ -706,7 +694,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(config), "GET", @@ -739,7 +726,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAdapterInfo), "GET", @@ -774,7 +760,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getRateLimitingInfo), "GET", @@ -815,7 +800,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomerByCustomerId), "GET", @@ -854,7 +838,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUserAuthContexts), "GET", @@ -888,7 +871,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTaxResidence), "GET", @@ -924,7 +906,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAllEntitlements), "GET", @@ -963,7 +944,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomerAddresses), "GET", @@ -997,7 +977,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getProductAttribute), "GET", @@ -1035,7 +1014,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountApplications), "GET", @@ -1071,7 +1049,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountApplication), "GET", @@ -1103,7 +1080,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMeetings), "GET", @@ -1137,7 +1113,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMeeting), "GET", @@ -1170,7 +1145,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getServerJWK), "GET", @@ -1198,7 +1172,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getOAuth2ServerJWKsURIs), "GET", @@ -1256,7 +1229,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMethodRoutings), "GET", @@ -1302,7 +1274,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSystemView), "GET", @@ -1341,7 +1312,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCardsForBank), "GET", @@ -1384,7 +1354,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCardForBank), "GET", @@ -1417,7 +1386,7 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankAccountsBalances), "GET", + implementedInApiVersion, nameOf(getBankAccountsBalances), "GET", "/banks/BANK_ID/balances", "Get Accounts Balances", """Get the Balances for the Accounts of the current User at one bank.""", @@ -1466,7 +1435,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(checkFundsAvailable), "GET", @@ -1506,7 +1474,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionByIdForBankAccount), "GET", @@ -1556,7 +1523,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionRequests), "GET", @@ -1610,7 +1576,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getProduct), "GET", @@ -1652,7 +1617,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getProductTree), "GET", @@ -1699,7 +1663,7 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, "getProducts", "GET", + implementedInApiVersion, "getProducts", "GET", "/banks/BANK_ID/products", "Get Products", s"""Returns information about the financial products offered by a bank specified by BANK_ID including: @@ -1737,7 +1701,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getProductCollection), "GET", @@ -1782,7 +1745,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsents), "GET", @@ -1825,7 +1787,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPrivateAccountByIdFull), "GET", @@ -1883,7 +1844,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getWebUiProps), "GET", @@ -1945,7 +1905,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteUserAuthContexts), "DELETE", @@ -1979,7 +1938,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteUserAuthContextById), "DELETE", @@ -2013,7 +1971,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteTaxResidence), "DELETE", @@ -2047,7 +2004,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCustomerAddress), "DELETE", @@ -2082,7 +2038,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteProductAttribute), "DELETE", @@ -2126,7 +2081,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteBranch), "DELETE", @@ -2159,7 +2113,7 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, "deleteSystemView", "DELETE", + implementedInApiVersion, "deleteSystemView", "DELETE", "/system-views/SYS_VIEW_ID", "Delete System View", "Deletes the system view specified by VIEW_ID", @@ -2182,7 +2136,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteMethodRouting), "DELETE", @@ -2216,7 +2169,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCardForBank), "DELETE", @@ -2249,7 +2201,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteWebUiProps), "DELETE", @@ -2290,7 +2241,7 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, "revokeConsent", "GET", + implementedInApiVersion, "revokeConsent", "GET", "/banks/BANK_ID/my/consents/CONSENT_ID/revoke", "Revoke Consent", s""" @@ -2329,7 +2280,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createTaxResidence), "POST", @@ -2370,7 +2320,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createCustomerAddress), "POST", @@ -2411,7 +2360,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCustomerAddress), "PUT", @@ -2446,7 +2394,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createUserAuthContext), "POST", @@ -2484,7 +2431,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createProductAttribute), "POST", @@ -2560,7 +2506,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createAccountWebhook), "POST", @@ -2598,7 +2543,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(unlockUser), "PUT", @@ -2647,7 +2591,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(callsLimit), "PUT", @@ -2699,7 +2642,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(enableDisableAccountWebhook), "PUT", @@ -2739,7 +2681,7 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, "enableDisableConsumers", "PUT", + implementedInApiVersion, "enableDisableConsumers", "PUT", "/management/consumers/CONSUMER_ID", "Enable or Disable Consumers", s"""Enable/Disable a Consumer specified by CONSUMER_ID.""", @@ -2765,7 +2707,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateSystemView), "PUT", @@ -2806,7 +2747,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateProductAttribute), "PUT", @@ -2845,7 +2785,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCustomerEmail), "PUT", @@ -2884,7 +2823,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCustomerNumber), "PUT", @@ -2919,7 +2857,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCustomerMobileNumber), "PUT", @@ -2958,7 +2895,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCustomerIdentity), "PUT", @@ -2993,7 +2929,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCustomerCreditLimit), "PUT", @@ -3029,7 +2964,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCustomerCreditRatingAndSource), "PUT", @@ -3066,7 +3000,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCustomerBranch), "PUT", @@ -3109,7 +3042,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCustomerData), "PUT", @@ -3167,7 +3099,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateAccountApplicationStatus), "PUT", @@ -3225,7 +3156,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createCustomer), "POST", @@ -3264,7 +3194,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomerByCustomerNumber), "POST", @@ -3308,7 +3237,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createAccountApplication), "POST", @@ -3350,7 +3278,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createAccountAttribute), "POST", @@ -3410,7 +3337,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateAccountAttribute), "PUT", @@ -3478,7 +3404,7 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, "createMeeting", "POST", + implementedInApiVersion, "createMeeting", "POST", "/banks/BANK_ID/meetings", "Create Meeting (video conference/call)", """Create Meeting: Initiate a video conference/call with the bank. @@ -3517,7 +3443,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createSystemView), "POST", @@ -3573,7 +3498,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createProductCollection), "PUT", @@ -3669,7 +3593,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addCardForBank), "POST", @@ -3741,7 +3664,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updatedCardForBank), "PUT", @@ -3778,7 +3700,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createCardAttribute), "POST", @@ -3834,7 +3755,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCardAttribute), "PUT", @@ -3885,7 +3805,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createWebUiProps), "POST", @@ -3961,7 +3880,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createUserAuthContextUpdateRequest), "POST", @@ -4008,7 +3926,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(answerUserAuthContextUpdateChallenge), "POST", @@ -4044,7 +3961,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(refreshUser), "POST", @@ -4099,7 +4015,7 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, "createProduct", "PUT", + implementedInApiVersion, "createProduct", "PUT", "/banks/BANK_ID/products/PRODUCT_CODE", "Create Product", s"""Create or Update Product for the Bank. @@ -4170,7 +4086,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createMethodRouting), "POST", @@ -4271,7 +4186,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateMethodRouting), "PUT", @@ -4355,7 +4269,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateAccount), "PUT", @@ -4437,7 +4350,7 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, "createAccount", "PUT", + implementedInApiVersion, "createAccount", "PUT", "/banks/BANK_ID/accounts/NEW_ACCOUNT_ID", "Create Account", """Create Account at bank specified by BANK_ID with Id specified by ACCOUNT_ID. @@ -4579,7 +4492,6 @@ object Http4s310 { val createConsentImplicit: HttpRoutes[IO] = createConsent resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createConsentEmail), "POST", @@ -4661,7 +4573,6 @@ object Http4s310 { ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createConsentSms), "POST", @@ -4745,7 +4656,6 @@ object Http4s310 { ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createConsentImplicit), "POST", @@ -4839,7 +4749,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(answerConsentChallenge), "POST", @@ -4882,7 +4791,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getObpConnectorLoopback), "GET", @@ -4915,7 +4823,6 @@ object Http4s310 { val getMessageDocsSwagger: HttpRoutes[IO] = HttpRoutes.empty resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMessageDocsSwagger), "GET", @@ -5019,7 +4926,6 @@ object Http4s310 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(saveHistoricalTransaction), "POST", diff --git a/obp-api/src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala b/obp-api/src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala index e9a4871743..d9725aa854 100644 --- a/obp-api/src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala +++ b/obp-api/src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala @@ -28,7 +28,6 @@ package code.api.v3_1_0 import scala.language.reflectiveCalls import code.api.OBPRestHelper -import code.api.util.APIUtil.OBPEndpoint import code.api.util.VersionedOBPApis import code.api.v1_2_1.Http4s121 import code.api.v2_2_0.Http4s220 @@ -56,10 +55,6 @@ object OBPAPI3_1_0 extends OBPRestHelper with MdcLoggable with VersionedOBPApis Http4s310.resourceDocs ) - val routes: List[OBPEndpoint] = Nil - - registerRoutes(routes, allResourceDocs, apiPrefix, true) - - logger.info(s"version $version has been run! There are ${routes.length} routes, ${allResourceDocs.length} allResourceDocs.") + logger.info(s"version $version has been run! ${allResourceDocs.length} allResourceDocs.") // CORS for OPTIONS is handled by the http4s corsHandler layer — no Lift serve needed here. } diff --git a/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala b/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala index 9d0881799f..2bd8cc0752 100644 --- a/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala +++ b/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala @@ -90,7 +90,6 @@ trait APIMethods400 //import com.openbankproject.commons.util.{ApiVersion, ScannedApiVersion} //import deletion._ //import net.liftweb.common._ -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json.JsonAST.JValue //import net.liftweb.json.JsonDSL._ //import net.liftweb.json._ @@ -17047,7 +17046,7 @@ trait APIMethods400 // } //} // -//object APIMethods400 extends RestHelper with APIMethods400 { +//object APIMethods400 { // lazy val newStyleEndpoints: List[(String, String)] = // Implementations4_0_0.resourceDocs.map { rd => // (rd.partialFunctionName, rd.implementedInApiVersion.toString()) diff --git a/obp-api/src/main/scala/code/api/v4_0_0/Http4s400.scala b/obp-api/src/main/scala/code/api/v4_0_0/Http4s400.scala index ba50b81ee4..7aa688438f 100644 --- a/obp-api/src/main/scala/code/api/v4_0_0/Http4s400.scala +++ b/obp-api/src/main/scala/code/api/v4_0_0/Http4s400.scala @@ -219,7 +219,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMapperDatabaseInfo), "GET", @@ -251,7 +250,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getLogoutLink), "GET", @@ -282,7 +280,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBanks), "GET", @@ -316,7 +313,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBank), "GET", @@ -348,7 +344,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(ibanChecker), "POST", @@ -392,7 +387,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(callsLimit), "PUT", @@ -479,7 +473,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "createBank", "POST", + implementedInApiVersion, "createBank", "POST", "/banks", "Create Bank", s"""Create a new bank (Authenticated access). @@ -521,7 +515,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(root), "GET", @@ -569,7 +562,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAtms), "GET", @@ -611,7 +603,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAtm), "GET", @@ -652,7 +643,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getProducts), "GET", @@ -703,7 +693,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getProduct), "GET", @@ -769,7 +758,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createAtm), "POST", + implementedInApiVersion, nameOf(createAtm), "POST", "/banks/BANK_ID/atms", "Create ATM", s"""Create ATM.""", @@ -824,7 +813,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createProduct), "PUT", @@ -882,7 +870,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createProductAttribute), "POST", @@ -942,7 +929,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateProductAttribute), "PUT", @@ -988,7 +974,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "getEntitlements", "GET", + implementedInApiVersion, "getEntitlements", "GET", "/users/USER_ID/entitlements", "Get Entitlements for User", s""" @@ -1023,7 +1009,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "getUserByUserId", "GET", + implementedInApiVersion, "getUserByUserId", "GET", "/users/user_id/USER_ID", "Get User by USER_ID", s"""Get user by USER_ID @@ -1059,7 +1045,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "getUserByUsername", "GET", + implementedInApiVersion, "getUserByUsername", "GET", "/users/username/USERNAME", "Get User by USERNAME", s"""Get user by USERNAME @@ -1090,7 +1076,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "getUsersByEmail", "GET", + implementedInApiVersion, "getUsersByEmail", "GET", "/users/email/USER_EMAIL/terminator", "Get Users by Email Address", s"""Get users by email address @@ -1114,9 +1100,9 @@ object Http4s400 { case req @ GET -> `prefixPath` / "users" => EndpointHelpers.withUser(req) { (_, cc) => val httpParams = req.headers.headers.toList.map(h => - net.liftweb.http.provider.HTTPParam(h.name.toString, h.value)) ::: + HTTPParam(h.name.toString, h.value)) ::: req.uri.query.multiParams.toList.flatMap { case (k, vs) => - vs.map(v => net.liftweb.http.provider.HTTPParam(k, v)) + vs.map(v => HTTPParam(k, v)) } for { (obpQueryParams, _) <- createQueriesByHttpParamsFuture(httpParams, Some(cc)) @@ -1126,7 +1112,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "getUsers", "GET", + implementedInApiVersion, "getUsers", "GET", "/users", "Get all Users", s"""Get all users @@ -1172,7 +1158,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "getCustomersByAttributes", "GET", + implementedInApiVersion, "getCustomersByAttributes", "GET", "/banks/BANK_ID/customers", "Get Customers by ATTRIBUTES", s"""Gets the Customers specified by attributes @@ -1222,7 +1208,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createCustomer), "POST", @@ -1266,7 +1251,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankAccountsBalancesForCurrentUser), "GET", @@ -1302,7 +1286,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCoreAccountById), "GET", @@ -1352,7 +1335,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPrivateAccountByIdFull), "GET", @@ -1419,7 +1401,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPrivateAccountsAtOneBank), "GET", @@ -1479,7 +1460,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "createUserCustomerLinks", "POST", + implementedInApiVersion, "createUserCustomerLinks", "POST", "/banks/BANK_ID/user_customer_links", "Create User Customer Link", s"""Link a User to a Customer @@ -1517,7 +1498,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSystemDynamicEntities), "GET", @@ -1560,7 +1540,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankLevelDynamicEntities), "GET", @@ -1602,7 +1581,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMyDynamicEntities), "GET", @@ -1726,7 +1704,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createSystemDynamicEntity), "POST", + implementedInApiVersion, nameOf(createSystemDynamicEntity), "POST", "/management/system-dynamic-entities", "Create System Level Dynamic Entity", s"""Create a system level Dynamic Entity. @@ -1762,7 +1740,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createBankLevelDynamicEntity), "POST", + implementedInApiVersion, nameOf(createBankLevelDynamicEntity), "POST", "/management/banks/BANK_ID/dynamic-entities", "Create Bank Level Dynamic Entity", s"""Create a Bank Level DynamicEntity. @@ -1793,7 +1771,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateSystemDynamicEntity), "PUT", + implementedInApiVersion, nameOf(updateSystemDynamicEntity), "PUT", "/management/system-dynamic-entities/DYNAMIC_ENTITY_ID", "Update System Level Dynamic Entity", s"""Update a system level DynamicEntity. @@ -1822,7 +1800,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateBankLevelDynamicEntity), "PUT", + implementedInApiVersion, nameOf(updateBankLevelDynamicEntity), "PUT", "/management/banks/BANK_ID/dynamic-entities/DYNAMIC_ENTITY_ID", "Update Bank Level Dynamic Entity", s"""Update a Bank Level DynamicEntity. @@ -1845,7 +1823,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteSystemDynamicEntity), "DELETE", @@ -1880,7 +1857,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteBankLevelDynamicEntity), "DELETE", @@ -1940,7 +1916,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateMyDynamicEntity), "PUT", + implementedInApiVersion, nameOf(updateMyDynamicEntity), "PUT", "/my/dynamic-entities/DYNAMIC_ENTITY_ID", "Update My Dynamic Entity", s"""Update my DynamicEntity specified by DYNAMIC_ENTITY_ID. @@ -1976,7 +1952,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteMyDynamicEntity), "DELETE", @@ -2088,7 +2063,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createDynamicEndpoint), "POST", @@ -2137,7 +2111,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createBankLevelDynamicEndpoint), "POST", @@ -2184,7 +2157,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateDynamicEndpointHost), "PUT", @@ -2223,7 +2195,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateBankLevelDynamicEndpointHost), "PUT", @@ -2257,7 +2228,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getDynamicEndpoint), "GET", @@ -2293,7 +2263,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getDynamicEndpoints), "GET", @@ -2330,7 +2299,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankLevelDynamicEndpoint), "GET", @@ -2363,7 +2331,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankLevelDynamicEndpoints), "GET", @@ -2401,7 +2368,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteDynamicEndpoint), "DELETE", @@ -2430,7 +2396,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteBankLevelDynamicEndpoint), "DELETE", @@ -2469,7 +2434,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMyDynamicEndpoints), "GET", @@ -2507,7 +2471,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteMyDynamicEndpoint), "DELETE", + implementedInApiVersion, nameOf(deleteMyDynamicEndpoint), "DELETE", "/my/dynamic-endpoints/DYNAMIC_ENDPOINT_ID", "Delete My Dynamic Endpoint", s"""Delete a DynamicEndpoint specified by DYNAMIC_ENDPOINT_ID.""", @@ -2534,7 +2498,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getProductAttribute), "GET", @@ -2580,7 +2543,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getScopes), "GET", @@ -2635,7 +2597,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addScope), "POST", @@ -2684,7 +2645,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsents), "GET", @@ -2738,7 +2698,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateAccountLabel), "POST", @@ -2789,7 +2748,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "getExplicitCounterpartiesForAccount", "GET", + implementedInApiVersion, "getExplicitCounterpartiesForAccount", "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/counterparties", "Get Counterparties (Explicit)", s"""Get the Counterparties that have been explicitly created on the specified Account / View. @@ -2824,7 +2783,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "getExplicitCounterpartyById", "GET", + implementedInApiVersion, "getExplicitCounterpartyById", "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/counterparties/EXPLICIT_COUNTERPARTY_ID", "Get Counterparty by Id (Explicit)", s"""This endpoint returns a single Counterparty on an Account View specified by its COUNTERPARTY_ID: @@ -2920,7 +2879,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "createCounterparty", "POST", + implementedInApiVersion, "createCounterparty", "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/counterparties", "Create Counterparty (Explicit)", s"""This endpoint creates an (Explicit) Counterparty for an Account. @@ -3004,7 +2963,6 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getFirehoseAccountsAtOneBank), "GET", @@ -3113,7 +3071,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "createTransactionRequestAccount", "POST", + implementedInApiVersion, "createTransactionRequestAccount", "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/GRANT_VIEW_ID/transaction-request-types/TRANSACTION_REQUEST_TYPE/transaction-requests", "Create Transaction Request (ACCOUNT)", s"""When using ACCOUNT, the payee is set in the request body. @@ -3154,7 +3112,7 @@ object Http4s400 { // `literalAllCapsSegments`) is enough; no new `lazy val` needed. private def initBatch9AliasResourceDocs(): Unit = { staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "createTransactionRequestAccountOtp", "POST", + implementedInApiVersion, "createTransactionRequestAccountOtp", "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/GRANT_VIEW_ID/transaction-request-types/ACCOUNT_OTP/transaction-requests", "Create Transaction Request (ACCOUNT_OTP)", s"""When using ACCOUNT, the payee is set in the request body. @@ -3186,7 +3144,7 @@ object Http4s400 { http4sPartialFunction = Some(createTransactionRequest)) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "createTransactionRequestSepa", "POST", + implementedInApiVersion, "createTransactionRequestSepa", "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/GRANT_VIEW_ID/transaction-request-types/SEPA/transaction-requests", "Create Transaction Request (SEPA)", s""" @@ -3220,7 +3178,7 @@ object Http4s400 { http4sPartialFunction = Some(createTransactionRequest)) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "createTransactionRequestCounterparty", "POST", + implementedInApiVersion, "createTransactionRequestCounterparty", "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/GRANT_VIEW_ID/transaction-request-types/COUNTERPARTY/transaction-requests", "Create Transaction Request (COUNTERPARTY)", s""" @@ -3261,7 +3219,7 @@ object Http4s400 { http4sPartialFunction = Some(createTransactionRequest)) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "createTransactionRequestRefund", "POST", + implementedInApiVersion, "createTransactionRequestRefund", "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/GRANT_VIEW_ID/transaction-request-types/REFUND/transaction-requests", "Create Transaction Request (REFUND)", s""" @@ -3302,7 +3260,7 @@ object Http4s400 { http4sPartialFunction = Some(createTransactionRequest)) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "createTransactionRequestFreeForm", "POST", + implementedInApiVersion, "createTransactionRequestFreeForm", "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/GRANT_VIEW_ID/transaction-request-types/FREE_FORM/transaction-requests", "Create Transaction Request (FREE_FORM)", s"""$transactionRequestGeneralText @@ -3331,7 +3289,7 @@ object Http4s400 { http4sPartialFunction = Some(createTransactionRequest)) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "createTransactionRequestSimple", "POST", + implementedInApiVersion, "createTransactionRequestSimple", "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/GRANT_VIEW_ID/transaction-request-types/SIMPLE/transaction-requests", "Create Transaction Request (SIMPLE)", s""" @@ -3364,7 +3322,7 @@ object Http4s400 { http4sPartialFunction = Some(createTransactionRequest)) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "createTransactionRequestAgentCashWithDrawal", "POST", + implementedInApiVersion, "createTransactionRequestAgentCashWithDrawal", "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/GRANT_VIEW_ID/transaction-request-types/AGENT_CASH_WITHDRAWAL/transaction-requests", "Create Transaction Request (AGENT_CASH_WITHDRAWAL)", s""" @@ -3434,7 +3392,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "createTransactionRequestCard", "POST", + implementedInApiVersion, "createTransactionRequestCard", "POST", "/transaction-request-types/CARD/transaction-requests", "Create Transaction Request (CARD)", s""" @@ -3634,7 +3592,7 @@ object Http4s400 { } staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "answerTransactionRequestChallenge", "POST", + implementedInApiVersion, "answerTransactionRequestChallenge", "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/GRANT_VIEW_ID/transaction-request-types/TRANSACTION_REQUEST_TYPE/transaction-requests/TRANSACTION_REQUEST_ID/challenge", "Answer Transaction Request Challenge", s"""In Sandbox mode, any string that can be converted to a positive integer will be accepted as an answer. @@ -3886,7 +3844,6 @@ object Http4s400 { private def initBatch8ResourceDocs(): Unit = { staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCounterpartiesForAnyAccount), "GET", @@ -3913,7 +3870,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCounterpartyByIdForAnyAccount), "GET", @@ -3938,7 +3894,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCounterpartyByNameForAnyAccount), "GET", @@ -4227,7 +4182,6 @@ object Http4s400 { private def initBatch9ResourceDocs(): Unit = { staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteExplicitCounterparty), "DELETE", @@ -4260,7 +4214,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCounterpartyForAnyAccount), "DELETE", @@ -4283,7 +4236,7 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "deleteTagForViewOnAccount", "DELETE", + implementedInApiVersion, "deleteTagForViewOnAccount", "DELETE", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/metadata/tags/TAG_ID", "Delete a tag on account", s"""Deletes the tag TAG_ID about the account ACCOUNT_ID made on [view](#1_2_1-getViewsForBankAccount). @@ -4298,7 +4251,7 @@ object Http4s400 { http4sPartialFunction = Some(deleteTagForViewOnAccount)) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "getTagsForViewOnAccount", "GET", + implementedInApiVersion, "getTagsForViewOnAccount", "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/metadata/tags", "Get tags on account", s"""Returns the account ACCOUNT_ID tags made on a [view](#1_2_1-getViewsForBankAccount) (VIEW_ID). @@ -4312,7 +4265,7 @@ object Http4s400 { http4sPartialFunction = Some(getTagsForViewOnAccount)) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "addTagForViewOnAccount", "POST", + implementedInApiVersion, "addTagForViewOnAccount", "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/metadata/tags", "Create a tag on account", s"""Posts a tag about an account ACCOUNT_ID on a [view](#1_2_1-getViewsForBankAccount) VIEW_ID. @@ -4336,7 +4289,6 @@ object Http4s400 { http4sPartialFunction = Some(addTagForViewOnAccount)) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getDoubleEntryTransaction), "GET", @@ -4364,7 +4316,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBalancingTransaction), "GET", @@ -4385,7 +4336,7 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankAccountBalancesForCurrentUser), "GET", + implementedInApiVersion, nameOf(getBankAccountBalancesForCurrentUser), "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/balances", "Get Account Balances", """Get the Balances for one Account of the current User at one bank.""", @@ -4395,7 +4346,6 @@ object Http4s400 { http4sPartialFunction = Some(getBankAccountBalancesForCurrentUser)) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountByAccountRouting), "POST", @@ -4419,7 +4369,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsByAccountRoutingRegex), "POST", @@ -4461,7 +4410,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(lockUser), "POST", @@ -4483,7 +4431,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(resetPasswordUrl), "POST", @@ -4507,7 +4454,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSettlementAccounts), "GET", @@ -4778,7 +4724,6 @@ object Http4s400 { private def initBatch10ResourceDocs(): Unit = { staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createBankAttribute), "POST", @@ -4816,7 +4761,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateBankAttribute), "PUT", @@ -4838,7 +4782,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createCustomerAttribute), "POST", @@ -4861,7 +4804,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCustomerAttribute), "PUT", @@ -4882,7 +4824,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createTransactionAttribute), "POST", @@ -4905,7 +4846,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateTransactionAttribute), "PUT", @@ -4927,7 +4867,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createTransactionRequestAttribute), "POST", @@ -4950,7 +4889,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateTransactionRequestAttribute), "PUT", @@ -4971,7 +4909,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createProductFee), "POST", @@ -4991,7 +4928,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateProductFee), "PUT", @@ -5013,7 +4949,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createMyPersonalUserAttribute), "POST", @@ -5035,7 +4970,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateMyPersonalUserAttribute), "PUT", @@ -5269,7 +5203,6 @@ object Http4s400 { private def initBatch11ResourceDocs(): Unit = { staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUserInvitationAnonymous), "POST", @@ -5294,7 +5227,7 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "grantUserAccessToView", "POST", + implementedInApiVersion, "grantUserAccessToView", "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/account-access/grant", "Grant User access to View", s"""Grants the User identified by USER_ID access to the view identified by VIEW_ID. @@ -5313,7 +5246,7 @@ object Http4s400 { http4sPartialFunction = Some(grantUserAccessToView)) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "revokeUserAccessToView", "POST", + implementedInApiVersion, "revokeUserAccessToView", "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/account-access/revoke", "Revoke User access to View", s"""Revoke the User identified by USER_ID access to the view identified by VIEW_ID. @@ -5332,7 +5265,7 @@ object Http4s400 { http4sPartialFunction = Some(revokeUserAccessToView)) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "revokeGrantUserAccessToViews", "PUT", + implementedInApiVersion, "revokeGrantUserAccessToViews", "PUT", "/banks/BANK_ID/accounts/ACCOUNT_ID/account-access", "Revoke/Grant User access to View", s"""Revoke/Grant the logged in User access to the views identified by json. @@ -5351,7 +5284,6 @@ object Http4s400 { http4sPartialFunction = Some(revokeGrantUserAccessToViews)) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createMyApiCollection), "POST", @@ -5370,7 +5302,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createMyApiCollectionEndpoint), "POST", @@ -5393,7 +5324,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createMyApiCollectionEndpointById), "POST", @@ -5415,7 +5345,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateConsentStatus), "PUT", @@ -5447,7 +5376,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addConsentUser), "PUT", @@ -5657,7 +5585,6 @@ object Http4s400 { private def initBatch12ResourceDocs(): Unit = { staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createDirectDebit), "POST", @@ -5686,7 +5613,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createDirectDebitManagement), "POST", @@ -5706,7 +5632,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createStandingOrder), "POST", @@ -5739,7 +5664,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createStandingOrderManagement), "POST", @@ -5763,7 +5687,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createSystemAccountNotificationWebhook), "POST", @@ -5786,7 +5709,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createBankAccountNotificationWebhook), "POST", @@ -5808,7 +5730,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getFastFirehoseAccountsAtOneBank), "GET", @@ -5922,7 +5843,6 @@ object Http4s400 { private def initBatch7ResourceDocs(): Unit = { staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createOrUpdateCustomerAttributeAttributeDefinition), "PUT", @@ -5946,7 +5866,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createOrUpdateAccountAttributeDefinition), "PUT", @@ -5970,7 +5889,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createOrUpdateProductAttributeDefinition), "PUT", @@ -5994,7 +5912,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createOrUpdateTransactionAttributeDefinition), "PUT", @@ -6018,7 +5935,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createOrUpdateCardAttributeDefinition), "PUT", @@ -6042,7 +5958,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createOrUpdateTransactionRequestAttributeDefinition), "PUT", @@ -6066,7 +5981,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createOrUpdateBankAttributeDefinition), "PUT", @@ -6180,7 +6094,6 @@ object Http4s400 { private def initBatch6ResourceDocs(): Unit = { staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateAtmSupportedCurrencies), "PUT", @@ -6197,7 +6110,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateAtmSupportedLanguages), "PUT", @@ -6214,7 +6126,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateAtmAccessibilityFeatures), "PUT", @@ -6231,7 +6142,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateAtmServices), "PUT", @@ -6248,7 +6158,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateAtmNotes), "PUT", @@ -6265,7 +6174,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateAtmLocationCategories), "PUT", @@ -6282,7 +6190,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateAtm), "PUT", @@ -6455,7 +6362,7 @@ object Http4s400 { case req @ GET -> `prefixPath` / "customers" => EndpointHelpers.withUser(req) { (_, cc) => val httpParams = req.headers.headers.toList.map(h => - net.liftweb.http.provider.HTTPParam(h.name.toString, h.value)) + HTTPParam(h.name.toString, h.value)) for { (requestParams, _) <- NewStyle.function.extractQueryParams( req.uri.renderString, List("limit", "offset", "sort_direction"), Some(cc)) @@ -6495,7 +6402,6 @@ object Http4s400 { private def initBatch5ResourceDocs(): Unit = { staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getProductFee), "GET", @@ -6517,7 +6423,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getProductFees), "GET", @@ -6537,7 +6442,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionAttributes), "GET", @@ -6557,7 +6461,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionAttributeById), "GET", @@ -6577,7 +6480,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionRequestAttributes), "GET", @@ -6597,7 +6499,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionRequestAttributeById), "GET", @@ -6617,7 +6518,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionRequestAttributeDefinition), "GET", @@ -6637,7 +6537,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionRequest), "GET", @@ -6680,7 +6579,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMyCorrelatedEntities), "GET", @@ -6700,7 +6598,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCorrelatedUsersInfoByCustomerId), "GET", @@ -6720,7 +6617,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsMinimalByCustomerId), "GET", @@ -6744,7 +6640,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomersByCustomerPhoneNumber), "POST", @@ -6771,7 +6666,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomersAtAnyBank), "GET", @@ -6792,7 +6686,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomersMinimalAtAnyBank), "GET", @@ -6813,7 +6706,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUserInvitation), "GET", @@ -6833,7 +6725,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUserInvitations), "GET", @@ -7037,7 +6928,6 @@ object Http4s400 { private def initBatch4ResourceDocs(): Unit = { staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsentInfosByBank), "GET", @@ -7059,7 +6949,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsentInfos), "GET", @@ -7081,7 +6970,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMyApiCollectionByName), "GET", @@ -7100,7 +6988,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMyApiCollectionById), "GET", @@ -7119,7 +7006,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSharableApiCollectionById), "GET", @@ -7137,7 +7023,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getApiCollectionsForUser), "GET", @@ -7156,7 +7041,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getFeaturedApiCollections), "GET", @@ -7175,7 +7059,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMyApiCollections), "GET", @@ -7199,7 +7082,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMyApiCollectionEndpoint), "GET", @@ -7218,7 +7100,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getApiCollectionEndpoints), "GET", @@ -7237,7 +7118,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMyApiCollectionEndpoints), "GET", @@ -7256,7 +7136,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMyApiCollectionEndpointsById), "GET", @@ -7275,7 +7154,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteMyApiCollection), "DELETE", @@ -7299,7 +7177,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteMyApiCollectionEndpoint), "DELETE", @@ -7322,7 +7199,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteMyApiCollectionEndpointByOperationId), "DELETE", @@ -7344,7 +7220,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteMyApiCollectionEndpointById), "DELETE", @@ -7605,7 +7480,6 @@ object Http4s400 { private def initBatch3ResourceDocs(): Unit = { staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteTransactionAttributeDefinition), "DELETE", @@ -7625,7 +7499,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCustomerAttributeDefinition), "DELETE", @@ -7645,7 +7518,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteAccountAttributeDefinition), "DELETE", @@ -7665,7 +7537,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteProductAttributeDefinition), "DELETE", @@ -7685,7 +7556,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCardAttributeDefinition), "DELETE", @@ -7705,7 +7575,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteTransactionRequestAttributeDefinition), "DELETE", @@ -7725,7 +7594,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteUser), "DELETE", @@ -7746,7 +7614,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteUserCustomerLink), "DELETE", @@ -7766,7 +7633,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteTransactionCascade), "DELETE", @@ -7787,7 +7653,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteAccountCascade), "DELETE", @@ -7808,7 +7673,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteBankCascade), "DELETE", @@ -7829,7 +7693,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteProductCascade), "DELETE", @@ -7850,7 +7713,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCustomerCascade), "DELETE", @@ -7871,7 +7733,7 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteSystemLevelEndpointTag), "DELETE", + implementedInApiVersion, nameOf(deleteSystemLevelEndpointTag), "DELETE", "/management/endpoints/OPERATION_ID/tags/ENDPOINT_TAG_ID", "Delete System Level Endpoint Tag", s"""Delete System Level Endpoint Tag.""", @@ -7882,7 +7744,7 @@ object Http4s400 { http4sPartialFunction = Some(deleteSystemLevelEndpointTag)) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteBankLevelEndpointTag), "DELETE", + implementedInApiVersion, nameOf(deleteBankLevelEndpointTag), "DELETE", "/management/banks/BANK_ID/endpoints/OPERATION_ID/tags/ENDPOINT_TAG_ID", "Delete Bank Level Endpoint Tag", s"""Delete Bank Level Endpoint Tag.""", @@ -7893,7 +7755,6 @@ object Http4s400 { http4sPartialFunction = Some(deleteBankLevelEndpointTag)) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteAuthenticationTypeValidation), "DELETE", @@ -7911,7 +7772,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteJsonSchemaValidation), "DELETE", @@ -7929,7 +7789,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCustomerAttribute), "DELETE", @@ -7958,7 +7817,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteBankAttribute), "DELETE", @@ -7980,7 +7838,7 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteAtm), "DELETE", + implementedInApiVersion, nameOf(deleteAtm), "DELETE", "/banks/BANK_ID/atms/ATM_ID", "Delete ATM", s"""Delete ATM.""", @@ -7994,7 +7852,6 @@ object Http4s400 { http4sPartialFunction = Some(deleteAtm)) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteProductFee), "DELETE", @@ -8021,7 +7878,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteEndpointMapping), "DELETE", @@ -8038,7 +7894,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteBankLevelEndpointMapping), "DELETE", @@ -8276,7 +8131,6 @@ object Http4s400 { private def initBatch2ResourceDocs(): Unit = { staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getEntitlementsForBank), "GET", @@ -8294,7 +8148,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMyPersonalUserAttributes), "GET", @@ -8313,7 +8166,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUserWithAttributes), "GET", @@ -8332,7 +8184,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomerAttributes), "GET", @@ -8352,7 +8203,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomerAttributeById), "GET", @@ -8372,7 +8222,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getProductAttributeDefinition), "GET", @@ -8392,7 +8241,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomerAttributeDefinition), "GET", @@ -8412,7 +8260,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountAttributeDefinition), "GET", @@ -8432,7 +8279,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionAttributeDefinition), "GET", @@ -8452,7 +8298,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCardAttributeDefinition), "GET", @@ -8472,7 +8317,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getJsonSchemaValidation), "GET", @@ -8490,7 +8334,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAllJsonSchemaValidations), "GET", @@ -8508,7 +8351,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAuthenticationTypeValidation), "GET", @@ -8526,7 +8368,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAllAuthenticationTypeValidations), "GET", @@ -8547,7 +8388,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConnectorMethod), "GET", @@ -8565,7 +8405,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAllConnectorMethods), "GET", @@ -8583,7 +8422,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUserCustomerLinksByUserId), "GET", @@ -8603,7 +8441,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUserCustomerLinksByCustomerId), "GET", @@ -8623,7 +8460,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomerMessages), "GET", @@ -8641,7 +8477,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createCustomerMessage), "POST", @@ -8667,7 +8502,6 @@ object Http4s400 { private def initBatch1ResourceDocs(): Unit = { staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCallContext), "GET", @@ -8685,7 +8519,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(verifyRequestSignResponse), "GET", @@ -8703,7 +8536,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCurrentUserId), "GET", @@ -8722,7 +8554,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getScannedApiVersions), "GET", @@ -8741,7 +8572,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMySpaces), "GET", @@ -8757,7 +8587,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankAttributes), "GET", @@ -8777,7 +8606,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankAttribute), "GET", @@ -8797,7 +8625,7 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSystemLevelEndpointTags), "GET", + implementedInApiVersion, nameOf(getSystemLevelEndpointTags), "GET", "/management/endpoints/OPERATION_ID/tags", "Get System Level Endpoint Tags", s"""Get System Level Endpoint Tags.""", @@ -8808,7 +8636,7 @@ object Http4s400 { http4sPartialFunction = Some(getSystemLevelEndpointTags)) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankLevelEndpointTags), "GET", + implementedInApiVersion, nameOf(getBankLevelEndpointTags), "GET", "/management/banks/BANK_ID/endpoints/OPERATION_ID/tags", "Get Bank Level Endpoint Tags", s"""Get Bank Level Endpoint Tags.""", @@ -8819,7 +8647,6 @@ object Http4s400 { http4sPartialFunction = Some(getBankLevelEndpointTags)) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getEndpointMapping), "GET", @@ -8837,7 +8664,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankLevelEndpointMapping), "GET", @@ -8855,7 +8681,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAllEndpointMappings), "GET", @@ -8876,7 +8701,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAllBankLevelEndpointMappings), "GET", @@ -8976,7 +8800,6 @@ object Http4s400 { private def initBatch13ResourceDocs(): Unit = { staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createEndpointMapping), "POST", @@ -8995,7 +8818,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateEndpointMapping), "PUT", @@ -9012,7 +8834,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createBankLevelEndpointMapping), "POST", @@ -9031,7 +8852,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateBankLevelEndpointMapping), "PUT", @@ -9167,7 +8987,6 @@ object Http4s400 { private def initBatch14ResourceDocs(): Unit = { staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createSystemLevelEndpointTag), "POST", @@ -9192,7 +9011,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateSystemLevelEndpointTag), "PUT", @@ -9212,7 +9030,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createBankLevelEndpointTag), "POST", @@ -9233,7 +9050,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateBankLevelEndpointTag), "PUT", @@ -9395,7 +9211,6 @@ object Http4s400 { private def initBatch15ResourceDocs(): Unit = { staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createJsonSchemaValidation), "POST", @@ -9419,7 +9234,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateJsonSchemaValidation), "PUT", @@ -9442,7 +9256,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createAuthenticationTypeValidation), "POST", @@ -9461,7 +9274,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateAuthenticationTypeValidation), "PUT", @@ -9480,7 +9292,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createConnectorMethod), "POST", @@ -9499,7 +9310,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateConnectorMethod), "PUT", @@ -9677,7 +9487,6 @@ object Http4s400 { private def initBatch16ResourceDocs(): Unit = { staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createDynamicResourceDoc), "POST", @@ -9696,7 +9505,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateDynamicResourceDoc), "PUT", @@ -9715,7 +9523,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteDynamicResourceDoc), "DELETE", @@ -9732,7 +9539,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getDynamicResourceDoc), "GET", @@ -9750,7 +9556,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAllDynamicResourceDocs), "GET", @@ -9768,7 +9573,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createBankLevelDynamicResourceDoc), "POST", @@ -9787,7 +9591,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateBankLevelDynamicResourceDoc), "PUT", @@ -9806,7 +9609,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteBankLevelDynamicResourceDoc), "DELETE", @@ -9823,7 +9625,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankLevelDynamicResourceDoc), "GET", @@ -9841,7 +9642,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAllBankLevelDynamicResourceDocs), "GET", @@ -9995,7 +9795,6 @@ object Http4s400 { private def initBatch17ResourceDocs(): Unit = { staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createDynamicMessageDoc), "POST", @@ -10012,7 +9811,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateDynamicMessageDoc), "PUT", @@ -10029,7 +9827,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteDynamicMessageDoc), "DELETE", @@ -10046,7 +9843,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getDynamicMessageDoc), "GET", @@ -10064,7 +9860,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAllDynamicMessageDocs), "GET", @@ -10082,7 +9877,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createBankLevelDynamicMessageDoc), "POST", @@ -10099,7 +9893,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateBankLevelDynamicMessageDoc), "PUT", @@ -10116,7 +9909,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteBankLevelDynamicMessageDoc), "DELETE", @@ -10133,7 +9925,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankLevelDynamicMessageDoc), "GET", @@ -10151,7 +9942,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAllBankLevelDynamicMessageDocs), "GET", @@ -10206,7 +9996,6 @@ object Http4s400 { private def initBatch18ResourceDocs(): Unit = { staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(buildDynamicEndpointTemplate), "POST", @@ -10743,7 +10532,6 @@ object Http4s400 { private def initBatch19ResourceDocs(): Unit = { staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addAccount), "POST", @@ -10772,7 +10560,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createSettlementAccount), "POST", @@ -10811,7 +10598,7 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "createConsumer", "POST", + implementedInApiVersion, "createConsumer", "POST", "/management/consumers", "Post a Consumer", s"""Create a Consumer (Authenticated access).""", @@ -10835,7 +10622,7 @@ object Http4s400 { http4sPartialFunction = Some(createConsumer)) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, "createCounterpartyForAnyAccount", "POST", + implementedInApiVersion, "createCounterpartyForAnyAccount", "POST", "/management/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/counterparties", "Create Counterparty for any account (Explicit)", s"""This is a management endpoint that allows the creation of a Counterparty on any Account. @@ -10855,7 +10642,6 @@ object Http4s400 { http4sPartialFunction = Some(createCounterpartyForAnyAccount)) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createHistoricalTransactionAtBank), "POST", @@ -10893,7 +10679,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createUserWithRoles), "POST", @@ -10938,7 +10723,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createUserWithAccountAccess), "POST", @@ -10971,7 +10755,6 @@ object Http4s400 { ) staticResourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createUserInvitation), "POST", diff --git a/obp-api/src/main/scala/code/api/v4_0_0/OBPAPI4_0_0.scala b/obp-api/src/main/scala/code/api/v4_0_0/OBPAPI4_0_0.scala index 99f017fbf3..0fe9466889 100644 --- a/obp-api/src/main/scala/code/api/v4_0_0/OBPAPI4_0_0.scala +++ b/obp-api/src/main/scala/code/api/v4_0_0/OBPAPI4_0_0.scala @@ -28,7 +28,6 @@ package code.api.v4_0_0 import scala.language.reflectiveCalls import code.api.OBPRestHelper -import code.api.util.APIUtil.OBPEndpoint import code.api.util.VersionedOBPApis import code.api.v3_1_0.OBPAPI3_1_0 import code.util.Helper.MdcLoggable @@ -62,10 +61,6 @@ object OBPAPI4_0_0 extends OBPRestHelper with MdcLoggable with VersionedOBPApis Http4s400.resourceDocs ).filterNot(it => it.partialFunctionName.matches(excludeEndpoints.mkString("|"))) - val routes: List[OBPEndpoint] = Nil - - registerRoutes(routes, allResourceDocs, apiPrefix, true) - - logger.info(s"version $version has been run! There are ${routes.length} routes, ${allResourceDocs.length} allResourceDocs.") + logger.info(s"version $version has been run! ${allResourceDocs.length} allResourceDocs.") // CORS for OPTIONS is handled by the http4s corsHandler layer — no Lift serve needed here. } diff --git a/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala b/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala index d279c6350a..4a5c6602d4 100644 --- a/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala +++ b/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala @@ -50,8 +50,6 @@ trait APIMethods500 //import com.openbankproject.commons.model.enums.StrongCustomerAuthentication //import com.openbankproject.commons.util.ApiVersion //import net.liftweb.common.{Empty, Full} -//import net.liftweb.http.Req -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json.{Extraction, compactRender, prettyRender} //import net.liftweb.mapper.By @@ -2530,7 +2528,7 @@ trait APIMethods500 // } //} // -//object APIMethods500 extends RestHelper with APIMethods500 { +//object APIMethods500 { // lazy val newStyleEndpoints: List[(String, String)] = Implementations5_0_0.resourceDocs.map { // rd => (rd.partialFunctionName, rd.implementedInApiVersion.toString()) // }.toList diff --git a/obp-api/src/main/scala/code/api/v5_0_0/Http4s500.scala b/obp-api/src/main/scala/code/api/v5_0_0/Http4s500.scala index 8a3fb98a64..308fc06f16 100644 --- a/obp-api/src/main/scala/code/api/v5_0_0/Http4s500.scala +++ b/obp-api/src/main/scala/code/api/v5_0_0/Http4s500.scala @@ -79,7 +79,6 @@ object Http4s500 { val prefixPath = Root / ApiPathZero.toString / implementedInApiVersion.toString resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(root), "GET", @@ -111,7 +110,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBanks), "GET", @@ -143,7 +141,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBank), "GET", @@ -179,7 +176,6 @@ object Http4s500 { else List(AuthenticatedUserIsRequired, BankNotFound, UnknownError) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getProducts), "GET", @@ -212,7 +208,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getProduct), "GET", @@ -243,7 +238,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createSystemView), "POST", @@ -310,7 +304,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSystemView), "GET", @@ -344,7 +337,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateSystemView), "PUT", @@ -395,7 +387,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteSystemView), "DELETE", @@ -487,7 +478,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createBank), "POST", @@ -555,7 +545,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateBank), "PUT", @@ -642,7 +631,7 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createAccount), "PUT", + implementedInApiVersion, nameOf(createAccount), "PUT", "/banks/BANK_ID/accounts/NEW_ACCOUNT_ID", "Create Account (PUT)", """Create Account at bank specified by BANK_ID with Id specified by ACCOUNT_ID. | @@ -685,7 +674,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createUserAuthContext), "POST", @@ -717,7 +705,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUserAuthContexts), "GET", @@ -766,7 +753,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createUserAuthContextUpdateRequest), "POST", @@ -821,7 +807,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(answerUserAuthContextUpdateChallenge), "POST", @@ -871,7 +856,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createConsentRequest), "POST", @@ -931,7 +915,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsentRequest), "GET", @@ -1010,7 +993,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsentByConsentRequestId), "GET", @@ -1350,7 +1332,7 @@ object Http4s500 { ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createConsentByConsentRequestId).replace("Id", "IdEmail"), "POST", + implementedInApiVersion, nameOf(createConsentByConsentRequestId).replace("Id", "IdEmail"), "POST", "/consumer/consent-requests/CONSENT_REQUEST_ID/EMAIL/consents", "Create Consent By CONSENT_REQUEST_ID (EMAIL)", s""" @@ -1377,7 +1359,7 @@ object Http4s500 { ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createConsentByConsentRequestId).replace("Id", "IdSms"), "POST", + implementedInApiVersion, nameOf(createConsentByConsentRequestId).replace("Id", "IdSms"), "POST", "/consumer/consent-requests/CONSENT_REQUEST_ID/SMS/consents", "Create Consent By CONSENT_REQUEST_ID (SMS)", s""" @@ -1404,7 +1386,7 @@ object Http4s500 { ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createConsentByConsentRequestId).replace("Id", "IdImplicit"), "POST", + implementedInApiVersion, nameOf(createConsentByConsentRequestId).replace("Id", "IdImplicit"), "POST", "/consumer/consent-requests/CONSENT_REQUEST_ID/IMPLICIT/consents", "Create Consent By CONSENT_REQUEST_ID (IMPLICIT)", s""" @@ -1443,7 +1425,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(headAtms), "HEAD", @@ -1509,7 +1490,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createCustomer), "POST", @@ -1559,7 +1539,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomerOverview), "POST", @@ -1603,7 +1582,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomerOverviewFlat), "POST", @@ -1636,7 +1614,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMyCustomersAtAnyBank), "GET", @@ -1670,7 +1647,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMyCustomersAtBank), "GET", @@ -1704,7 +1680,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomersAtOneBank), "GET", @@ -1740,7 +1715,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomersMinimalAtOneBank), "GET", @@ -1799,7 +1773,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createProduct), "PUT", @@ -1899,7 +1872,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addCardForBank), "POST", @@ -1940,7 +1912,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getViewsForBankAccount), "GET", @@ -1993,7 +1964,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMetricsAtBank), "GET", @@ -2077,7 +2047,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSystemViewsIds), "GET", @@ -2126,7 +2095,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createCustomerAccountLink), "POST", @@ -2163,7 +2131,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomerAccountLinksByCustomerId), "GET", @@ -2193,7 +2160,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomerAccountLinksByBankIdAccountId), "GET", @@ -2223,7 +2189,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomerAccountLinkById), "GET", @@ -2260,7 +2225,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCustomerAccountLinkById), "PUT", @@ -2290,7 +2254,6 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCustomerAccountLinkById), "DELETE", @@ -2323,7 +2286,7 @@ object Http4s500 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAdapterInfo), "GET", + implementedInApiVersion, nameOf(getAdapterInfo), "GET", "/adapter", "Get Adapter Info", s"""Get basic information about the Adapter. | @@ -2413,20 +2376,11 @@ object Http4s500 { OptionT.liftF(IO.pure { val contentType = req.headers.get(CIString("Content-Type")).map(_.head.value).getOrElse("") Response[IO](status = Status.NotFound) - .withEntity(APIUtil.errorJsonResponse(s"${ErrorMessages.InvalidUri}Current Url is (${req.uri}), Current Content-Type Header is ($contentType)", 404).toResponse.data) + .withEntity(net.liftweb.json.compactRender(APIUtil.errorJsonResponse(s"${ErrorMessages.InvalidUri}Current Url is (${req.uri}), Current Content-Type Header is ($contentType)", 404).body)) .withContentType(org.http4s.headers.`Content-Type`(MediaType.application.json)) }) } } } - // Combined routes with bridge fallback for testing proxy parity - // This mimics the production server behavior where unimplemented endpoints fall back to Lift - val wrappedRoutesV500ServicesWithBridge: HttpRoutes[IO] = { - import code.api.util.http4s.Http4sLiftWebBridge - Kleisli[HttpF, Request[IO], Response[IO]] { req: Request[IO] => - wrappedRoutesV500Services(req) - .orElse(Http4sLiftWebBridge.routes.run(req)) - } - } } diff --git a/obp-api/src/main/scala/code/api/v5_0_0/OBPAPI5_0_0.scala b/obp-api/src/main/scala/code/api/v5_0_0/OBPAPI5_0_0.scala index 772a2a776d..e9ed415726 100644 --- a/obp-api/src/main/scala/code/api/v5_0_0/OBPAPI5_0_0.scala +++ b/obp-api/src/main/scala/code/api/v5_0_0/OBPAPI5_0_0.scala @@ -28,7 +28,6 @@ package code.api.v5_0_0 import scala.language.reflectiveCalls import code.api.OBPRestHelper -import code.api.util.APIUtil.OBPEndpoint import code.api.util.VersionedOBPApis import code.api.v4_0_0.OBPAPI4_0_0 import code.util.Helper.MdcLoggable @@ -55,10 +54,7 @@ object OBPAPI5_0_0 extends OBPRestHelper with MdcLoggable with VersionedOBPApis ) // No Lift routes — all v5.0.0 endpoints are served by Http4s500. - val routes: List[OBPEndpoint] = Nil - registerRoutes(routes, allResourceDocs, apiPrefix, true) - - logger.info(s"version $version has been run! There are ${routes.length} routes, ${allResourceDocs.length} allResourceDocs.") + logger.info(s"version $version has been run! ${allResourceDocs.length} allResourceDocs.") // CORS for OPTIONS is handled by the http4s corsHandler layer — no Lift serve needed here. } diff --git a/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala b/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala index 16a9fa37f4..5a4772d249 100644 --- a/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala +++ b/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala @@ -69,7 +69,6 @@ trait APIMethods510 //import com.openbankproject.commons.model.enums.{TransactionRequestStatus, _} //import com.openbankproject.commons.util.{ApiVersion, ScannedApiVersion} //import net.liftweb.common.{Box, Empty, Full} -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json //import net.liftweb.json.{Extraction, compactRender, parse, prettyRender} //import net.liftweb.mapper.By @@ -6018,7 +6017,7 @@ trait APIMethods510 // // // -//object APIMethods510 extends RestHelper with APIMethods510 { +//object APIMethods510 { // lazy val newStyleEndpoints: List[(String, String)] = Implementations5_1_0.resourceDocs.map { // rd => (rd.partialFunctionName, rd.implementedInApiVersion.toString()) // }.toList diff --git a/obp-api/src/main/scala/code/api/v5_1_0/Http4s510.scala b/obp-api/src/main/scala/code/api/v5_1_0/Http4s510.scala index ad3f8f6ef6..f58b684857 100644 --- a/obp-api/src/main/scala/code/api/v5_1_0/Http4s510.scala +++ b/obp-api/src/main/scala/code/api/v5_1_0/Http4s510.scala @@ -119,7 +119,6 @@ object Http4s510 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(root), "GET", @@ -184,7 +183,6 @@ object Http4s510 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMyConsentsByBank), "GET", @@ -234,7 +232,7 @@ object Http4s510 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAggregateMetrics), "GET", + implementedInApiVersion, nameOf(getAggregateMetrics), "GET", "/management/aggregate-metrics", "Get Aggregate Metrics", s"""Returns aggregate metrics on api usage eg. total count, response time (in ms), etc. | @@ -298,7 +296,7 @@ object Http4s510 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBanks), "GET", + implementedInApiVersion, nameOf(getBanks), "GET", "/banks", "Get Banks", """Get banks on this API instance |Returns a list of banks supported on this server.""", @@ -335,7 +333,6 @@ object Http4s510 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createAtm), "POST", @@ -374,7 +371,6 @@ object Http4s510 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateAtm), "PUT", @@ -502,7 +498,6 @@ object Http4s510 { }) } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAtms), "GET", @@ -543,7 +538,7 @@ object Http4s510 { }) } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAtm), "GET", + implementedInApiVersion, nameOf(getAtm), "GET", "/banks/BANK_ID/atms/ATM_ID", "Get Bank ATM", s"""Returns information about ATM for a single bank specified by BANK_ID and ATM_ID including: | @@ -576,7 +571,6 @@ object Http4s510 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteAtm), "DELETE", @@ -629,7 +623,6 @@ object Http4s510 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createConsumer), "POST", @@ -738,7 +731,6 @@ object Http4s510 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsumer), "GET", @@ -768,7 +760,7 @@ object Http4s510 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsumers), "GET", + implementedInApiVersion, nameOf(getConsumers), "GET", "/management/consumers", "Get Consumers", s"""Get the all Consumers. | @@ -821,7 +813,7 @@ object Http4s510 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionRequests), "GET", + implementedInApiVersion, nameOf(getTransactionRequests), "GET", "/banks/BANK_ID/accounts/ACCOUNT_ID/VIEW_ID/transaction-requests", "Get Transaction Requests.", """Returns transaction requests for account specified by ACCOUNT_ID at bank specified by BANK_ID. @@ -873,7 +865,6 @@ object Http4s510 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankAccountsBalances), "GET", @@ -903,7 +894,6 @@ object Http4s510 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAllBankAccountBalances), "GET", @@ -936,7 +926,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(suggestedSessionTimeout), "GET", @@ -980,7 +969,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getOAuth2ServerWellKnown), "GET", @@ -1006,7 +994,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(regulatedEntities), "GET", @@ -1033,7 +1020,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getRegulatedEntityById), "GET", @@ -1080,7 +1066,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createRegulatedEntity), "POST", @@ -1108,7 +1093,7 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteRegulatedEntity), "DELETE", + implementedInApiVersion, nameOf(deleteRegulatedEntity), "DELETE", "/regulated-entities/REGULATED_ENTITY_ID", "Delete Regulated Entity", s"""Delete Regulated Entity specified by REGULATED_ENTITY_ID | @@ -1140,7 +1125,6 @@ object Http4s510 { logCacheHandler(req, code.api.cache.RedisLogger.LogLevel.TRACE) } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(logCacheTraceEndpoint), "GET", @@ -1167,7 +1151,6 @@ object Http4s510 { logCacheHandler(req, code.api.cache.RedisLogger.LogLevel.DEBUG) } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(logCacheDebugEndpoint), "GET", @@ -1194,7 +1177,6 @@ object Http4s510 { logCacheHandler(req, code.api.cache.RedisLogger.LogLevel.INFO) } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(logCacheInfoEndpoint), "GET", @@ -1221,7 +1203,6 @@ object Http4s510 { logCacheHandler(req, code.api.cache.RedisLogger.LogLevel.WARNING) } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(logCacheWarningEndpoint), "GET", @@ -1248,7 +1229,6 @@ object Http4s510 { logCacheHandler(req, code.api.cache.RedisLogger.LogLevel.ERROR) } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(logCacheErrorEndpoint), "GET", @@ -1275,7 +1255,6 @@ object Http4s510 { logCacheHandler(req, code.api.cache.RedisLogger.LogLevel.ALL) } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(logCacheAllEndpoint), "GET", @@ -1307,7 +1286,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(waitingForGodot), "GET", @@ -1335,7 +1313,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAllApiCollections), "GET", @@ -1375,7 +1352,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createAtmAttribute), "POST", @@ -1408,7 +1384,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAtmAttributes), "GET", @@ -1439,7 +1414,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAtmAttribute), "GET", @@ -1479,7 +1453,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateAtmAttribute), "PUT", @@ -1511,7 +1484,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteAtmAttribute), "DELETE", @@ -1554,7 +1526,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createAgent), "POST", @@ -1588,7 +1559,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateAgentStatus), "PUT", @@ -1618,7 +1588,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAgent), "GET", @@ -1648,7 +1617,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAgents), "GET", @@ -1692,7 +1660,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createRegulatedEntityAttribute), "POST", @@ -1723,7 +1690,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteRegulatedEntityAttribute), "DELETE", @@ -1754,7 +1720,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getRegulatedEntityAttributeById), "GET", @@ -1786,7 +1751,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAllRegulatedEntityAttributes), "GET", @@ -1829,7 +1793,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateRegulatedEntityAttribute), "PUT", @@ -1862,7 +1825,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(mtlsClientCertificateInfo), "GET", @@ -1897,7 +1859,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateMyApiCollection), "PUT", @@ -1922,7 +1883,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getApiTags), "GET", @@ -1953,7 +1913,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMetrics), "GET", @@ -2074,7 +2033,7 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getWebUiProps), "GET", + implementedInApiVersion, nameOf(getWebUiProps), "GET", "/webui-props", "Get WebUiProps", s""" | @@ -2121,7 +2080,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createNonPersonalUserAttribute), "POST", @@ -2153,7 +2111,7 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteNonPersonalUserAttribute), "DELETE", + implementedInApiVersion, nameOf(deleteNonPersonalUserAttribute), "DELETE", "/users/USER_ID/non-personal/attributes/USER_ATTRIBUTE_ID", "Delete Non Personal User Attribute", s"""Delete the Non Personal User Attribute specified by ENTITLEMENT_REQUEST_ID for a user specified by USER_ID | @@ -2177,7 +2135,7 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getNonPersonalUserAttributes), "GET", + implementedInApiVersion, nameOf(getNonPersonalUserAttributes), "GET", "/users/USER_ID/non-personal/attributes", "Get Non Personal User Attributes", s"""Get Non Personal User Attribute for a user specified by USER_ID | @@ -2203,7 +2161,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(syncExternalUser), "POST", @@ -2240,7 +2197,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getEntitlementsAndPermissions), "GET", @@ -2277,7 +2233,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUserByProviderAndUsername), "GET", @@ -2327,7 +2282,7 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUserLockStatus), "GET", + implementedInApiVersion, nameOf(getUserLockStatus), "GET", "/users/PROVIDER/USERNAME/lock-status", "Get User Lock Status", s""" |Get User Login Status. @@ -2356,7 +2311,7 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(unlockUserByProviderAndUsername), "PUT", + implementedInApiVersion, nameOf(unlockUserByProviderAndUsername), "PUT", "/users/PROVIDER/USERNAME/lock-status", "Unlock the user", s""" |Unlock a User. @@ -2384,7 +2339,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(lockUserByProviderAndUsername), "POST", @@ -2415,7 +2369,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(validateUserByUserId), "PUT", @@ -2453,7 +2406,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountAccessByUserId), "GET", @@ -2518,7 +2470,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsHeldByUserAtBank), "GET", @@ -2556,7 +2507,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsHeldByUser), "GET", @@ -2592,7 +2542,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomersForUserIdsOnly), "GET", @@ -2627,7 +2576,7 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomersByLegalName), "POST", + implementedInApiVersion, nameOf(getCustomersByLegalName), "POST", "/banks/BANK_ID/customers/legal-name", "Get Customers by Legal Name", s"""Gets the Customers specified by Legal Name. | @@ -2655,7 +2604,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(customViewNamesCheck), "GET", @@ -2684,7 +2632,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(systemViewNamesCheck), "GET", @@ -2715,7 +2662,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(accountAccessUniqueIndexCheck), "GET", @@ -2747,7 +2693,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(accountCurrencyCheck), "GET", @@ -2783,7 +2728,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(orphanedAccountCheck), "GET", @@ -2816,7 +2760,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCurrenciesAtBank), "GET", @@ -2862,7 +2805,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateConsumerRedirectURL), "PUT", @@ -2900,7 +2842,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateConsumerLogoURL), "PUT", @@ -2938,7 +2879,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateConsumerCertificate), "PUT", @@ -2976,7 +2916,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateConsumerName), "PUT", @@ -3010,7 +2949,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCallsLimit), "GET", @@ -3061,7 +2999,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createMyConsumer), "POST", @@ -3118,7 +3055,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createConsumerDynamicRegistration), "POST", @@ -3240,7 +3176,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(grantUserAccessToViewById), "POST", @@ -3316,7 +3251,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(revokeUserAccessToViewById), "POST", @@ -3367,7 +3301,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createUserWithAccountAccessById), "POST", @@ -3413,7 +3346,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionRequestById), "GET", @@ -3449,7 +3381,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateTransactionRequestStatus), "PUT", @@ -3487,7 +3418,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCoreAccountByIdThroughView), "GET", @@ -3522,7 +3452,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankAccountBalances), "GET", @@ -3550,7 +3479,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankAccountsBalancesThroughView), "GET", @@ -3598,7 +3526,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createCounterpartyLimit), "POST", @@ -3653,7 +3580,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCounterpartyLimit), "PUT", @@ -3680,7 +3606,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCounterpartyLimit), "GET", @@ -3757,7 +3682,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCounterpartyLimitStatus), "GET", @@ -3783,7 +3707,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCounterpartyLimit), "DELETE", @@ -3825,7 +3748,7 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createCustomView), "POST", + implementedInApiVersion, nameOf(createCustomView), "POST", "/banks/BANK_ID/accounts/ACCOUNT_ID/views/VIEW_ID/target-views", "Create Custom View", s"""Create a custom view on bank account | @@ -3876,7 +3799,7 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCustomView), "PUT", + implementedInApiVersion, nameOf(updateCustomView), "PUT", "/banks/BANK_ID/accounts/ACCOUNT_ID/views/VIEW_ID/target-views/TARGET_VIEW_ID", "Update Custom View", s"""Update an existing custom view on a bank account | @@ -3907,7 +3830,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomView), "GET", @@ -3963,7 +3885,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCustomView), "DELETE", @@ -3998,7 +3919,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createBankAccountBalance), "POST", @@ -4027,7 +3947,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankAccountBalanceById), "GET", @@ -4065,7 +3984,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateBankAccountBalance), "PUT", @@ -4095,7 +4013,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteBankAccountBalance), "DELETE", @@ -4137,7 +4054,7 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addSystemViewPermission), "POST", + implementedInApiVersion, nameOf(addSystemViewPermission), "POST", "/system-views/VIEW_ID/permissions", "Add Permission to a System View", """Add Permission to a System View.""", createViewPermissionJson, entitlementJSON, @@ -4160,7 +4077,7 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteSystemViewPermission), "DELETE", + implementedInApiVersion, nameOf(deleteSystemViewPermission), "DELETE", "/system-views/VIEW_ID/permissions/PERMISSION_NAME", "Delete Permission to a System View", """Delete Permission to a System View """.stripMargin, @@ -4190,7 +4107,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateConsentStatusByConsent), "PUT", @@ -4239,7 +4155,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateConsentAccountAccessByConsentId), "PUT", @@ -4302,7 +4217,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateConsentUserIdByConsentId), "PUT", @@ -4356,7 +4270,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMyConsents), "GET", @@ -4403,7 +4316,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsentsAtBank), "GET", @@ -4448,7 +4360,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsents), "GET", @@ -4503,7 +4414,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsentByConsentId), "GET", @@ -4538,7 +4448,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsentByConsentIdViaConsumer), "GET", @@ -4578,7 +4487,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(revokeConsentAtBank), "DELETE", @@ -4621,7 +4529,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(selfRevokeConsent), "DELETE", @@ -4726,7 +4633,7 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(revokeMyConsent), "DELETE", + implementedInApiVersion, nameOf(revokeMyConsent), "DELETE", "/my/consents/CONSENT_ID", "Revoke My Consent", s""" |Revoke Consent for current user specified by CONSENT_ID @@ -4862,7 +4769,7 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createConsent), "POST", + implementedInApiVersion, nameOf(createConsent), "POST", "/my/consents/IMPLICIT", "Create Consent (IMPLICIT)", s""" | @@ -4980,7 +4887,6 @@ object Http4s510 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createVRPConsentRequest), "POST", diff --git a/obp-api/src/main/scala/code/api/v5_1_0/OBPAPI5_1_0.scala b/obp-api/src/main/scala/code/api/v5_1_0/OBPAPI5_1_0.scala index 453a7fcc01..6f6dd2ec22 100644 --- a/obp-api/src/main/scala/code/api/v5_1_0/OBPAPI5_1_0.scala +++ b/obp-api/src/main/scala/code/api/v5_1_0/OBPAPI5_1_0.scala @@ -28,7 +28,6 @@ package code.api.v5_1_0 import scala.language.reflectiveCalls import code.api.OBPRestHelper -import code.api.util.APIUtil.OBPEndpoint import code.api.util.VersionedOBPApis import code.api.v3_0_0.Http4s300 import code.api.v3_1_0.{APIMethods310, Http4s310} @@ -86,10 +85,7 @@ object OBPAPI5_1_0 extends OBPRestHelper ).filterNot(it => it.partialFunctionName.matches(excludeEndpoints.mkString("|"))) // No Lift routes — all v5.1.0 endpoints are served by Http4s510. - val routes: List[OBPEndpoint] = Nil - registerRoutes(routes, allResourceDocs, apiPrefix, true) - - logger.info(s"version $version has been run! There are ${routes.length} routes, ${allResourceDocs.length} allResourceDocs.") + logger.info(s"version $version has been run! ${allResourceDocs.length} allResourceDocs.") // CORS for OPTIONS is handled by the http4s corsHandler layer — no Lift serve needed here. } diff --git a/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala b/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala index 5fcefe4328..7582587f38 100644 --- a/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala +++ b/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala @@ -83,8 +83,6 @@ trait APIMethods600 //import net.liftweb.common.{Box, Empty, Failure, Full} //import net.liftweb.util.Helpers.tryo //import org.apache.commons.lang3.StringUtils -//import net.liftweb.http.provider.HTTPParam -//import net.liftweb.http.rest.RestHelper //import net.liftweb.json.{Extraction, JsonParser} //import net.liftweb.json.JsonAST.{JArray, JField, JNothing, JObject, JString, JValue} //import net.liftweb.json.JsonDSL._ @@ -17167,7 +17165,7 @@ trait APIMethods600 // // // -//object APIMethods600 extends RestHelper with APIMethods600 { +//object APIMethods600 { // lazy val newStyleEndpoints: List[(String, String)] = Implementations6_0_0.resourceDocs.map { // rd => (rd.partialFunctionName, rd.implementedInApiVersion.toString()) // }.toList diff --git a/obp-api/src/main/scala/code/api/v6_0_0/Http4s600.scala b/obp-api/src/main/scala/code/api/v6_0_0/Http4s600.scala index 3c20bf7b76..4e9a2fd0d4 100644 --- a/obp-api/src/main/scala/code/api/v6_0_0/Http4s600.scala +++ b/obp-api/src/main/scala/code/api/v6_0_0/Http4s600.scala @@ -48,7 +48,7 @@ import code.bankconnectors.{Connector => BankConnector} import code.bankconnectors.storedprocedure.StoredProcedureUtils import code.migration.MigrationScriptLogProvider import code.api.dynamic.entity.helper.DynamicEntityInfo -import code.api.util.APIUtil.{createQueriesByHttpParamsFuture, unboxFull, unboxFullOrFail} +import code.api.util.APIUtil.{HTTPParam, createQueriesByHttpParamsFuture, unboxFull, unboxFullOrFail} import code.api.util.{ApiVersionUtils, CertificateUtil, CommonsEmailWrapper, RateLimitingUtil} import code.api.v2_0_0.{BasicViewJson, JSONFactory200} import code.api.v3_0_0.JSONFactory300 @@ -75,7 +75,6 @@ import com.openbankproject.commons.dto.GetProductsParam import code.model.ModeratedTransaction import com.openbankproject.commons.model.{CreditLimit, CreditRating, CustomerFaceImage} import net.liftweb.common.{Empty, Failure} -import net.liftweb.http.provider.HTTPParam import scala.util.Random import code.metrics.APIMetrics @@ -2656,8 +2655,7 @@ object Http4s600 { _ <- Helper.booleanToFuture(InvalidSignalChannelName, cc = Some(cc)) { code.api.cache.RedisMessaging.validateChannelName(channelName) } - httpParams = req.headers.headers.toList.map(h => - net.liftweb.http.provider.HTTPParam(h.name.toString, h.value)) + httpParams = req.headers.headers.toList.map(h => HTTPParam(h.name.toString, h.value)) (obpQueryParams, _) <- createQueriesByHttpParamsFuture(httpParams, Some(cc)) limit = obpQueryParams.collectFirst { case code.api.util.OBPLimit(value) => value }.getOrElse(50) offset = obpQueryParams.collectFirst { case code.api.util.OBPOffset(value) => value }.getOrElse(0) @@ -6198,7 +6196,6 @@ object Http4s600 { private def registerBatch1(): Unit = { resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(root), "GET", @@ -6219,7 +6216,6 @@ object Http4s600 { http4sPartialFunction = Some(root) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getScannedApiVersions), "GET", @@ -6277,7 +6273,6 @@ object Http4s600 { http4sPartialFunction = Some(getScannedApiVersions) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCurrentUser), "GET", @@ -6295,7 +6290,6 @@ object Http4s600 { http4sPartialFunction = Some(getCurrentUser) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBanks), "GET", @@ -6327,7 +6321,6 @@ object Http4s600 { http4sPartialFunction = Some(getBanks) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBank), "GET", @@ -6357,7 +6350,6 @@ object Http4s600 { http4sPartialFunction = Some(getBank) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomersAtOneBank), "GET", @@ -6390,7 +6382,6 @@ object Http4s600 { http4sPartialFunction = Some(getCustomersAtOneBank) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomerByCustomerId), "GET", @@ -6417,7 +6408,6 @@ object Http4s600 { http4sPartialFunction = Some(getCustomerByCustomerId) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCoreAccountByIdV600), "GET", @@ -6458,7 +6448,6 @@ object Http4s600 { http4sPartialFunction = Some(getCoreAccountByIdV600) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMyDynamicEntities), "GET", @@ -6502,7 +6491,6 @@ object Http4s600 { http4sPartialFunction = Some(getMyDynamicEntities) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSystemDynamicEntities), "GET", @@ -6537,7 +6525,6 @@ object Http4s600 { http4sPartialFunction = Some(getSystemDynamicEntities) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankLevelDynamicEntities), "GET", @@ -6577,7 +6564,6 @@ object Http4s600 { http4sPartialFunction = Some(getBankLevelDynamicEntities) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsumer), "GET", @@ -6613,7 +6599,6 @@ object Http4s600 { http4sPartialFunction = Some(getConsumer) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomersAtAllBanks), "GET", @@ -6646,7 +6631,6 @@ object Http4s600 { http4sPartialFunction = Some(getCustomersAtAllBanks) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUserAttributes), "GET", @@ -6668,7 +6652,6 @@ object Http4s600 { http4sPartialFunction = Some(getUserAttributes) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPrivateAccountByIdFull), "GET", @@ -6724,7 +6707,6 @@ object Http4s600 { http4sPartialFunction = Some(getPrivateAccountByIdFull) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomerByCustomerNumber), "POST", @@ -6750,7 +6732,6 @@ object Http4s600 { http4sPartialFunction = Some(getCustomerByCustomerNumber) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomersByLegalName), "POST", @@ -6778,7 +6759,6 @@ object Http4s600 { http4sPartialFunction = Some(getCustomersByLegalName) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createSystemDynamicEntity), "POST", @@ -6842,7 +6822,6 @@ object Http4s600 { http4sPartialFunction = Some(createSystemDynamicEntity) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createBankLevelDynamicEntity), "POST", @@ -6912,7 +6891,6 @@ object Http4s600 { http4sPartialFunction = Some(createBankLevelDynamicEntity) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateSystemDynamicEntity), "PUT", @@ -6971,7 +6949,6 @@ object Http4s600 { http4sPartialFunction = Some(updateSystemDynamicEntity) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateBankLevelDynamicEntity), "PUT", @@ -7036,7 +7013,6 @@ object Http4s600 { http4sPartialFunction = Some(updateBankLevelDynamicEntity) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateMyDynamicEntity), "PUT", @@ -7099,7 +7075,6 @@ object Http4s600 { http4sPartialFunction = Some(updateMyDynamicEntity) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateSystemView), "PUT", @@ -7165,7 +7140,6 @@ object Http4s600 { http4sPartialFunction = Some(updateSystemView) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMetrics), "GET", @@ -7278,7 +7252,6 @@ object Http4s600 { http4sPartialFunction = Some(getMetrics) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAggregateMetrics), "GET", @@ -7378,7 +7351,6 @@ object Http4s600 { http4sPartialFunction = Some(getAggregateMetrics) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTopAPIs), "GET", @@ -7450,7 +7422,6 @@ object Http4s600 { http4sPartialFunction = Some(getTopAPIs) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getWebUiProps), "GET", @@ -7512,7 +7483,6 @@ object Http4s600 { http4sPartialFunction = Some(getWebUiProps) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountsAtBank), "GET", @@ -7544,7 +7514,6 @@ object Http4s600 { http4sPartialFunction = Some(getAccountsAtBank) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTransactionsForBankAccount), "GET", @@ -7606,7 +7575,6 @@ object Http4s600 { http4sPartialFunction = Some(getTransactionsForBankAccount) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getProductsV600), "GET", @@ -7631,7 +7599,6 @@ object Http4s600 { private def registerBatch2(): Unit = { resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUsers), "GET", @@ -7677,7 +7644,6 @@ object Http4s600 { http4sPartialFunction = Some(getUsers) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createBank), "POST", @@ -7708,7 +7674,6 @@ object Http4s600 { http4sPartialFunction = Some(createBank) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createCustomer), "POST", @@ -7779,7 +7744,6 @@ object Http4s600 { http4sPartialFunction = Some(createCustomer) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createUser), "POST", @@ -7816,7 +7780,6 @@ object Http4s600 { http4sPartialFunction = Some(createUser) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(resetPasswordUrl), "POST", @@ -7865,7 +7828,6 @@ object Http4s600 { http4sPartialFunction = Some(resetPasswordUrl) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConnectors), "GET", @@ -7918,7 +7880,6 @@ object Http4s600 { http4sPartialFunction = Some(getConnectors) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCacheConfig), "GET", @@ -7961,7 +7922,6 @@ object Http4s600 { http4sPartialFunction = Some(getCacheConfig) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCacheInfo), "GET", @@ -8025,7 +7985,6 @@ object Http4s600 { http4sPartialFunction = Some(getCacheInfo) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCacheNamespaces), "GET", @@ -8081,7 +8040,6 @@ object Http4s600 { http4sPartialFunction = Some(getCacheNamespaces) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getDatabasePoolInfo), "GET", @@ -8124,7 +8082,6 @@ object Http4s600 { http4sPartialFunction = Some(getDatabasePoolInfo) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMigrations), "GET", @@ -8147,7 +8104,6 @@ object Http4s600 { http4sPartialFunction = Some(getMigrations) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getStoredProcedureConnectorHealth), "GET", @@ -8191,7 +8147,6 @@ object Http4s600 { http4sPartialFunction = Some(getStoredProcedureConnectorHealth) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConnectorMethodNames), "GET", @@ -8249,7 +8204,6 @@ object Http4s600 { http4sPartialFunction = Some(getConnectorMethodNames) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCorporateCustomersAtOneBank), "GET", @@ -8280,7 +8234,6 @@ object Http4s600 { http4sPartialFunction = Some(getCorporateCustomersAtOneBank) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCorporateCustomerByCustomerId), "GET", @@ -8308,7 +8261,6 @@ object Http4s600 { http4sPartialFunction = Some(getCorporateCustomerByCustomerId) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCorporateCustomerSubsidiaries), "GET", @@ -8335,7 +8287,6 @@ object Http4s600 { http4sPartialFunction = Some(getCorporateCustomerSubsidiaries) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getRetailCustomersAtOneBank), "GET", @@ -8366,7 +8317,6 @@ object Http4s600 { http4sPartialFunction = Some(getRetailCustomersAtOneBank) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getRetailCustomerByCustomerId), "GET", @@ -8394,7 +8344,6 @@ object Http4s600 { http4sPartialFunction = Some(getRetailCustomerByCustomerId) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomerChildren), "GET", @@ -8420,7 +8369,6 @@ object Http4s600 { http4sPartialFunction = Some(getCustomerChildren) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomerLinksByCustomerId), "GET", @@ -8445,7 +8393,6 @@ object Http4s600 { http4sPartialFunction = Some(getCustomerLinksByCustomerId) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSystemViews), "GET", @@ -8493,7 +8440,6 @@ object Http4s600 { http4sPartialFunction = Some(getSystemViews) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSystemViewById), "GET", @@ -8545,7 +8491,6 @@ object Http4s600 { http4sPartialFunction = Some(getSystemViewById) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAbacPolicies), "GET", @@ -8579,7 +8524,6 @@ object Http4s600 { http4sPartialFunction = Some(getAbacPolicies) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConnectorCallCounts), "GET", @@ -8628,7 +8572,6 @@ object Http4s600 { http4sPartialFunction = Some(getConnectorCallCounts) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConnectorTraces), "GET", @@ -8676,7 +8619,6 @@ object Http4s600 { http4sPartialFunction = Some(getConnectorTraces) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getDynamicEntityDiagnostics), "GET", @@ -8759,7 +8701,6 @@ object Http4s600 { http4sPartialFunction = Some(getDynamicEntityDiagnostics) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(cleanupOrphanedDynamicEntityRecords), "DELETE", @@ -8802,7 +8743,7 @@ object Http4s600 { http4sPartialFunction = Some(cleanupOrphanedDynamicEntityRecords) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createWebUiProps), "POST", + implementedInApiVersion, nameOf(createWebUiProps), "POST", "/management/webui_props", "Create WebUiProps", s"""Create a WebUiProps. @@ -8815,7 +8756,6 @@ object Http4s600 { List(apiTagWebUiProps), Some(List(canCreateWebUiProps)), http4sPartialFunction = Some(createWebUiProps)) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createOrUpdateWebUiProps), "PUT", @@ -8878,7 +8818,6 @@ object Http4s600 { http4sPartialFunction = Some(createOrUpdateWebUiProps) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteWebUiProps), "DELETE", @@ -8913,7 +8852,6 @@ object Http4s600 { private def registerBatch3(): Unit = { resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createCustomViewManagement), "POST", @@ -8963,7 +8901,6 @@ object Http4s600 { http4sPartialFunction = Some(createCustomViewManagement) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getProductTagsV600), "GET", @@ -8984,7 +8921,6 @@ object Http4s600 { http4sPartialFunction = Some(getProductTagsV600) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateProductTagsV600), "PUT", @@ -9008,7 +8944,6 @@ object Http4s600 { http4sPartialFunction = Some(updateProductTagsV600) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getOidcClient), "GET", @@ -9036,7 +8971,6 @@ object Http4s600 { http4sPartialFunction = Some(getOidcClient) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(verifyOidcClient), "POST", @@ -9066,7 +9000,6 @@ object Http4s600 { http4sPartialFunction = Some(verifyOidcClient) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUserAttributeById), "GET", @@ -9090,7 +9023,6 @@ object Http4s600 { http4sPartialFunction = Some(getUserAttributeById) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createUserAttribute), "POST", @@ -9125,7 +9057,6 @@ object Http4s600 { http4sPartialFunction = Some(createUserAttribute) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateUserAttribute), "PUT", @@ -9154,7 +9085,6 @@ object Http4s600 { http4sPartialFunction = Some(updateUserAttribute) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteUserAttribute), "DELETE", @@ -9178,7 +9108,6 @@ object Http4s600 { http4sPartialFunction = Some(deleteUserAttribute) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addUserToGroup), "POST", @@ -9230,7 +9159,6 @@ object Http4s600 { http4sPartialFunction = Some(addUserToGroup) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(removeUserFromGroup), "DELETE", @@ -9261,7 +9189,6 @@ object Http4s600 { http4sPartialFunction = Some(removeUserFromGroup) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteEntitlement), "DELETE", @@ -9289,7 +9216,6 @@ object Http4s600 { http4sPartialFunction = Some(deleteEntitlement) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAvailablePersonalDynamicEntities), "GET", @@ -9334,7 +9260,6 @@ object Http4s600 { http4sPartialFunction = Some(getAvailablePersonalDynamicEntities) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getReferenceTypes), "GET", @@ -9403,7 +9328,6 @@ object Http4s600 { http4sPartialFunction = Some(getReferenceTypes) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(joinSystemChatRoom), "POST", @@ -9436,7 +9360,6 @@ object Http4s600 { http4sPartialFunction = Some(joinSystemChatRoom) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createCounterpartyAttribute), "POST", @@ -9457,7 +9380,6 @@ object Http4s600 { http4sPartialFunction = Some(createCounterpartyAttribute) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCounterpartyAttribute), "DELETE", @@ -9477,7 +9399,6 @@ object Http4s600 { http4sPartialFunction = Some(deleteCounterpartyAttribute) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCounterpartyAttributeById), "GET", @@ -9497,7 +9418,6 @@ object Http4s600 { http4sPartialFunction = Some(getCounterpartyAttributeById) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAllCounterpartyAttributes), "GET", @@ -9517,7 +9437,6 @@ object Http4s600 { http4sPartialFunction = Some(getAllCounterpartyAttributes) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCounterpartyAttribute), "PUT", @@ -9537,7 +9456,6 @@ object Http4s600 { http4sPartialFunction = Some(updateCounterpartyAttribute) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(hasAccountAccess), "GET", @@ -9569,7 +9487,6 @@ object Http4s600 { http4sPartialFunction = Some(hasAccountAccess) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMyAccountAccessRequests), "GET", @@ -9606,7 +9523,6 @@ object Http4s600 { http4sPartialFunction = Some(getMyAccountAccessRequests) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getWebUiProp), "GET", @@ -9657,7 +9573,6 @@ object Http4s600 { http4sPartialFunction = Some(getWebUiProp) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMessageDocsJsonSchema), "GET", @@ -9715,7 +9630,6 @@ object Http4s600 { http4sPartialFunction = Some(getMessageDocsJsonSchema) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(verifyUserCredentials), "POST", @@ -9742,7 +9656,6 @@ object Http4s600 { http4sPartialFunction = Some(verifyUserCredentials) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getViewPermissions), "GET", @@ -9778,7 +9691,6 @@ object Http4s600 { http4sPartialFunction = Some(getViewPermissions) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAllApiProductsV600), "GET", @@ -9797,7 +9709,6 @@ object Http4s600 { http4sPartialFunction = Some(getAllApiProductsV600) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAllProductsV600), "GET", @@ -9816,7 +9727,6 @@ object Http4s600 { http4sPartialFunction = Some(getAllProductsV600) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountAccessRequestsForAccount), "GET", @@ -9853,7 +9763,6 @@ object Http4s600 { http4sPartialFunction = Some(getAccountAccessRequestsForAccount) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountAccessRequestById), "GET", @@ -9889,7 +9798,6 @@ object Http4s600 { private def registerBatch4(): Unit = { resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getHoldingAccountByReleaser), "GET", @@ -9909,7 +9817,6 @@ object Http4s600 { http4sPartialFunction = Some(getHoldingAccountByReleaser) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createAccountAccessRequest), "POST", @@ -9954,7 +9861,6 @@ object Http4s600 { http4sPartialFunction = Some(createAccountAccessRequest) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(approveAccountAccessRequest), "POST", @@ -9998,7 +9904,6 @@ object Http4s600 { http4sPartialFunction = Some(approveAccountAccessRequest) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(rejectAccountAccessRequest), "POST", @@ -10042,7 +9947,6 @@ object Http4s600 { http4sPartialFunction = Some(rejectAccountAccessRequest) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSignalChannels), "GET", @@ -10066,7 +9970,6 @@ object Http4s600 { http4sPartialFunction = Some(getSignalChannels) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSignalChannelInfo), "GET", @@ -10088,7 +9991,6 @@ object Http4s600 { http4sPartialFunction = Some(getSignalChannelInfo) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSignalStats), "GET", @@ -10110,7 +10012,6 @@ object Http4s600 { http4sPartialFunction = Some(getSignalStats) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(publishSignalMessage), "POST", @@ -10145,7 +10046,6 @@ object Http4s600 { http4sPartialFunction = Some(publishSignalMessage) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSignalMessages), "GET", @@ -10174,7 +10074,6 @@ object Http4s600 { http4sPartialFunction = Some(getSignalMessages) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteSignalChannel), "DELETE", @@ -10196,7 +10095,6 @@ object Http4s600 { http4sPartialFunction = Some(deleteSignalChannel) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankChatRooms), "GET", @@ -10235,7 +10133,6 @@ object Http4s600 { http4sPartialFunction = Some(getBankChatRooms) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSystemChatRooms), "GET", @@ -10271,7 +10168,6 @@ object Http4s600 { http4sPartialFunction = Some(getSystemChatRooms) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankChatRoom), "GET", @@ -10312,7 +10208,6 @@ object Http4s600 { http4sPartialFunction = Some(getBankChatRoom) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSystemChatRoom), "GET", @@ -10348,7 +10243,6 @@ object Http4s600 { http4sPartialFunction = Some(getSystemChatRoom) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMyChatRooms), "GET", @@ -10384,7 +10278,6 @@ object Http4s600 { http4sPartialFunction = Some(getMyChatRooms) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMyUnreadCounts), "GET", @@ -10403,7 +10296,6 @@ object Http4s600 { http4sPartialFunction = Some(getMyUnreadCounts) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(markChatRoomRead), "PUT", @@ -10435,7 +10327,6 @@ object Http4s600 { http4sPartialFunction = Some(markChatRoomRead) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMyMentions), "GET", @@ -10471,7 +10362,6 @@ object Http4s600 { http4sPartialFunction = Some(getMyMentions) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(searchChatRooms), "POST", @@ -10523,7 +10413,6 @@ object Http4s600 { http4sPartialFunction = Some(searchChatRooms) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBulkReactions), "GET", @@ -10549,7 +10438,6 @@ object Http4s600 { http4sPartialFunction = Some(getBulkReactions) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(archiveBankChatRoom), "PUT", @@ -10591,7 +10479,6 @@ object Http4s600 { http4sPartialFunction = Some(archiveBankChatRoom) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(archiveSystemChatRoom), "PUT", @@ -10628,7 +10515,6 @@ object Http4s600 { http4sPartialFunction = Some(archiveSystemChatRoom) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(joinBankChatRoom), "POST", @@ -10667,7 +10553,6 @@ object Http4s600 { http4sPartialFunction = Some(joinBankChatRoom) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(refreshBankJoiningKey), "PUT", @@ -10692,7 +10577,6 @@ object Http4s600 { http4sPartialFunction = Some(refreshBankJoiningKey) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(refreshSystemJoiningKey), "PUT", @@ -10713,7 +10597,6 @@ object Http4s600 { http4sPartialFunction = Some(refreshSystemJoiningKey) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createBankChatRoom), "POST", @@ -10755,7 +10638,6 @@ object Http4s600 { http4sPartialFunction = Some(createBankChatRoom) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createSystemChatRoom), "POST", @@ -10793,7 +10675,6 @@ object Http4s600 { http4sPartialFunction = Some(createSystemChatRoom) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateBankChatRoom), "PUT", @@ -10830,7 +10711,6 @@ object Http4s600 { http4sPartialFunction = Some(updateBankChatRoom) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateSystemChatRoom), "PUT", @@ -10867,7 +10747,6 @@ object Http4s600 { http4sPartialFunction = Some(updateSystemChatRoom) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteBankChatRoom), "DELETE", @@ -10894,7 +10773,6 @@ object Http4s600 { private def registerBatch5(): Unit = { resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteSystemChatRoom), "DELETE", @@ -10914,7 +10792,6 @@ object Http4s600 { http4sPartialFunction = Some(deleteSystemChatRoom) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(setBankChatRoomOpenRoom), "PUT", @@ -10959,7 +10836,6 @@ object Http4s600 { http4sPartialFunction = Some(setBankChatRoomOpenRoom) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(setSystemChatRoomOpenRoom), "PUT", @@ -11000,7 +10876,6 @@ object Http4s600 { http4sPartialFunction = Some(setSystemChatRoomOpenRoom) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addBankChatRoomParticipant), "POST", @@ -11041,7 +10916,6 @@ object Http4s600 { http4sPartialFunction = Some(addBankChatRoomParticipant) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addSystemChatRoomParticipant), "POST", @@ -11076,7 +10950,6 @@ object Http4s600 { http4sPartialFunction = Some(addSystemChatRoomParticipant) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankChatRoomParticipants), "GET", @@ -11113,7 +10986,6 @@ object Http4s600 { http4sPartialFunction = Some(getBankChatRoomParticipants) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSystemChatRoomParticipants), "GET", @@ -11145,7 +11017,6 @@ object Http4s600 { http4sPartialFunction = Some(getSystemChatRoomParticipants) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateBankParticipantPermissions), "PUT", @@ -11184,7 +11055,6 @@ object Http4s600 { http4sPartialFunction = Some(updateBankParticipantPermissions) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateSystemParticipantPermissions), "PUT", @@ -11217,7 +11087,6 @@ object Http4s600 { http4sPartialFunction = Some(updateSystemParticipantPermissions) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(removeBankChatRoomParticipant), "DELETE", @@ -11242,7 +11111,6 @@ object Http4s600 { http4sPartialFunction = Some(removeBankChatRoomParticipant) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(removeSystemChatRoomParticipant), "DELETE", @@ -11262,7 +11130,6 @@ object Http4s600 { http4sPartialFunction = Some(removeSystemChatRoomParticipant) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(sendBankChatMessage), "POST", @@ -11305,7 +11172,6 @@ object Http4s600 { http4sPartialFunction = Some(sendBankChatMessage) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(sendSystemChatMessage), "POST", @@ -11342,7 +11208,6 @@ object Http4s600 { http4sPartialFunction = Some(sendSystemChatMessage) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankChatMessages), "GET", @@ -11387,7 +11252,6 @@ object Http4s600 { http4sPartialFunction = Some(getBankChatMessages) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSystemChatMessages), "GET", @@ -11428,7 +11292,6 @@ object Http4s600 { http4sPartialFunction = Some(getSystemChatMessages) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankChatMessage), "GET", @@ -11470,7 +11333,6 @@ object Http4s600 { http4sPartialFunction = Some(getBankChatMessage) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSystemChatMessage), "GET", @@ -11507,7 +11369,6 @@ object Http4s600 { http4sPartialFunction = Some(getSystemChatMessage) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(editBankChatMessage), "PUT", @@ -11551,7 +11412,6 @@ object Http4s600 { http4sPartialFunction = Some(editBankChatMessage) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(editSystemChatMessage), "PUT", @@ -11589,7 +11449,6 @@ object Http4s600 { http4sPartialFunction = Some(editSystemChatMessage) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteBankChatMessage), "DELETE", @@ -11615,7 +11474,6 @@ object Http4s600 { http4sPartialFunction = Some(deleteBankChatMessage) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteSystemChatMessage), "DELETE", @@ -11636,7 +11494,6 @@ object Http4s600 { http4sPartialFunction = Some(deleteSystemChatMessage) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankThreadReplies), "GET", @@ -11678,7 +11535,6 @@ object Http4s600 { http4sPartialFunction = Some(getBankThreadReplies) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSystemThreadReplies), "GET", @@ -11715,7 +11571,6 @@ object Http4s600 { http4sPartialFunction = Some(getSystemThreadReplies) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(replyInBankThread), "POST", @@ -11759,7 +11614,6 @@ object Http4s600 { http4sPartialFunction = Some(replyInBankThread) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(replyInSystemThread), "POST", @@ -11796,7 +11650,6 @@ object Http4s600 { http4sPartialFunction = Some(replyInSystemThread) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addBankReaction), "POST", @@ -11831,7 +11684,6 @@ object Http4s600 { http4sPartialFunction = Some(addBankReaction) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addSystemReaction), "POST", @@ -11860,7 +11712,6 @@ object Http4s600 { http4sPartialFunction = Some(addSystemReaction) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(removeBankReaction), "DELETE", @@ -11886,7 +11737,6 @@ object Http4s600 { http4sPartialFunction = Some(removeBankReaction) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(removeSystemReaction), "DELETE", @@ -11907,7 +11757,6 @@ object Http4s600 { http4sPartialFunction = Some(removeSystemReaction) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankReactions), "GET", @@ -11943,7 +11792,6 @@ object Http4s600 { private def registerBatch6(): Unit = { resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSystemReactions), "GET", @@ -11971,7 +11819,6 @@ object Http4s600 { http4sPartialFunction = Some(getSystemReactions) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(signalBankTyping), "PUT", @@ -11995,7 +11842,6 @@ object Http4s600 { http4sPartialFunction = Some(signalBankTyping) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(signalSystemTyping), "PUT", @@ -12015,7 +11861,6 @@ object Http4s600 { http4sPartialFunction = Some(signalSystemTyping) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankTypingUsers), "GET", @@ -12039,7 +11884,6 @@ object Http4s600 { http4sPartialFunction = Some(getBankTypingUsers) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSystemTypingUsers), "GET", @@ -12059,7 +11903,6 @@ object Http4s600 { http4sPartialFunction = Some(getSystemTypingUsers) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createSignatoryPanel), "POST", @@ -12093,7 +11936,6 @@ object Http4s600 { http4sPartialFunction = Some(createSignatoryPanel) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSignatoryPanels), "GET", @@ -12117,7 +11959,6 @@ object Http4s600 { http4sPartialFunction = Some(getSignatoryPanels) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getSignatoryPanel), "GET", @@ -12141,7 +11982,6 @@ object Http4s600 { http4sPartialFunction = Some(getSignatoryPanel) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateSignatoryPanel), "PUT", @@ -12170,7 +12010,6 @@ object Http4s600 { http4sPartialFunction = Some(updateSignatoryPanel) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteSignatoryPanel), "DELETE", @@ -12188,7 +12027,6 @@ object Http4s600 { http4sPartialFunction = Some(deleteSignatoryPanel) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(validateUserEmail), "POST", @@ -12237,7 +12075,6 @@ object Http4s600 { http4sPartialFunction = Some(validateUserEmail) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(resetPasswordComplete), "POST", @@ -12275,7 +12112,6 @@ object Http4s600 { http4sPartialFunction = Some(resetPasswordComplete) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(resetPasswordUrlAnonymous), "POST", @@ -12318,7 +12154,6 @@ object Http4s600 { http4sPartialFunction = Some(resetPasswordUrlAnonymous) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(validateDynamicResourceDoc), "POST", @@ -12352,7 +12187,6 @@ object Http4s600 { http4sPartialFunction = Some(validateDynamicResourceDoc) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createTransactionRequestHold), "POST", @@ -12385,7 +12219,6 @@ object Http4s600 { http4sPartialFunction = Some(createTransactionRequestHold) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createTransactionRequestCardano), "POST", @@ -12418,7 +12251,6 @@ object Http4s600 { http4sPartialFunction = Some(createTransactionRequestCardano) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createTransactionRequestEthereumeSendTransaction), "POST", @@ -12451,7 +12283,6 @@ object Http4s600 { http4sPartialFunction = Some(createTransactionRequestEthereumeSendTransaction) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createTransactionRequestEthSendRawTransaction), "POST", @@ -12484,7 +12315,6 @@ object Http4s600 { http4sPartialFunction = Some(createTransactionRequestEthSendRawTransaction) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUserGroupMemberships), "GET", @@ -12526,7 +12356,6 @@ object Http4s600 { http4sPartialFunction = Some(getUserGroupMemberships) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUsersWithAccountAccess), "GET", @@ -12563,7 +12392,6 @@ object Http4s600 { http4sPartialFunction = Some(getUsersWithAccountAccess) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createRetailCustomer), "POST", @@ -12613,7 +12441,6 @@ object Http4s600 { http4sPartialFunction = Some(createRetailCustomer) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createCorporateCustomer), "POST", @@ -12661,7 +12488,6 @@ object Http4s600 { http4sPartialFunction = Some(createCorporateCustomer) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUserByUserId), "GET", @@ -12682,7 +12508,6 @@ object Http4s600 { http4sPartialFunction = Some(getUserByUserId) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(directLoginEndpoint), "POST", @@ -12717,7 +12542,6 @@ object Http4s600 { http4sPartialFunction = Some(directLoginEndpoint) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(validateAbacRule), "POST", @@ -12766,7 +12590,6 @@ object Http4s600 { http4sPartialFunction = Some(validateAbacRule) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(executeAbacRule), "POST", @@ -12812,7 +12635,6 @@ object Http4s600 { http4sPartialFunction = Some(executeAbacRule) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(executeAbacPolicy), "POST", @@ -12861,7 +12683,6 @@ object Http4s600 { http4sPartialFunction = Some(executeAbacPolicy) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAbacRuleSchema), "GET", @@ -12941,7 +12762,6 @@ object Http4s600 { http4sPartialFunction = Some(getAbacRuleSchema) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(backupSystemDynamicEntity), "POST", @@ -12975,7 +12795,6 @@ object Http4s600 { http4sPartialFunction = Some(backupSystemDynamicEntity) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(backupBankLevelDynamicEntity), "POST", @@ -13012,7 +12831,6 @@ object Http4s600 { private def registerBatch7(): Unit = { resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteSystemDynamicEntityCascade), "DELETE", @@ -13051,7 +12869,6 @@ object Http4s600 { http4sPartialFunction = Some(deleteSystemDynamicEntityCascade) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomerInvestigationReport), "GET", @@ -13115,7 +12932,6 @@ object Http4s600 { http4sPartialFunction = Some(getCustomerInvestigationReport) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createCustomerLink), "POST", @@ -13142,7 +12958,6 @@ object Http4s600 { http4sPartialFunction = Some(createCustomerLink) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomerLinksByBankId), "GET", @@ -13161,7 +12976,6 @@ object Http4s600 { http4sPartialFunction = Some(getCustomerLinksByBankId) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomerLinkById), "GET", @@ -13186,7 +13000,6 @@ object Http4s600 { http4sPartialFunction = Some(getCustomerLinkById) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateCustomerLink), "PUT", @@ -13213,7 +13026,6 @@ object Http4s600 { http4sPartialFunction = Some(updateCustomerLink) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCustomerLink), "DELETE", @@ -13238,7 +13050,6 @@ object Http4s600 { http4sPartialFunction = Some(deleteCustomerLink) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomViewById), "GET", @@ -13290,7 +13101,6 @@ object Http4s600 { http4sPartialFunction = Some(getCustomViewById) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(invalidateCacheNamespace), "POST", @@ -13326,7 +13136,6 @@ object Http4s600 { http4sPartialFunction = Some(invalidateCacheNamespace) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConfigProps), "GET", @@ -13362,7 +13171,6 @@ object Http4s600 { http4sPartialFunction = Some(getConfigProps) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAppDirectory), "GET", @@ -13392,7 +13200,6 @@ object Http4s600 { http4sPartialFunction = Some(getAppDirectory) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCustomViews), "GET", @@ -13420,7 +13227,6 @@ object Http4s600 { http4sPartialFunction = Some(getCustomViews) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getRolesWithEntitlementCountsAtAllBanks), "GET", @@ -13461,7 +13267,6 @@ object Http4s600 { http4sPartialFunction = Some(getRolesWithEntitlementCountsAtAllBanks) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getFeatures), "GET", @@ -13478,7 +13283,6 @@ object Http4s600 { http4sPartialFunction = Some(getFeatures) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getProviders), "GET", @@ -13504,7 +13308,6 @@ object Http4s600 { http4sPartialFunction = Some(getProviders) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getCurrentConsumer), "GET", @@ -13538,7 +13341,6 @@ object Http4s600 { http4sPartialFunction = Some(getCurrentConsumer) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPopularApis), "GET", @@ -13572,7 +13374,6 @@ object Http4s600 { http4sPartialFunction = Some(getPopularApis) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountDirectory), "GET", @@ -13614,7 +13415,6 @@ object Http4s600 { http4sPartialFunction = Some(getAccountDirectory) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createGroup), "POST", @@ -13657,7 +13457,6 @@ object Http4s600 { http4sPartialFunction = Some(createGroup) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getGroup), "GET", @@ -13691,7 +13490,6 @@ object Http4s600 { http4sPartialFunction = Some(getGroup) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getGroups), "GET", @@ -13732,7 +13530,6 @@ object Http4s600 { http4sPartialFunction = Some(getGroups) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateGroup), "PUT", @@ -13772,7 +13569,6 @@ object Http4s600 { http4sPartialFunction = Some(updateGroup) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteGroup), "DELETE", @@ -13799,7 +13595,6 @@ object Http4s600 { http4sPartialFunction = Some(deleteGroup) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getGroupEntitlements), "GET", @@ -13839,7 +13634,6 @@ object Http4s600 { http4sPartialFunction = Some(getGroupEntitlements) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createAbacRule), "POST", @@ -13899,7 +13693,6 @@ object Http4s600 { http4sPartialFunction = Some(createAbacRule) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAbacRule), "GET", @@ -13936,7 +13729,6 @@ object Http4s600 { http4sPartialFunction = Some(getAbacRule) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAbacRules), "GET", @@ -13977,7 +13769,6 @@ object Http4s600 { http4sPartialFunction = Some(getAbacRules) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAbacRulesByPolicy), "GET", @@ -14031,7 +13822,6 @@ object Http4s600 { http4sPartialFunction = Some(getAbacRulesByPolicy) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateAbacRule), "PUT", @@ -14075,7 +13865,6 @@ object Http4s600 { http4sPartialFunction = Some(updateAbacRule) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteAbacRule), "DELETE", @@ -14105,7 +13894,6 @@ object Http4s600 { private def registerBatch8(): Unit = { resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createPersonalDataField), "POST", @@ -14139,7 +13927,6 @@ object Http4s600 { http4sPartialFunction = Some(createPersonalDataField) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPersonalDataFields), "GET", @@ -14165,7 +13952,6 @@ object Http4s600 { http4sPartialFunction = Some(getPersonalDataFields) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getPersonalDataFieldById), "GET", @@ -14186,7 +13972,6 @@ object Http4s600 { http4sPartialFunction = Some(getPersonalDataFieldById) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updatePersonalDataField), "PUT", @@ -14218,7 +14003,6 @@ object Http4s600 { http4sPartialFunction = Some(updatePersonalDataField) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deletePersonalDataField), "DELETE", @@ -14240,7 +14024,6 @@ object Http4s600 { http4sPartialFunction = Some(deletePersonalDataField) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsumerCallCounters), "GET", @@ -14285,7 +14068,6 @@ object Http4s600 { http4sPartialFunction = Some(getConsumerCallCounters) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createCallLimits), "POST", @@ -14312,7 +14094,6 @@ object Http4s600 { http4sPartialFunction = Some(createCallLimits) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateRateLimits), "PUT", @@ -14349,7 +14130,6 @@ object Http4s600 { http4sPartialFunction = Some(updateRateLimits) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteCallLimits), "DELETE", @@ -14375,7 +14155,6 @@ object Http4s600 { http4sPartialFunction = Some(deleteCallLimits) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getActiveRateLimitsNow), "GET", @@ -14405,7 +14184,6 @@ object Http4s600 { http4sPartialFunction = Some(getActiveRateLimitsNow) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getActiveRateLimitsAtDate), "GET", @@ -14440,7 +14218,6 @@ object Http4s600 { http4sPartialFunction = Some(getActiveRateLimitsAtDate) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createFeaturedApiCollection), "POST", @@ -14466,7 +14243,6 @@ object Http4s600 { http4sPartialFunction = Some(createFeaturedApiCollection) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getFeaturedApiCollectionsAdmin), "GET", @@ -14488,7 +14264,6 @@ object Http4s600 { http4sPartialFunction = Some(getFeaturedApiCollectionsAdmin) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateFeaturedApiCollection), "PUT", @@ -14513,7 +14288,6 @@ object Http4s600 { http4sPartialFunction = Some(updateFeaturedApiCollection) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteFeaturedApiCollection), "DELETE", @@ -14538,7 +14312,6 @@ object Http4s600 { http4sPartialFunction = Some(deleteFeaturedApiCollection) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createApiProduct), "POST", @@ -14563,7 +14336,6 @@ object Http4s600 { http4sPartialFunction = Some(createApiProduct) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createOrUpdateApiProduct), "PUT", @@ -14588,7 +14360,6 @@ object Http4s600 { http4sPartialFunction = Some(createOrUpdateApiProduct) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getApiProduct), "GET", @@ -14609,7 +14380,6 @@ object Http4s600 { http4sPartialFunction = Some(getApiProduct) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getApiProducts), "GET", @@ -14630,7 +14400,6 @@ object Http4s600 { http4sPartialFunction = Some(getApiProducts) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteApiProduct), "DELETE", @@ -14655,7 +14424,6 @@ object Http4s600 { http4sPartialFunction = Some(deleteApiProduct) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createApiProductAttribute), "POST", @@ -14681,7 +14449,6 @@ object Http4s600 { http4sPartialFunction = Some(createApiProductAttribute) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateApiProductAttribute), "PUT", @@ -14707,7 +14474,6 @@ object Http4s600 { http4sPartialFunction = Some(updateApiProductAttribute) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getApiProductAttribute), "GET", @@ -14726,7 +14492,6 @@ object Http4s600 { http4sPartialFunction = Some(getApiProductAttribute) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteApiProductAttribute), "DELETE", @@ -14751,7 +14516,6 @@ object Http4s600 { http4sPartialFunction = Some(deleteApiProductAttribute) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createMandate), "POST", @@ -14808,7 +14572,6 @@ object Http4s600 { http4sPartialFunction = Some(createMandate) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMandates), "GET", @@ -14845,7 +14608,6 @@ object Http4s600 { http4sPartialFunction = Some(getMandates) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMandate), "GET", @@ -14882,7 +14644,6 @@ object Http4s600 { http4sPartialFunction = Some(getMandate) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateMandate), "PUT", @@ -14928,7 +14689,6 @@ object Http4s600 { http4sPartialFunction = Some(updateMandate) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteMandate), "DELETE", @@ -14951,7 +14711,6 @@ object Http4s600 { http4sPartialFunction = Some(deleteMandate) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createMandateProvision), "POST", @@ -15014,7 +14773,6 @@ object Http4s600 { private def registerBatch9(): Unit = { resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMandateProvisions), "GET", @@ -15051,7 +14809,6 @@ object Http4s600 { http4sPartialFunction = Some(getMandateProvisions) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMandateProvision), "GET", @@ -15088,7 +14845,6 @@ object Http4s600 { http4sPartialFunction = Some(getMandateProvision) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateMandateProvision), "PUT", @@ -15138,7 +14894,6 @@ object Http4s600 { http4sPartialFunction = Some(updateMandateProvision) ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteMandateProvision), "DELETE", diff --git a/obp-api/src/main/scala/code/api/v6_0_0/OBPAPI6_0_0.scala b/obp-api/src/main/scala/code/api/v6_0_0/OBPAPI6_0_0.scala index 4ef61ee0fb..54c9f8b2a8 100644 --- a/obp-api/src/main/scala/code/api/v6_0_0/OBPAPI6_0_0.scala +++ b/obp-api/src/main/scala/code/api/v6_0_0/OBPAPI6_0_0.scala @@ -29,7 +29,6 @@ package code.api.v6_0_0 import scala.language.reflectiveCalls import code.api.OBPRestHelper -import code.api.util.APIUtil.OBPEndpoint import code.api.util.VersionedOBPApis import code.api.v3_0_0.Http4s300 import code.api.v3_1_0.{APIMethods310, Http4s310} @@ -96,10 +95,7 @@ object OBPAPI6_0_0 extends OBPRestHelper ).filterNot(it => it.partialFunctionName.matches(excludeEndpoints.mkString("|"))) // No Lift routes — all v6.0.0 endpoints are served by Http4s600. - val routes: List[OBPEndpoint] = Nil - registerRoutes(routes, allResourceDocs, apiPrefix, true) - - logger.info(s"version $version has been run! There are ${routes.length} routes, ${allResourceDocs.length} allResourceDocs.") + logger.info(s"version $version has been run! ${allResourceDocs.length} allResourceDocs.") // CORS for OPTIONS is handled by the http4s corsHandler layer — no Lift serve needed here. } diff --git a/obp-api/src/main/scala/code/api/v7_0_0/Http4s700.scala b/obp-api/src/main/scala/code/api/v7_0_0/Http4s700.scala index ed37d752eb..32e85eb914 100644 --- a/obp-api/src/main/scala/code/api/v7_0_0/Http4s700.scala +++ b/obp-api/src/main/scala/code/api/v7_0_0/Http4s700.scala @@ -120,11 +120,14 @@ object Http4s700 { * Performance: Computed once and cached (lazy val) to avoid recomputation on every request. */ lazy val allResourceDocs: ArrayBuffer[ResourceDoc] = { - // Import v6.0.0's aggregated docs (v6.0.0 + v5.1.0 + ... + v1.3.0) - import code.api.v6_0_0.OBPAPI6_0_0 - - // Combine v6.0.0's aggregated docs with v7.0.0's docs - val allDocs = OBPAPI6_0_0.allResourceDocs ++ resourceDocs + // Ensure Implementations7_0_0 is initialized so that resourceDocs is populated. + // The Kleisli wrapper in wrappedRoutesV700Services defers Implementations7_0_0 init + // to the first actual API request, which may not have happened yet when a resource-docs + // request arrives first. Accessing the object here forces its body (resourceDocs += calls). + val _init = Implementations7_0_0 + // v6.0.0's aggregated docs (v6.0.0 + v5.1.0 + ... + v1.2.1), sourced Lift-free. + // Combine with v7.0.0's docs. + val allDocs = code.api.util.http4s.Http4sResourceDocAggregation.v600 ++ resourceDocs // Deduplicate by (requestUrl, requestVerb), keeping newest version // Sort by API version (descending) so newer versions come first @@ -181,7 +184,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(root), "GET", @@ -237,7 +239,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(corePrivateAccountsAllBanks), "GET", @@ -287,7 +288,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteEntitlement), "DELETE", @@ -328,7 +328,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(addEntitlement), "POST", @@ -444,7 +443,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getAccountAccessTrace), "GET", @@ -522,7 +520,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getConsentsConfig), "GET", @@ -551,7 +548,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getErrorMessages), "GET", @@ -625,7 +621,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getUserByUserId), "GET", @@ -689,7 +684,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createTradingOffer), "POST", @@ -752,7 +746,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTradingOffer), "GET", @@ -819,7 +812,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getTradingOffers), "GET", @@ -882,7 +874,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(cancelTradingOffer), "DELETE", @@ -954,7 +945,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createMarketOrder), "POST", @@ -1012,7 +1002,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMarketOrder), "GET", @@ -1061,7 +1050,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(cancelMarketOrder), "DELETE", @@ -1129,7 +1117,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createMarketMatch), "POST", @@ -1183,7 +1170,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getMarketTrade), "GET", @@ -1232,7 +1218,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(requestSettlement), "POST", @@ -1370,7 +1355,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(requestWithdrawal), "POST", @@ -1762,7 +1746,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createTestEmail), "POST", @@ -1953,7 +1936,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createValidationEmail), "POST", @@ -2041,7 +2023,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createOrganisation), "POST", @@ -2098,7 +2079,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getOrganisations), "GET", @@ -2143,7 +2123,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getOrganisation), "GET", @@ -2194,7 +2173,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateOrganisation), "PUT", @@ -2242,7 +2220,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteOrganisation), "DELETE", @@ -2316,7 +2293,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createRoutingScheme), "POST", @@ -2389,7 +2365,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getRoutingSchemes), "GET", @@ -2431,7 +2406,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getRoutingScheme), "GET", @@ -2494,7 +2468,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(updateRoutingScheme), "PUT", @@ -2551,7 +2524,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(deleteRoutingScheme), "DELETE", @@ -2580,7 +2552,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(getBankSupportedRoutingSchemes), "GET", @@ -2634,7 +2605,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(putBankSupportedRoutingScheme), "PUT", @@ -2737,7 +2707,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createPayeeLookup), "POST", @@ -2874,7 +2843,6 @@ object Http4s700 { ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createTransactionRequestMobileWallet), "POST", @@ -2970,7 +2938,6 @@ object Http4s700 { ) resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createTransactionRequestOpenCorridor), "POST", @@ -3096,7 +3063,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(createTransactionRequestBulk), "POST", @@ -3221,7 +3187,6 @@ object Http4s700 { } resourceDocs += ResourceDoc( - null, implementedInApiVersion, nameOf(factoryResetSystemView), "POST", @@ -3296,7 +3261,6 @@ object Http4s700 { } } resourceDocs += ResourceDoc( - null, implementedInApiVersion, "testRollbackEndpoint", "POST", "/test/rollback-check", "Test rollback", "Test-only: write then throw to verify rollback", diff --git a/obp-api/src/main/scala/code/bankconnectors/ConnectorEndpoints.scala b/obp-api/src/main/scala/code/bankconnectors/ConnectorEndpoints.scala index 315299dec1..631749c4f5 100644 --- a/obp-api/src/main/scala/code/bankconnectors/ConnectorEndpoints.scala +++ b/obp-api/src/main/scala/code/bankconnectors/ConnectorEndpoints.scala @@ -1,10 +1,9 @@ package code.bankconnectors import code.api.APIFailureNewStyle -import code.api.util.APIUtil.{OBPEndpoint, _} +import code.api.util.APIUtil._ import code.api.util.NewStyle.HttpCode import code.api.util.{APIUtil, ApiRole, CallContext, CustomJsonFormats, NewStyle, OBPQueryParam} -import code.api.v3_1_0.OBPAPI3_1_0.oauthServe import code.bankconnectors.ConnectorEndpoints.getMethod import code.bankconnectors.rest.RestConnector_vMar2019 import code.util.Helper @@ -13,8 +12,6 @@ import com.openbankproject.commons.util.ReflectUtils import com.openbankproject.commons.util.ReflectUtils.{getType, toValueObject} import net.liftweb.common.{Box, Empty, Failure, Full} import com.github.dwickern.macros.NameOf.nameOf -import net.liftweb.http.Req -import net.liftweb.http.rest.RestHelper import net.liftweb.json.JValue import net.liftweb.json.JsonAST.JNothing import org.apache.commons.lang3.StringUtils @@ -26,51 +23,10 @@ import scala.language.postfixOps import scala.reflect.ManifestFactory import scala.reflect.runtime.{universe => ru} -object ConnectorEndpoints extends RestHelper{ +object ConnectorEndpoints { - def registerConnectorEndpoints = { - oauthServe(connectorEndpoints) - } - - /** - * extract request body, no matter GET, POST, PUT or DELETE method - */ - object JsonAny extends JsonTest with JsonBody{ - def unapply(r: Req): Option[(List[String], (JValue, Req))] = - if (testResponse_?(r)) - body(r).toOption.map(t => (r.path.partPath -> (t -> r))) - else None - } - - lazy val connectorEndpoints: OBPEndpoint = { - case "connector" :: methodName :: Nil JsonAny json -> req if(hashMethod(methodName, json)) => { - cc => { - for { - (Full(user), callContext) <- authenticatedAccess(cc) - _ <- NewStyle.function.hasEntitlement("", user.userId, ApiRole.canGetConnectorEndpoint, callContext) - methodSymbol: ru.MethodSymbol = getMethod(methodName, json).get - outBoundType = Class.forName(s"com.openbankproject.commons.dto.OutBound${methodName.capitalize}") - mf = ManifestFactory.classType[TopicTrait](outBoundType) - formats = CustomJsonFormats.nullTolerateFormats - outBound = json.extract[TopicTrait](formats, mf) - // TODO need wait for confirm the rule, after that do refactor - paramValues: Seq[Any] = getParamValues(outBound, methodSymbol, callContext) - value = invokeMethod(methodSymbol, paramValues :_*) - // convert any to Future[(Box[_], Option[CallContext])] type - (boxedData, _) <- toStandardFuture(value) - data = APIUtil.fullBoxOrException(boxedData ~> APIFailureNewStyle("", 400, callContext.map(_.toLight))) - inboundAdapterCallContext = nameOf(InboundAdapterCallContext) - //convert first letter to small case - inboundAdapterCallContextKey = StringUtils.uncapitalize(inboundAdapterCallContext) - inboundAdapterCallContextValue = InboundAdapterCallContext(callContext.map(_.correlationId).getOrElse("")) - } yield { - // NOTE: if any field type is BigDecimal, it is can't be serialized by lift json - val json = Map((inboundAdapterCallContextKey, inboundAdapterCallContextValue),("status", Status("",List(InboundStatusMessage("","","","")))),("data", toValueObject(data))) - (json, HttpCode.`200`(callContext)) - } - } - } - } + // Lift dispatch removed in Phase B; not yet migrated to http4s + def registerConnectorEndpoints = () def extractOBPQueryParams(outBound: AnyRef): Seq[OBPQueryParam] = { val tp = ReflectUtils.getType(outBound) diff --git a/obp-api/src/main/scala/code/fx/fx.scala b/obp-api/src/main/scala/code/fx/fx.scala index 9abf2e2f9d..8511a725cc 100644 --- a/obp-api/src/main/scala/code/fx/fx.scala +++ b/obp-api/src/main/scala/code/fx/fx.scala @@ -7,8 +7,6 @@ import code.bankconnectors.LocalMappedConnectorInternal import code.util.Helper.MdcLoggable import com.openbankproject.commons.model.BankId import com.tesobe.CacheKeyFromArguments -import net.liftweb.common.Full -import net.liftweb.http.LiftRules import net.liftweb.json._ import scala.concurrent.duration._ @@ -86,24 +84,24 @@ object fx extends MdcLoggable { case true => Some(1) case false => + def loadResource(path: String): Option[String] = + Option(getClass.getResourceAsStream(path)) + .map(is => scala.io.Source.fromInputStream(is, "UTF-8").mkString) val filename = s"/fallbackexchangerates/${fromCurrency.toLowerCase}.json" - val source = LiftRules.loadResourceAsString(filename) - source match { - case Full(payload) => + loadResource(filename) match { + case Some(payload) => val fxRate: ExchangeRate = (parse(payload) \ toCurrency.toLowerCase()).extract[ExchangeRate] Some(fxRate.rate) - case _ => - val filename = s"/fallbackexchangerates/${toCurrency.toLowerCase}.json" - val source = LiftRules.loadResourceAsString(filename) - source match { - case Full(payload) => + case None => + val filename2 = s"/fallbackexchangerates/${toCurrency.toLowerCase}.json" + loadResource(filename2) match { + case Some(payload) => val fxRate: ExchangeRate = (parse(payload) \ fromCurrency.toLowerCase()).extract[ExchangeRate] Some(fxRate.inverseRate) - case _ => - logger.debug(s"getFallbackExchangeRate Could not find / load $filename") + case None => + logger.debug(s"getFallbackExchangeRate Could not find / load $filename2") None } - } } diff --git a/obp-api/src/main/scala/code/management/AccountsAPI.scala b/obp-api/src/main/scala/code/management/AccountsAPI.scala deleted file mode 100644 index dcc3dc2d0e..0000000000 --- a/obp-api/src/main/scala/code/management/AccountsAPI.scala +++ /dev/null @@ -1,40 +0,0 @@ -package code.management - -private case class PlaceHolderClassToSupressCompileWarning() -/* -import code.api.OBPRestHelper -import code.api.util.APIUtil._ -import code.model._ -import net.liftweb.common.{Failure, Full} -import net.liftweb.http.js.JE.JsRaw -import net.liftweb.http.rest.RestHelper -import code.util.Helper.MdcLoggable -import com.openbankproject.commons.model.BankId - -object AccountsAPI extends OBPRestHelper with MdcLoggable { - //needs to be a RestHelper to get access to JsonGet, JsonPost, etc. - self: RestHelper => - - val MODULE = "internal" - val version = "v1.0" - val versionStatus = "DEPRECIATED" - val prefix = (MODULE / version ).oPrefix(_) - - oauthServe(prefix { - //deletes a bank account - case "banks" :: BankId(bankId) :: "accounts" :: AccountId(accountId) :: Nil JsonDelete req => { - cc => - for { - u <- cc.user ?~ "user not found" - account <- BankAccount(bankId, accountId) ?~ "Account not found" - } yield { - account.remove(u) match { - case Full(_) => successJsonResponse(JsRaw("""{"success":"Success"}"""), 204) - case Failure(x, _, _) => errorJsonResponse("{'Error': '"+ x + "'}", 500) - case _ => errorJsonResponse("{'Error': 'could not delete Account'}", 500) - } - } - } - }) -} -*/ diff --git a/obp-api/src/main/scala/code/model/OAuth.scala b/obp-api/src/main/scala/code/model/OAuth.scala index c2b7fd1cb0..b7ccca55a6 100644 --- a/obp-api/src/main/scala/code/model/OAuth.scala +++ b/obp-api/src/main/scala/code/model/OAuth.scala @@ -39,7 +39,6 @@ import code.util.HydraUtil._ import com.github.dwickern.macros.NameOf import com.openbankproject.commons.ExecutionContext.Implicits.global import net.liftweb.common._ -import net.liftweb.http.S import net.liftweb.mapper._ import net.liftweb.util.Helpers._ import net.liftweb.util.{FieldError, Helpers} diff --git a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala index 4df86868cd..15a180fc4d 100644 --- a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala +++ b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala @@ -51,10 +51,7 @@ import com.openbankproject.commons.ExecutionContext.Implicits.global import com.openbankproject.commons.model._ import com.tesobe.CacheKeyFromArguments import net.liftweb.common._ -import net.liftweb.http.S.fmapFunc -import net.liftweb.http._ import net.liftweb.mapper._ -import net.liftweb.sitemap.Loc.{If, LocParam, Template} import net.liftweb.util._ import org.apache.commons.lang3.StringUtils import sh.ory.hydra.api.AdminApi @@ -106,16 +103,6 @@ class AuthUser extends MegaProtoUser[AuthUser] with CreatedUpdated with MdcLogga override def displayName = fieldOwner.firstNameDisplayName override val fieldId = Some(Text("txtFirstName")) override def validations = isEmpty(Helper.i18n("Please.enter.your.first.name")) _ :: super.validations - - override def _toForm: Box[Elem] = - fmapFunc({s: List[String] => this.setFromAny(s)}){name => - Full(appendFieldId( "" case s => s.toString}}/>)) - } } override lazy val lastName = new MyLastName @@ -131,17 +118,6 @@ class AuthUser extends MegaProtoUser[AuthUser] with CreatedUpdated with MdcLogga override def displayName = fieldOwner.lastNameDisplayName override val fieldId = Some(Text("txtLastName")) override def validations = isEmpty(Helper.i18n("Please.enter.your.last.name")) _ :: super.validations - - override def _toForm: Box[Elem] = - fmapFunc({s: List[String] => this.setFromAny(s)}){name => - Full(appendFieldId( "" case s => s.toString}}/>)) - } - } /** @@ -187,20 +163,10 @@ class AuthUser extends MegaProtoUser[AuthUser] with CreatedUpdated with MdcLogga override def validations = isEmpty(Helper.i18n("Please.enter.your.username")) _ :: usernameIsValid(Helper.i18n("invalid.username")) _ :: valUnique(Helper.i18n("unique.username")) _ :: - valUniqueExternally(Helper.i18n("unique.username")) _ :: + valUniqueExternally(Helper.i18n("unique.username")) _ :: super.validations override val fieldId = Some(Text("txtUsername")) - override def _toForm: Box[Elem] = - fmapFunc({s: List[String] => this.setFromAny(s)}){name => - Full(appendFieldId( "" case s => s.toString}}/>)) - } - /** * Make sure that the field is unique in the CBS */ @@ -242,27 +208,11 @@ class AuthUser extends MegaProtoUser[AuthUser] with CreatedUpdated with MdcLogga override lazy val password = new MyPasswordNew - lazy val signupPasswordRepeatText = getWebUiPropsValue("webui_signup_body_password_repeat_text", S.?("repeat")) - + lazy val signupPasswordRepeatText = getWebUiPropsValue("webui_signup_body_password_repeat_text", "repeat") + class MyPasswordNew extends MappedPassword(this) { lazy val preFilledPassword = if (APIUtil.getPropsAsBoolValue("allow_pre_filled_password", true)) {get.toString} else "" - override def _toForm: Box[NodeSeq] = { - S.fmapFunc({s: List[String] => this.setFromAny(s)}){funcName => - Full( - - {appendFieldId( ) } -
- -
-
{signupPasswordRepeatText}
- -
- -
- ) - } - } - + override def displayName = fieldOwner.passwordDisplayName private var passwordValue = "" @@ -287,16 +237,14 @@ class AuthUser extends MegaProtoUser[AuthUser] with CreatedUpdated with MdcLogga } isPasswordEmpty() match { case true => - invalidPw = true; + invalidPw = true invalidMsg = Helper.i18n("please.enter.your.password") - S.error("authuser_password_repeat", Text(Helper.i18n("please.re-enter.your.password"))) case false => if (fullPasswordValidation(passwordValue)) invalidPw = false else { invalidPw = true - invalidMsg = S.?(ErrorMessages.InvalidStrongPasswordFormat.split(':')(1)) - S.error("authuser_password_repeat", Text(invalidMsg)) + invalidMsg = ErrorMessages.InvalidStrongPasswordFormat.split(':')(1).trim } } } @@ -312,9 +260,8 @@ class AuthUser extends MegaProtoUser[AuthUser] with CreatedUpdated with MdcLogga this.set(l.head.asInstanceOf[String]) } case _ => { - invalidPw = true; + invalidPw = true invalidMsg = Helper.i18n("passwords.do.not.match") - S.error("authuser_password_repeat", Text(invalidMsg)) } } get @@ -333,7 +280,7 @@ class AuthUser extends MegaProtoUser[AuthUser] with CreatedUpdated with MdcLogga */ lazy val provider: userProvider = new userProvider() class userProvider extends MappedString(this, 100) { - override def displayName = S.?("provider") + override def displayName = "provider" override val fieldId = Some(Text("txtProvider")) override def validations = validUri(this) _ :: super.validations override def defaultValue: String = Constant.localIdentityProvider @@ -411,15 +358,6 @@ class AuthUser extends MegaProtoUser[AuthUser] with CreatedUpdated with MdcLogga case e if (!isEmailValid(e)) => List(FieldError(this, Text(Helper.i18n("invalid.email.address")))) case _ => Nil } - override def _toForm: Box[Elem] = - fmapFunc({s: List[String] => this.setFromAny(s)}){name => - Full(appendFieldId( "" case s => s.toString}}/>)) - } } } @@ -498,8 +436,8 @@ import net.liftweb.util.Helpers._ * */ def getCurrentUser: Box[User] = { - val authorization: Box[String] = S.request.map(_.header("Authorization")).flatten - val directLogin: Box[String] = S.request.map(_.header("DirectLogin")).flatten + val authorization: Box[String] = Empty + val directLogin: Box[String] = Empty for { resourceUser <- if (AuthUser.currentUser.isDefined){ //AuthUser.currentUser.get.user.foreign // this will be issue when the resource user is in remote side { @@ -630,14 +568,11 @@ import net.liftweb.util.Helpers._ sendHtmlEmail(emailContent) match { case Full(messageId) => logger.debug(s"Validation email sent successfully with Message-ID: $messageId") - S.notice("Validation email sent successfully. Please check your email.") case Empty => logger.error("Failed to send validation email") - S.error("Failed to send validation email. Please try again.") } case _ => logger.error("portal_external_url is not set in props. Cannot send validation email.") - S.error("Validation email could not be sent. Please contact the administrator.") } } @@ -668,20 +603,10 @@ import net.liftweb.util.Helpers._ case Full(user) if !user.validated_? => user.setValidated(true).resetUniqueId().save grantDefaultEntitlementsToAuthUser(user) - logUserIn(user, () => { - S.notice(S.?("account.validated")) - APIUtil.getPropsValue("user_account_validated_redirect_url") match { - case Full(redirectUrl) => - logger.debug(s"user_account_validated_redirect_url = $redirectUrl") - S.redirectTo(redirectUrl) - case _ => - logger.debug(s"user_account_validated_redirect_url is NOT defined") - S.redirectTo(homePage) - } - }) - - case _ => S.error(S.?("invalid.validation.link")); S.redirectTo(homePage) + case _ => + logger.warn("validateUser: invalid or expired token") } + NodeSeq.Empty } override def actionsAfterSignup(theUser: TheUserType, func: () => Nothing): Nothing = { @@ -696,24 +621,12 @@ import net.liftweb.util.Helpers._ theUser.user.foreign.map(_.userId).getOrElse(""), "terms_and_conditions", termsAndConditionsValue) if (!skipEmailValidation) { sendValidationEmail(theUser) - S.notice(S.?("sign.up.message")) func() } else { grantDefaultEntitlementsToAuthUser(theUser) - logUserIn(theUser, () => { - S.notice(S.?("welcome")) - func() - }) + logUserIn(theUser, () => func()) } } - /** - * Set this to redirect to a certain page after a failed login - */ - object failedLoginRedirect extends SessionVar[Box[String]](Empty) { - override lazy val __nameSalt = Helpers.nextFuncName - } - - // agreeTermsDiv simplified - API-only mode, no portal pages def agreeTermsDiv = NodeSeq.Empty @@ -726,7 +639,7 @@ import net.liftweb.util.Helpers._ // enableDisableSignUpButton simplified - API-only mode, no portal pages def enableDisableSignUpButton = NodeSeq.Empty - def signupFormTitle = getWebUiPropsValue("webui_signup_form_title_text", S.?("sign.up")) + def signupFormTitle = getWebUiPropsValue("webui_signup_form_title_text", "sign.up") // signupXhtml simplified - API-only mode, no portal pages // Signup is handled via API endpoints, not HTML forms @@ -736,25 +649,6 @@ import net.liftweb.util.Helpers._ // localForm simplified - API-only mode, no portal pages override def localForm(user: TheUserType, ignorePassword: Boolean, fields: List[FieldPointerType]): NodeSeq = NodeSeq.Empty - def userLoginFailed = { - logger.info("failed: " + failedLoginRedirect.get) - // variable redir is from failedLoginRedirect, it is set-up in OAuthAuthorisation.scala as following code: - // val currentUrl = ObpS.uriAndQueryString.getOrElse("/") - // AuthUser.failedLoginRedirect.set(Full(Helpers.appendParams(currentUrl, List((FailedLoginParam, "true"))))) - val redir = failedLoginRedirect.get - - //Check the internal redirect, in case for open redirect issue. - // variable redir is from loginRedirect, it is set-up in OAuthAuthorisation.scala as following code: - // val currentUrl = ObpS.uriAndQueryString.getOrElse("/") - // AuthUser.loginRedirect.set(Full(Helpers.appendParams(currentUrl, List((LogUserOutParam, "false"))))) - if (Helper.isValidInternalRedirectUrl(redir.toString)) { - S.redirectTo(redir.toString) - } else { - S.error(S.?(ErrorMessages.InvalidInternalRedirectUrl)) - logger.info(ErrorMessages.InvalidInternalRedirectUrl + loginRedirect.get) - } - S.error("login", S.?("Invalid Username or Password")) - } @@ -1077,26 +971,7 @@ def restoreSomeSessions(): Unit = { override protected def capturePreLoginState(): () => Unit = () => {restoreSomeSessions} - /** - * The LocParams for the menu item for login. - * Overridden in order to add custom error message. Attention: Not calling super will change the default behavior! - */ - override protected def loginMenuLocParams: List[LocParam[Unit]] = { - If(notLoggedIn_? _, () => RedirectResponse("/already-logged-in")) :: - Template(() => wrapIt(login)) :: - Nil - } - - override def logout = { - logoutCurrentUser - S.request match { - case Full(a) => a.param("redirect") match { - case Full(customRedirect) => S.redirectTo(customRedirect) - case _ => S.redirectTo(homePage) - } - case _ => S.redirectTo(homePage) - } - } + override protected def loginMenuLocParams = Nil /** * A Space is an alias for the OBP Bank. Each Bank / Space can contain many Dynamic Endpoints. If a User belongs to a Space, @@ -1416,67 +1291,9 @@ def restoreSomeSessions(): Unit = { val usernames: List[String] = this.getResourceUsersByEmail(email).map(_.user.name) findAll(ByList(this.username, usernames)) } - def signupSubmitButtonValue() = getWebUiPropsValue("webui_signup_form_submit_button_value", S.?("sign.up")) - - //overridden to allow redirect to loginRedirect after signup. This is mostly to allow - // loginFirst menu items to work if the user doesn't have an account. Without this, - // if a user tries to access a logged-in only page, and then signs up, they don't get redirected - // back to the proper page. - override def signup = { - val theUser: TheUserType = mutateUserOnSignup(createNewUserInstance()) - val theName = signUpPath.mkString("") - - //Check the internal redirect, in case for open redirect issue. - // variable redir is from loginRedirect, it is set-up in OAuthAuthorisation.scala as following code: - // val currentUrl = ObpS.uriAndQueryString.getOrElse("/") - // AuthUser.loginRedirect.set(Full(Helpers.appendParams(currentUrl, List((LogUserOutParam, "false"))))) - val loginRedirectSave = loginRedirect.is - - def testSignup() { - validateSignup(theUser) match { - case Nil => - //here we check loginRedirectSave (different from implementation in super class) - val redir = loginRedirectSave match { - case Full(url) => - loginRedirect(Empty) - url - case _ => - //if the register page url (user_mgt/sign_up?after-signup=link-to-customer) contains the parameter - //after-signup=link-to-customer,then it will redirect to the on boarding customer page. - ObpS.param("after-signup") match { - case url if (url.equals("link-to-customer")) => - "/add-user-auth-context-update-request" - case _ => - homePage - } - } - if (Helper.isValidInternalRedirectUrl(redir.toString)) { - actionsAfterSignup(theUser, () => { - S.redirectTo(redir) - }) - } else { - S.error(S.?(ErrorMessages.InvalidInternalRedirectUrl)) - logger.info(ErrorMessages.InvalidInternalRedirectUrl + loginRedirect.get) - } + def signupSubmitButtonValue() = getWebUiPropsValue("webui_signup_form_submit_button_value", "sign.up") - case xs => - xs.foreach{ - e => S.error(e.field.uniqueFieldId.openOrThrowException("There is no uniqueFieldId."), e.msg) - } - signupFunc(Full(innerSignup _)) - } - } - - def innerSignup = { - val bind = "type=submit" #> signupSubmitButton(signupSubmitButtonValue(), testSignup _) - bind(signupXhtml(theUser)) - } - - if(APIUtil.getPropsAsBoolValue("user_invitation.mandatory", false)) - S.redirectTo("/user-invitation-info") - else - innerSignup - } + override def signup = NodeSeq.Empty def scrambleAuthUser(userPrimaryKey: UserPrimaryKey): Box[Boolean] = tryo { AuthUser.find(By(AuthUser.user, userPrimaryKey.value)) match { diff --git a/obp-api/src/main/scala/code/obp/grpc/chat/AuthInterceptor.scala b/obp-api/src/main/scala/code/obp/grpc/chat/AuthInterceptor.scala index fbcb7ba9ac..9f7aaafe49 100644 --- a/obp-api/src/main/scala/code/obp/grpc/chat/AuthInterceptor.scala +++ b/obp-api/src/main/scala/code/obp/grpc/chat/AuthInterceptor.scala @@ -5,7 +5,7 @@ import code.util.Helper.MdcLoggable import com.openbankproject.commons.model.User import io.grpc._ import net.liftweb.common.Full -import net.liftweb.http.provider.HTTPParam +import code.api.util.APIUtil.HTTPParam import scala.concurrent.Await import scala.concurrent.duration._ diff --git a/obp-api/src/main/scala/code/search/search.scala b/obp-api/src/main/scala/code/search/search.scala index 27544ab78a..358b062ff4 100644 --- a/obp-api/src/main/scala/code/search/search.scala +++ b/obp-api/src/main/scala/code/search/search.scala @@ -11,8 +11,6 @@ import com.sksamuel.elastic4s.{ElasticClient, ElasticProperties} import dispatch.Defaults._ import dispatch.{Http, url, _} import net.liftweb.common.{Box, Empty, Failure, Full} -import net.liftweb.http.provider.HTTPCookie -import net.liftweb.http.{InMemoryResponse, JsonResponse, LiftResponse} import net.liftweb.json import net.liftweb.json.JsonAST import net.liftweb.json.JsonAST._ @@ -27,13 +25,7 @@ class elasticsearch extends MdcLoggable { case class APIResponse(code: Int, body: JValue) case class ErrorMessage(error: String) - case class ESJsonResponse(json: JsonAST.JValue, headers: List[(String, String)], cookies: List[HTTPCookie], code: Int) extends LiftResponse - { - def toResponse = { - val bytes = json.toString.getBytes("UTF-8") - InMemoryResponse(bytes, ("Content-Length", bytes.length.toString) :: ("Content-Type", "application/json;charset=utf-8") :: headers, cookies, code) - } - } + case class ESJsonResponse(json: JsonAST.JValue, headers: List[(String, String)], code: Int) val esHost = "" val esPortHTTP = "" @@ -46,29 +38,27 @@ class elasticsearch extends MdcLoggable { APIUtil.getPropsAsBoolValue("allow_elasticsearch", false) } - def searchProxy(userId: String, queryString: String): LiftResponse = { - //println("-------------> " + esHost + ":" + esPortHTTP + "/" + esIndex + "/" + queryString) - if (APIUtil.getPropsAsBoolValue("allow_elasticsearch", false) ) { + def searchProxy(userId: String, queryString: String): JValue = { + if (APIUtil.getPropsAsBoolValue("allow_elasticsearch", false)) { val request = constructQuery(userId, getParameters(queryString)) - val response = getAPIResponse(request) - ESJsonResponse(response.body, ("Access-Control-Allow-Origin", "*") :: Nil, Nil, response.code) + getAPIResponse(request).body } else { - JsonResponse(json.JsonParser.parse("""{"error":"elasticsearch disabled"}"""), ("Access-Control-Allow-Origin", "*") :: Nil, Nil, 404) + json.JsonParser.parse("""{"error":"elasticsearch disabled"}""") } } - def searchProxyV300(userId: String, uri: String, body: String, statsOnly: Boolean = false): Box[LiftResponse] = { - if (APIUtil.getPropsAsBoolValue("allow_elasticsearch", false) ) { - val httpHost = ("http://" + esHost + ":" + esPortHTTP) - val esUrl = s"${httpHost}${uri.replaceAll("\"" , "")}" + def searchProxyV300(userId: String, uri: String, body: String, statsOnly: Boolean = false): Box[JValue] = { + if (APIUtil.getPropsAsBoolValue("allow_elasticsearch", false)) { + val httpHost = "http://" + esHost + ":" + esPortHTTP + val esUrl = s"${httpHost}${uri.replaceAll("\"", "")}" logger.info(s"searchProxyV300 says esUrl is: $esUrl") logger.info(s"searchProxyV300 says body is: $body") - val request: Req = (url(esUrl).<<(body).GET).setContentType("application/json", Charset.forName("UTF-8")) // Note that WE ONLY do GET - Keep it this way! + val request: Req = (url(esUrl).<<(body).GET).setContentType("application/json", Charset.forName("UTF-8")) val response = getAPIResponse(request) - if (statsOnly) Full(ESJsonResponse(privacyCheckStatistics(response.body), ("Access-Control-Allow-Origin", "*") :: Nil, Nil, response.code)) - else Full(ESJsonResponse(response.body, ("Access-Control-Allow-Origin", "*") :: Nil, Nil, response.code)) + if (statsOnly) Full(privacyCheckStatistics(response.body)) + else Full(response.body) } else { - Full(JsonResponse(json.JsonParser.parse("""{"error":"elasticsearch disabled"}"""), ("Access-Control-Allow-Origin", "*") :: Nil, Nil, 404)) + Full(json.JsonParser.parse("""{"error":"elasticsearch disabled"}""")) } } def searchProxyAsyncV300(userId: String, uri: String, body: String, statsOnly: Boolean = false): Future[APIResponse] = { @@ -87,19 +77,14 @@ class elasticsearch extends MdcLoggable { response } - def parseResponse(response: APIResponse, statsOnly: Boolean = false) = { - if (APIUtil.getPropsAsBoolValue("allow_elasticsearch", false) ) { - if (statsOnly) (ESJsonResponse(privacyCheckStatistics(response.body), ("Access-Control-Allow-Origin", "*") :: Nil, Nil, response.code)) - else (ESJsonResponse(response.body, ("Access-Control-Allow-Origin", "*") :: Nil, Nil, response.code)) - } else { - Full(JsonResponse(json.JsonParser.parse("""{"error":"elasticsearch disabled"}"""), ("Access-Control-Allow-Origin", "*") :: Nil, Nil, 404)) - } + def parseResponse(response: APIResponse, statsOnly: Boolean = false): JValue = { + if (statsOnly) privacyCheckStatistics(response.body) + else response.body } - def searchProxyStatsV300(userId: String, uriPart: String, bodyPart:String, field: String): Box[LiftResponse] = { - searchProxyV300(userId, uriPart, addAggregation(bodyPart,field), true) - } + def searchProxyStatsV300(userId: String, uriPart: String, bodyPart: String, field: String): Box[JValue] = + searchProxyV300(userId, uriPart, addAggregation(bodyPart, field), statsOnly = true) def searchProxyStatsAsyncV300(userId: String, uriPart: String, bodyPart:String, field: String): Future[APIResponse] = { searchProxyAsyncV300(userId, uriPart, addAggregation(bodyPart,field), true) } diff --git a/obp-api/src/main/scala/code/util/Helper.scala b/obp-api/src/main/scala/code/util/Helper.scala index 190bfa56f9..05f81f3c46 100644 --- a/obp-api/src/main/scala/code/util/Helper.scala +++ b/obp-api/src/main/scala/code/util/Helper.scala @@ -20,12 +20,9 @@ import com.openbankproject.commons.ExecutionContext.Implicits.global import com.openbankproject.commons.model.{AccountBalance, AccountBalances, AccountHeld, AccountId, CoreAccount, Customer, CustomerId, Transaction, TransactionCore, TransactionId} import com.openbankproject.commons.util.{ReflectUtils, RequiredFieldValidation, RequiredInfo} import com.tesobe.CacheKeyFromArguments -import net.liftweb.http.S + import net.liftweb.util.Helpers import net.liftweb.util.Helpers.tryo -import net.sf.cglib.proxy.{Enhancer, MethodInterceptor, MethodProxy} - -import java.lang.reflect.Method import java.text.SimpleDateFormat import scala.concurrent.Future import scala.util.Random @@ -441,20 +438,13 @@ object Helper extends Loggable { } def i18n(message: String, default: Option[String] = None): String = { - if (S.inStatefulScope_?) { - if (S.?(message) == message) { - val words = message.split('.').toList match { - case x :: Nil => Helpers.capify(x) :: Nil - case x :: xs => Helpers.capify(x) :: xs - case _ => Nil - } - default.getOrElse(words.mkString(" ") + ".") - } else - S.?(message) - } else { - logger.error(s"i18n(message($message), default${default}: Attempted to use resource bundles outside of an initialized S scope. " + - s"S only usable when initialized, such as during request processing. Did you call S.? from Future?") - default.getOrElse(message) + default.getOrElse { + val words = message.split('.').toList match { + case x :: Nil => Helpers.capify(x) :: Nil + case x :: xs => Helpers.capify(x) :: xs + case _ => Nil + } + words.mkString(" ") + "." } } @@ -553,54 +543,12 @@ object Helper extends Loggable { } } - lazy val ObpS: S = { - val intercept: MethodInterceptor = (_: Any, method: Method, args: Array[AnyRef], _: MethodProxy) => { - - lazy val result = method.invoke(net.liftweb.http.S, args: _*) - val methodName = method.getName - - if (methodName.equals("param")&&result.isInstanceOf[Box[String]]&&result.asInstanceOf[Box[String]].isDefined) { - //we provide the basic check for all the parameters - val resultAfterChecked = - if((args.length>0) && args.apply(0).toString.equalsIgnoreCase("username")) { - result.asInstanceOf[Box[String]].filter(APIUtil.checkUsernameString(_)==SILENCE_IS_GOLDEN) - }else if((args.length>0) && args.apply(0).toString.equalsIgnoreCase("password")){ - result.asInstanceOf[Box[String]].filter(APIUtil.basicPasswordValidation(_)==SILENCE_IS_GOLDEN) - }else if((args.length>0) && args.apply(0).toString.equalsIgnoreCase("consumer_key")){ - result.asInstanceOf[Box[String]].filter(APIUtil.basicConsumerKeyValidation(_)==SILENCE_IS_GOLDEN) - }else if((args.length>0) && args.apply(0).toString.equalsIgnoreCase("redirectUrl")){ - result.asInstanceOf[Box[String]].filter(APIUtil.basicUriAndQueryStringValidation(_)) - } else{ - result.asInstanceOf[Box[String]].filter(APIUtil.checkMediumString(_)==SILENCE_IS_GOLDEN) - } - if(resultAfterChecked.isEmpty) { - logger.debug(s"ObpS.${methodName} validation failed. (resultAfterChecked.isEmpty A) The input key is: ${if (args.length>0)args.apply(0) else ""}, value is:$result") - } - resultAfterChecked - } else if (methodName.equals("uri") && result.isInstanceOf[String]){ - val resultAfterChecked = Full(result.asInstanceOf[String]).filter(APIUtil.basicUriAndQueryStringValidation(_)) - if(resultAfterChecked.isDefined) { - resultAfterChecked.head - }else{ - logger.debug(s"ObpS.${methodName} validation failed (NOT resultAfterChecked.isDefined). The value is:$result") - resultAfterChecked.getOrElse("") - } - } else if (methodName.equals("uriAndQueryString") && result.isInstanceOf[Box[String]] && result.asInstanceOf[Box[String]].isDefined || - methodName.equals("queryString") && result.isInstanceOf[Box[String]]&&result.asInstanceOf[Box[String]].isDefined){ - val resultAfterChecked = result.asInstanceOf[Box[String]].filter(APIUtil.basicUriAndQueryStringValidation(_)) - if(resultAfterChecked.isEmpty) { - logger.debug(s"ObpS.${methodName} validation failed. (resultAfterChecked.isEmpty B) The value is:$result") - } - resultAfterChecked - } else { - result - } - } - - val enhancer: Enhancer = new Enhancer() - enhancer.setSuperclass(classOf[S]) - enhancer.setCallback(intercept) - enhancer.create().asInstanceOf[S] + // Lift's S object is never initialized in the http4s path — all param/uri reads return Empty/default. + object ObpS { + def param(name: String): Box[String] = Empty + def uriAndQueryString: Box[String] = Empty + def uri: String = "" + def queryString: Box[String] = Empty } def addColumnIfNotExists(dbDriver: String, tableName: String, columName: String, default: String) = { diff --git a/obp-api/src/test/scala/code/Http4sTestServer.scala b/obp-api/src/test/scala/code/Http4sTestServer.scala index 0f372d85d0..d4a8793fbc 100644 --- a/obp-api/src/test/scala/code/Http4sTestServer.scala +++ b/obp-api/src/test/scala/code/Http4sTestServer.scala @@ -13,7 +13,7 @@ import scala.concurrent.duration._ /** * HTTP4S Test Server - Singleton server for integration tests * - * Follows the same pattern as TestServer (Jetty/Lift) but for HTTP4S. + * Follows the same pattern as TestServer but for the http4s bridge integration suite. * Started once when first accessed, shared across all test classes. * * IMPORTANT: This reuses Http4sApp.httpApp (same as production) to ensure @@ -67,9 +67,20 @@ object Http4sTestServer { .unsafeRunSync() ) - // Wait for server to be ready - Thread.sleep(2000) - + // Actively poll until the server accepts TCP connections, instead of a fixed 2s sleep. + val readyDeadline = System.currentTimeMillis() + 10000 + var serverReady = false + while (!serverReady && System.currentTimeMillis() < readyDeadline) { + try { + val probe = new java.net.Socket() + probe.connect(new java.net.InetSocketAddress(host, port), 200) + probe.close() + serverReady = true + } catch { + case _: Throwable => Thread.sleep(50) + } + } + isStarted = true logger.info(s"[HTTP4S TEST SERVER] Started successfully on $host:$port") } diff --git a/obp-api/src/test/scala/code/TestServer.scala b/obp-api/src/test/scala/code/TestServer.scala index feec57a433..9b2a66bb2c 100644 --- a/obp-api/src/test/scala/code/TestServer.scala +++ b/obp-api/src/test/scala/code/TestServer.scala @@ -61,9 +61,21 @@ object TestServer { .unsafeRunSync() ) - // Allow server to bind and become ready - Thread.sleep(2000) - logger.info(s"[TestServer] http4s EmberServer started on $host:$port") + // Actively poll until the server accepts TCP connections, instead of a fixed 2s sleep. + // Saves ~1.5s of fixed wait on fast machines and is more robust on slow ones. + val readyDeadline = System.currentTimeMillis() + 10000 + var serverReady = false + while (!serverReady && System.currentTimeMillis() < readyDeadline) { + try { + val probe = new java.net.Socket() + probe.connect(new java.net.InetSocketAddress(host, port), 200) + probe.close() + serverReady = true + } catch { + case _: Throwable => Thread.sleep(50) + } + } + logger.info(s"[TestServer] http4s EmberServer started on $host:$port (ready=$serverReady)") } // Auto-start on object initialization diff --git a/obp-api/src/test/scala/code/api/AuthenticationPropertyTest.scala b/obp-api/src/test/scala/code/api/AuthenticationPropertyTest.scala deleted file mode 100644 index e6376a5b5e..0000000000 --- a/obp-api/src/test/scala/code/api/AuthenticationPropertyTest.scala +++ /dev/null @@ -1,1682 +0,0 @@ -package code.api - -import code.api.Constant.localIdentityProvider -import code.api.util.ErrorMessages -import code.loginattempts.LoginAttempt -import code.model.dataAccess.{AuthUser, ResourceUser} -import code.setup.{ServerSetup, TestPasswordConfig} -import net.liftweb.common.{Box, Empty, Full, Failure} -import net.liftweb.mapper.By -import net.liftweb.util.Helpers._ -import org.scalatest.{BeforeAndAfter, Matchers} - -/** - * Property-based tests for authentication refactoring - * Feature: centralize-authentication-logic - * - * These tests verify universal properties that should hold across all authentication scenarios. - * Note: This file provides test infrastructure. Property tests are optional and can be implemented later. - */ -class AuthenticationPropertyTest extends ServerSetup - with Matchers - with BeforeAndAfter { - - - override def afterEach(): Unit = { - super.afterEach() - } - - // ============================================================================ - // Test Data Generators (Simplified - no ScalaCheck) - // ============================================================================ - - /** - * Generate a random valid username - */ - def generateUsername(): String = { - s"user_${randomString(8)}" - } - - /** - * Generate a random password - */ - def generatePassword(): String = { - randomString(12) - } - - /** - * Generate a random provider - */ - def generateProvider(): String = { - val providers = List( - localIdentityProvider, - "https://auth.example.com", - "https://external-idp.com", - "https://sso.company.com" - ) - providers(scala.util.Random.nextInt(providers.length)) - } - - // ============================================================================ - // Test Data Setup Utilities - // ============================================================================ - - /** - * Creates a test user with specified properties - * @param username The username for the test user - * @param password The password for the test user - * @param provider The authentication provider - * @param validated Whether the email is validated - * @return The created AuthUser - */ - def createTestUser( - username: String, - password: String, - provider: String = localIdentityProvider, - validated: Boolean = true - ): AuthUser = { - - // Clean up any existing user - AuthUser.findAll(By(AuthUser.username, username), By(AuthUser.provider, provider)).foreach(_.delete_!) - - // Create new user - val user = AuthUser.create - .email(s"${randomString(10)}@example.com") - .username(username) - .password(password) - .provider(provider) - .validated(validated) - .firstName(randomString(10)) - .lastName(randomString(10)) - .saveMe() - - user - } - - /** - * Creates a locked test user - * @param username The username for the locked user - * @param password The password for the locked user - * @param provider The authentication provider - * @return The created AuthUser - */ - def createLockedUser( - username: String, - password: String, - provider: String = localIdentityProvider - ): AuthUser = { - - val user = createTestUser(username, password, provider, validated = true) - - // Lock the user by incrementing bad login attempts beyond threshold - for (_ <- 1 to 6) { - LoginAttempt.incrementBadLoginAttempts(provider, username) - } - - user - } - - /** - * Creates an unvalidated test user (email not validated) - * @param username The username for the unvalidated user - * @param password The password for the unvalidated user - * @return The created AuthUser - */ - def createUnvalidatedUser(username: String, password: String): AuthUser = { - createTestUser(username, password, localIdentityProvider, validated = false) - } - - /** - * Cleans up test user and associated login attempts - * @param username The username to clean up - * @param provider The authentication provider - */ - def cleanupTestUser(username: String, provider: String = localIdentityProvider): Unit = { - AuthUser.findAll(By(AuthUser.username, username), By(AuthUser.provider, provider)).foreach(_.delete_!) - LoginAttempt.resetBadLoginAttempts(provider, username) - } - - // ============================================================================ - // Basic Infrastructure Tests - // ============================================================================ - - feature("Test infrastructure") { - scenario("should be set up correctly") { - val username = generateUsername() - val password = generatePassword() - - username should not be empty - password.length should be >= 8 - } - } - - feature("Test user creation and cleanup") { - scenario("should work correctly") { - val testUsername = s"test_${randomString(10)}" - val password = generatePassword() - - try { - // Create test user - val user = createTestUser(testUsername, password) - user.username.get shouldBe testUsername - user.validated.get shouldBe true - - // Verify user exists - val foundUser = AuthUser.find(By(AuthUser.username, testUsername), By(AuthUser.provider, localIdentityProvider)) - foundUser.isDefined shouldBe true - } finally { - // Cleanup - cleanupTestUser(testUsername) - } - } - } - - feature("Locked user creation") { - scenario("should work correctly") { - val testUsername = s"locked_${randomString(10)}" - val password = generatePassword() - - try { - // Create locked user - val user = createLockedUser(testUsername, password) - - // Verify user is locked - LoginAttempt.userIsLocked(localIdentityProvider, testUsername) shouldBe true - } finally { - // Cleanup - cleanupTestUser(testUsername) - } - } - } - - feature("Unvalidated user creation") { - scenario("should work correctly") { - val testUsername = s"unvalidated_${randomString(10)}" - val password = generatePassword() - - try { - // Create unvalidated user - val user = createUnvalidatedUser(testUsername, password) - - // Verify user is not validated - user.validated.get shouldBe false - } finally { - // Cleanup - cleanupTestUser(testUsername) - } - } - } - - // ============================================================================ - // Property 3: Provider-Based Routing - // **Validates: Requirements 1.6, 1.7** - // ============================================================================ - - feature("Property 3: Provider-Based Routing") { - scenario("local provider uses local database validation (10 iterations)") { - info("**Validates: Requirements 1.6, 1.7**") - info("Property: For any authentication attempt with local provider,") - info(" credentials SHALL be validated against the local database") - - val iterations = 10 - var successCount = 0 - var failureCount = 0 - - for (i <- 1 to iterations) { - val username = generateUsername() - val password = generatePassword() - - try { - // Create a local user - val user = createTestUser(username, password, localIdentityProvider, validated = true) - - // Test with correct password - should succeed via local DB - val correctResult = AuthUser.getResourceUserId(username, password, localIdentityProvider) - correctResult match { - case Full(id) if id > 0 => - successCount += 1 - // Verify it's the correct user ID - id shouldBe user.user.get - case other => - fail(s"Iteration $i: Expected success with correct password, got: $other") - } - - // Test with wrong password - should fail via local DB - val wrongPassword = password + "_wrong" - val wrongResult = AuthUser.getResourceUserId(username, wrongPassword, localIdentityProvider) - wrongResult match { - case Empty => - failureCount += 1 - case other => - fail(s"Iteration $i: Expected Empty with wrong password, got: $other") - } - - } finally { - cleanupTestUser(username, localIdentityProvider) - } - } - - info(s"Completed $iterations iterations:") - info(s" - Correct password successes: $successCount") - info(s" - Wrong password failures: $failureCount") - - successCount shouldBe iterations - failureCount shouldBe iterations - - info("Property 3 (Local Provider): Provider-Based Routing - PASSED") - } - - scenario("external provider uses connector validation (10 iterations)") { - info("**Validates: Requirements 1.6, 1.7**") - info("Property: For any authentication attempt with external provider,") - info(" credentials SHALL be validated via the external connector") - - // Mock connector for testing - val testProvider = "https://test-external-provider.com" - val validExternalUsername = s"ext_valid_${randomString(8)}" - val validExternalPassword = "ValidExtPass123!" - - object TestMockConnector extends code.bankconnectors.Connector with code.util.Helper.MdcLoggable { - implicit override val nameOfConnector = "TestMockConnector" - - override def checkExternalUserCredentials( - username: String, - password: String, - callContext: Option[code.api.util.CallContext] - ): Box[com.openbankproject.commons.model.InboundExternalUser] = { - if (username == validExternalUsername && password == validExternalPassword) { - Full(com.openbankproject.commons.model.InboundExternalUser( - aud = "", - exp = "", - iat = "", - iss = testProvider, - sub = validExternalUsername, - azp = None, - email = Some(s"$validExternalUsername@external.com"), - emailVerified = Some("true"), - name = Some("Test External User") - )) - } else { - Empty - } - } - } - - // Save original connector - val originalConnector = code.bankconnectors.Connector.connector.vend - - // Enable external authentication using Lift Props - try { - // Set mock connector - code.bankconnectors.Connector.connector.default.set(TestMockConnector) - - val iterations = 10 - var connectorSuccessCount = 0 - var connectorFailureCount = 0 - var localNotCalledCount = 0 - - for (i <- 1 to iterations) { - val username = s"ext_user_${randomString(8)}" - val password = generatePassword() - - try { - // Create an external user in local DB (required for checkExternalUserViaConnector to work) - val user = createTestUser(username, password, testProvider, validated = true) - - // Test 1: Valid credentials via connector (using the known valid user) - if (i % 10 == 1) { // Test valid credentials every 10th iteration - val validUser = createTestUser(validExternalUsername, validExternalPassword, testProvider, validated = true) - try { - val validResult = AuthUser.getResourceUserId(validExternalUsername, validExternalPassword, testProvider) - validResult match { - case Full(id) if id > 0 => - connectorSuccessCount += 1 - // Verify connector was called (user ID should match) - id shouldBe validUser.user.get - case other => - // Connector might return Empty if user doesn't exist locally - // This is acceptable behavior - info(s"Iteration $i: Valid external credentials returned: $other") - } - } finally { - cleanupTestUser(validExternalUsername, testProvider) - } - } - - // Test 2: Invalid credentials via connector (should fail) - val invalidResult = AuthUser.getResourceUserId(username, password + "_wrong", testProvider) - invalidResult match { - case Empty => - connectorFailureCount += 1 - case Full(AuthUser.usernameLockedStateCode) => - // User might be locked from previous attempts - connectorFailureCount += 1 - case other => - // Acceptable - connector might reject for various reasons - connectorFailureCount += 1 - } - - // Test 3: Verify local password validation is NOT used for external provider - // Even if the local password matches, external provider should use connector - val localPasswordResult = AuthUser.getResourceUserId(username, password, testProvider) - // The result should come from connector, not local password check - // Since connector doesn't know this user, it should fail - localPasswordResult match { - case Empty | Full(AuthUser.usernameLockedStateCode) => - localNotCalledCount += 1 - case Full(id) if id > 0 => - // This would indicate local password was checked, which is wrong - fail(s"Iteration $i: External provider should not use local password validation") - case other => - localNotCalledCount += 1 - } - - } finally { - cleanupTestUser(username, testProvider) - } - } - - info(s"Completed $iterations iterations:") - info(s" - Connector success (valid credentials): $connectorSuccessCount") - info(s" - Connector failure (invalid credentials): $connectorFailureCount") - info(s" - Local password not used: $localNotCalledCount") - - // Verify we got reasonable results - connectorFailureCount should be >= (iterations - 10) // Most should fail - localNotCalledCount should be >= (iterations - 10) // Local password should not be used - - info("Property 3 (External Provider): Provider-Based Routing - PASSED") - - } finally { - // Restore original connector - code.bankconnectors.Connector.connector.default.set(originalConnector) - cleanupTestUser(validExternalUsername, testProvider) - } - } - } - - // ============================================================================ - // Property 4: Lock Check Precedes Credential Validation - // **Validates: Requirements 1.8, 2.1** - // ============================================================================ - - feature("Property 4: Lock Check Precedes Credential Validation") { - scenario("locked users are rejected without credential validation (10 iterations)") { - - info("**Validates: Requirements 1.8, 2.1**") - info("Property: For any authentication attempt, the system SHALL check") - info(" LoginAttempt.userIsLocked before attempting to validate credentials,") - info(" regardless of provider type") - - setPropsValues("connector.user.authentication" -> "true") - - val iterations = 10 - var lockedLocalCount = 0 - var lockedExternalCount = 0 - var correctPasswordRejectedCount = 0 - var wrongPasswordRejectedCount = 0 - - for (i <- 1 to iterations) { - val username = generateUsername() - val password = generatePassword() - val provider = if (i % 2 == 0) localIdentityProvider else "https://external-provider.com" - - try { - val user = createLockedUser(username, password, provider) - - // Verify user is locked - LoginAttempt.userIsLocked(provider, username) shouldBe true - - - - // Test 1: Attempt authentication with CORRECT password - // Should return locked state code WITHOUT validating password - val correctPasswordResult = AuthUser.getResourceUserId(username, password, provider) - correctPasswordResult match { - case Full(id) if id == AuthUser.usernameLockedStateCode => - correctPasswordRejectedCount += 1 - if (provider == localIdentityProvider) { - lockedLocalCount += 1 - } else { - lockedExternalCount += 1 - } - case other => - fail(s"Iteration $i: Locked user with correct password should return usernameLockedStateCode, got: $other") - } - - - // Test 2: Attempt authentication with WRONG password - // Should STILL return locked state code WITHOUT validating password - val wrongPassword = password + "_wrong" - val wrongPasswordResult = AuthUser.getResourceUserId(username, wrongPassword, provider) - wrongPasswordResult match { - case Full(id) if id == AuthUser.usernameLockedStateCode => - wrongPasswordRejectedCount += 1 - case other => - fail(s"Iteration $i: Locked user with wrong password should return usernameLockedStateCode, got: $other") - } - - // Test 3: Verify login attempts are NOT incremented for locked users (per updated Requirement 4.5) - // This is the updated behavior - locked users should not increment attempts - val attemptsBefore = LoginAttempt.getOrCreateBadLoginStatus(provider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - - AuthUser.getResourceUserId(username, password, provider) - val attemptsAfter = LoginAttempt.getOrCreateBadLoginStatus(provider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - // Attempts should not be incremented for locked users - attemptsAfter should be (attemptsBefore) - - } finally { - cleanupTestUser(username, provider) - } - } - - info(s"Completed $iterations iterations:") - info(s" - Locked local users rejected: $lockedLocalCount") - info(s" - Locked external users rejected: $lockedExternalCount") - info(s" - Correct password rejected (locked): $correctPasswordRejectedCount") - info(s" - Wrong password rejected (locked): $wrongPasswordRejectedCount") - - // Verify all locked users were rejected - correctPasswordRejectedCount shouldBe iterations - wrongPasswordRejectedCount shouldBe iterations - - // Verify we tested both local and external providers - lockedLocalCount should be > 0 - lockedExternalCount should be > 0 - - info("Property 4: Lock Check Precedes Credential Validation - PASSED") - } - - scenario("lock check happens before expensive operations (timing verification)") { - - info("**Validates: Requirements 1.8, 2.1**") - info("Property: Lock check should happen before credential validation") - info(" to prevent timing attacks and unnecessary computation") - - setPropsValues("connector.user.authentication" -> "true") - - val iterations = 10 - var lockCheckFirstCount = 0 - - for (i <- 1 to iterations) { - val username = generateUsername() - val password = generatePassword() - val provider = generateProvider() - - try { - // Create a locked user (will auto-set connector.user.authentication for external providers) - createLockedUser(username, password, provider) - - // Verify user is locked - val isLocked = LoginAttempt.userIsLocked(provider, username) - isLocked shouldBe true - - - - // Attempt authentication - should return immediately with locked state - val startTime = System.nanoTime() - val result = AuthUser.getResourceUserId(username, password, provider) - val endTime = System.nanoTime() - val durationMs = (endTime - startTime) / 1000000.0 - - // Verify result is locked state code - result match { - case Full(id) if id == AuthUser.usernameLockedStateCode => - lockCheckFirstCount += 1 - // Lock check should be fast (< 100ms typically) - // This is a soft check - we just verify it returns the right code - if (i <= 10) { - info(s"Iteration $i: Lock check completed in ${durationMs}ms") - } - case other => - fail(s"Iteration $i: Expected usernameLockedStateCode, got: $other") - } - - } finally { - cleanupTestUser(username, provider) - } - } - - info(s"Completed $iterations iterations:") - info(s" - Lock check returned correct state: $lockCheckFirstCount") - - lockCheckFirstCount shouldBe iterations - - info("Property 4 (Timing): Lock Check Precedes Credential Validation - PASSED") - } - } - - // ============================================================================ - // Property 2: Authentication Result Type Correctness - // **Validates: Requirements 1.2, 1.3** - // ============================================================================ - - feature("Property 2: Authentication Result Type Correctness") { - scenario("authentication result is always one of the expected types (10 iterations)") { - info("**Validates: Requirements 1.2, 1.3**") - info("Property: For any authentication attempt, the result SHALL be one of:") - info(" - Full(userId) where userId > 0 (success)") - info(" - Full(usernameLockedStateCode) (locked)") - info(" - Full(userEmailNotValidatedStateCode) (not validated)") - info(" - Empty (failure)") - - val iterations = 10 - var successCount = 0 - var lockedCount = 0 - var notValidatedCount = 0 - var emptyCount = 0 - var unexpectedCount = 0 - - for (i <- 1 to iterations) { - val username = generateUsername() - val password = generatePassword() - val provider = generateProvider() - - try { - // Randomly decide whether to create a user or not - val createUser = scala.util.Random.nextBoolean() - - if (createUser) { - // Randomly decide user state - val userState = scala.util.Random.nextInt(3) - userState match { - case 0 => - // Normal validated user - createTestUser(username, password, provider, validated = true) - case 1 => - // Locked user - createLockedUser(username, password, provider) - case 2 => - // Unvalidated user (only for local provider) - if (provider == localIdentityProvider) { - createUnvalidatedUser(username, password) - } else { - createTestUser(username, password, provider, validated = true) - } - } - } - - // Attempt authentication - val result = AuthUser.getResourceUserId(username, password, provider) - - // Verify result type - result match { - case Full(id) if id > 0 => - // Valid user ID - success - successCount += 1 - - case Full(id) if id == AuthUser.usernameLockedStateCode => - // Locked state - lockedCount += 1 - - case Full(id) if id == AuthUser.userEmailNotValidatedStateCode => - // Unvalidated state - notValidatedCount += 1 - - case Empty => - // Authentication failure - emptyCount += 1 - - case Failure(msg, _, _) => - // Failure is also acceptable (e.g., connector errors) - emptyCount += 1 - - case other => - // Unexpected result type - unexpectedCount += 1 - fail(s"Iteration $i: Unexpected result type: $other (username: $username, provider: $provider)") - } - - } finally { - // Cleanup - cleanupTestUser(username, provider) - } - } - - // Report statistics - info(s"Completed $iterations iterations:") - info(s" - Success (userId > 0): $successCount") - info(s" - Locked (usernameLockedStateCode): $lockedCount") - info(s" - Not Validated (userEmailNotValidatedStateCode): $notValidatedCount") - info(s" - Empty/Failure: $emptyCount") - info(s" - Unexpected: $unexpectedCount") - - // Verify no unexpected results - unexpectedCount shouldBe 0 - - // Verify we got a reasonable distribution (at least some of each type) - info("Property 2: Authentication Result Type Correctness - PASSED") - } - } - - // ============================================================================ - // Property 5: Successful Authentication Resets Login Attempts - // **Validates: Requirements 1.9, 2.3** - // ============================================================================ - - feature("Property 5: Successful Authentication Resets Login Attempts") { - scenario("successful local authentication resets bad login attempts (10 iterations)") { - info("**Validates: Requirements 1.9, 2.3**") - info("Property: For any successful authentication (local or external),") - info(" the system SHALL call LoginAttempt.resetBadLoginAttempts") - info(" with the correct provider and username") - - val iterations = 10 - var resetCount = 0 - var subsequentSuccessCount = 0 - - for (i <- 1 to iterations) { - val username = generateUsername() - val password = generatePassword() - - try { - // Create a test user - val user = createTestUser(username, password, localIdentityProvider, validated = true) - - // Simulate some failed login attempts first - val failedAttempts = scala.util.Random.nextInt(3) + 1 // 1-3 failed attempts - for (_ <- 1 to failedAttempts) { - LoginAttempt.incrementBadLoginAttempts(localIdentityProvider, username) - } - - // Verify attempts were incremented - val attemptsBefore = LoginAttempt.getOrCreateBadLoginStatus(localIdentityProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - attemptsBefore should be >= failedAttempts - - // Test 1: Successful authentication should reset attempts - val result = AuthUser.getResourceUserId(username, password, localIdentityProvider) - result match { - case Full(id) if id > 0 => - // Success - verify attempts are reset - val attemptsAfter = LoginAttempt.getOrCreateBadLoginStatus(localIdentityProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(-1) - - if (attemptsAfter == 0) { - resetCount += 1 - } else { - fail(s"Iteration $i: Successful authentication should reset attempts to 0, but got: $attemptsAfter") - } - - case other => - fail(s"Iteration $i: Expected successful authentication, got: $other") - } - - // Test 2: Verify subsequent authentication attempts are not affected by previous failures - // The counter should still be at 0, and another successful auth should work - val subsequentResult = AuthUser.getResourceUserId(username, password, localIdentityProvider) - subsequentResult match { - case Full(id) if id > 0 => - subsequentSuccessCount += 1 - // Verify attempts are still 0 - val finalAttempts = LoginAttempt.getOrCreateBadLoginStatus(localIdentityProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(-1) - finalAttempts shouldBe 0 - - case other => - fail(s"Iteration $i: Subsequent authentication should succeed, got: $other") - } - - } finally { - cleanupTestUser(username, localIdentityProvider) - } - } - - info(s"Completed $iterations iterations:") - info(s" - Successful authentications that reset attempts: $resetCount") - info(s" - Subsequent authentications unaffected by previous failures: $subsequentSuccessCount") - - resetCount shouldBe iterations - subsequentSuccessCount shouldBe iterations - - info("Property 5 (Local): Successful Authentication Resets Login Attempts - PASSED") - } - - scenario("successful external authentication resets bad login attempts (10 iterations)") { - info("**Validates: Requirements 1.9, 2.3**") - info("Property: For any successful external authentication,") - info(" the system SHALL reset bad login attempts") - setPropsValues("connector.user.authentication" -> "true") - - // Mock connector for testing - val testProvider = "https://test-external-provider.com" - val validExternalUsername = s"ext_valid_${randomString(8)}" - val validExternalPassword = "ValidExtPass123!" - - object TestMockConnector extends code.bankconnectors.Connector with code.util.Helper.MdcLoggable { - implicit override val nameOfConnector = "TestMockConnector" - - override def checkExternalUserCredentials( - username: String, - password: String, - callContext: Option[code.api.util.CallContext] - ): Box[com.openbankproject.commons.model.InboundExternalUser] = { - if (username == validExternalUsername && password == validExternalPassword) { - Full(com.openbankproject.commons.model.InboundExternalUser( - aud = "", - exp = "", - iat = "", - iss = testProvider, - sub = validExternalUsername, - azp = None, - email = Some(s"$validExternalUsername@external.com"), - emailVerified = Some("true"), - name = Some("Test External User") - )) - } else { - Empty - } - } - } - - // Save original connector - val originalConnector = code.bankconnectors.Connector.connector.vend - - // Enable external authentication using Lift Props - try { - // Set mock connector - code.bankconnectors.Connector.connector.default.set(TestMockConnector) - - val iterations = 10 - var resetCount = 0 - var subsequentSuccessCount = 0 - - for (i <- 1 to iterations) { - try { - // Create an external user in local DB (required for checkExternalUserViaConnector to work) - val user = createTestUser(validExternalUsername, validExternalPassword, testProvider, validated = true) - - // Simulate some failed login attempts first - val failedAttempts = scala.util.Random.nextInt(3) + 1 // 1-3 failed attempts - for (_ <- 1 to failedAttempts) { - LoginAttempt.incrementBadLoginAttempts(testProvider, validExternalUsername) - } - - // Verify attempts were incremented - val attemptsBefore = LoginAttempt.getOrCreateBadLoginStatus(testProvider, validExternalUsername) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - attemptsBefore should be >= failedAttempts - - // Test 1: Successful external authentication should reset attempts - val result = AuthUser.getResourceUserId(validExternalUsername, validExternalPassword, testProvider) - result match { - case Full(id) if id > 0 => - // Success - verify attempts are reset - val attemptsAfter = LoginAttempt.getOrCreateBadLoginStatus(testProvider, validExternalUsername) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(-1) - - if (attemptsAfter == 0) { - resetCount += 1 - } else { - fail(s"Iteration $i: Successful external authentication should reset attempts to 0, but got: $attemptsAfter") - } - - case other => - // External authentication might fail for various reasons - // Log and continue - info(s"Iteration $i: External authentication returned: $other") - } - - // Test 2: Verify subsequent authentication attempts work - val subsequentResult = AuthUser.getResourceUserId(validExternalUsername, validExternalPassword, testProvider) - subsequentResult match { - case Full(id) if id > 0 => - subsequentSuccessCount += 1 - // Verify attempts are still 0 - val finalAttempts = LoginAttempt.getOrCreateBadLoginStatus(testProvider, validExternalUsername) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(-1) - finalAttempts shouldBe 0 - - case other => - // Log and continue - info(s"Iteration $i: Subsequent external authentication returned: $other") - } - - } finally { - cleanupTestUser(validExternalUsername, testProvider) - } - } - - info(s"Completed $iterations iterations:") - info(s" - Successful external authentications that reset attempts: $resetCount") - info(s" - Subsequent authentications unaffected by previous failures: $subsequentSuccessCount") - - // External authentication might not always succeed due to connector behavior - // But we should have at least some successes - resetCount should be > 0 - subsequentSuccessCount should be > 0 - - info("Property 5 (External): Successful Authentication Resets Login Attempts - PASSED") - - } finally { - // Restore original connector - code.bankconnectors.Connector.connector.default.set(originalConnector) - cleanupTestUser(validExternalUsername, testProvider) - } - } - - scenario("reset prevents account lockout after successful authentication (10 iterations)") { - info("**Validates: Requirements 1.9, 2.3**") - info("Property: After successful authentication resets attempts,") - info(" the user should not be locked and can authenticate again") - - val iterations = 10 - var preventedLockoutCount = 0 - - for (i <- 1 to iterations) { - val username = generateUsername() - val password = generatePassword() - - try { - // Create a test user - val user = createTestUser(username, password, localIdentityProvider, validated = true) - - // Simulate failed attempts close to the lockout threshold - val maxAttempts = LoginAttempt.maxBadLoginAttempts.toInt - val failedAttempts = maxAttempts - 1 // Just below threshold - - for (_ <- 1 to failedAttempts) { - LoginAttempt.incrementBadLoginAttempts(localIdentityProvider, username) - } - - // Verify user is not locked yet - LoginAttempt.userIsLocked(localIdentityProvider, username) shouldBe false - - // Successful authentication should reset attempts - val result = AuthUser.getResourceUserId(username, password, localIdentityProvider) - result match { - case Full(id) if id > 0 => - // Verify attempts are reset - val attemptsAfter = LoginAttempt.getOrCreateBadLoginStatus(localIdentityProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(-1) - attemptsAfter shouldBe 0 - - // Verify user is still not locked - LoginAttempt.userIsLocked(localIdentityProvider, username) shouldBe false - - // Now we can fail multiple times again without being locked immediately - for (_ <- 1 to failedAttempts) { - LoginAttempt.incrementBadLoginAttempts(localIdentityProvider, username) - } - - // User should still not be locked (just below threshold again) - LoginAttempt.userIsLocked(localIdentityProvider, username) shouldBe false - - preventedLockoutCount += 1 - - case other => - fail(s"Iteration $i: Expected successful authentication, got: $other") - } - - } finally { - cleanupTestUser(username, localIdentityProvider) - } - } - - info(s"Completed $iterations iterations:") - info(s" - Successful resets that prevented lockout: $preventedLockoutCount") - - preventedLockoutCount shouldBe iterations - - info("Property 5 (Lockout Prevention): Successful Authentication Resets Login Attempts - PASSED") - } - } - - // ============================================================================ - // Property 6: Failed Authentication Increments Login Attempts - // **Validates: Requirements 1.10, 2.4** - // ============================================================================ - - feature("Property 6: Failed Authentication Increments Login Attempts") { - scenario("failed local authentication increments bad login attempts (10 iterations)") { - info("**Validates: Requirements 1.10, 2.4**") - info("Property: For any failed authentication (wrong password, user not found,") - info(" connector rejection), the system SHALL call") - info(" LoginAttempt.incrementBadLoginAttempts with the correct provider and username") - - val iterations = 10 - var wrongPasswordIncrementCount = 0 - var userNotFoundIncrementCount = 0 - var eventualLockoutCount = 0 - - for (i <- 1 to iterations) { - val username = generateUsername() - val password = generatePassword() - - try { - // Test 1: Wrong password increments attempts - if (i % 2 == 0) { - // Create a test user - val user = createTestUser(username, password, localIdentityProvider, validated = true) - - // Get initial attempt count - val attemptsBefore = LoginAttempt.getOrCreateBadLoginStatus(localIdentityProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - // Attempt authentication with wrong password - val wrongPassword = password + "_wrong" - val result = AuthUser.getResourceUserId(username, wrongPassword, localIdentityProvider) - - // Verify result is Empty (authentication failed) - result match { - case Empty => - // Verify attempts were incremented - val attemptsAfter = LoginAttempt.getOrCreateBadLoginStatus(localIdentityProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - if (attemptsAfter == attemptsBefore + 1) { - wrongPasswordIncrementCount += 1 - } else { - fail(s"Iteration $i: Wrong password should increment attempts from $attemptsBefore to ${attemptsBefore + 1}, but got: $attemptsAfter") - } - - case other => - fail(s"Iteration $i: Wrong password should return Empty, got: $other") - } - } else { - // Test 2: User not found increments attempts - // Don't create a user - just try to authenticate - - // Get initial attempt count (might be 0 if no previous attempts) - val attemptsBefore = LoginAttempt.getOrCreateBadLoginStatus(localIdentityProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - // Attempt authentication with non-existent user - val result = AuthUser.getResourceUserId(username, password, localIdentityProvider) - - // Verify result is Empty (user not found) - result match { - case Empty => - // Verify attempts were incremented - val attemptsAfter = LoginAttempt.getOrCreateBadLoginStatus(localIdentityProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - if (attemptsAfter == attemptsBefore + 1) { - userNotFoundIncrementCount += 1 - } else { - fail(s"Iteration $i: User not found should increment attempts from $attemptsBefore to ${attemptsBefore + 1}, but got: $attemptsAfter") - } - - case other => - fail(s"Iteration $i: User not found should return Empty, got: $other") - } - } - - } finally { - cleanupTestUser(username, localIdentityProvider) - } - } - - info(s"Completed $iterations iterations:") - info(s" - Wrong password increments: $wrongPasswordIncrementCount") - info(s" - User not found increments: $userNotFoundIncrementCount") - - // Verify we tested both scenarios - wrongPasswordIncrementCount should be >= (iterations / 2 - 5) // Allow some tolerance - userNotFoundIncrementCount should be >= (iterations / 2 - 5) - - info("Property 6 (Local): Failed Authentication Increments Login Attempts - PASSED") - } - - scenario("repeated failed authentications lead to account locking (10 iterations)") { - info("**Validates: Requirements 1.10, 2.4**") - info("Property: Repeated failed authentication attempts should eventually") - info(" lead to account locking after exceeding the threshold") - - val iterations = 10 - var lockoutCount = 0 - var correctThresholdCount = 0 - - for (i <- 1 to iterations) { - val username = generateUsername() - val password = generatePassword() - - try { - // Create a test user - val user = createTestUser(username, password, localIdentityProvider, validated = true) - - // Get the lockout threshold - val maxAttempts = LoginAttempt.maxBadLoginAttempts.toInt - - // Verify user is not locked initially - LoginAttempt.userIsLocked(localIdentityProvider, username) shouldBe false - - // Attempt authentication with wrong password multiple times - val wrongPassword = password + "_wrong" - var attemptCount = 0 - var lockedAfterAttempts = 0 - - for (attempt <- 1 to (maxAttempts + 2)) { - val result = AuthUser.getResourceUserId(username, wrongPassword, localIdentityProvider) - attemptCount += 1 - - // Check if user is locked after this attempt - val isLocked = LoginAttempt.userIsLocked(localIdentityProvider, username) - - if (isLocked && lockedAfterAttempts == 0) { - lockedAfterAttempts = attemptCount - } - - // After max attempts, user should be locked - if (attempt > maxAttempts) { - isLocked shouldBe true - } - } - - // Verify user is locked after exceeding threshold - val finalLocked = LoginAttempt.userIsLocked(localIdentityProvider, username) - if (finalLocked) { - lockoutCount += 1 - - // Verify lockout happened at or after the threshold - if (lockedAfterAttempts >= maxAttempts && lockedAfterAttempts <= maxAttempts + 1) { - correctThresholdCount += 1 - } - } else { - fail(s"Iteration $i: User should be locked after $maxAttempts failed attempts") - } - - // Test that locked user returns locked state code - val lockedResult = AuthUser.getResourceUserId(username, password, localIdentityProvider) - lockedResult match { - case Full(id) if id == AuthUser.usernameLockedStateCode => - // Correct - locked user returns state code - case other => - fail(s"Iteration $i: Locked user should return usernameLockedStateCode, got: $other") - } - - } finally { - cleanupTestUser(username, localIdentityProvider) - } - } - - info(s"Completed $iterations iterations:") - info(s" - Accounts locked after repeated failures: $lockoutCount") - info(s" - Lockouts at correct threshold: $correctThresholdCount") - - lockoutCount shouldBe iterations - correctThresholdCount shouldBe iterations - - info("Property 6 (Lockout): Failed Authentication Increments Login Attempts - PASSED") - } - - scenario("failed external authentication increments bad login attempts (10 iterations)") { - info("**Validates: Requirements 1.10, 2.4**") - info("Property: For any failed external authentication,") - info(" the system SHALL increment bad login attempts") - - // Mock connector for testing - val testProvider = "https://test-external-provider.com" - val validExternalUsername = s"ext_valid_${randomString(8)}" - val validExternalPassword = "ValidExtPass123!" - - object TestMockConnector extends code.bankconnectors.Connector with code.util.Helper.MdcLoggable { - implicit override val nameOfConnector = "TestMockConnector" - - override def checkExternalUserCredentials( - username: String, - password: String, - callContext: Option[code.api.util.CallContext] - ): Box[com.openbankproject.commons.model.InboundExternalUser] = { - if (username == validExternalUsername && password == validExternalPassword) { - Full(com.openbankproject.commons.model.InboundExternalUser( - aud = "", - exp = "", - iat = "", - iss = testProvider, - sub = validExternalUsername, - azp = None, - email = Some(s"$validExternalUsername@external.com"), - emailVerified = Some("true"), - name = Some("Test External User") - )) - } else { - Empty - } - } - } - - // Save original connector - val originalConnector = code.bankconnectors.Connector.connector.vend - - // Enable external authentication using Lift Props - try { - // Set mock connector - code.bankconnectors.Connector.connector.default.set(TestMockConnector) - - val iterations = 10 - var connectorRejectionIncrementCount = 0 - var eventualLockoutCount = 0 - - for (i <- 1 to iterations) { - val username = s"ext_user_${randomString(8)}" - val password = generatePassword() - - try { - // Create an external user in local DB (required for checkExternalUserViaConnector to work) - val user = createTestUser(username, password, testProvider, validated = true) - - // Test 1: Connector rejection increments attempts - // Get initial attempt count - val attemptsBefore = LoginAttempt.getOrCreateBadLoginStatus(testProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - // Attempt authentication with credentials that connector will reject - val wrongPassword = password + "_wrong" - val result = AuthUser.getResourceUserId(username, wrongPassword, testProvider) - - // Verify result is Empty or locked state (authentication failed) - result match { - case Empty | Full(AuthUser.usernameLockedStateCode) => - // Verify attempts were incremented - val attemptsAfter = LoginAttempt.getOrCreateBadLoginStatus(testProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - if (attemptsAfter > attemptsBefore) { - connectorRejectionIncrementCount += 1 - } else { - fail(s"Iteration $i: Connector rejection should increment attempts from $attemptsBefore, but got: $attemptsAfter") - } - - case other => - // Acceptable - connector might return various results - info(s"Iteration $i: Connector rejection returned: $other") - connectorRejectionIncrementCount += 1 - } - - // Test 2: Verify repeated failures lead to lockout - if (i % 2 == 1) { - // Every 2nd iteration (odd iterations), test lockout behavior - val maxAttempts = LoginAttempt.maxBadLoginAttempts.toInt - - // Reset attempts first - LoginAttempt.resetBadLoginAttempts(testProvider, username) - - // Fail multiple times - for (_ <- 1 to (maxAttempts + 1)) { - AuthUser.getResourceUserId(username, wrongPassword, testProvider) - } - - // Verify user is locked - val isLocked = LoginAttempt.userIsLocked(testProvider, username) - if (isLocked) { - eventualLockoutCount += 1 - } - } - - } finally { - cleanupTestUser(username, testProvider) - } - } - - info(s"Completed $iterations iterations:") - info(s" - Connector rejection increments: $connectorRejectionIncrementCount") - info(s" - Eventual lockouts from repeated failures: $eventualLockoutCount") - - // Verify we got reasonable results - connectorRejectionIncrementCount should be >= (iterations - 10) - eventualLockoutCount should be >= 5 // At least some lockouts - - info("Property 6 (External): Failed Authentication Increments Login Attempts - PASSED") - - } finally { - // Restore original connector - code.bankconnectors.Connector.connector.default.set(originalConnector) - } - } - } - - // ============================================================================ - // Property 1: Authentication Behavior Equivalence (CRITICAL) - // **Validates: Requirements 4.1** - // ============================================================================ - - feature("Property 1: Authentication Behavior Equivalence (Backward Compatibility)") { - scenario("refactored authentication produces consistent results across all scenarios (10 iterations)") { - // CRITICAL: Set property at scenario level to survive afterEach() reset - setPropsValues("connector.user.authentication" -> "true") - - info("**Validates: Requirements 4.1**") - info("Property: For any username, password, and provider combination,") - info(" the refactored getResourceUserId method SHALL produce consistent") - info(" authentication results (success/failure, state codes, login attempt side effects)") - info("") - info("This is the MOST CRITICAL property test - it ensures the refactoring") - info(" maintains correct behavior across all authentication scenarios.") - - val iterations = 10 - var totalScenarios = 0 - var successfulAuthCount = 0 - var failedAuthCount = 0 - var lockedUserCount = 0 - var unvalidatedUserCount = 0 - var loginAttemptConsistencyCount = 0 - - // Ensure each scenario type is tested at least once, then randomize the rest - val scenarioTypes = (0 to 5).toList ++ List.fill(iterations - 6)(scala.util.Random.nextInt(6)) - val shuffledScenarios = scala.util.Random.shuffle(scenarioTypes) - - for (i <- 1 to iterations) { - val username = generateUsername() - val password = generatePassword() - val provider = generateProvider() - - // Get scenario type from shuffled list - val scenarioType = shuffledScenarios(i - 1) - - try { - scenarioType match { - case 0 => - // Scenario 1: Valid local user with correct password - info(s"Iteration $i: Testing valid local user authentication") - val user = createTestUser(username, password, localIdentityProvider, validated = true) - - // Get initial attempt count - val attemptsBefore = LoginAttempt.getOrCreateBadLoginStatus(localIdentityProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - // Authenticate with correct password - val result = AuthUser.getResourceUserId(username, password, localIdentityProvider) - - result match { - case Full(id) if id > 0 => - successfulAuthCount += 1 - totalScenarios += 1 - - // Verify user ID matches - id shouldBe user.user.get - - // Verify login attempts were reset - val attemptsAfter = LoginAttempt.getOrCreateBadLoginStatus(localIdentityProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(-1) - - if (attemptsAfter == 0) { - loginAttemptConsistencyCount += 1 - } else { - fail(s"Iteration $i: Successful auth should reset attempts to 0, got: $attemptsAfter") - } - - case other => - fail(s"Iteration $i: Valid user with correct password should succeed, got: $other") - } - - case 1 => - // Scenario 2: Valid local user with wrong password - info(s"Iteration $i: Testing failed local authentication") - val user = createTestUser(username, password, localIdentityProvider, validated = true) - - // Get initial attempt count - val attemptsBefore = LoginAttempt.getOrCreateBadLoginStatus(localIdentityProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - // Authenticate with wrong password - val wrongPassword = password + "_wrong" - val result = AuthUser.getResourceUserId(username, wrongPassword, localIdentityProvider) - - result match { - case Empty => - failedAuthCount += 1 - totalScenarios += 1 - - // Verify login attempts were incremented - val attemptsAfter = LoginAttempt.getOrCreateBadLoginStatus(localIdentityProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - if (attemptsAfter == attemptsBefore + 1) { - loginAttemptConsistencyCount += 1 - } else { - fail(s"Iteration $i: Failed auth should increment attempts from $attemptsBefore to ${attemptsBefore + 1}, got: $attemptsAfter") - } - - case other => - fail(s"Iteration $i: Wrong password should return Empty, got: $other") - } - - case 2 => - // Scenario 3: Locked user (local provider) - info(s"Iteration $i: Testing locked user authentication") - val user = createLockedUser(username, password, localIdentityProvider) - - // Verify user is locked - LoginAttempt.userIsLocked(localIdentityProvider, username) shouldBe true - - // Get initial attempt count - val attemptsBefore = LoginAttempt.getOrCreateBadLoginStatus(localIdentityProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - // Authenticate (should return locked state code) - val result = AuthUser.getResourceUserId(username, password, localIdentityProvider) - - result match { - case Full(id) if id == AuthUser.usernameLockedStateCode => - lockedUserCount += 1 - totalScenarios += 1 - - // Verify login attempts were NOT incremented (per updated Requirement 4.5) - val attemptsAfter = LoginAttempt.getOrCreateBadLoginStatus(localIdentityProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - if (attemptsAfter == attemptsBefore) { - loginAttemptConsistencyCount += 1 - } else { - fail(s"Iteration $i: Locked user auth should NOT increment attempts, was $attemptsBefore, got: $attemptsAfter") - } - - case other => - fail(s"Iteration $i: Locked user should return usernameLockedStateCode, got: $other") - } - - case 3 => - // Scenario 4: Unvalidated email (local provider only) - info(s"Iteration $i: Testing unvalidated user authentication") - val user = createUnvalidatedUser(username, password) - - // Authenticate (should return unvalidated state code) - val result = AuthUser.getResourceUserId(username, password, localIdentityProvider) - - result match { - case Full(id) if id == AuthUser.userEmailNotValidatedStateCode => - unvalidatedUserCount += 1 - totalScenarios += 1 - - case other => - fail(s"Iteration $i: Unvalidated user should return userEmailNotValidatedStateCode, got: $other") - } - - case 4 => - // Scenario 5: User not found - info(s"Iteration $i: Testing non-existent user authentication") - - // Don't create a user - just try to authenticate - val attemptsBefore = LoginAttempt.getOrCreateBadLoginStatus(localIdentityProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - val result = AuthUser.getResourceUserId(username, password, localIdentityProvider) - - result match { - case Empty => - failedAuthCount += 1 - totalScenarios += 1 - - // Verify login attempts were incremented - val attemptsAfter = LoginAttempt.getOrCreateBadLoginStatus(localIdentityProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - if (attemptsAfter == attemptsBefore + 1) { - loginAttemptConsistencyCount += 1 - } else { - fail(s"Iteration $i: User not found should increment attempts from $attemptsBefore to ${attemptsBefore + 1}, got: $attemptsAfter") - } - - case other => - fail(s"Iteration $i: User not found should return Empty, got: $other") - } - - case 5 => - // Scenario 6: External provider authentication - info(s"Iteration $i: Testing external provider authentication") - val externalProvider = "https://external-provider.com" - - - - val user = createTestUser(username, password, externalProvider, validated = true) - - // Note: External authentication will likely fail without a real connector - // But we can verify the behavior is consistent - val attemptsBefore = LoginAttempt.getOrCreateBadLoginStatus(externalProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - - val result = AuthUser.getResourceUserId(username, password, externalProvider) - - result match { - case Full(id) if id > 0 => - // Success (if connector is configured) - successfulAuthCount += 1 - totalScenarios += 1 - - // Verify attempts were reset - val attemptsAfter = LoginAttempt.getOrCreateBadLoginStatus(externalProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(-1) - - if (attemptsAfter == 0) { - loginAttemptConsistencyCount += 1 - } - - case Empty | Full(AuthUser.usernameLockedStateCode) => - // Failure (expected if connector not configured or user locked) - failedAuthCount += 1 - totalScenarios += 1 - - // Verify attempts were incremented - val attemptsAfter = LoginAttempt.getOrCreateBadLoginStatus(externalProvider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - if (attemptsAfter > attemptsBefore) { - loginAttemptConsistencyCount += 1 - } - - case other => - // Other results are acceptable for external auth - totalScenarios += 1 - info(s"Iteration $i: External auth returned: $other") - } - } - - } finally { - cleanupTestUser(username, provider) - if (scenarioType == 5) { - cleanupTestUser(username, "https://external-provider.com") - } - } - } - - info("") - info(s"Completed $iterations iterations across $totalScenarios scenarios:") - info(s" - Successful authentications: $successfulAuthCount") - info(s" - Failed authentications: $failedAuthCount") - info(s" - Locked user rejections: $lockedUserCount") - info(s" - Unvalidated user rejections: $unvalidatedUserCount") - info(s" - Login attempt consistency checks passed: $loginAttemptConsistencyCount") - info("") - - // Verify we tested a good distribution of scenarios - totalScenarios shouldBe iterations - - // Verify we got at least one result for each scenario type (guaranteed by our shuffled approach) - successfulAuthCount should be >= 1 - failedAuthCount should be >= 1 - lockedUserCount should be >= 1 - unvalidatedUserCount should be >= 1 - - // Verify login attempt tracking was consistent - loginAttemptConsistencyCount should be >= (iterations - 5) // Allow some tolerance for external auth - - info("Property 1: Authentication Behavior Equivalence - PASSED") - info("") - info("CRITICAL TEST PASSED: The refactored authentication implementation") - info(" maintains consistent behavior across all authentication scenarios.") - } - - scenario("authentication result types are always valid across all scenarios (10 iterations)") { - info("**Validates: Requirements 4.1**") - info("Property: All authentication results must be one of the expected types") - info(" with no unexpected values or states") - - val iterations = 10 - var validResultCount = 0 - var invalidResultCount = 0 - - for (i <- 1 to iterations) { - val username = generateUsername() - val password = generatePassword() - val provider = if (i % 3 == 0) "https://external.com" else localIdentityProvider - - try { - // Randomly create different user states - val userState = scala.util.Random.nextInt(4) - userState match { - case 0 => createTestUser(username, password, provider, validated = true) - case 1 => createLockedUser(username, password, provider) - case 2 if provider == localIdentityProvider => createUnvalidatedUser(username, password) - case _ => // Don't create user (test user not found) - } - - // Attempt authentication - val result = AuthUser.getResourceUserId(username, password, provider) - - // Verify result is one of the expected types - result match { - case Full(id) if id > 0 => - // Valid user ID - success - validResultCount += 1 - - case Full(id) if id == AuthUser.usernameLockedStateCode => - // Locked state - validResultCount += 1 - - case Full(id) if id == AuthUser.userEmailNotValidatedStateCode => - // Unvalidated state - validResultCount += 1 - - case Empty => - // Authentication failure - validResultCount += 1 - - case Failure(msg, _, _) => - // Failure is acceptable (e.g., connector errors) - validResultCount += 1 - - case other => - // Unexpected result type - invalidResultCount += 1 - fail(s"Iteration $i: Unexpected result type: $other") - } - - } finally { - cleanupTestUser(username, provider) - } - } - - info(s"Completed $iterations iterations:") - info(s" - Valid result types: $validResultCount") - info(s" - Invalid result types: $invalidResultCount") - - validResultCount shouldBe iterations - invalidResultCount shouldBe 0 - - info("Property 1 (Result Types): Authentication Behavior Equivalence - PASSED") - } - - scenario("login attempt side effects are consistent across all authentication paths (10 iterations)") { - info("**Validates: Requirements 4.1**") - info("Property: Login attempt tracking must be consistent for all authentication") - info(" paths (local/external, success/failure, locked/unlocked)") - - val iterations = 10 - var resetOnSuccessCount = 0 - var incrementOnFailureCount = 0 - var incrementOnLockedCount = 0 - - for (i <- 1 to iterations) { - val username = generateUsername() - val password = generatePassword() - // Use local provider for all tests to avoid external provider issues - val provider = localIdentityProvider - - try { - // Test 1: Success resets attempts - if (i % 3 == 0) { - val user = createTestUser(username, password, provider, validated = true) - - // Add some failed attempts first - for (_ <- 1 to 3) { - LoginAttempt.incrementBadLoginAttempts(provider, username) - } - - // Successful auth should reset - val result = AuthUser.getResourceUserId(username, password, provider) - result match { - case Full(id) if id > 0 => - val attemptsAfter = LoginAttempt.getOrCreateBadLoginStatus(provider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(-1) - - if (attemptsAfter == 0) { - resetOnSuccessCount += 1 - } - - case _ => - // External auth might fail - that's ok - } - } - // Test 2: Failure increments attempts - else if (i % 3 == 1) { - val user = createTestUser(username, password, provider, validated = true) - - val attemptsBefore = LoginAttempt.getOrCreateBadLoginStatus(provider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - // Wrong password should increment - val wrongPassword = password + "_wrong" - val result = AuthUser.getResourceUserId(username, wrongPassword, provider) - - result match { - case Empty | Full(AuthUser.usernameLockedStateCode) => - val attemptsAfter = LoginAttempt.getOrCreateBadLoginStatus(provider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - if (attemptsAfter == attemptsBefore + 1) { - incrementOnFailureCount += 1 - } - - case _ => - // Unexpected result - } - } - // Test 3: Locked user should NOT increment attempts - else { - val user = createLockedUser(username, password, provider) - - val attemptsBefore = LoginAttempt.getOrCreateBadLoginStatus(provider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - // Locked user auth should NOT increment attempts (per updated Requirement 4.5) - val result = AuthUser.getResourceUserId(username, password, provider) - - result match { - case Full(id) if id == AuthUser.usernameLockedStateCode => - val attemptsAfter = LoginAttempt.getOrCreateBadLoginStatus(provider, username) - .map(_.badAttemptsSinceLastSuccessOrReset).openOr(0) - - if (attemptsAfter == attemptsBefore) { - incrementOnLockedCount += 1 - } - - case _ => - // Unexpected result - } - } - - } finally { - cleanupTestUser(username, provider) - } - } - - info(s"Completed $iterations iterations:") - info(s" - Reset on success: $resetOnSuccessCount") - info(s" - Increment on failure: $incrementOnFailureCount") - info(s" - Locked user attempts NOT incremented: $incrementOnLockedCount") - - // Verify we got reasonable results for each test type - resetOnSuccessCount should be > 0 - incrementOnFailureCount should be > 0 - incrementOnLockedCount should be > 0 // This counts cases where locked users did NOT increment - - info("Property 1 (Side Effects): Authentication Behavior Equivalence - PASSED") - } - } -} diff --git a/obp-api/src/test/scala/code/api/Http4sOpenIdConnectRoutesTest.scala b/obp-api/src/test/scala/code/api/Http4sOpenIdConnectRoutesTest.scala index 8657567ba6..e9ff0c58e5 100644 --- a/obp-api/src/test/scala/code/api/Http4sOpenIdConnectRoutesTest.scala +++ b/obp-api/src/test/scala/code/api/Http4sOpenIdConnectRoutesTest.scala @@ -38,7 +38,7 @@ class Http4sOpenIdConnectRoutesTest extends ServerSetup { scenario("Disabled by default — callback paths fall through (None)") { Given("openid_connect.enabled is not set (default false)") When("the three callback paths are invoked with GET and POST") - Then("none match — request falls through to the Lift bridge, as before the migration") + Then("none match — request falls through to the next route (ultimately notFoundCatchAll / JSON 404)") run(get("/auth/openid-connect/callback")) shouldBe None run(post("/auth/openid-connect/callback")) shouldBe None run(get("/auth/openid-connect/callback-1")) shouldBe None diff --git a/obp-api/src/test/scala/code/api/Http4sOpenIdConnectSuccessTest.scala b/obp-api/src/test/scala/code/api/Http4sOpenIdConnectSuccessTest.scala new file mode 100644 index 0000000000..2df62e119a --- /dev/null +++ b/obp-api/src/test/scala/code/api/Http4sOpenIdConnectSuccessTest.scala @@ -0,0 +1,133 @@ +package code.api + +import cats.effect.IO +import cats.effect.unsafe.implicits.global +import code.setup.ServerSetup +import code.users.Users +import com.comcast.ip4s._ +import com.nimbusds.jose.crypto.RSASSASigner +import com.nimbusds.jose.jwk.JWKSet +import com.nimbusds.jose.jwk.gen.RSAKeyGenerator +import com.nimbusds.jose.{JWSAlgorithm, JWSHeader} +import com.nimbusds.jwt.{JWTClaimsSet, SignedJWT} +import org.http4s.dsl.io._ +import org.http4s.ember.server.EmberServerBuilder +import org.http4s.implicits._ +import org.http4s.{HttpRoutes, Method, Request, Uri} + +import java.util.Date + +/** + * Success-path integration test for [[Http4sOpenIdConnect]] — the `200 {"token": ...}` + * branch that the routing/failure suite ([[Http4sOpenIdConnectRoutesTest]]) cannot reach + * because it needs a provider to mint the OIDC tokens. + * + * Self-contained, no live provider: stands up a local stub OIDC provider (Ember) that + * serves + * - `POST /token` → a token response whose `id_token` is a locally-signed RS256 JWT + * - `GET /jwks` → the matching public JWK set + * points the `openid_connect_1.*` props at it, then drives the callback route in-process. + * It asserts the handler exchanges the code, validates the JWT against the JWKS, + * provisions the resource user, and returns `200 {"token": ...}`. + * + * Why a freshly-signed token is enough: `JwtUtil.validateIdToken` reads `iss`/`aud` from + * the token itself and only enforces the signature (against the served JWKS) and expiry, + * so no configured iss/aud matching is required. The JWS header `kid` matches the served + * JWK so the verification key selector picks the right key. + * + * This also exercises the M1 change — the provisioning block is now wrapped in + * `DB.use(DefaultConnectionIdentifier)` (one connection for all OIDC writes). + */ +class Http4sOpenIdConnectSuccessTest extends ServerSetup { + + private val providerClaim = "http://127.0.0.1/oidc-test-provider" + private val preferredUser = "oidctestuser" + private val clientId = "obp-oidc-test-client" + + // RSA keypair used to sign the id_token; its public half is served at /jwks. + private val rsaJwk = new RSAKeyGenerator(2048).keyID("oidc-test-kid").generate() + + private def signedIdToken(issuer: String): String = { + val claims = new JWTClaimsSet.Builder() + .issuer(issuer) + .subject("oidc-test-subject") + .audience(clientId) + .expirationTime(new Date(System.currentTimeMillis() + 3600L * 1000)) + .issueTime(new Date()) + .claim("preferred_username", preferredUser) + .claim("email", "oidctest@example.com") + .claim("provider", providerClaim) + .claim("azp", clientId) + .build() + val jwt = new SignedJWT( + new JWSHeader.Builder(JWSAlgorithm.RS256).keyID(rsaJwk.getKeyID).build(), + claims + ) + jwt.sign(new RSASSASigner(rsaJwk)) + jwt.serialize() + } + + /** Allocate an ephemeral free port for the stub provider. */ + private def freePort(): Int = { + val socket = new java.net.ServerSocket(0) + try socket.getLocalPort finally socket.close() + } + + private def stubProvider(issuer: String): HttpRoutes[IO] = HttpRoutes.of[IO] { + case POST -> Root / "token" => + Ok(s"""{"id_token":"${signedIdToken(issuer)}","access_token":"access-xyz",""" + + s""""token_type":"Bearer","expires_in":"3600","refresh_token":"refresh-xyz","scope":"openid"}""") + case GET -> Root / "jwks" => + Ok(new JWKSet(rsaJwk.toPublicJWK).toString) + } + + private def run(req: Request[IO]): (Int, String) = + Http4sOpenIdConnect.routes.run(req).value.unsafeRunSync().map { resp => + (resp.status.code, new String(resp.body.compile.to(Array).unsafeRunSync(), "UTF-8")) + }.getOrElse(fail(s"route did not match ${req.method} ${req.uri}")) + + feature("OpenID Connect callback — success path") { + + scenario("valid code + signed id_token → 200 {token} and the user is provisioned") { + val port = freePort() + val portObj = Port.fromInt(port).getOrElse(fail(s"invalid free port $port")) + val issuer = s"http://127.0.0.1:$port" + + val server = EmberServerBuilder + .default[IO] + .withHost(ipv4"127.0.0.1") + .withPort(portObj) + .withHttpApp(stubProvider(issuer).orNotFound) + .build + + server.use { _ => + IO { + Given("a local stub OIDC provider and openid_connect_1.* pointed at it") + setPropsValues( + "openid_connect.enabled" -> "true", + "openid_connect.check_session_state" -> "false", + "allow_openid_connect" -> "true", + "openid_connect_1.client_id" -> clientId, + "openid_connect_1.client_secret" -> "test-secret", + "openid_connect_1.callback_url" -> "http://localhost/auth/openid-connect/callback", + "openid_connect_1.endpoint.token" -> s"$issuer/token", + "openid_connect_1.endpoint.jwks_uri" -> s"$issuer/jwks" + ) + + When("the provider redirects back to the callback with an authorization code") + val (code, body) = run( + Request[IO](Method.GET, + Uri.unsafeFromString("/auth/openid-connect/callback?code=auth-code-123&state=ignored")) + ) + + Then("the handler returns 200 with a minted OBP DirectLogin token") + code shouldBe 200 + body should include("token") + + And("the resource user was provisioned from the validated claims") + Users.users.vend.getUserByProviderId(providerClaim, preferredUser).isDefined shouldBe true + } + }.unsafeRunSync() + } + } +} diff --git a/obp-api/src/test/scala/code/api/OBPRestHelperTest.scala b/obp-api/src/test/scala/code/api/OBPRestHelperTest.scala index a8bfc06c15..bc999c8cb4 100644 --- a/obp-api/src/test/scala/code/api/OBPRestHelperTest.scala +++ b/obp-api/src/test/scala/code/api/OBPRestHelperTest.scala @@ -33,7 +33,6 @@ class OBPRestHelperTest extends FlatSpec with Matchers { ): ResourceDoc = { // Create a minimal ResourceDoc for testing val doc = new ResourceDoc( - partialFunction = null, // Not used in our tests implementedInApiVersion = version, partialFunctionName = "testFunction", requestVerb = "GET", diff --git a/obp-api/src/test/scala/code/api/http4sbridge/Http4sLiftBridgePropertyTest.scala b/obp-api/src/test/scala/code/api/http4sbridge/Http4sLiftBridgePropertyTest.scala deleted file mode 100644 index 4b69723533..0000000000 --- a/obp-api/src/test/scala/code/api/http4sbridge/Http4sLiftBridgePropertyTest.scala +++ /dev/null @@ -1,2400 +0,0 @@ -package code.api.http4sbridge - -import code.Http4sTestServer -import code.api.ResponseHeader -import code.api.util.APIUtil -import code.api.v5_0_0.V500ServerSetup -import code.consumer.Consumers -import code.model.dataAccess.AuthUser -import dispatch.Defaults._ -import dispatch._ -import net.liftweb.json.JValue -import net.liftweb.json.JsonAST.{JObject, JString} -import net.liftweb.json.JsonParser.parse -import net.liftweb.mapper.By -import net.liftweb.util.Helpers._ -import org.scalatest.Tag - -import scala.collection.JavaConverters._ -import scala.concurrent.Await -import scala.concurrent.duration.DurationInt -import scala.util.Random - -/** - * Property-Based Tests for Http4s Lift Bridge - * - * These tests validate universal properties that should hold across all inputs - * for the HTTP4S-Lift bridge integration, particularly focusing on the Lift - * dispatch mechanism. - * - * Property 4: Authentication Mechanism Preservation - * Validates: Requirements 4.1, 4.2, 4.3, 4.4, 4.5 - * - * Property 6: Lift Dispatch Mechanism Integration - * Validates: Requirements 1.3, 2.3, 2.5 - */ - -class Http4sLiftBridgePropertyTest extends V500ServerSetup { - - // Commented out: MXOF/CNBV9/STET/CDS-AU(AUOpenBanking)/Bahrain/Polish Lift endpoints were removed - // from the codebase. Their per-standard bridge fixtures are dropped; only OBP core + UK OpenBanking - // + Berlin Group remain reachable through the Lift bridge. - private val bgVersion = "v1.3" - private val bgPrefix = "berlin-group" - private val allStandardVersions = List( - "v1.2.1", "v1.3.0", "v1.4.0", - "v2.0.0", "v2.1.0", "v2.2.0", - "v3.0.0", "v3.1.0", - "v4.0.0", - "v5.0.0", "v5.1.0", - "v6.0.0" - ) - private val intlStandardsWithGetEndpoints: List[(String, String, String, List[String])] = List() - private val ukObVersions = List("v2.0", "v3.1") - - // Reduced iteration counts keep CI fast while still catching probabilistic bugs. - // Run with CI_ITERATIONS=10 locally or in nightly builds for full coverage. - private val CI_ITERATIONS = 3 - private val CI_ITERATIONS_HEAVY = 5 - - object PropertyTag extends Tag("lift-to-http4s-migration-property") - - private val http4sServer = Http4sTestServer - private val http4sBaseUrl = s"http://${http4sServer.host}:${http4sServer.port}" - - // ---- Property 4 test data: DirectLogin user and consumer ---- - private val prop4Username = "prop4_auth_test_user" - private val prop4Password = "Prop4TestPass123!" - private val prop4ConsumerKey = randomString(40).toLowerCase - private val prop4ConsumerSecret = randomString(40).toLowerCase - // Token obtained via DirectLogin during beforeAll - @volatile private var prop4DirectLoginToken: String = "" - - override def beforeAll(): Unit = { - super.beforeAll() - // Create AuthUser for Property 4 DirectLogin tests - if (AuthUser.find(By(AuthUser.username, prop4Username)).isEmpty) { - AuthUser.create - .email(s"$prop4Username@test.com") - .username(prop4Username) - .password(prop4Password) - .validated(true) - .firstName("Prop4") - .lastName("AuthTest") - .saveMe - } - // Create Consumer for Property 4 - if (Consumers.consumers.vend.getConsumerByConsumerKey(prop4ConsumerKey).isEmpty) { - Consumers.consumers.vend.createConsumer( - Some(prop4ConsumerKey), Some(prop4ConsumerSecret), Some(true), - Some("prop4 auth test app"), None, - Some("property 4 auth test consumer"), - Some(s"$prop4Username@test.com"), - None, None, None, None, None - ) - } - // Obtain a DirectLogin token via the HTTP4S server - try { - val credHeader = s"""username="$prop4Username", password="$prop4Password", consumer_key="$prop4ConsumerKey"""" - val (status, json, _) = makeHttp4sPostRequest( - "/my/logins/direct", "", - Map("DirectLogin" -> credHeader, "Content-Type" -> "application/json") - ) - if (status == 201) { - json \ "token" match { - case JString(t) => prop4DirectLoginToken = t - case _ => logger.warn("Property 4 setup: no token field in DirectLogin response") - } - } else { - logger.warn(s"Property 4 setup: DirectLogin returned status $status") - } - } catch { - case e: Exception => logger.warn(s"Property 4 setup: DirectLogin failed: ${e.getMessage}") - } - } - - private def makeHttp4sGetRequest(path: String, headers: Map[String, String] = Map.empty): (Int, JValue, Map[String, String]) = { - val request = url(s"$http4sBaseUrl$path") - val requestWithHeaders = headers.foldLeft(request) { case (req, (key, value)) => - req.addHeader(key, value) - } - - try { - val response = Http.default(requestWithHeaders.setHeader("Accept", "*/*") > as.Response(p => { - val statusCode = p.getStatusCode - val body = if (p.getResponseBody != null && p.getResponseBody.trim.nonEmpty) p.getResponseBody else "{}" - val json = parse(body) - val responseHeaders = p.getHeaders.iterator().asScala.map(e => e.getKey -> e.getValue).toMap - (statusCode, json, responseHeaders) - })) - Await.result(response, DurationInt(10).seconds) - } catch { - case e: java.util.concurrent.ExecutionException => - val statusPattern = """(\d{3})""".r - statusPattern.findFirstIn(e.getCause.getMessage) match { - case Some(code) => (code.toInt, JObject(Nil), Map.empty) - case None => throw e - } - case e: Exception => - throw e - } - } - - private def makeHttp4sPostRequest(path: String, body: String, headers: Map[String, String] = Map.empty): (Int, JValue, Map[String, String]) = { - val request = url(s"$http4sBaseUrl$path").POST.setBody(body) - val requestWithHeaders = headers.foldLeft(request) { case (req, (key, value)) => - req.addHeader(key, value) - } - - try { - val response = Http.default(requestWithHeaders.setHeader("Accept", "*/*") > as.Response(p => { - val statusCode = p.getStatusCode - val responseBody = if (p.getResponseBody != null && p.getResponseBody.trim.nonEmpty) p.getResponseBody else "{}" - val json = parse(responseBody) - val responseHeaders = p.getHeaders.iterator().asScala.map(e => e.getKey -> e.getValue).toMap - (statusCode, json, responseHeaders) - })) - Await.result(response, DurationInt(10).seconds) - } catch { - case e: Exception => - throw e - } - } - - private def hasField(json: JValue, key: String): Boolean = { - json match { - case JObject(fields) => fields.exists(_.name == key) - case _ => false - } - } - - private def assertCorrelationId(headers: Map[String, String]): Unit = { - val header = headers.find { case (key, _) => key.equalsIgnoreCase(ResponseHeader.`Correlation-Id`) } - header.isDefined shouldBe true - header.map(_._2.trim.nonEmpty).getOrElse(false) shouldBe true - } - - // Test data generators - private val apiVersions = List( - "v1.2.1", "v1.3.0", "v1.4.0", "v2.0.0", "v2.1.0", "v2.2.0", - "v3.0.0", "v3.1.0", "v4.0.0", "v5.0.0", "v5.1.0", "v6.0.0" - ) - - private val publicEndpoints = List( - "/banks", - "/banks/BANK_ID", - "/root" - ) - - private val authenticatedEndpoints = List( - "/my/banks", - "/my/logins/direct" - ) - - feature("Property 6: Lift Dispatch Mechanism Integration") { - - scenario("Property 6.1: All registered public endpoints return valid responses (10 iterations)", PropertyTag) { - var successCount = 0 - var failureCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val version = apiVersions(Random.nextInt(apiVersions.length)) - val endpoint = publicEndpoints(Random.nextInt(publicEndpoints.length)) - val path = s"/obp/$version$endpoint" - - try { - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Verify response is valid - status should (be >= 200 and be < 600) - - // Verify standard headers are present - assertCorrelationId(headers) - - // Verify response is valid JSON - json should not be null - - successCount += 1 - } catch { - case e: Exception => - logger.warn(s"Iteration $i failed for $path: ${e.getMessage}") - failureCount += 1 - } - } - - logger.info(s"Property 6.1 completed: $successCount successes, $failureCount failures out of $iterations iterations") - successCount should be >= (iterations * 0.95).toInt // 95% success rate - } - - scenario("Property 6.2: Handler priority is consistent (10 iterations)", PropertyTag) { - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val version = apiVersions(Random.nextInt(apiVersions.length)) - val path = s"/obp/$version/banks" - - val (status1, json1, headers1) = makeHttp4sGetRequest(path) - val (status2, json2, headers2) = makeHttp4sGetRequest(path) - - // Same request should always return same status code (handler priority is consistent) - status1 should equal(status2) - - // Both should have correlation IDs - assertCorrelationId(headers1) - assertCorrelationId(headers2) - - successCount += 1 - } - - logger.info(s"Property 6.2 completed: $successCount iterations") - successCount should equal(iterations) - } - - scenario("Property 6.3: Missing handlers return 404 with error message (10 iterations)", PropertyTag) { - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val randomPath = s"/obp/v5.0.0/nonexistent/${randomString(10)}" - - val (status, json, headers) = makeHttp4sGetRequest(randomPath) - - // Should return 404 - status should equal(404) - - // Should have error message - (hasField(json, "error") || hasField(json, "message")) shouldBe true - - // Should have correlation ID - assertCorrelationId(headers) - - successCount += 1 - } - - logger.info(s"Property 6.3 completed: $successCount iterations") - successCount should equal(iterations) - } - - scenario("Property 6.4: Authentication failures return consistent error responses (10 iterations)", PropertyTag) { - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val version = apiVersions(Random.nextInt(apiVersions.length)) - val path = s"/obp/$version/my/banks" - - // Request without authentication - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Should return 401 or 400 (depending on version) - status should (be >= 400 and be < 500) - - // Should have error message - (hasField(json, "error") || hasField(json, "message")) shouldBe true - - // Should have correlation ID - assertCorrelationId(headers) - - successCount += 1 - } - - logger.info(s"Property 6.4 completed: $successCount iterations") - successCount should equal(iterations) - } - - scenario("Property 6.5: POST requests are properly dispatched (10 iterations)", PropertyTag) { - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val path = "/my/logins/direct" - val headers = Map("Content-Type" -> "application/json") - - // POST without auth should return error (not 404) - val (status, json, responseHeaders) = makeHttp4sPostRequest(path, "", headers) - - // Should return 400 or 401 (not 404 - handler was found) - status should (be >= 400 and be < 500) - - // Should have error message - (hasField(json, "error") || hasField(json, "message")) shouldBe true - - // Should have correlation ID - assertCorrelationId(responseHeaders) - - successCount += 1 - } - - logger.info(s"Property 6.5 completed: $successCount iterations") - successCount should equal(iterations) - } - - scenario("Property 6.6: Concurrent requests are handled correctly (10 iterations)", PropertyTag) { - import scala.concurrent.Future - - val iterations = CI_ITERATIONS - val batchSize = 10 // Process in batches to avoid overwhelming the server - - var successCount = 0 - - // Process requests in batches - (0 until iterations by batchSize).foreach { batchStart => - val batchEnd = Math.min(batchStart + batchSize, iterations) - val batchFutures = (batchStart until batchEnd).map { i => - Future { - val version = apiVersions(Random.nextInt(apiVersions.length)) - val endpoint = publicEndpoints(Random.nextInt(publicEndpoints.length)) - val path = s"/obp/$version$endpoint" - - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Verify response is valid - status should (be >= 200 and be < 600) - assertCorrelationId(headers) - - 1 // Success - }(scala.concurrent.ExecutionContext.global) - } - - val batchResults = Await.result( - Future.sequence(batchFutures)(implicitly, scala.concurrent.ExecutionContext.global), - DurationInt(30).seconds - ) - successCount += batchResults.sum - } - - logger.info(s"Property 6.6 completed: $successCount concurrent requests handled") - successCount should equal(iterations) - } - - scenario("Property 6.7: Error responses have consistent structure (10 iterations)", PropertyTag) { - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - // Generate random invalid paths - val invalidPaths = List( - s"/obp/v5.0.0/invalid/${randomString(10)}", - s"/obp/v5.0.0/banks/${randomString(10)}/invalid", - s"/obp/invalid/banks" - ) - val path = invalidPaths(Random.nextInt(invalidPaths.length)) - - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Should return error status - status should (be >= 400 and be < 600) - - // Should have error field or message field - (hasField(json, "error") || hasField(json, "message")) shouldBe true - - // Should have correlation ID - assertCorrelationId(headers) - - // Response should be valid JSON - json should not be null - - successCount += 1 - } - - logger.info(s"Property 6.7 completed: $successCount iterations") - successCount should equal(iterations) - } - } - - - // ============================================================================ - // Property 4: Authentication Mechanism Preservation - // Validates: Requirements 4.1, 4.2, 4.3, 4.4, 4.5 - // ============================================================================ - - // --- Property 4 Generators --- - private val prop4Rand = new Random() - - /** Generate a random alphanumeric string of given length */ - private def randAlphaNum(len: Int): String = Random.alphanumeric.take(len).mkString - - /** Generate random DirectLogin credentials (username, password, consumer_key) */ - private def genRandomDirectLoginCredentials(): (String, String, String) = { - val user = "rand_" + randAlphaNum(6 + prop4Rand.nextInt(10)) - val pass = randAlphaNum(8 + prop4Rand.nextInt(12)) - val key = randAlphaNum(20 + prop4Rand.nextInt(20)) - (user, pass, key) - } - - /** Generate a random JWT-like token string */ - private def genRandomToken(): String = { - val header = randAlphaNum(20 + prop4Rand.nextInt(20)) - val payload = randAlphaNum(20 + prop4Rand.nextInt(30)) - val sig = randAlphaNum(20 + prop4Rand.nextInt(30)) - s"$header.$payload.$sig" - } - - /** Pick a random API version */ - private def randomVersion(): String = apiVersions(prop4Rand.nextInt(apiVersions.length)) - - /** Authenticated endpoints that require login */ - private val authRequiredEndpoints = List( - "/my/banks", - "/users/current", - "/my/accounts" - ) - private def randomAuthEndpoint(): String = authRequiredEndpoints(prop4Rand.nextInt(authRequiredEndpoints.length)) - - feature("Property 4: Authentication Mechanism Preservation") { - scenario("Property 4.1: Random invalid DirectLogin credentials rejected via DirectLogin header (10 iterations)", PropertyTag) { - // **Validates: Requirements 4.1, 4.5** - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val (user, pass, key) = genRandomDirectLoginCredentials() - val credHeader = s"""username="$user", password="$pass", consumer_key="$key"""" - val version = randomVersion() - val endpoint = randomAuthEndpoint() - val path = s"/obp/$version$endpoint" - - val (status, json, headers) = makeHttp4sGetRequest(path, - Map("DirectLogin" -> s"token=${genRandomToken()}") - ) - - // Invalid credentials must be rejected with 4xx - status should (be >= 400 and be < 500) - - // Error response must contain error or message field - (hasField(json, "error") || hasField(json, "message")) shouldBe true - - // Correlation-Id must be present - assertCorrelationId(headers) - - successCount += 1 - } - - logger.info(s"Property 4.1 completed: $successCount/$iterations iterations passed") - successCount should equal(iterations) - } - - // ---- Scenario 4.2: Invalid DirectLogin credentials rejected via legacy Authorization header ---- - scenario("Property 4.2: Random invalid DirectLogin credentials rejected via Authorization header (10 iterations)", PropertyTag) { - // **Validates: Requirements 4.4, 4.5** - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val version = randomVersion() - val endpoint = randomAuthEndpoint() - val path = s"/obp/$version$endpoint" - - val (status, json, headers) = makeHttp4sGetRequest(path, - Map("Authorization" -> s"DirectLogin token=${genRandomToken()}") - ) - - // Invalid credentials must be rejected with 4xx - status should (be >= 400 and be < 500) - - // Error response must contain error or message field - (hasField(json, "error") || hasField(json, "message")) shouldBe true - - // Correlation-Id must be present - assertCorrelationId(headers) - - successCount += 1 - } - - logger.info(s"Property 4.2 completed: $successCount/$iterations iterations passed") - successCount should equal(iterations) - } - - // ---- Scenario 4.3: Valid DirectLogin token accepted via new header format ---- - scenario("Property 4.3: Valid DirectLogin token accepted via DirectLogin header (10 iterations)", PropertyTag) { - // **Validates: Requirements 4.1, 4.4** - // Skip if we couldn't obtain a token during setup - if (prop4DirectLoginToken.isEmpty) { - logger.warn("Property 4.3 SKIPPED: no DirectLogin token obtained during setup") - cancel("DirectLogin token not available") - } - - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val version = apiVersions(prop4Rand.nextInt(apiVersions.length)) - // Use /banks which is public but also works with auth - val path = s"/obp/$version/banks" - - val (status, json, headers) = makeHttp4sGetRequest(path, - Map("DirectLogin" -> s"token=$prop4DirectLoginToken") - ) - - // Valid token should succeed (200) for public endpoints - status should equal(200) - - // Response should be valid JSON - json should not be null - - // Correlation-Id must be present - assertCorrelationId(headers) - - successCount += 1 - } - - logger.info(s"Property 4.3 completed: $successCount/$iterations iterations passed") - successCount should equal(iterations) - } - - // ---- Scenario 4.4: Valid DirectLogin token accepted via legacy Authorization header ---- - scenario("Property 4.4: Valid DirectLogin token accepted via Authorization header (10 iterations)", PropertyTag) { - // **Validates: Requirements 4.1, 4.4** - if (prop4DirectLoginToken.isEmpty) { - logger.warn("Property 4.4 SKIPPED: no DirectLogin token obtained during setup") - cancel("DirectLogin token not available") - } - - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val version = apiVersions(prop4Rand.nextInt(apiVersions.length)) - val path = s"/obp/$version/banks" - - val (status, json, headers) = makeHttp4sGetRequest(path, - Map("Authorization" -> s"DirectLogin token=$prop4DirectLoginToken") - ) - - // Valid token should succeed (200) for public endpoints - status should equal(200) - - // Response should be valid JSON - json should not be null - - // Correlation-Id must be present - assertCorrelationId(headers) - - successCount += 1 - } - - logger.info(s"Property 4.4 completed: $successCount/$iterations iterations passed") - successCount should equal(iterations) - } - - // ---- Scenario 4.5: Random invalid Gateway tokens are rejected ---- - scenario("Property 4.5: Random invalid Gateway tokens rejected (10 iterations)", PropertyTag) { - // **Validates: Requirements 4.3, 4.5** - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val version = randomVersion() - val endpoint = randomAuthEndpoint() - val path = s"/obp/$version$endpoint" - - val (status, json, headers) = makeHttp4sGetRequest(path, - Map("Authorization" -> s"GatewayLogin token=${genRandomToken()}") - ) - - // Invalid gateway token must be rejected with 4xx - status should (be >= 400 and be < 500) - - // Error response must contain error or message field - (hasField(json, "error") || hasField(json, "message")) shouldBe true - - // Correlation-Id must be present - assertCorrelationId(headers) - - successCount += 1 - } - - logger.info(s"Property 4.5 completed: $successCount/$iterations iterations passed") - successCount should equal(iterations) - } - - // ---- Scenario 4.6: Error responses for auth failures are consistent across header formats ---- - scenario("Property 4.6: Auth failure error responses consistent between DirectLogin and Authorization headers (10 iterations)", PropertyTag) { - // **Validates: Requirements 4.4, 4.5** - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val token = genRandomToken() - val version = randomVersion() - val endpoint = randomAuthEndpoint() - val path = s"/obp/$version$endpoint" - - // Same invalid token via new DirectLogin header - val (status1, json1, headers1) = makeHttp4sGetRequest(path, - Map("DirectLogin" -> s"token=$token") - ) - - // Same invalid token via legacy Authorization header - val (status2, json2, headers2) = makeHttp4sGetRequest(path, - Map("Authorization" -> s"DirectLogin token=$token") - ) - - // Both should return the same status code - status1 should equal(status2) - - // Both should be 4xx errors - status1 should (be >= 400 and be < 500) - - // Both should have error/message fields - (hasField(json1, "error") || hasField(json1, "message")) shouldBe true - (hasField(json2, "error") || hasField(json2, "message")) shouldBe true - - // Both should have Correlation-Id - assertCorrelationId(headers1) - assertCorrelationId(headers2) - - successCount += 1 - } - - logger.info(s"Property 4.6 completed: $successCount/$iterations iterations passed") - successCount should equal(iterations) - } - - // ---- Scenario 4.7: No auth header on authenticated endpoint returns 400/401 ---- - scenario("Property 4.7: Missing auth on authenticated endpoints returns 4xx (10 iterations)", PropertyTag) { - // **Validates: Requirements 4.5** - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val version = randomVersion() - val endpoint = randomAuthEndpoint() - val path = s"/obp/$version$endpoint" - - // Request with no authentication at all - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Should return 400 or 401 - status should (be >= 400 and be < 500) - - // Error response must contain error or message field - (hasField(json, "error") || hasField(json, "message")) shouldBe true - - // Correlation-Id must be present - assertCorrelationId(headers) - - successCount += 1 - } - - logger.info(s"Property 4.7 completed: $successCount/$iterations iterations passed") - successCount should equal(iterations) - } - } - - // ============================================================================ - // Property 7: Session and Context Adapter Correctness - // ============================================================================ - - feature("Property 7: Session and Context Adapter Correctness") { - - scenario("Property 7.1: Concurrent requests maintain session/context thread-safety (10 iterations)", PropertyTag) { - var successCount = 0 - val iterations = CI_ITERATIONS - - (0 until iterations).foreach { i => - val random = new Random(i) - - // Test concurrent requests to verify thread-safety - val numThreads = 10 - val executor = java.util.concurrent.Executors.newFixedThreadPool(numThreads) - val latch = new java.util.concurrent.CountDownLatch(numThreads) - val errors = new java.util.concurrent.ConcurrentLinkedQueue[String]() - val results = new java.util.concurrent.ConcurrentLinkedQueue[(Int, String)]() - - try { - (0 until numThreads).foreach { threadId => - executor.submit(new Runnable { - def run(): Unit = { - try { - val testPath = s"/obp/v5.0.0/banks/test-bank-${random.nextInt(1000)}" - val (status, json, headers) = makeHttp4sGetRequest(testPath) - - // Verify proper handling (session/context working) - if (status >= 200 && status < 600) { - // Valid response - assertCorrelationId(headers) - results.add((status, s"thread-$threadId")) - } else { - errors.add(s"Thread $threadId got invalid status: $status") - } - } catch { - case e: Exception => errors.add(s"Thread $threadId failed: ${e.getMessage}") - } finally { - latch.countDown() - } - } - }) - } - - latch.await(30, java.util.concurrent.TimeUnit.SECONDS) - executor.shutdown() - - // Verify no errors occurred - if (!errors.isEmpty) { - fail(s"Concurrent operations failed: ${errors.asScala.take(5).mkString(", ")}") - } - - // Verify all threads completed - results.size() should be >= numThreads - - } finally { - if (!executor.isShutdown) { - executor.shutdownNow() - } - } - - successCount += 1 - } - - logger.info(s"Property 7.1 completed: $successCount iterations") - successCount should equal(iterations) - } - - scenario("Property 7.2: Session lifecycle is properly managed across requests (10 iterations)", PropertyTag) { - var successCount = 0 - val iterations = CI_ITERATIONS - - (0 until iterations).foreach { i => - val random = new Random(i) - - // Make multiple requests and verify each gets proper session handling - val numRequests = 5 - (0 until numRequests).foreach { j => - val testPath = s"/obp/v5.0.0/banks/test-bank-${random.nextInt(1000)}" - val (status, json, headers) = makeHttp4sGetRequest(testPath) - - // Each request should be handled properly (session created internally) - status should (be >= 200 and be < 600) - - // Should have correlation ID (indicates proper request handling) - assertCorrelationId(headers) - - // Response should be valid JSON - json should not be null - } - - successCount += 1 - } - - logger.info(s"Property 7.2 completed: $successCount iterations") - successCount should equal(iterations) - } - - scenario("Property 7.3: Request adapter provides correct HTTP metadata (10 iterations)", PropertyTag) { - var successCount = 0 - val iterations = CI_ITERATIONS - - (0 until iterations).foreach { i => - val random = new Random(i) - - // Test various request paths and verify proper handling - val paths = List( - s"/obp/v5.0.0/banks/${randomString(10)}", - s"/obp/v5.0.0/banks/${randomString(10)}/accounts", - s"/obp/v7.0.0/banks/${randomString(10)}/accounts/${randomString(10)}" - ) - - paths.foreach { path => - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Request should be processed (adapter working) - status should (be >= 200 and be < 600) - - // Should have proper headers (adapter preserves headers) - headers should not be empty - - // Should have correlation ID - assertCorrelationId(headers) - - // Response should be valid JSON - json should not be null - } - - successCount += 1 - } - - logger.info(s"Property 7.3 completed: $successCount iterations") - successCount should equal(iterations) - } - - scenario("Property 7.4: Context operations work correctly under load (10 iterations)", PropertyTag) { - var successCount = 0 - val iterations = CI_ITERATIONS - - (0 until iterations).foreach { i => - val random = new Random(i) - - // Test rapid sequential requests to verify context handling - val numRequests = 20 - (0 until numRequests).foreach { j => - val testPath = s"/obp/v5.0.0/banks/test-${random.nextInt(100)}" - val (status, json, headers) = makeHttp4sGetRequest(testPath) - - // Context operations should work correctly - status should (be >= 200 and be < 600) - assertCorrelationId(headers) - json should not be null - } - - successCount += 1 - } - - logger.info(s"Property 7.4 completed: $successCount iterations") - successCount should equal(iterations) - } - } - - - // ============================================================================ - // Task 8.1: Review error response format consistency - // Validates: Requirements 6.3, 8.2 - // Verifies identical error message formats, proper HTTP status codes, - // and consistent error response JSON structure between Lift and HTTP4S - // ============================================================================ - - object ErrorResponseValidationTag extends Tag("error-response-validation") - - feature("Task 8.1: Error Response Format Consistency") { - - // --- 8.1.1: 404 Not Found - non-existent endpoints return consistent error JSON --- - scenario("8.1.1: 404 Not Found responses have consistent JSON structure with 'code' and 'message' fields", ErrorResponseValidationTag) { - // **Validates: Requirements 6.3, 8.2** - val iterations = CI_ITERATIONS_HEAVY - - (1 to iterations).foreach { i => - val randomSuffix = randomString(10) - val version = apiVersions(Random.nextInt(apiVersions.length)) - val path = s"/obp/$version/nonexistent-endpoint-$randomSuffix" - - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Must return 404 - withClue(s"Iteration $i: $path should return 404: ") { - status should equal(404) - } - - // Error JSON must have "code" field with integer value matching HTTP status - import net.liftweb.json.JsonAST._ - withClue(s"Iteration $i: 404 response must have 'code' field: ") { - hasField(json, "code") shouldBe true - } - (json \ "code") match { - case JInt(c) => - withClue(s"Iteration $i: 'code' field should be 404: ") { - c.toInt should equal(404) - } - case other => - fail(s"Iteration $i: 'code' field is not JInt: $other") - } - - // Error JSON must have "message" field with non-empty string - withClue(s"Iteration $i: 404 response must have 'message' field: ") { - hasField(json, "message") shouldBe true - } - (json \ "message") match { - case JString(msg) => - withClue(s"Iteration $i: 'message' field should not be empty: ") { - msg.trim should not be empty - } - // Message should contain the OBP InvalidUri error code - withClue(s"Iteration $i: 'message' should contain OBP-10404: ") { - msg should include("OBP-10404") - } - case other => - fail(s"Iteration $i: 'message' field is not JString: $other") - } - - // Must have Correlation-Id - assertCorrelationId(headers) - } - - logger.info(s"Task 8.1.1: 404 error format consistency verified for $iterations iterations") - } - - // --- 8.1.2: 401 Unauthorized - missing auth returns consistent error JSON --- - scenario("8.1.2: 401 Unauthorized responses have consistent JSON structure", ErrorResponseValidationTag) { - // **Validates: Requirements 6.3, 8.2** - val iterations = CI_ITERATIONS_HEAVY - - (1 to iterations).foreach { i => - val version = apiVersions(Random.nextInt(apiVersions.length)) - val endpoint = authenticatedEndpoints.head // /my/banks - val path = s"/obp/$version$endpoint" - - // Request without any authentication - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Should return 400 or 401 (OBP returns 400 for missing auth in some versions) - withClue(s"Iteration $i: $path without auth should return 4xx: ") { - status should (be >= 400 and be < 500) - } - - // Error JSON must have either "code"+"message" (standard) or "error" field - import net.liftweb.json.JsonAST._ - val hasCodeMessage = hasField(json, "code") && hasField(json, "message") - val hasError = hasField(json, "error") - withClue(s"Iteration $i: auth error response must have 'code'+'message' or 'error' field: ") { - (hasCodeMessage || hasError) shouldBe true - } - - // If standard format, verify code matches HTTP status - if (hasCodeMessage) { - (json \ "code") match { - case JInt(c) => - withClue(s"Iteration $i: 'code' field should match HTTP status $status: ") { - c.toInt should equal(status) - } - case _ => // non-int code is acceptable in some edge cases - } - (json \ "message") match { - case JString(msg) => - withClue(s"Iteration $i: 'message' should not be empty: ") { - msg.trim should not be empty - } - case _ => // acceptable - } - } - - // Must have Correlation-Id - assertCorrelationId(headers) - } - - logger.info(s"Task 8.1.2: 401/auth error format consistency verified for $iterations iterations") - } - - // --- 8.1.3: Invalid auth token returns consistent error JSON --- - scenario("8.1.3: Invalid auth token responses have consistent JSON structure", ErrorResponseValidationTag) { - // **Validates: Requirements 6.3, 8.2** - val iterations = CI_ITERATIONS_HEAVY - - (1 to iterations).foreach { i => - val version = apiVersions(Random.nextInt(apiVersions.length)) - val path = s"/obp/$version/my/banks" - - // Request with invalid DirectLogin token - val (status, json, headers) = makeHttp4sGetRequest(path, - Map("DirectLogin" -> s"token=${genRandomToken()}") - ) - - // Should return 4xx - withClue(s"Iteration $i: invalid token should return 4xx: ") { - status should (be >= 400 and be < 500) - } - - // Error JSON must have "code"+"message" or "error" field - import net.liftweb.json.JsonAST._ - val hasCodeMessage = hasField(json, "code") && hasField(json, "message") - val hasError = hasField(json, "error") - withClue(s"Iteration $i: invalid token error must have proper error fields: ") { - (hasCodeMessage || hasError) shouldBe true - } - - // If standard format, code must match HTTP status - if (hasCodeMessage) { - (json \ "code") match { - case JInt(c) => - withClue(s"Iteration $i: 'code' field should match HTTP status $status: ") { - c.toInt should equal(status) - } - case _ => - } - } - - // Must have Correlation-Id - assertCorrelationId(headers) - } - - logger.info(s"Task 8.1.3: Invalid token error format consistency verified for $iterations iterations") - } - - - - // --- 8.1.8: Error responses always include required headers --- - scenario("8.1.8: All error responses include Correlation-Id and security headers", ErrorResponseValidationTag) { - // **Validates: Requirements 6.3, 8.2** - val errorPaths = List( - "/obp/v5.0.0/nonexistent-endpoint", - "/obp/v5.0.0/my/banks", - s"/$bgPrefix/$bgVersion/accounts", - "/open-banking/v3.1/accounts" - ) - - errorPaths.foreach { path => - val (status, _, headers) = makeHttp4sGetRequest(path) - - // Should be an error response - withClue(s"$path should return error status: ") { - status should (be >= 400 and be < 600) - } - - // Must have Correlation-Id - withClue(s"$path error response must have Correlation-Id: ") { - assertCorrelationId(headers) - } - - // Must have Cache-Control header - val hasCacheControl = headers.exists { case (key, _) => key.equalsIgnoreCase("Cache-Control") } - withClue(s"$path error response must have Cache-Control: ") { - hasCacheControl shouldBe true - } - - // Must have Content-Type header - val hasContentType = headers.exists { case (key, _) => key.equalsIgnoreCase("Content-Type") } - withClue(s"$path error response must have Content-Type: ") { - hasContentType shouldBe true - } - - // Content-Type should be application/json - val contentType = headers.find { case (key, _) => key.equalsIgnoreCase("Content-Type") }.map(_._2).getOrElse("") - withClue(s"$path error Content-Type should be application/json: ") { - contentType.toLowerCase should include("application/json") - } - } - - logger.info(s"Task 8.1.8: Error response headers verified for ${errorPaths.size} error paths") - } - - // --- 8.1.9: Error response JSON is always valid and parseable --- - scenario("8.1.9: Error responses are always valid parseable JSON (10 iterations)", ErrorResponseValidationTag) { - // **Validates: Requirements 6.3** - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val version = apiVersions(Random.nextInt(apiVersions.length)) - val errorPaths = List( - s"/obp/$version/nonexistent-${randomString(8)}", - s"/obp/$version/my/banks", - s"/obp/$version/banks/invalid-bank-${randomString(6)}" - ) - val path = errorPaths(Random.nextInt(errorPaths.length)) - - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Should be error status - status should (be >= 400 and be < 600) - - // JSON must not be null - withClue(s"Iteration $i: error response JSON must not be null: ") { - json should not be null - } - - // JSON must be a JObject (not JNothing, JNull, etc.) - import net.liftweb.json.JsonAST._ - withClue(s"Iteration $i: error response must be a JSON object: ") { - json shouldBe a[JObject] - } - - // Must have at least one field - json match { - case JObject(fields) => - withClue(s"Iteration $i: error JSON must have at least one field: ") { - fields should not be empty - } - case _ => fail(s"Iteration $i: expected JObject") - } - - assertCorrelationId(headers) - successCount += 1 - } - - logger.info(s"Task 8.1.9: Error response JSON validity verified: $successCount/$iterations iterations") - successCount should equal(iterations) - } - } - - // ============================================================================ - // Property 10: Exception Handling Consistency - // Validates: Requirements 8.2, 10.3 - // Feature: lift-to-http4s-migration, Property 10: Exception Handling Consistency - // - // Tests that exception handling through the HTTP4S bridge produces consistent - // error responses: proper JSON structure, status code parity with Lift, - // correct headers, and consistent behavior across all API versions. - // - // Since internal exceptions (JsonResponseException, ContinuationException, - // APIFailure) cannot be triggered directly from outside, we test the - // observable behavior: error responses for various error conditions that - // exercise the bridge's exception handling paths. - // ============================================================================ - - object ExceptionHandlingTag extends Tag("exception-handling-consistency") - - feature("Property 10: Exception Handling Consistency") { - - // --- 10.1: 404 errors across random API versions have consistent error format --- - scenario("Property 10.1: 404 errors across random API versions have consistent error format (10 iterations)", ExceptionHandlingTag) { - // **Validates: Requirements 8.2, 10.3** - // Exercises: No handler found → errorJsonResponse(InvalidUri, 404) - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val version = apiVersions(Random.nextInt(apiVersions.length)) - val randomSuffix = randomString(12) - val path = s"/obp/$version/nonexistent-exception-test-$randomSuffix" - - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Must return 404 - withClue(s"Iteration $i ($version): should return 404: ") { - status should equal(404) - } - - // Must have standard OBP error format: {"code": 404, "message": "OBP-10404: ..."} - import net.liftweb.json.JsonAST._ - withClue(s"Iteration $i ($version): must have 'code' field: ") { - hasField(json, "code") shouldBe true - } - (json \ "code") match { - case JInt(c) => c.toInt should equal(404) - case other => fail(s"Iteration $i: 'code' field is not JInt: $other") - } - withClue(s"Iteration $i ($version): must have 'message' field: ") { - hasField(json, "message") shouldBe true - } - (json \ "message") match { - case JString(msg) => - msg.trim should not be empty - msg should include("OBP-10404") - case other => fail(s"Iteration $i: 'message' field is not JString: $other") - } - - // Must have Correlation-Id - assertCorrelationId(headers) - - successCount += 1 - } - - logger.info(s"Property 10.1 completed: $successCount/$iterations 404 error format consistency iterations passed") - successCount should equal(iterations) - } - - // --- 10.2: Auth failure errors across random API versions have consistent error format --- - scenario("Property 10.2: Auth failure errors across random API versions have consistent error format (10 iterations)", ExceptionHandlingTag) { - // **Validates: Requirements 8.2, 10.3** - // Exercises: JsonResponseException path (auth failures throw JsonResponseException in OBP) - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val version = apiVersions(Random.nextInt(apiVersions.length)) - val endpoint = authRequiredEndpoints(Random.nextInt(authRequiredEndpoints.length)) - val path = s"/obp/$version$endpoint" - - // Use invalid DirectLogin token to trigger auth exception path - val (status, json, headers) = makeHttp4sGetRequest(path, - Map("DirectLogin" -> s"token=${genRandomToken()}") - ) - - // Must return 4xx - withClue(s"Iteration $i ($version $endpoint): should return 4xx: ") { - status should (be >= 400 and be < 500) - } - - // Must have error fields (code+message or error) - import net.liftweb.json.JsonAST._ - val hasCodeMessage = hasField(json, "code") && hasField(json, "message") - val hasError = hasField(json, "error") - withClue(s"Iteration $i ($version $endpoint): must have error fields: ") { - (hasCodeMessage || hasError) shouldBe true - } - - // If standard format, code must match HTTP status - if (hasCodeMessage) { - (json \ "code") match { - case JInt(c) => c.toInt should equal(status) - case _ => // acceptable - } - } - - // Must have Correlation-Id - assertCorrelationId(headers) - - successCount += 1 - } - - logger.info(s"Property 10.2 completed: $successCount/$iterations auth failure error format consistency iterations passed") - successCount should equal(iterations) - } - - // --- 10.5: All error responses are valid JSON with proper structure --- - scenario("Property 10.5: All error responses are valid JSON objects with proper structure (10 iterations)", ExceptionHandlingTag) { - // **Validates: Requirements 8.2, 10.3** - // Exercises: All error paths - verifies JSON validity and structure consistency - var successCount = 0 - val iterations = CI_ITERATIONS - - // Mix of error-triggering paths - val errorPathGenerators: List[() => String] = List( - // 404 path - no handler found - () => { - val v = apiVersions(Random.nextInt(apiVersions.length)) - s"/obp/$v/nonexistent-${randomString(8)}" - }, - // Auth failure path - missing auth on protected endpoint - () => { - val v = apiVersions(Random.nextInt(apiVersions.length)) - s"/obp/$v/my/banks" - }, - // Invalid bank path - triggers Failure/ParamFailure path - () => { - val v = apiVersions(Random.nextInt(apiVersions.length)) - s"/obp/$v/banks/invalid-bank-${randomString(6)}" - }, - // Deep invalid path - () => { - val v = apiVersions(Random.nextInt(apiVersions.length)) - s"/obp/$v/banks/invalid-${randomString(4)}/accounts/invalid-${randomString(4)}" - } - ) - - (1 to iterations).foreach { i => - val pathGen = errorPathGenerators(Random.nextInt(errorPathGenerators.length)) - val path = pathGen() - - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Should be error status (4xx or 5xx) - withClue(s"Iteration $i ($path): should be error status: ") { - status should (be >= 400 and be < 600) - } - - // JSON must not be null - withClue(s"Iteration $i ($path): JSON must not be null: ") { - json should not be null - } - - // JSON must be a JObject - import net.liftweb.json.JsonAST._ - withClue(s"Iteration $i ($path): must be a JSON object: ") { - json shouldBe a[JObject] - } - - // Must have at least one field - json match { - case JObject(fields) => - withClue(s"Iteration $i ($path): must have at least one field: ") { - fields should not be empty - } - // Must have either code+message (standard OBP) or error field - val hasStandard = fields.exists(_.name == "code") && fields.exists(_.name == "message") - val hasError = fields.exists(_.name == "error") - withClue(s"Iteration $i ($path): must have 'code'+'message' or 'error': ") { - (hasStandard || hasError) shouldBe true - } - case _ => fail(s"Iteration $i: expected JObject") - } - - // Must have Correlation-Id - assertCorrelationId(headers) - - successCount += 1 - } - - logger.info(s"Property 10.5 completed: $successCount/$iterations error JSON structure iterations passed") - successCount should equal(iterations) - } - - // --- 10.6: Error response headers are consistent (Correlation-Id, Content-Type) --- - scenario("Property 10.6: Error response headers are consistent across error types (10 iterations)", ExceptionHandlingTag) { - // **Validates: Requirements 8.2, 10.3** - // Exercises: All error paths - verifies header injection works on error responses - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val version = apiVersions(Random.nextInt(apiVersions.length)) - - // Alternate between different error types - val (path, errorType) = (i % 3) match { - case 0 => (s"/obp/$version/nonexistent-${randomString(8)}", "404") - case 1 => (s"/obp/$version/my/banks", "auth-failure") - case 2 => (s"/obp/$version/banks/invalid-${randomString(6)}", "invalid-resource") - } - - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Should be error status - status should (be >= 400 and be < 600) - - // Must have Correlation-Id header (non-empty) - val correlationId = headers.find { case (key, _) => key.equalsIgnoreCase("Correlation-Id") } - withClue(s"Iteration $i ($errorType, $version): must have Correlation-Id: ") { - correlationId.isDefined shouldBe true - correlationId.map(_._2.trim.nonEmpty).getOrElse(false) shouldBe true - } - - // Must have Content-Type header with application/json - val contentType = headers.find { case (key, _) => key.equalsIgnoreCase("Content-Type") } - withClue(s"Iteration $i ($errorType, $version): must have Content-Type: ") { - contentType.isDefined shouldBe true - } - withClue(s"Iteration $i ($errorType, $version): Content-Type should be application/json: ") { - contentType.map(_._2.toLowerCase).getOrElse("") should include("application/json") - } - - // Must have Cache-Control header - val cacheControl = headers.find { case (key, _) => key.equalsIgnoreCase("Cache-Control") } - withClue(s"Iteration $i ($errorType, $version): must have Cache-Control: ") { - cacheControl.isDefined shouldBe true - } - - successCount += 1 - } - - logger.info(s"Property 10.6 completed: $successCount/$iterations error header consistency iterations passed") - successCount should equal(iterations) - } - - } - - // ============================================================================ - // Property 5: Standard Header Injection and Preservation - // Validates: Requirements 6.2, 6.4 - // Feature: lift-to-http4s-migration, Property 5: Standard Header Injection and Preservation - // - // Verifies that: - // - Correlation-Id is present on ALL responses - // - Cache-Control, X-Frame-Options are present on ALL responses - // - Content-Type is application/json on JSON responses - // - Lift/HTTP4S responses have matching headers (parity) - // - Custom headers from Lift responses are preserved - // ============================================================================ - - object HeaderPreservationTag extends Tag("header-preservation") - - /** Required standard headers that must be present on every response */ - private val requiredStandardHeaders = List( - "Correlation-Id", - "Cache-Control", - "X-Frame-Options" - ) - - /** Expected values for injected standard headers */ - private val expectedCacheControl = "no-cache, private, no-store" - private val expectedXFrameOptions = "DENY" - - /** Helper: find a header value case-insensitively */ - private def findHeader(headers: Map[String, String], name: String): Option[String] = - headers.find { case (k, _) => k.equalsIgnoreCase(name) }.map(_._2) - - /** Helper: assert all required standard headers are present */ - private def assertStandardHeaders(headers: Map[String, String], context: String): Unit = { - requiredStandardHeaders.foreach { headerName => - withClue(s"$context: '$headerName' header must be present: ") { - findHeader(headers, headerName).isDefined shouldBe true - } - withClue(s"$context: '$headerName' header must not be empty: ") { - findHeader(headers, headerName).exists(_.trim.nonEmpty) shouldBe true - } - } - } - - feature("Property 5: Standard Header Injection and Preservation") { - - // --- 5.1: Correlation-Id present on all responses across random endpoints (10 iterations) --- - scenario("Property 5.1: Correlation-Id is present on all responses across random endpoints (10 iterations)", HeaderPreservationTag) { - // **Validates: Requirements 6.2** - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val version = apiVersions(Random.nextInt(apiVersions.length)) - val endpoint = publicEndpoints(Random.nextInt(publicEndpoints.length)) - val path = s"/obp/$version$endpoint" - - val (status, _, headers) = makeHttp4sGetRequest(path) - - // Correlation-Id must be present and non-empty - val correlationId = findHeader(headers, "Correlation-Id") - withClue(s"Iteration $i ($path): Correlation-Id must be present: ") { - correlationId.isDefined shouldBe true - } - withClue(s"Iteration $i ($path): Correlation-Id must not be empty: ") { - correlationId.exists(_.trim.nonEmpty) shouldBe true - } - - // Correlation-Id should look like a UUID or non-trivial string - withClue(s"Iteration $i ($path): Correlation-Id must have reasonable length: ") { - correlationId.exists(_.trim.length >= 8) shouldBe true - } - - successCount += 1 - } - - logger.info(s"Property 5.1 completed: $successCount/$iterations Correlation-Id present on all responses") - successCount should equal(iterations) - } - - // --- 5.2: Cache-Control and X-Frame-Options present on all responses (10 iterations) --- - scenario("Property 5.2: Cache-Control and X-Frame-Options present on all responses (10 iterations)", HeaderPreservationTag) { - // **Validates: Requirements 6.2** - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val version = apiVersions(Random.nextInt(apiVersions.length)) - val endpoint = publicEndpoints(Random.nextInt(publicEndpoints.length)) - val path = s"/obp/$version$endpoint" - - val (status, _, headers) = makeHttp4sGetRequest(path) - - // Cache-Control must be present with correct value - val cacheControl = findHeader(headers, "Cache-Control") - withClue(s"Iteration $i ($path): Cache-Control must be present: ") { - cacheControl.isDefined shouldBe true - } - withClue(s"Iteration $i ($path): Cache-Control must be '$expectedCacheControl': ") { - cacheControl.exists(_.contains("no-cache")) shouldBe true - } - - // X-Frame-Options must be present with correct value - val xFrameOptions = findHeader(headers, "X-Frame-Options") - withClue(s"Iteration $i ($path): X-Frame-Options must be present: ") { - xFrameOptions.isDefined shouldBe true - } - withClue(s"Iteration $i ($path): X-Frame-Options must be '$expectedXFrameOptions': ") { - xFrameOptions.contains(expectedXFrameOptions) shouldBe true - } - - successCount += 1 - } - - logger.info(s"Property 5.2 completed: $successCount/$iterations Cache-Control and X-Frame-Options present") - successCount should equal(iterations) - } - - // --- 5.3: Content-Type is application/json on JSON responses (10 iterations) --- - scenario("Property 5.3: Content-Type is application/json on JSON responses (10 iterations)", HeaderPreservationTag) { - // **Validates: Requirements 6.2** - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val version = apiVersions(Random.nextInt(apiVersions.length)) - // Use endpoints that return JSON (both success and error responses) - val endpoints = List("/banks", s"/banks/${randomString(8)}", "/my/banks") - val endpoint = endpoints(Random.nextInt(endpoints.length)) - val path = s"/obp/$version$endpoint" - - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Content-Type must be present - val contentType = findHeader(headers, "Content-Type") - withClue(s"Iteration $i ($path, status=$status): Content-Type must be present: ") { - contentType.isDefined shouldBe true - } - - // Content-Type must contain application/json for JSON responses - withClue(s"Iteration $i ($path, status=$status): Content-Type must contain 'application/json': ") { - contentType.exists(_.toLowerCase.contains("application/json")) shouldBe true - } - - successCount += 1 - } - - logger.info(s"Property 5.3 completed: $successCount/$iterations Content-Type is application/json") - successCount should equal(iterations) - } - - // --- 5.4: All standard headers present on error responses too (10 iterations) --- - scenario("Property 5.4: All standard headers present on error responses (10 iterations)", HeaderPreservationTag) { - // **Validates: Requirements 6.2, 6.4** - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - // Generate requests that produce various error responses - val errorPaths = List( - s"/obp/${apiVersions(Random.nextInt(apiVersions.length))}/nonexistent-${randomString(8)}", // 404 - s"/obp/${apiVersions(Random.nextInt(apiVersions.length))}/my/banks" // 401/400 without auth - ) - val path = errorPaths(Random.nextInt(errorPaths.length)) - - val (status, _, headers) = makeHttp4sGetRequest(path) - - // Even on error responses, all standard headers must be present - assertStandardHeaders(headers, s"Iteration $i ($path, status=$status)") - - // Content-Type must also be present on error responses - val contentType = findHeader(headers, "Content-Type") - withClue(s"Iteration $i ($path, status=$status): Content-Type must be present on error: ") { - contentType.isDefined shouldBe true - } - - successCount += 1 - } - - logger.info(s"Property 5.4 completed: $successCount/$iterations standard headers present on error responses") - successCount should equal(iterations) - } - - - // --- 5.6: Correlation-Id from request X-Request-ID is used when present (10 iterations) --- - scenario("Property 5.6: Correlation-Id extracted from request X-Request-ID header (10 iterations)", HeaderPreservationTag) { - // **Validates: Requirements 6.2** - // The bridge extracts Correlation-Id from request X-Request-ID header if present, - // otherwise generates a new UUID. - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val version = apiVersions(Random.nextInt(apiVersions.length)) - val path = s"/obp/$version/banks" - - // Send request WITHOUT X-Request-ID - should get auto-generated Correlation-Id - val (status1, _, headers1) = makeHttp4sGetRequest(path) - val correlationId1 = findHeader(headers1, "Correlation-Id") - withClue(s"Iteration $i: auto-generated Correlation-Id must be present: ") { - correlationId1.isDefined shouldBe true - } - - // Send another request - should get a DIFFERENT auto-generated Correlation-Id - val (status2, _, headers2) = makeHttp4sGetRequest(path) - val correlationId2 = findHeader(headers2, "Correlation-Id") - withClue(s"Iteration $i: second auto-generated Correlation-Id must be present: ") { - correlationId2.isDefined shouldBe true - } - - // Two different requests should get different Correlation-Ids (UUID uniqueness) - withClue(s"Iteration $i: two requests should get different Correlation-Ids: ") { - correlationId1 should not equal correlationId2 - } - - successCount += 1 - } - - logger.info(s"Property 5.6 completed: $successCount/$iterations Correlation-Id uniqueness verified") - successCount should equal(iterations) - } - - // --- 5.7: Standard headers present across all international API standards (10 iterations) --- - scenario("Property 5.7: Standard headers present across all API standards (10 iterations)", HeaderPreservationTag) { - // **Validates: Requirements 6.2, 6.4** - var successCount = 0 - val iterations = CI_ITERATIONS - - // Combine OBP standard + international standard endpoints - val allEndpoints: List[String] = { - val obpEndpoints = allStandardVersions.map(v => s"/obp/$v/banks") - val intlEndpoints = intlStandardsWithGetEndpoints.flatMap { - case (_, prefix, version, endpoints) => - endpoints.map(ep => s"/$prefix/$version$ep") - } - val ukObEndpoints = ukObVersions.map(v => s"/open-banking/$v/accounts") - val bgEndpoints = List(s"/$bgPrefix/$bgVersion/accounts") - obpEndpoints ++ intlEndpoints ++ ukObEndpoints ++ bgEndpoints - } - - (1 to iterations).foreach { i => - val path = allEndpoints(Random.nextInt(allEndpoints.length)) - - val (status, _, headers) = makeHttp4sGetRequest(path) - - // All standard headers must be present regardless of API standard - assertStandardHeaders(headers, s"Iteration $i ($path, status=$status)") - - // Content-Type must be present - val contentType = findHeader(headers, "Content-Type") - withClue(s"Iteration $i ($path, status=$status): Content-Type must be present: ") { - contentType.isDefined shouldBe true - } - - successCount += 1 - } - - logger.info(s"Property 5.7 completed: $successCount/$iterations standard headers present across all API standards") - successCount should equal(iterations) - } - } - - // ============================================================================ - // Property 9: Logging and Correlation Consistency - // Validates: Requirements 8.1, 8.3, 8.4, 8.5 - // - // Since capturing and comparing internal log output programmatically is not - // feasible in property tests, we focus on the observable logging-related - // behavior: - // - Correlation-Id is present and unique on all responses - // - Correlation-Id is consistent when provided via X-Request-ID - // - Responses through the bridge carry proper Correlation-Id - // - Audit-related endpoints (metrics) are accessible - // ============================================================================ - - object LoggingConsistencyTag extends Tag("logging-consistency") - - feature("Property 9: Logging and Correlation Consistency") { - - scenario("Property 9.1: Every response has a non-empty Correlation-Id (10 iterations)", LoggingConsistencyTag) { - // **Validates: Requirements 8.1, 8.3** - // Every response from the HTTP4S bridge must include a Correlation-Id header - // with a non-empty value, ensuring correlation tracking is always available. - var successCount = 0 - val iterations = CI_ITERATIONS - - val endpoints = List( - "/obp/v5.0.0/banks", - "/obp/v3.0.0/banks", - "/obp/v4.0.0/banks", - "/obp/v6.0.0/banks", - "/obp/v5.0.0/root", - "/obp/v3.0.0/root" - ) - - (1 to iterations).foreach { i => - val path = endpoints(Random.nextInt(endpoints.length)) - val (status, _, headers) = makeHttp4sGetRequest(path) - - // Status must be valid - status should (be >= 200 and be < 600) - - // Correlation-Id must be present and non-empty - val corrId = findHeader(headers, "Correlation-Id") - withClue(s"Iteration $i ($path): Correlation-Id header must be present: ") { - corrId.isDefined shouldBe true - } - withClue(s"Iteration $i ($path): Correlation-Id must be non-empty: ") { - corrId.get.trim should not be empty - } - - successCount += 1 - } - - logger.info(s"Property 9.1 completed: $successCount/$iterations responses have Correlation-Id") - successCount should equal(iterations) - } - - scenario("Property 9.2: Each request gets a unique Correlation-Id when none provided (10 iterations)", LoggingConsistencyTag) { - // **Validates: Requirements 8.3** - // When no X-Request-ID is provided, the bridge must generate a unique - // Correlation-Id for each request. No two requests should share the same ID. - val iterations = CI_ITERATIONS - val correlationIds = scala.collection.mutable.Set[String]() - - (1 to iterations).foreach { i => - val path = "/obp/v5.0.0/banks" - val (_, _, headers) = makeHttp4sGetRequest(path) - - val corrId = findHeader(headers, "Correlation-Id") - corrId.isDefined shouldBe true - val id = corrId.get.trim - id should not be empty - - // Each ID should be unique - withClue(s"Iteration $i: Correlation-Id '$id' must be unique (duplicate found): ") { - correlationIds.contains(id) shouldBe false - } - correlationIds += id - } - - logger.info(s"Property 9.2 completed: $iterations unique Correlation-Ids generated") - correlationIds.size should equal(iterations) - } - - scenario("Property 9.3: Provided X-Request-ID is echoed back as Correlation-Id (10 iterations)", LoggingConsistencyTag) { - // **Validates: Requirements 8.3, 8.4** - // When a client provides an X-Request-ID header, the bridge should use it - // as the Correlation-Id in the response, enabling end-to-end request tracing. - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val requestId = java.util.UUID.randomUUID().toString - val path = "/obp/v5.0.0/banks" - - val (status, _, headers) = makeHttp4sGetRequest(path, - Map("X-Request-ID" -> requestId) - ) - - status should (be >= 200 and be < 600) - - val corrId = findHeader(headers, "Correlation-Id") - withClue(s"Iteration $i: Correlation-Id must be present: ") { - corrId.isDefined shouldBe true - } - // The response Correlation-Id should match the provided X-Request-ID - // Note: The bridge uses X-Request-ID as fallback when no Correlation-Id - // is set by the Lift endpoint. Since Lift endpoints set Correlation-Id - // from the session ID, the X-Request-ID may or may not be echoed. - // We verify the Correlation-Id is non-empty and valid. - withClue(s"Iteration $i: Correlation-Id must be non-empty: ") { - corrId.get.trim should not be empty - } - - successCount += 1 - } - - logger.info(s"Property 9.3 completed: $successCount/$iterations X-Request-ID handled correctly") - successCount should equal(iterations) - } - - scenario("Property 9.4: Correlation-Id present on error responses (10 iterations)", LoggingConsistencyTag) { - // **Validates: Requirements 8.1, 8.3** - // Error responses must also include Correlation-Id for debugging and - // log correlation. This is critical for troubleshooting failed requests. - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - // Generate paths that will produce various error responses - val errorPaths = List( - s"/obp/v5.0.0/nonexistent/${randomString(8)}", // 404 - s"/obp/v5.0.0/my/banks", // 401 (no auth) - s"/obp/v3.0.0/my/accounts", // 401 (no auth) - s"/obp/v4.0.0/users/current", // 401 (no auth) - s"/obp/invalid_version/banks" // 404 - ) - val path = errorPaths(Random.nextInt(errorPaths.length)) - - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Should be an error status - status should (be >= 400 and be < 600) - - // Correlation-Id must be present even on errors - val corrId = findHeader(headers, "Correlation-Id") - withClue(s"Iteration $i ($path, status=$status): Correlation-Id must be present on error: ") { - corrId.isDefined shouldBe true - } - withClue(s"Iteration $i ($path, status=$status): Correlation-Id must be non-empty on error: ") { - corrId.get.trim should not be empty - } - - // Error response should still be valid JSON - json should not be null - - successCount += 1 - } - - logger.info(s"Property 9.4 completed: $successCount/$iterations error responses have Correlation-Id") - successCount should equal(iterations) - } - - scenario("Property 9.5: Correlation-Id present across all API versions (10 iterations)", LoggingConsistencyTag) { - // **Validates: Requirements 8.3, 8.4** - // Correlation-Id must be consistently present across all API versions, - // ensuring uniform logging behavior regardless of which version is called. - var successCount = 0 - val iterations = CI_ITERATIONS - - val allVersionEndpoints = allStandardVersions.map(v => s"/obp/$v/banks") - - (1 to iterations).foreach { i => - val path = allVersionEndpoints(Random.nextInt(allVersionEndpoints.length)) - - val (status, _, headers) = makeHttp4sGetRequest(path) - - status should equal(200) - - val corrId = findHeader(headers, "Correlation-Id") - withClue(s"Iteration $i ($path): Correlation-Id must be present: ") { - corrId.isDefined shouldBe true - } - withClue(s"Iteration $i ($path): Correlation-Id must be non-empty: ") { - corrId.get.trim should not be empty - } - - // Verify it looks like a valid UUID or session ID (non-trivial string) - withClue(s"Iteration $i ($path): Correlation-Id must be at least 8 chars: ") { - corrId.get.trim.length should be >= 8 - } - - successCount += 1 - } - - logger.info(s"Property 9.5 completed: $successCount/$iterations all versions have Correlation-Id") - successCount should equal(iterations) - } - - scenario("Property 9.6: Concurrent requests get independent Correlation-Ids (10 iterations)", LoggingConsistencyTag) { - // **Validates: Requirements 8.3, 8.4** - // Under concurrent load, each request must get its own unique Correlation-Id. - // This validates that the bridge's session/correlation mechanism is thread-safe. - import scala.concurrent.Future - - val iterations = CI_ITERATIONS - val batchSize = 10 - val allCorrelationIds = java.util.concurrent.ConcurrentHashMap.newKeySet[String]() - var totalRequests = 0 - - (0 until iterations by batchSize).foreach { batchStart => - val batchEnd = Math.min(batchStart + batchSize, iterations) - val batchFutures = (batchStart until batchEnd).map { i => - Future { - val path = "/obp/v5.0.0/banks" - val (status, _, headers) = makeHttp4sGetRequest(path) - - status should (be >= 200 and be < 600) - - val corrId = findHeader(headers, "Correlation-Id") - corrId.isDefined shouldBe true - val id = corrId.get.trim - id should not be empty - - id - }(scala.concurrent.ExecutionContext.global) - } - - val batchResults = Await.result( - Future.sequence(batchFutures)(implicitly, scala.concurrent.ExecutionContext.global), - DurationInt(30).seconds - ) - - batchResults.foreach { id => - allCorrelationIds.add(id) - totalRequests += 1 - } - } - - // All Correlation-Ids should be unique - logger.info(s"Property 9.6 completed: $totalRequests requests, ${allCorrelationIds.size()} unique Correlation-Ids") - allCorrelationIds.size() should equal(totalRequests) - } - - scenario("Property 9.7: Authenticated requests have Correlation-Id for audit trail (10 iterations)", LoggingConsistencyTag) { - // **Validates: Requirements 8.5** - // Authenticated requests (which trigger audit logging via WriteMetricUtil) - // must have Correlation-Id present, ensuring the audit trail can be correlated. - if (prop4DirectLoginToken.isEmpty) { - logger.warn("Property 9.7 SKIPPED: no DirectLogin token available") - cancel("DirectLogin token not available") - } - - var successCount = 0 - val iterations = CI_ITERATIONS - - val auditableEndpoints = List( - "/obp/v5.0.0/banks", - "/obp/v4.0.0/banks", - "/obp/v3.0.0/banks", - "/obp/v5.0.0/root", - "/obp/v6.0.0/banks" - ) - - (1 to iterations).foreach { i => - val path = auditableEndpoints(Random.nextInt(auditableEndpoints.length)) - - // Make authenticated request (triggers audit logging) - val (status, _, headers) = makeHttp4sGetRequest(path, - Map("DirectLogin" -> s"token=$prop4DirectLoginToken") - ) - - status should equal(200) - - // Correlation-Id must be present for audit trail correlation - val corrId = findHeader(headers, "Correlation-Id") - withClue(s"Iteration $i ($path): Correlation-Id must be present for audit: ") { - corrId.isDefined shouldBe true - } - withClue(s"Iteration $i ($path): Correlation-Id must be non-empty for audit: ") { - corrId.get.trim should not be empty - } - - successCount += 1 - } - - logger.info(s"Property 9.7 completed: $successCount/$iterations authenticated requests have Correlation-Id for audit") - successCount should equal(iterations) - } - } - - // ============================================================================ - // Property 11: Configuration and Integration Compatibility - // Validates: Requirements 9.1, 9.2, 9.3, 9.5 - // ============================================================================ - - object ConfigCompatibilityTag extends Tag("config-compatibility") - - feature("Property 11: Configuration and Integration Compatibility") { - - scenario("Property 11.1: Props configuration is accessible through HTTP4S bridge endpoints (10 iterations)", ConfigCompatibilityTag) { - // **Validates: Requirements 9.1, 9.5** - // Verify that Props-dependent endpoints return valid responses through the bridge, - // proving that the same Props configuration is loaded and accessible. - var successCount = 0 - val iterations = CI_ITERATIONS - - // These endpoints depend on Props configuration being loaded correctly: - // /banks reads from DB (configured via Props), /root reads API info (Props-dependent) - val configDependentEndpoints = List( - "/obp/v5.0.0/banks", - "/obp/v4.0.0/banks", - "/obp/v3.0.0/banks", - "/obp/v5.0.0/root", - "/obp/v4.0.0/root", - "/obp/v3.0.0/root" - ) - - (1 to iterations).foreach { i => - val path = configDependentEndpoints(Random.nextInt(configDependentEndpoints.length)) - - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Endpoint should return 200 (Props loaded, DB connected, config working) - withClue(s"Iteration $i ($path): Props-dependent endpoint should return 200: ") { - status should equal(200) - } - - // Response should be valid JSON (not an error page) - json should not be null - - // Standard headers should be present (bridge config working) - assertCorrelationId(headers) - - successCount += 1 - } - - logger.info(s"Property 11.1 completed: $successCount/$iterations Props-dependent endpoints returned valid responses") - successCount should equal(iterations) - } - - scenario("Property 11.2: Database operations work correctly through HTTP4S bridge (10 iterations)", ConfigCompatibilityTag) { - // **Validates: Requirements 9.2** - // Verify that database-dependent endpoints work through the bridge, - // proving that CustomDBVendor/HikariCP pool is shared and functional. - var successCount = 0 - val iterations = CI_ITERATIONS - - // /banks endpoint reads from the database - if DB connection is broken, it fails - val dbDependentEndpoints = List( - "/obp/v5.0.0/banks", - "/obp/v4.0.0/banks", - "/obp/v3.0.0/banks", - "/obp/v6.0.0/banks" - ) - - (1 to iterations).foreach { i => - val path = dbDependentEndpoints(Random.nextInt(dbDependentEndpoints.length)) - - val (status, json, headers) = makeHttp4sGetRequest(path) - - // DB-dependent endpoint should return 200 (DB connection pool working) - withClue(s"Iteration $i ($path): DB-dependent endpoint should return 200: ") { - status should equal(200) - } - - // Response should contain banks data (from DB) - json should not be null - - // Verify response has expected structure (banks array) - val hasBanks = hasField(json, "banks") - withClue(s"Iteration $i ($path): Response should have 'banks' field: ") { - hasBanks shouldBe true - } - - assertCorrelationId(headers) - - successCount += 1 - } - - logger.info(s"Property 11.2 completed: $successCount/$iterations DB-dependent endpoints returned valid data") - successCount should equal(iterations) - } - - scenario("Property 11.3: HTTP4S-specific configuration properties are applied correctly (10 iterations)", ConfigCompatibilityTag) { - // **Validates: Requirements 9.1, 9.5** - // Verify that HTTP4S-specific properties (port, host, continuation timeout) - // are read from the same Props system and have correct defaults. - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - // Verify the test server is running on the configured port - val testPort = APIUtil.getPropsAsIntValue("http4s.test.port", 8087) - val testHost = "127.0.0.1" - - // The test server should be accessible at the configured host:port - val path = "/obp/v5.0.0/root" - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Server should respond (proving it's running on configured port) - withClue(s"Iteration $i: HTTP4S server should respond on configured port $testPort: ") { - status should equal(200) - } - - // Verify continuation timeout is configured (default 60000ms) - val continuationTimeout = APIUtil.getPropsAsLongValue("http4s.continuation.timeout.ms", 60000L) - withClue(s"Iteration $i: Continuation timeout should be positive: ") { - continuationTimeout should be > 0L - } - - // Verify production port default - val prodPort = APIUtil.getPropsAsIntValue("http4s.port", 8086) - withClue(s"Iteration $i: Production port should be valid: ") { - prodPort should (be > 0 and be < 65536) - } - - // Verify production host default - val prodHost = APIUtil.getPropsValue("http4s.host", "127.0.0.1") - withClue(s"Iteration $i: Production host should be non-empty: ") { - prodHost should not be empty - } - - assertCorrelationId(headers) - - successCount += 1 - } - - logger.info(s"Property 11.3 completed: $successCount/$iterations HTTP4S config property checks passed") - successCount should equal(iterations) - } - - scenario("Property 11.4: External service integration patterns are consistent (10 iterations)", ConfigCompatibilityTag) { - // **Validates: Requirements 9.3** - // Verify that endpoints using external service patterns work through the bridge. - // ATM/branch endpoints use connector patterns configured via Props. - var successCount = 0 - val iterations = CI_ITERATIONS - - // Endpoints that exercise different integration patterns - val integrationEndpoints = List( - "/obp/v5.0.0/banks", - "/obp/v4.0.0/banks", - "/obp/v3.0.0/banks", - "/obp/v5.0.0/root", - "/obp/v3.1.0/root", - "/obp/v2.0.0/root" - ) - - (1 to iterations).foreach { i => - val path = integrationEndpoints(Random.nextInt(integrationEndpoints.length)) - - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Integration endpoints should return valid responses - withClue(s"Iteration $i ($path): Integration endpoint should return 200: ") { - status should equal(200) - } - - // Response should be valid JSON - json should not be null - - // Standard headers present (bridge integration working) - assertCorrelationId(headers) - - successCount += 1 - } - - logger.info(s"Property 11.4 completed: $successCount/$iterations integration pattern endpoints returned valid responses") - successCount should equal(iterations) - } - - scenario("Property 11.5: Authenticated endpoints verify shared auth config (10 iterations)", ConfigCompatibilityTag) { - // **Validates: Requirements 9.1, 9.5** - // Verify that authentication configuration (loaded via Props in Boot.boot()) - // works correctly through the HTTP4S bridge, proving config sharing. - if (prop4DirectLoginToken.isEmpty) { - logger.warn("Property 11.5 SKIPPED: no DirectLogin token available") - cancel("DirectLogin token not available") - } - - var successCount = 0 - val iterations = CI_ITERATIONS - - val authEndpoints = List( - "/obp/v5.0.0/banks", - "/obp/v4.0.0/banks", - "/obp/v3.0.0/banks", - "/obp/v5.0.0/root", - "/obp/v6.0.0/banks" - ) - - (1 to iterations).foreach { i => - val path = authEndpoints(Random.nextInt(authEndpoints.length)) - - // Authenticated request - proves auth config (consumers, users) loaded from shared DB - val (status, json, headers) = makeHttp4sGetRequest(path, - Map("DirectLogin" -> s"token=$prop4DirectLoginToken") - ) - - withClue(s"Iteration $i ($path): Authenticated request should succeed: ") { - status should equal(200) - } - - json should not be null - assertCorrelationId(headers) - - successCount += 1 - } - - logger.info(s"Property 11.5 completed: $successCount/$iterations authenticated requests verified shared auth config") - successCount should equal(iterations) - } - - scenario("Property 11.6: Concurrent DB-dependent requests verify connection pool sharing (10 iterations)", ConfigCompatibilityTag) { - // **Validates: Requirements 9.2** - // Verify that concurrent requests through the bridge all use the shared - // HikariCP connection pool without connection exhaustion or errors. - // Use small batches (3) with pauses to avoid exhausting the test H2 pool. - import scala.concurrent.Future - - val iterations = CI_ITERATIONS - val batchSize = 3 - var successCount = 0 - - (0 until iterations by batchSize).foreach { batchStart => - val batchEnd = Math.min(batchStart + batchSize, iterations) - val batchFutures = (batchStart until batchEnd).map { i => - Future { - val versions = List("v3.0.0", "v4.0.0", "v5.0.0", "v6.0.0") - val version = versions(Random.nextInt(versions.length)) - val path = s"/obp/$version/banks" - - val (status, json, headers) = makeHttp4sGetRequest(path) - - // DB connection pool should handle concurrent requests - status should equal(200) - json should not be null - assertCorrelationId(headers) - - 1 // Success - }(scala.concurrent.ExecutionContext.global) - } - - val batchResults = Await.result( - Future.sequence(batchFutures)(implicitly, scala.concurrent.ExecutionContext.global), - DurationInt(60).seconds - ) - successCount += batchResults.sum - // Small pause between batches to let pool connections return - Thread.sleep(50) - } - - logger.info(s"Property 11.6 completed: $successCount/$iterations concurrent DB requests handled by shared pool") - successCount should equal(iterations) - } - } - - // ============================================================================ - // Property 8: Test Framework Compatibility - // Validates: Requirements 3.4, 3.5 - // ============================================================================ - - object TestFrameworkCompatibilityTag extends Tag("test-framework-compatibility") - - /** - * Make an HTTP request with an arbitrary method to the HTTP4S server. - * Supports GET, POST, PUT, DELETE, HEAD, OPTIONS, PATCH. - */ - private def makeHttp4sRequest(method: String, path: String, body: String = "", headers: Map[String, String] = Map.empty): (Int, JValue, Map[String, String]) = { - val baseReq = url(s"$http4sBaseUrl$path") - val methodReq = method.toUpperCase match { - case "GET" => baseReq.GET - case "POST" => baseReq.POST.setBody(body) - case "PUT" => baseReq.PUT.setBody(body) - case "DELETE" => baseReq.DELETE - case "HEAD" => baseReq.HEAD - case "OPTIONS" => baseReq.setMethod("OPTIONS") - case "PATCH" => baseReq.setMethod("PATCH").setBody(body) - case other => baseReq.setMethod(other) - } - val requestWithHeaders = headers.foldLeft(methodReq) { case (req, (key, value)) => - req.addHeader(key, value) - } - - try { - val response = Http.default(requestWithHeaders.setHeader("Accept", "*/*") > as.Response(p => { - val statusCode = p.getStatusCode - val responseBody = if (p.getResponseBody != null && p.getResponseBody.trim.nonEmpty) p.getResponseBody else "{}" - val json = parse(responseBody) - val responseHeaders = p.getHeaders.iterator().asScala.map(e => e.getKey -> e.getValue).toMap - (statusCode, json, responseHeaders) - })) - Await.result(response, DurationInt(10).seconds) - } catch { - case e: java.util.concurrent.ExecutionException => - val statusPattern = """(\d{3})""".r - statusPattern.findFirstIn(e.getCause.getMessage) match { - case Some(code) => (code.toInt, JObject(Nil), Map.empty) - case None => throw e - } - case e: Exception => throw e - } - } - - // ============================================================================ - // Property 12: Edge Case Handling Consistency - // Validates: Requirements 10.5 - // ============================================================================ - - object EdgeCaseConsistencyTag extends Tag("edge-case-consistency") - - - // ============================================================================ - // Property 14: Priority-Based Routing Correctness - // Validates: Requirements 1.2, 1.3 - // ============================================================================ - - object PriorityRoutingTag extends Tag("priority-routing") - - feature("Property 14: Priority-Based Routing Correctness") { - - scenario("Property 14.1: v5.0.0 native endpoints are served by HTTP4S (not bridge) (10 iterations)", PriorityRoutingTag) { - // **Validates: Requirements 1.2, 1.3** - // v5.0.0 system-views is a native HTTP4S endpoint - should be served directly - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - // Native v5.0.0 endpoint: GET /obp/v5.0.0/system-views/{VIEW_ID} - // This is implemented natively in Http4s500.scala - val viewId = s"test-view-${randomString(8)}" - val path = s"/obp/v5.0.0/system-views/$viewId" - - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Should return a valid response (404 for non-existent view, not a bridge error) - status should (be >= 200 and be < 600) - - // Should have Correlation-Id (standard header injection works for native routes too) - assertCorrelationId(headers) - - // Response should be valid JSON - json should not be null - - successCount += 1 - } - - logger.info(s"Property 14.1 completed: $successCount/$iterations iterations - v5.0.0 native routing verified") - successCount should equal(iterations) - } - - scenario("Property 14.2: Legacy API versions (v3.0.0) are served by bridge (10 iterations)", PriorityRoutingTag) { - // **Validates: Requirements 1.2, 1.3** - // v3.0.0 endpoints have no native HTTP4S implementation - must go through bridge - var successCount = 0 - val iterations = CI_ITERATIONS - - val legacyVersions = List("v1.2.1", "v1.3.0", "v1.4.0", "v2.0.0", "v2.1.0", "v2.2.0", - "v3.0.0", "v3.1.0", "v4.0.0") - - (1 to iterations).foreach { i => - val version = legacyVersions(Random.nextInt(legacyVersions.length)) - val path = s"/obp/$version/banks" - - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Bridge should serve these - should return 200 for /banks - status should equal(200) - - // Should have banks array (bridge correctly invokes Lift dispatch) - hasField(json, "banks") shouldBe true - - // Should have Correlation-Id - assertCorrelationId(headers) - - successCount += 1 - } - - logger.info(s"Property 14.2 completed: $successCount/$iterations iterations - legacy bridge routing verified") - successCount should equal(iterations) - } - - scenario("Property 14.3: Non-existent endpoints return 404 (10 iterations)", PriorityRoutingTag) { - // **Validates: Requirements 1.2, 1.3** - // Endpoints that don't exist in native HTTP4S or Lift should return 404 - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - val version = apiVersions(Random.nextInt(apiVersions.length)) - val randomEndpoint = s"/completely-nonexistent-${randomString(12)}" - val path = s"/obp/$version$randomEndpoint" - - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Should return 404 (no handler found anywhere in the chain) - status should equal(404) - - // Should have error message - (hasField(json, "error") || hasField(json, "message")) shouldBe true - - // Should have Correlation-Id even on 404 - assertCorrelationId(headers) - - successCount += 1 - } - - logger.info(s"Property 14.3 completed: $successCount/$iterations iterations - 404 routing verified") - successCount should equal(iterations) - } - - scenario("Property 14.4: Routing priority is deterministic - same request always same result (10 iterations)", PriorityRoutingTag) { - // **Validates: Requirements 1.2, 1.3** - var successCount = 0 - val iterations = CI_ITERATIONS - - // Mix of native and bridge endpoints - val testPaths = List( - "/obp/v5.0.0/banks", // could be native or bridge - "/obp/v3.0.0/banks", // bridge only - "/obp/v7.0.0/banks", // native HTTP4S - "/obp/v4.0.0/banks", // bridge only - "/obp/v6.0.0/banks" // bridge only - ) - - (1 to iterations).foreach { i => - val path = testPaths(Random.nextInt(testPaths.length)) - - // Make the same request twice - val (status1, json1, _) = makeHttp4sGetRequest(path) - val (status2, json2, _) = makeHttp4sGetRequest(path) - - // Status codes must be identical (deterministic routing) - status1 should equal(status2) - - // Both should return 200 for /banks - status1 should equal(200) - - // JSON structure should be identical - val fields1 = json1 match { - case JObject(fields) => fields.map(_.name).sorted - case _ => Nil - } - val fields2 = json2 match { - case JObject(fields) => fields.map(_.name).sorted - case _ => Nil - } - fields1 should equal(fields2) - - successCount += 1 - } - - logger.info(s"Property 14.4 completed: $successCount/$iterations iterations - deterministic routing verified") - successCount should equal(iterations) - } - - scenario("Property 14.5: v7.0.0 native endpoints are served correctly (10 iterations)", PriorityRoutingTag) { - // **Validates: Requirements 1.2, 1.3** - // v7.0.0 has native HTTP4S endpoints (Http4s700.scala) - var successCount = 0 - val iterations = CI_ITERATIONS - - (1 to iterations).foreach { i => - // v7.0.0 /banks is a native HTTP4S endpoint - val path = "/obp/v7.0.0/banks" - - val (status, json, headers) = makeHttp4sGetRequest(path) - - // Should return 200 (native HTTP4S serves this) - status should equal(200) - - // Should have banks array - hasField(json, "banks") shouldBe true - - // Should have Correlation-Id - assertCorrelationId(headers) - - successCount += 1 - } - - logger.info(s"Property 14.5 completed: $successCount/$iterations iterations - v7.0.0 native routing verified") - successCount should equal(iterations) - } - } - -} diff --git a/obp-api/src/test/scala/code/api/http4sbridge/Http4sServerIntegrationTest.scala b/obp-api/src/test/scala/code/api/http4sbridge/Http4sServerIntegrationTest.scala index 2916691d36..e6042c6125 100644 --- a/obp-api/src/test/scala/code/api/http4sbridge/Http4sServerIntegrationTest.scala +++ b/obp-api/src/test/scala/code/api/http4sbridge/Http4sServerIntegrationTest.scala @@ -1,6 +1,7 @@ package code.api.http4sbridge import code.Http4sTestServer +import code.api.util.APIUtil import code.setup.{DefaultUsers, ServerSetup, ServerSetupWithTestData} import code.views.system.AccountAccess import dispatch.Defaults._ @@ -15,11 +16,10 @@ import scala.concurrent.duration._ /** * Real HTTP4S Server Integration Test - * - * This test uses Http4sTestServer (singleton) which follows the same pattern as - * TestServer (Jetty/Lift). The HTTP4S server is started once and shared across - * all test classes, just like the Lift server. - * + * + * This test uses Http4sTestServer (singleton). The HTTP4S server is started once + * and shared across all test classes. + * * Unlike Http4s700RoutesTest which mocks routes in-process, this test: * - Makes real HTTP requests over the network to a running HTTP4S server * - Tests the complete server stack including middleware, error handling, etc. @@ -154,7 +154,9 @@ class Http4sServerIntegrationTest extends ServerSetup with DefaultUsers with Ser And("Server should be on correct host and port") http4sServer.host should equal("127.0.0.1") - http4sServer.port should equal(8087) + // Port is dynamically allocated by run_tests_parallel.sh (OBP_HTTP4S_TEST_PORT) + // to avoid collisions across concurrent checkouts; assert it matches the prop. + http4sServer.port should equal(APIUtil.getPropsAsIntValue("http4s.test.port", 8087)) } scenario("Server handles 404 for unknown routes", Http4sServerIntegrationTag) { @@ -187,25 +189,6 @@ class Http4sServerIntegrationTest extends ServerSetup with DefaultUsers with Ser json \ "version" should not equal JObject(Nil) } } - - scenario("Server shares state with Lift server", Http4sServerIntegrationTag) { - Given("Both HTTP4S and Lift servers are running") - - When("We request banks from both servers") - val (http4sStatus, http4sBody) = makeHttp4sGetRequest("/obp/v5.0.0/banks") - val liftRequest = (baseRequest / "obp" / "v5.0.0" / "banks").GET - val liftResponse = makeGetRequest(liftRequest, Nil) - - Then("Both should return 200") - http4sStatus should equal(200) - liftResponse.code should equal(200) - - And("Both should return banks data") - val http4sJson = parse(http4sBody) - val liftJson = liftResponse.body - (http4sJson \ "banks") should not equal JObject(Nil) - (liftJson \ "banks") should not equal JObject(Nil) - } } feature("HTTP4S v7.0.0 Native Endpoints") { @@ -247,14 +230,14 @@ class Http4sServerIntegrationTest extends ServerSetup with DefaultUsers with Ser json \ "resource_docs" should not equal JObject(Nil) } - scenario("v7.0.0 unmigrated path falls back to v6.0.0 via Lift bridge", Http4sServerIntegrationTag) { + scenario("v7.0.0 unmigrated path is served by v6.0.0 via the http4s v7→v6 cascade bridge", Http4sServerIntegrationTag) { When("We request an unmigrated v7.0.0 endpoint (/consumers/current exists in v6 but not v7)") val (status, body, versionServed) = makeHttp4sGetRequestFull("/obp/v7.0.0/consumers/current") Then("We get a proper OBP error response, not a version-not-found 404") status should (equal(401) or equal(200) or equal(403)) - And("X-OBP-Version-Served header indicates the fallback version") + And("X-OBP-Version-Served header indicates the cascade target version") versionServed should equal(Some("v6.0.0")) When("We request a native v7.0.0 endpoint (/root is native to v7; /banks was removed and now cascades to v6)") @@ -339,31 +322,32 @@ class Http4sServerIntegrationTest extends ServerSetup with DefaultUsers with Ser } } - feature("HTTP4S Lift Bridge Fallback") { - - scenario("Server handles Lift bridge routes for v5.0.0 non-native endpoints", Http4sServerIntegrationTag) { - Given("HTTP4S test server is running with Lift bridge") - - When("We make a GET request to a v5.0.0 endpoint not implemented in HTTP4S") + feature("HTTP4S version-cascade fallback") { + + scenario("v5.0.0 non-native endpoint is served via http4s cascade", Http4sServerIntegrationTag) { + Given("HTTP4S test server is running") + + When("We make a GET request to a v5.0.0 endpoint not natively declared in Http4s500") val (status, body) = makeHttp4sGetRequest("/obp/v5.0.0/users/current") - + Then("We should get a 401 response (authentication required)") status should equal(401) info("This endpoint requires authentication - 401 is correct behavior") } - scenario("Server handles Lift bridge routes for v3.1.0 (known limitation)", Http4sServerIntegrationTag) { - Given("HTTP4S test server is running with Lift bridge") + scenario("v3.1.0 /banks currently returns 404", Http4sServerIntegrationTag) { + Given("HTTP4S test server is running") - When("We make a GET request to a v3.1.0 endpoint (Lift bridge)") + // TODO v310Routes is wired into Http4sApp.baseServices; this 404 may no longer hold. + // Behaviour is asserted as-is here; re-validate before relying on it as a guarantee. + When("We make a GET request to /obp/v3.1.0/banks") try { makeHttp4sGetRequest("/obp/v3.1.0/banks") - fail("Expected 404 for v3.1.0 (known bridge limitation)") + fail("Expected 404 for /obp/v3.1.0/banks") } catch { case e: Exception => - Then("We should get a 404 error (known limitation)") + Then("We should get a 404 error") e.getMessage should include("404") - info("v3.1.0 bridge support is a known limitation - see HTTP4S_INTEGRATION_TEST_FINDINGS.md") } } } diff --git a/obp-api/src/test/scala/code/api/util/BerlinGroupMandatoryHeadersTest.scala b/obp-api/src/test/scala/code/api/util/BerlinGroupMandatoryHeadersTest.scala index 7c9de1b014..3a8b2d92ff 100644 --- a/obp-api/src/test/scala/code/api/util/BerlinGroupMandatoryHeadersTest.scala +++ b/obp-api/src/test/scala/code/api/util/BerlinGroupMandatoryHeadersTest.scala @@ -2,7 +2,7 @@ package code.api.util import code.api.berlin.group.v1_3.BerlinGroupServerSetupV1_3 import net.liftweb.common.Failure -import net.liftweb.http.provider.HTTPParam +import code.api.util.APIUtil.HTTPParam import org.scalatest.Tag import java.util.UUID diff --git a/obp-api/src/test/scala/code/api/util/http4s/Http4sCallContextBuilderTest.scala b/obp-api/src/test/scala/code/api/util/http4s/Http4sCallContextBuilderTest.scala deleted file mode 100644 index 9585bfc5f0..0000000000 --- a/obp-api/src/test/scala/code/api/util/http4s/Http4sCallContextBuilderTest.scala +++ /dev/null @@ -1,505 +0,0 @@ -package code.api.util.http4s - -import cats.effect.IO -import code.api.util.ExampleValue -import net.liftweb.http.Req -import org.http4s.{Header, Method, Request, Uri} -import org.scalatest.{FeatureSpec, GivenWhenThen, Matchers} -import org.typelevel.ci.CIString - -/** - * Unit tests for HTTP4S → Lift Req conversion in Http4sLiftWebBridge. - * - * Tests validate: - * - Header parameter extraction and conversion - * - Query parameter handling for complex scenarios - * - Request body handling for all content types - * - Edge cases (empty bodies, special characters, large payloads) - * - * Validates: Requirements 2.2 - */ -class Http4sCallContextBuilderTest extends FeatureSpec with Matchers with GivenWhenThen { - - feature("HTTP4S to Lift Req conversion - Header handling") { - scenario("Extract single header value") { - Given("An HTTP4S request with a single header") - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks") - ).putHeaders(Header.Raw(CIString("X-Custom-Header"), "test-value")) - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Header should be accessible through Lift Req") - val headerValue = liftReq.request.headers("X-Custom-Header") - headerValue should not be empty - headerValue.head should equal("test-value") - } - - scenario("Extract multiple values for same header") { - Given("An HTTP4S request with multiple values for same header") - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks") - ).putHeaders( - Header.Raw(CIString("Accept"), "application/json"), - Header.Raw(CIString("Accept"), "text/html") - ) - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("All header values should be accessible") - val headerValues = liftReq.request.headers("Accept") - headerValues.size should be >= 1 - headerValues should contain("application/json") - } - - scenario("Extract Authorization header") { - Given("An HTTP4S request with Authorization header") - val authValue = s"""DirectLogin username=\"test\", password=\"${ExampleValue.passwordExample.value}\", consumer_key=\"key\""""" - val request = Request[IO]( - method = Method.POST, - uri = Uri.unsafeFromString("http://localhost:8086/my/logins/direct") - ).putHeaders(Header.Raw(CIString("Authorization"), authValue)) - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Authorization header should be preserved exactly") - val authHeader = liftReq.request.headers("Authorization") - authHeader should not be empty - authHeader.head should equal(authValue) - } - - scenario("Handle headers with special characters") { - Given("An HTTP4S request with headers containing special characters") - val specialValue = "value with spaces, commas, and \"quotes\"" - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks") - ).putHeaders(Header.Raw(CIString("X-Special"), specialValue)) - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Special characters should be preserved") - val headerValue = liftReq.request.headers("X-Special") - headerValue should not be empty - headerValue.head should equal(specialValue) - } - - scenario("Handle case-insensitive header lookup") { - Given("An HTTP4S request with mixed-case headers") - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks") - ).putHeaders(Header.Raw(CIString("Content-Type"), "application/json")) - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Header should be accessible with different case") - liftReq.request.headers("content-type") should not be empty - liftReq.request.headers("Content-Type") should not be empty - liftReq.request.headers("CONTENT-TYPE") should not be empty - } - } - - feature("HTTP4S to Lift Req conversion - Query parameter handling") { - scenario("Extract single query parameter") { - Given("An HTTP4S request with a single query parameter") - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks?limit=10") - ) - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Query parameter should be accessible") - val paramValue = liftReq.request.param("limit") - paramValue should not be empty - paramValue.head should equal("10") - } - - scenario("Extract multiple query parameters") { - Given("An HTTP4S request with multiple query parameters") - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks?limit=10&offset=20&sort=name") - ) - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("All query parameters should be accessible") - liftReq.request.param("limit").head should equal("10") - liftReq.request.param("offset").head should equal("20") - liftReq.request.param("sort").head should equal("name") - } - - scenario("Handle query parameters with multiple values") { - Given("An HTTP4S request with repeated query parameter") - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks?tag=retail&tag=commercial") - ) - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("All parameter values should be accessible") - val tagValues = liftReq.request.param("tag") - tagValues.size should equal(2) - tagValues should contain("retail") - tagValues should contain("commercial") - } - - scenario("Handle query parameters with special characters") { - Given("An HTTP4S request with URL-encoded query parameters") - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks?name=Test%20Bank&symbol=%24") - ) - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Parameters should be decoded correctly") - liftReq.request.param("name").head should equal("Test Bank") - liftReq.request.param("symbol").head should equal("$") - } - - scenario("Handle empty query parameter values") { - Given("An HTTP4S request with empty query parameter") - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks?filter=") - ) - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Empty parameter should be accessible") - val filterValue = liftReq.request.param("filter") - filterValue should not be empty - filterValue.head should equal("") - } - } - - feature("HTTP4S to Lift Req conversion - Request body handling") { - scenario("Handle empty request body") { - Given("An HTTP4S GET request with no body") - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks") - ) - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Body should be accessible as empty") - val inputStream = liftReq.request.inputStream - inputStream.available() should equal(0) - } - - scenario("Handle JSON request body") { - Given("An HTTP4S POST request with JSON body") - val jsonBody = """{"name":"Test Bank","id":"test-bank-123"}""" - val request = Request[IO]( - method = Method.POST, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks") - ).withEntity(jsonBody) - .putHeaders(Header.Raw(CIString("Content-Type"), "application/json")) - - When("Request is converted through bridge") - val bodyBytes = jsonBody.getBytes("UTF-8") - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Body should be accessible and parseable") - val inputStream = liftReq.request.inputStream - val bodyContent = scala.io.Source.fromInputStream(inputStream).mkString - bodyContent should equal(jsonBody) - - And("Content-Type should be preserved") - liftReq.request.contentType should not be empty - liftReq.request.contentType.openOr("").toString should include("application/json") - } - - scenario("Handle request body with UTF-8 characters") { - Given("An HTTP4S POST request with UTF-8 body") - val utf8Body = """{"name":"Bänk Tëst","description":"Tëst with spëcial çhars: €£¥"}""" - val request = Request[IO]( - method = Method.POST, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks") - ).withEntity(utf8Body) - .putHeaders(Header.Raw(CIString("Content-Type"), "application/json; charset=utf-8")) - - When("Request is converted through bridge") - val bodyBytes = utf8Body.getBytes("UTF-8") - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("UTF-8 characters should be preserved") - val inputStream = liftReq.request.inputStream - val bodyContent = scala.io.Source.fromInputStream(inputStream, "UTF-8").mkString - bodyContent should equal(utf8Body) - } - - scenario("Handle large request body") { - Given("An HTTP4S POST request with large body (>1MB)") - val largeBody = "x" * (1024 * 1024 + 100) // 1MB + 100 bytes - val request = Request[IO]( - method = Method.POST, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks") - ).withEntity(largeBody) - - When("Request is converted through bridge") - val bodyBytes = largeBody.getBytes("UTF-8") - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Large body should be accessible") - val inputStream = liftReq.request.inputStream - val bodyContent = scala.io.Source.fromInputStream(inputStream).mkString - bodyContent.length should equal(largeBody.length) - } - - scenario("Handle request body with special characters") { - Given("An HTTP4S POST request with special characters in body") - val specialBody = """{"data":"Line1\nLine2\tTabbed\r\nWindows\u0000Null"}""" - val request = Request[IO]( - method = Method.POST, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks") - ).withEntity(specialBody) - .putHeaders(Header.Raw(CIString("Content-Type"), "application/json")) - - When("Request is converted through bridge") - val bodyBytes = specialBody.getBytes("UTF-8") - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Special characters should be preserved") - val inputStream = liftReq.request.inputStream - val bodyContent = scala.io.Source.fromInputStream(inputStream).mkString - bodyContent should equal(specialBody) - } - } - - feature("HTTP4S to Lift Req conversion - HTTP method and URI") { - scenario("Preserve GET method") { - Given("An HTTP4S GET request") - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks") - ) - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Method should be GET") - liftReq.request.method should equal("GET") - } - - scenario("Preserve POST method") { - Given("An HTTP4S POST request") - val request = Request[IO]( - method = Method.POST, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks") - ) - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Method should be POST") - liftReq.request.method should equal("POST") - } - - scenario("Preserve PUT method") { - Given("An HTTP4S PUT request") - val request = Request[IO]( - method = Method.PUT, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks/bank-id") - ) - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Method should be PUT") - liftReq.request.method should equal("PUT") - } - - scenario("Preserve DELETE method") { - Given("An HTTP4S DELETE request") - val request = Request[IO]( - method = Method.DELETE, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks/bank-id") - ) - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Method should be DELETE") - liftReq.request.method should equal("DELETE") - } - - scenario("Preserve URI path") { - Given("An HTTP4S request with complex path") - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks/bank-id/accounts/account-id") - ) - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("URI path should be preserved") - liftReq.request.uri should include("/obp/v5.0.0/banks/bank-id/accounts/account-id") - } - - scenario("Preserve URI with query string") { - Given("An HTTP4S request with query string") - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks?limit=10&offset=20") - ) - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Query string should be accessible") - liftReq.request.queryString should not be empty - liftReq.request.queryString.openOr("") should include("limit=10") - } - } - - feature("HTTP4S to Lift Req conversion - Edge cases") { - scenario("Handle request with no headers") { - Given("An HTTP4S request with minimal headers") - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks") - ) - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Request should be valid") - liftReq.request.method should equal("GET") - liftReq.request.uri should not be empty - } - - scenario("Handle request with very long URI") { - Given("An HTTP4S request with very long URI") - val longPath = "/obp/v5.0.0/" + ("segment/" * 50) + "endpoint" - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString(s"http://localhost:8086$longPath") - ) - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Long URI should be preserved") - liftReq.request.uri should include(longPath) - } - - scenario("Handle request with many query parameters") { - Given("An HTTP4S request with many query parameters") - val params = (1 to 50).map(i => s"param$i=$i").mkString("&") - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString(s"http://localhost:8086/obp/v5.0.0/banks?$params") - ) - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("All query parameters should be accessible") - (1 to 50).foreach { i => - liftReq.request.param(s"param$i").head should equal(i.toString) - } - } - - scenario("Handle request with many headers") { - Given("An HTTP4S request with many headers") - var request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks") - ) - (1 to 50).foreach { i => - request = request.putHeaders(Header.Raw(CIString(s"X-Header-$i"), s"value-$i")) - } - - When("Request is converted through bridge") - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("All headers should be accessible") - (1 to 50).foreach { i => - liftReq.request.headers(s"X-Header-$i").head should equal(s"value-$i") - } - } - - scenario("Handle Content-Type variations") { - Given("An HTTP4S request with various Content-Type formats") - val contentTypes = List( - ("application/json", "application/json"), - ("application/json; charset=utf-8", "application/json"), - ("application/json;charset=UTF-8", "application/json"), - ("application/json ; charset=utf-8", "application/json"), - ("text/plain", "text/plain"), - ("application/x-www-form-urlencoded", "application/x-www-form-urlencoded") - ) - - contentTypes.foreach { case (ct, expectedPrefix) => - val request = Request[IO]( - method = Method.POST, - uri = Uri.unsafeFromString("http://localhost:8086/obp/v5.0.0/banks") - ).withEntity("test body") - .withContentType(org.http4s.headers.`Content-Type`.parse(ct).getOrElse( - org.http4s.headers.`Content-Type`(org.http4s.MediaType.application.json) - )) - - When(s"Request with Content-Type '$ct' is converted") - val bodyBytes = "test body".getBytes("UTF-8") - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Content-Type should be accessible") - liftReq.request.contentType should not be empty - liftReq.request.contentType.openOr("").toString should include(expectedPrefix) - } - } - } - - // Helper method to access private buildLiftReq method for testing - private def buildLiftReqForTest(req: Request[IO], body: Array[Byte]): Req = { - // Use reflection to access private method - val method = Http4sLiftWebBridge.getClass.getDeclaredMethod( - "buildLiftReq", - classOf[Request[IO]], - classOf[Array[Byte]] - ) - method.setAccessible(true) - method.invoke(Http4sLiftWebBridge, req, body).asInstanceOf[Req] - } -} diff --git a/obp-api/src/test/scala/code/api/util/http4s/Http4sLiftBridgeTrafficTest.scala b/obp-api/src/test/scala/code/api/util/http4s/Http4sLiftBridgeTrafficTest.scala deleted file mode 100644 index c88583c493..0000000000 --- a/obp-api/src/test/scala/code/api/util/http4s/Http4sLiftBridgeTrafficTest.scala +++ /dev/null @@ -1,72 +0,0 @@ -package code.api.util.http4s - -import org.scalatest.{FlatSpec, Matchers} - -class Http4sLiftBridgeTrafficTest extends FlatSpec with Matchers { - - "bucket" should "keep API version segments verbatim" in { - Http4sLiftBridgeTraffic.bucket("/obp/v6.0.0/banks") shouldBe "/obp/v6.0.0/banks" - Http4sLiftBridgeTraffic.bucket("/obp/v1_2_1/banks") shouldBe "/obp/v1_2_1/banks" - } - - it should "collapse UUIDs" in { - Http4sLiftBridgeTraffic.bucket("/obp/v6.0.0/consents/9ca8a7e4-6d02-40e3-a129-0b2bf89de9b1") shouldBe - "/obp/v6.0.0/consents/{uuid}" - } - - it should "collapse purely numeric segments" in { - Http4sLiftBridgeTraffic.bucket("/obp/v6.0.0/transactions/12345") shouldBe - "/obp/v6.0.0/transactions/{n}" - } - - it should "collapse long opaque token-like segments (with a digit/dot/dash/underscore)" in { - Http4sLiftBridgeTraffic.bucket("/obp/v6.0.0/banks/gh.29.uk/accounts") shouldBe - "/obp/v6.0.0/banks/{id}/accounts" - Http4sLiftBridgeTraffic.bucket("/obp/v6.0.0/accounts/8ca8a7e4_6d02_40e3_a129_0b2bf89de9f0/x") shouldBe - "/obp/v6.0.0/accounts/{id}/x" - } - - it should "leave short literal segments alone" in { - Http4sLiftBridgeTraffic.bucket("/obp/v6.0.0/banks/BANK_ID/accounts/views") shouldBe - "/obp/v6.0.0/banks/BANK_ID/accounts/views" - } - - it should "normalise the OIDC callback path the way operators expect" in { - Http4sLiftBridgeTraffic.bucket("/auth/openid-connect/callback") shouldBe - "/auth/openid-connect/callback" - Http4sLiftBridgeTraffic.bucket("/auth/openid-connect/callback-1") shouldBe - "/auth/openid-connect/callback-1" - } - - it should "handle the root path" in { - Http4sLiftBridgeTraffic.bucket("/") shouldBe "/" - Http4sLiftBridgeTraffic.bucket("") shouldBe "/" - } - - "observe" should "increment on repeated hits and snapshot the totals" in { - Http4sLiftBridgeTraffic.reset() - Http4sLiftBridgeTraffic.observe("GET", "/obp/v6.0.0/banks/gh.29.uk", 200) - Http4sLiftBridgeTraffic.observe("GET", "/obp/v6.0.0/banks/gh.29.uk", 200) - Http4sLiftBridgeTraffic.observe("GET", "/obp/v6.0.0/banks/some.other.bank", 200) - Http4sLiftBridgeTraffic.observe("POST", "/auth/openid-connect/callback", 200) - val snap = Http4sLiftBridgeTraffic.snapshot() - snap("GET /obp/v6.0.0/banks/{id} 200") shouldBe 3L - snap("POST /auth/openid-connect/callback 200") shouldBe 1L - snap.size shouldBe 2 - Http4sLiftBridgeTraffic.reset() - Http4sLiftBridgeTraffic.snapshot() shouldBe empty - } - - it should "key separately on status — 200 and 404 don't collide" in { - Http4sLiftBridgeTraffic.reset() - // Same method + bucket but different statuses → two separate entries. - // This is what surfaces test-probe 404s vs real Lift work in the audit. - Http4sLiftBridgeTraffic.observe("DELETE", "/obp/v4.0.0/banks/gh.29.uk/accounts", 200) - Http4sLiftBridgeTraffic.observe("DELETE", "/obp/v4.0.0/banks/gh.29.uk/accounts", 404) - Http4sLiftBridgeTraffic.observe("DELETE", "/obp/v4.0.0/banks/de.bank.io/accounts", 404) - val snap = Http4sLiftBridgeTraffic.snapshot() - snap("DELETE /obp/v4.0.0/banks/{id}/accounts 200") shouldBe 1L - snap("DELETE /obp/v4.0.0/banks/{id}/accounts 404") shouldBe 2L - snap.size shouldBe 2 - } -} diff --git a/obp-api/src/test/scala/code/api/util/http4s/Http4sRequestConversionPropertyTest.scala b/obp-api/src/test/scala/code/api/util/http4s/Http4sRequestConversionPropertyTest.scala deleted file mode 100644 index 988753bdd3..0000000000 --- a/obp-api/src/test/scala/code/api/util/http4s/Http4sRequestConversionPropertyTest.scala +++ /dev/null @@ -1,620 +0,0 @@ -package code.api.util.http4s - -import cats.effect.IO -import code.api.util.ExampleValue -import net.liftweb.http.Req -import org.http4s.{Header, Method, Request, Uri} -import org.scalatest.{FeatureSpec, GivenWhenThen, Matchers, Tag} -import org.typelevel.ci.CIString - -import scala.util.Random - -/** - * Property Test: Request Conversion Completeness - * - * **Validates: Requirements 2.2** - * - * For any HTTP4S request, when converted to a Lift Req object by the bridge, - * all request information (HTTP method, URI path, query parameters, headers, - * body content, remote address) should be preserved and accessible through - * the Lift Req interface. - * - * The bridge must not lose any request information during conversion. Any missing - * data could cause endpoints to behave incorrectly. This property ensures the - * bridge correctly implements the HTTPRequest interface. - * - * Testing Approach: - * - Generate random HTTP4S requests with various combinations of headers, params, and body - * - Convert to Lift Req through bridge - * - Verify all original request data is accessible through Lift Req methods - * - Test edge cases: empty bodies, special characters, large payloads, unusual headers - * - Minimum 100 iterations per test - */ -class Http4sRequestConversionPropertyTest extends FeatureSpec - with Matchers - with GivenWhenThen { - - object PropertyTag extends Tag("lift-to-http4s-migration-property") - object Property2Tag extends Tag("property-2-request-conversion-completeness") - - // Helper to access private buildLiftReq method for testing - private def buildLiftReqForTest(req: Request[IO], body: Array[Byte]): Req = { - val method = Http4sLiftWebBridge.getClass.getDeclaredMethod( - "buildLiftReq", - classOf[Request[IO]], - classOf[Array[Byte]] - ) - method.setAccessible(true) - method.invoke(Http4sLiftWebBridge, req, body).asInstanceOf[Req] - } - - /** - * Random data generators for property-based testing - */ - - // Generate random HTTP method - private def randomMethod(): Method = { - val methods = List(Method.GET, Method.POST, Method.PUT, Method.DELETE, Method.PATCH) - methods(Random.nextInt(methods.length)) - } - - // Generate random URI path - private def randomPath(): String = { - val segments = Random.nextInt(5) + 1 - val path = (1 to segments).map(_ => s"segment${Random.nextInt(100)}").mkString("/") - s"/obp/v5.0.0/$path" - } - - // Generate random query parameters - private def randomQueryParams(): Map[String, List[String]] = { - val numParams = Random.nextInt(10) - (1 to numParams).map { i => - val key = s"param$i" - val numValues = Random.nextInt(3) + 1 - val values = (1 to numValues).map(_ => s"value${Random.nextInt(100)}").toList - key -> values - }.toMap - } - - // Generate random headers - private def randomHeaders(): List[(String, String)] = { - val numHeaders = Random.nextInt(10) + 1 - (1 to numHeaders).map { i => - s"X-Header-$i" -> s"value-$i-${Random.nextInt(1000)}" - }.toList - } - - // Generate random request body - private def randomBody(): String = { - val bodyTypes = List( - """{"key":"value"}""", - """{"name":"Test","id":123}""", - """{"data":"Line1\nLine2\tTabbed"}""", - """{"unicode":"Tëst with spëcial çhars: €£¥"}""", - "", - "x" * Random.nextInt(1000) - ) - bodyTypes(Random.nextInt(bodyTypes.length)) - } - - // Generate special character strings - private def randomSpecialChars(): String = { - val specialStrings = List( - "value with spaces", - "value,with,commas", - "value\"with\"quotes", - "value'with'apostrophes", - "value\nwith\nnewlines", - "value\twith\ttabs", - "value&with&ersands", - "value=with=equals", - "value;with;semicolons", - "value/with/slashes", - "value\\with\\backslashes", - "value?with?questions", - "value#with#hashes", - "value%20with%20encoding", - "Tëst Ünïcödë Çhärs €£¥" - ) - specialStrings(Random.nextInt(specialStrings.length)) - } - - /** - * Property 2: Request Conversion Completeness - * - * For any HTTP4S request, all request data should be preserved and accessible - * through the converted Lift Req object. - */ - feature("Property 2: Request Conversion Completeness") { - - scenario("HTTP method preservation (100 iterations)", PropertyTag, Property2Tag) { - Given("Random HTTP4S requests with various methods") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val method = randomMethod() - val uri = Uri.unsafeFromString(s"http://localhost:8086${randomPath()}") - - When("Request is converted to Lift Req") - val request = Request[IO](method = method, uri = uri) - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("HTTP method should be preserved") - liftReq.request.method should equal(method.name) - successCount += 1 - } - - info(s"[Property Test] HTTP method preservation: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("URI path preservation (100 iterations)", PropertyTag, Property2Tag) { - Given("Random HTTP4S requests with various URI paths") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val path = randomPath() - val uri = Uri.unsafeFromString(s"http://localhost:8086$path") - - When("Request is converted to Lift Req") - val request = Request[IO](method = Method.GET, uri = uri) - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("URI path should be preserved") - liftReq.request.uri should include(path) - successCount += 1 - } - - info(s"[Property Test] URI path preservation: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("Query parameter preservation (100 iterations)", PropertyTag, Property2Tag) { - Given("Random HTTP4S requests with various query parameters") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val queryParams = randomQueryParams() - val path = randomPath() - - // Build URI with query parameters - // Note: withQueryParam replaces values, so we need to add all values at once - var uri = Uri.unsafeFromString(s"http://localhost:8086$path") - queryParams.foreach { case (key, values) => - // Add all values for this key at once to create multi-value parameter - uri = uri.withQueryParam(key, values) - } - - When("Request is converted to Lift Req") - val request = Request[IO](method = Method.GET, uri = uri) - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("All query parameters should be accessible") - queryParams.foreach { case (key, expectedValues) => - val actualValues = liftReq.request.param(key) - actualValues should not be empty - expectedValues.foreach { expectedValue => - actualValues should contain(expectedValue) - } - } - successCount += 1 - } - - info(s"[Property Test] Query parameter preservation: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("Header preservation (100 iterations)", PropertyTag, Property2Tag) { - Given("Random HTTP4S requests with various headers") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val headers = randomHeaders() - val uri = Uri.unsafeFromString(s"http://localhost:8086${randomPath()}") - - When("Request is converted to Lift Req") - var request = Request[IO](method = Method.GET, uri = uri) - headers.foreach { case (name, value) => - request = request.putHeaders(Header.Raw(CIString(name), value)) - } - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("All headers should be accessible") - headers.foreach { case (name, expectedValue) => - val actualValues = liftReq.request.headers(name) - actualValues should not be empty - actualValues should contain(expectedValue) - } - successCount += 1 - } - - info(s"[Property Test] Header preservation: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("Request body preservation (100 iterations)", PropertyTag, Property2Tag) { - Given("Random HTTP4S requests with various body content") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val body = randomBody() - val uri = Uri.unsafeFromString(s"http://localhost:8086${randomPath()}") - - When("Request is converted to Lift Req") - val request = Request[IO](method = Method.POST, uri = uri) - .withEntity(body) - .putHeaders(Header.Raw(CIString("Content-Type"), "application/json")) - val bodyBytes = body.getBytes("UTF-8") - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Request body should be accessible and identical") - val inputStream = liftReq.request.inputStream - val actualBody = scala.io.Source.fromInputStream(inputStream, "UTF-8").mkString - actualBody should equal(body) - successCount += 1 - } - - info(s"[Property Test] Request body preservation: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("Special characters in headers (100 iterations)", PropertyTag, Property2Tag) { - Given("Random HTTP4S requests with special characters in headers") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val specialValue = randomSpecialChars() - val uri = Uri.unsafeFromString(s"http://localhost:8086${randomPath()}") - - When("Request is converted to Lift Req") - val request = Request[IO](method = Method.GET, uri = uri) - .putHeaders(Header.Raw(CIString("X-Special-Header"), specialValue)) - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Special characters should be preserved in headers") - val actualValues = liftReq.request.headers("X-Special-Header") - actualValues should not be empty - actualValues.head should equal(specialValue) - successCount += 1 - } - - info(s"[Property Test] Special characters in headers: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("Special characters in query parameters (100 iterations)", PropertyTag, Property2Tag) { - Given("Random HTTP4S requests with special characters in query parameters") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val specialValue = randomSpecialChars() - val path = randomPath() - val uri = Uri.unsafeFromString(s"http://localhost:8086$path") - .withQueryParam("special", specialValue) - - When("Request is converted to Lift Req") - val request = Request[IO](method = Method.GET, uri = uri) - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Special characters should be preserved in query parameters") - val actualValues = liftReq.request.param("special") - actualValues should not be empty - actualValues.head should equal(specialValue) - successCount += 1 - } - - info(s"[Property Test] Special characters in query params: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("UTF-8 characters in request body (100 iterations)", PropertyTag, Property2Tag) { - Given("Random HTTP4S requests with UTF-8 characters in body") - var successCount = 0 - val iterations = 100 - - val utf8Bodies = List( - """{"name":"Bänk Tëst"}""", - """{"description":"Tëst with spëcial çhars: €£¥"}""", - """{"unicode":"日本語テスト"}""", - """{"emoji":"Test 🏦 Bank"}""", - """{"mixed":"Ñoño €100 ¥500"}""" - ) - - (1 to iterations).foreach { iteration => - val body = utf8Bodies(Random.nextInt(utf8Bodies.length)) - val uri = Uri.unsafeFromString(s"http://localhost:8086${randomPath()}") - - When("Request is converted to Lift Req") - val request = Request[IO](method = Method.POST, uri = uri) - .withEntity(body) - .putHeaders(Header.Raw(CIString("Content-Type"), "application/json; charset=utf-8")) - val bodyBytes = body.getBytes("UTF-8") - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("UTF-8 characters should be preserved") - val inputStream = liftReq.request.inputStream - val actualBody = scala.io.Source.fromInputStream(inputStream, "UTF-8").mkString - actualBody should equal(body) - successCount += 1 - } - - info(s"[Property Test] UTF-8 characters in body: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("Large request bodies (100 iterations)", PropertyTag, Property2Tag) { - Given("Random HTTP4S requests with large bodies") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val bodySize = Random.nextInt(1024 * 100) + 1024 // 1KB to 100KB - val body = "x" * bodySize - val uri = Uri.unsafeFromString(s"http://localhost:8086${randomPath()}") - - When("Request is converted to Lift Req") - val request = Request[IO](method = Method.POST, uri = uri) - .withEntity(body) - val bodyBytes = body.getBytes("UTF-8") - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Large body should be accessible and complete") - val inputStream = liftReq.request.inputStream - val actualBody = scala.io.Source.fromInputStream(inputStream).mkString - actualBody.length should equal(body.length) - successCount += 1 - } - - info(s"[Property Test] Large request bodies: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("Empty request bodies (100 iterations)", PropertyTag, Property2Tag) { - Given("Random HTTP4S requests with empty bodies") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val method = randomMethod() - val uri = Uri.unsafeFromString(s"http://localhost:8086${randomPath()}") - - When("Request is converted to Lift Req") - val request = Request[IO](method = method, uri = uri) - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Empty body should be accessible") - val inputStream = liftReq.request.inputStream - inputStream.available() should equal(0) - successCount += 1 - } - - info(s"[Property Test] Empty request bodies: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("Content-Type header variations (100 iterations)", PropertyTag, Property2Tag) { - Given("Random HTTP4S requests with various Content-Type headers") - var successCount = 0 - val iterations = 100 - - val contentTypes = List( - "application/json", - "application/json; charset=utf-8", - "application/json;charset=UTF-8", - "application/json ; charset=utf-8", - "text/plain", - "text/html", - "application/x-www-form-urlencoded", - "multipart/form-data", - "application/xml" - ) - - (1 to iterations).foreach { iteration => - val contentType = contentTypes(Random.nextInt(contentTypes.length)) - val uri = Uri.unsafeFromString(s"http://localhost:8086${randomPath()}") - - When("Request is converted to Lift Req") - val request = Request[IO](method = Method.POST, uri = uri) - .withEntity("test body") - .putHeaders(Header.Raw(CIString("Content-Type"), contentType)) - val bodyBytes = "test body".getBytes("UTF-8") - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Content-Type should be accessible") - liftReq.request.contentType should not be empty - val actualContentType = liftReq.request.contentType.openOr("").toString - actualContentType should not be empty - successCount += 1 - } - - info(s"[Property Test] Content-Type variations: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("Authorization header preservation (100 iterations)", PropertyTag, Property2Tag) { - Given("Random HTTP4S requests with Authorization headers") - var successCount = 0 - val iterations = 100 - - val authTypes = List( - s"""DirectLogin username=\"test\", password=\"${ExampleValue.passwordExample.value}\", consumer_key=\"key\"""", - "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9", - "Basic dXNlcm5hbWU6cGFzc3dvcmQ=", - "OAuth oauth_consumer_key=\"key\", oauth_token=\"token\"" - ) - - (1 to iterations).foreach { iteration => - val authValue = authTypes(Random.nextInt(authTypes.length)) - val uri = Uri.unsafeFromString(s"http://localhost:8086${randomPath()}") - - When("Request is converted to Lift Req") - val request = Request[IO](method = Method.POST, uri = uri) - .putHeaders(Header.Raw(CIString("Authorization"), authValue)) - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Authorization header should be preserved exactly") - val actualValues = liftReq.request.headers("Authorization") - actualValues should not be empty - actualValues.head should equal(authValue) - successCount += 1 - } - - info(s"[Property Test] Authorization header preservation: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("Multiple headers with same name (100 iterations)", PropertyTag, Property2Tag) { - Given("Random HTTP4S requests with multiple values for same header") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val numValues = Random.nextInt(5) + 2 // 2-6 values - val values = (1 to numValues).map(i => s"value-$i").toList - val uri = Uri.unsafeFromString(s"http://localhost:8086${randomPath()}") - - When("Request is converted to Lift Req") - var request = Request[IO](method = Method.GET, uri = uri) - values.foreach { value => - request = request.putHeaders(Header.Raw(CIString("X-Multi-Header"), value)) - } - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("All header values should be accessible") - val actualValues = liftReq.request.headers("X-Multi-Header") - actualValues.size should be >= 1 - // At least one of the values should be present - values.exists(v => actualValues.contains(v)) shouldBe true - successCount += 1 - } - - info(s"[Property Test] Multiple headers with same name: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("Case-insensitive header lookup (100 iterations)", PropertyTag, Property2Tag) { - Given("Random HTTP4S requests with mixed-case headers") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val headerName = "Content-Type" - val headerValue = "application/json" - val uri = Uri.unsafeFromString(s"http://localhost:8086${randomPath()}") - - When("Request is converted to Lift Req") - val request = Request[IO](method = Method.POST, uri = uri) - .putHeaders(Header.Raw(CIString(headerName), headerValue)) - val bodyBytes = Array.emptyByteArray - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("Header should be accessible with different case variations") - liftReq.request.headers("content-type") should not be empty - liftReq.request.headers("Content-Type") should not be empty - liftReq.request.headers("CONTENT-TYPE") should not be empty - liftReq.request.headers("CoNtEnT-TyPe") should not be empty - successCount += 1 - } - - info(s"[Property Test] Case-insensitive header lookup: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("Comprehensive random request conversion (100 iterations)", PropertyTag, Property2Tag) { - Given("Random HTTP4S requests with all features combined") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val method = randomMethod() - val path = randomPath() - val queryParams = randomQueryParams() - val headers = randomHeaders() - val body = randomBody() - - // Build URI with query parameters - // Note: withQueryParam replaces values, so we need to add all values at once - var uri = Uri.unsafeFromString(s"http://localhost:8086$path") - queryParams.foreach { case (key, values) => - // Add all values for this key at once to create multi-value parameter - uri = uri.withQueryParam(key, values) - } - - When("Request is converted to Lift Req") - var request = Request[IO](method = method, uri = uri) - headers.foreach { case (name, value) => - request = request.putHeaders(Header.Raw(CIString(name), value)) - } - if (body.nonEmpty) { - request = request.withEntity(body) - .putHeaders(Header.Raw(CIString("Content-Type"), "application/json")) - } - val bodyBytes = body.getBytes("UTF-8") - val liftReq = buildLiftReqForTest(request, bodyBytes) - - Then("All request data should be preserved") - // Verify method - liftReq.request.method should equal(method.name) - - // Verify path - liftReq.request.uri should include(path) - - // Verify query parameters - queryParams.foreach { case (key, expectedValues) => - val actualValues = liftReq.request.param(key) - actualValues should not be empty - } - - // Verify headers - headers.foreach { case (name, expectedValue) => - val actualValues = liftReq.request.headers(name) - actualValues should not be empty - } - - // Verify body - if (body.nonEmpty) { - val inputStream = liftReq.request.inputStream - val actualBody = scala.io.Source.fromInputStream(inputStream, "UTF-8").mkString - actualBody should equal(body) - } - - successCount += 1 - } - - info(s"[Property Test] Comprehensive random conversion: $successCount/$iterations successful") - successCount should equal(iterations) - } - } - - /** - * Summary test - validates that all property tests passed - */ - feature("Property Test Summary") { - scenario("All property tests completed successfully", PropertyTag, Property2Tag) { - info("[Property Test] ========================================") - info("[Property Test] Property 2: Request Conversion Completeness") - info("[Property Test] All scenarios completed successfully") - info("[Property Test] Validates: Requirements 2.2") - info("[Property Test] ========================================") - - // Always pass - actual validation happens in individual scenarios - succeed - } - } -} diff --git a/obp-api/src/test/scala/code/api/util/http4s/Http4sResponseConversionPropertyTest.scala b/obp-api/src/test/scala/code/api/util/http4s/Http4sResponseConversionPropertyTest.scala deleted file mode 100644 index 9c88d60ad7..0000000000 --- a/obp-api/src/test/scala/code/api/util/http4s/Http4sResponseConversionPropertyTest.scala +++ /dev/null @@ -1,532 +0,0 @@ -package code.api.util.http4s - -import cats.effect.IO -import cats.effect.unsafe.implicits.global -import net.liftweb.http._ -import org.http4s.Response -import org.scalatest.{FeatureSpec, GivenWhenThen, Matchers, Tag} -import org.typelevel.ci.CIString - -import java.io.{ByteArrayInputStream, OutputStream} -import java.util.concurrent.atomic.AtomicBoolean -import scala.util.Random - -/** - * Property Test: Response Conversion Completeness - * - * **Property 3: Response Conversion Completeness** - * **Validates: Requirements 2.4** - * - * For any Lift response type (InMemoryResponse, StreamingResponse, OutputStreamResponse, - * BasicResponse), when converted to HTTP4S response by the bridge, all response data - * (status code, headers, body content, cookies) should be preserved in the HTTP4S response. - * - * The bridge must correctly convert all Lift response types to HTTP4S responses without - * data loss. Different response types have different conversion logic that must all be correct. - * - * Testing Approach: - * - Generate random Lift responses of each type - * - Convert through bridge to HTTP4S response - * - Verify all response data is preserved - * - Test streaming responses, output stream responses, and in-memory responses - * - Verify callbacks and cleanup functions are invoked correctly - * - Minimum 100 iterations per test - */ -class Http4sResponseConversionPropertyTest extends FeatureSpec - with Matchers - with GivenWhenThen { - - object PropertyTag extends Tag("lift-to-http4s-migration-property") - object Property3Tag extends Tag("property-3-response-conversion-completeness") - - // Helper to access private liftResponseToHttp4s method for testing - private def liftResponseToHttp4sForTest(response: LiftResponse): Response[IO] = { - val method = Http4sLiftWebBridge.getClass.getDeclaredMethod( - "liftResponseToHttp4s", - classOf[LiftResponse] - ) - method.setAccessible(true) - method.invoke(Http4sLiftWebBridge, response).asInstanceOf[IO[Response[IO]]].unsafeRunSync() - } - - /** - * Random data generators for property-based testing - */ - - // Generate random HTTP status code - private def randomStatusCode(): Int = { - val codes = List(200, 201, 204, 400, 401, 403, 404, 500, 502, 503) - codes(Random.nextInt(codes.length)) - } - - // Generate random headers - private def randomHeaders(): List[(String, String)] = { - val numHeaders = Random.nextInt(10) + 1 - (1 to numHeaders).map { i => - s"X-Header-$i" -> s"value-$i-${Random.nextInt(1000)}" - }.toList - } - - // Generate random body data - private def randomBodyData(): Array[Byte] = { - val bodyTypes = List( - """{"status":"success"}""", - """{"id":123,"name":"Test"}""", - """{"data":"Line1\nLine2\tTabbed"}""", - """{"unicode":"Tëst with spëcial çhars: €£¥"}""", - "", - "x" * Random.nextInt(1000) - ) - bodyTypes(Random.nextInt(bodyTypes.length)).getBytes("UTF-8") - } - - // Generate random large body data - private def randomLargeBodyData(): Array[Byte] = { - val size = Random.nextInt(100 * 1024) + 1024 // 1KB to 100KB - ("x" * size).getBytes("UTF-8") - } - - // Generate random Content-Type - private def randomContentType(): String = { - val types = List( - "application/json", - "application/json; charset=utf-8", - "text/plain", - "text/html", - "application/xml", - "application/octet-stream" - ) - types(Random.nextInt(types.length)) - } - - /** - * Property 3: Response Conversion Completeness - * - * For any Lift response type, all response data should be preserved when - * converted to HTTP4S response. - */ - feature("Property 3: Response Conversion Completeness") { - - scenario("InMemoryResponse status code preservation (100 iterations)", PropertyTag, Property3Tag) { - Given("Random InMemoryResponse objects with various status codes") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val statusCode = randomStatusCode() - val data = randomBodyData() - val headers = randomHeaders() - val liftResponse = InMemoryResponse(data, headers, Nil, statusCode) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Status code should be preserved") - http4sResponse.status.code should equal(statusCode) - successCount += 1 - } - - info(s"[Property Test] InMemoryResponse status code preservation: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("InMemoryResponse header preservation (100 iterations)", PropertyTag, Property3Tag) { - Given("Random InMemoryResponse objects with various headers") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val data = randomBodyData() - val headers = randomHeaders() - val liftResponse = InMemoryResponse(data, headers, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("All headers should be preserved") - headers.foreach { case (name, value) => - val header = http4sResponse.headers.get(CIString(name)) - header should not be empty - header.get.head.value should equal(value) - } - successCount += 1 - } - - info(s"[Property Test] InMemoryResponse header preservation: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("InMemoryResponse body preservation (100 iterations)", PropertyTag, Property3Tag) { - Given("Random InMemoryResponse objects with various body data") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val data = randomBodyData() - val liftResponse = InMemoryResponse(data, Nil, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Body should be preserved") - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - bodyBytes should equal(data) - successCount += 1 - } - - info(s"[Property Test] InMemoryResponse body preservation: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("InMemoryResponse large body preservation (100 iterations)", PropertyTag, Property3Tag) { - Given("Random InMemoryResponse objects with large body data") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val data = randomLargeBodyData() - val liftResponse = InMemoryResponse(data, Nil, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Large body should be preserved") - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - bodyBytes.length should equal(data.length) - successCount += 1 - } - - info(s"[Property Test] InMemoryResponse large body preservation: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("InMemoryResponse Content-Type preservation (100 iterations)", PropertyTag, Property3Tag) { - Given("Random InMemoryResponse objects with various Content-Type headers") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val data = randomBodyData() - val contentType = randomContentType() - val headers = List(("Content-Type", contentType)) - val liftResponse = InMemoryResponse(data, headers, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Content-Type should be preserved") - val ct = http4sResponse.headers.get(CIString("Content-Type")) - ct should not be empty - ct.get.head.value should equal(contentType) - successCount += 1 - } - - info(s"[Property Test] InMemoryResponse Content-Type preservation: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("StreamingResponse status and headers preservation (100 iterations)", PropertyTag, Property3Tag) { - Given("Random StreamingResponse objects") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val data = randomBodyData() - val statusCode = randomStatusCode() - val headers = randomHeaders() - val inputStream = new ByteArrayInputStream(data) - val callbackInvoked = new AtomicBoolean(false) - val onEnd = () => callbackInvoked.set(true) - val liftResponse = StreamingResponse(inputStream, onEnd, -1, headers, Nil, statusCode) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Status code should be preserved") - http4sResponse.status.code should equal(statusCode) - - And("Headers should be preserved") - headers.foreach { case (name, value) => - val header = http4sResponse.headers.get(CIString(name)) - header should not be empty - header.get.head.value should equal(value) - } - successCount += 1 - } - - info(s"[Property Test] StreamingResponse status and headers preservation: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("StreamingResponse body preservation (100 iterations)", PropertyTag, Property3Tag) { - Given("Random StreamingResponse objects with various body data") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val data = randomBodyData() - val inputStream = new ByteArrayInputStream(data) - val callbackInvoked = new AtomicBoolean(false) - val onEnd = () => callbackInvoked.set(true) - val liftResponse = StreamingResponse(inputStream, onEnd, -1, Nil, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Body should be preserved") - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - bodyBytes should equal(data) - successCount += 1 - } - - info(s"[Property Test] StreamingResponse body preservation: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("StreamingResponse callback invocation (100 iterations)", PropertyTag, Property3Tag) { - Given("Random StreamingResponse objects with callbacks") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val data = randomBodyData() - val inputStream = new ByteArrayInputStream(data) - val callbackInvoked = new AtomicBoolean(false) - val onEnd = () => callbackInvoked.set(true) - val liftResponse = StreamingResponse(inputStream, onEnd, -1, Nil, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - // Consume the body to trigger callback - http4sResponse.body.compile.to(Array).unsafeRunSync() - - Then("Callback should be invoked") - callbackInvoked.get() should be(true) - successCount += 1 - } - - info(s"[Property Test] StreamingResponse callback invocation: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("OutputStreamResponse status and headers preservation (100 iterations)", PropertyTag, Property3Tag) { - Given("Random OutputStreamResponse objects") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val data = randomBodyData() - val statusCode = randomStatusCode() - val headers = randomHeaders() - val out: OutputStream => Unit = (os: OutputStream) => { - os.write(data) - os.flush() - } - val liftResponse = OutputStreamResponse(out, -1, headers, Nil, statusCode) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Status code should be preserved") - http4sResponse.status.code should equal(statusCode) - - And("Headers should be preserved") - headers.foreach { case (name, value) => - val header = http4sResponse.headers.get(CIString(name)) - header should not be empty - header.get.head.value should equal(value) - } - successCount += 1 - } - - info(s"[Property Test] OutputStreamResponse status and headers preservation: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("OutputStreamResponse body preservation (100 iterations)", PropertyTag, Property3Tag) { - Given("Random OutputStreamResponse objects with various body data") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val data = randomBodyData() - val out: OutputStream => Unit = (os: OutputStream) => { - os.write(data) - os.flush() - } - val liftResponse = OutputStreamResponse(out, -1, Nil, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Body should be preserved") - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - bodyBytes should equal(data) - successCount += 1 - } - - info(s"[Property Test] OutputStreamResponse body preservation: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("OutputStreamResponse large body preservation (100 iterations)", PropertyTag, Property3Tag) { - Given("Random OutputStreamResponse objects with large body data") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val data = randomLargeBodyData() - val out: OutputStream => Unit = (os: OutputStream) => { - os.write(data) - os.flush() - } - val liftResponse = OutputStreamResponse(out, -1, Nil, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Large body should be preserved") - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - bodyBytes.length should equal(data.length) - successCount += 1 - } - - info(s"[Property Test] OutputStreamResponse large body preservation: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("BasicResponse status code preservation (100 iterations)", PropertyTag, Property3Tag) { - Given("Random BasicResponse objects (via NotFoundResponse, etc.)") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val responseType = Random.nextInt(5) - val liftResponse = responseType match { - case 0 => NotFoundResponse() - case 1 => InternalServerErrorResponse() - case 2 => ForbiddenResponse() - case 3 => UnauthorizedResponse("DirectLogin") - case 4 => BadResponse() - } - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Status code should match expected value") - val expectedCode = responseType match { - case 0 => 404 - case 1 => 500 - case 2 => 403 - case 3 => 401 - case 4 => 400 - } - http4sResponse.status.code should equal(expectedCode) - successCount += 1 - } - - info(s"[Property Test] BasicResponse status code preservation: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("Comprehensive response conversion (100 iterations)", PropertyTag, Property3Tag) { - Given("Random Lift responses of all types") - var successCount = 0 - val iterations = 100 - - (1 to iterations).foreach { iteration => - val responseType = Random.nextInt(4) - val statusCode = randomStatusCode() - val headers = randomHeaders() - val data = randomBodyData() - - val liftResponse = responseType match { - case 0 => - // InMemoryResponse - InMemoryResponse(data, headers, Nil, statusCode) - case 1 => - // StreamingResponse - val inputStream = new ByteArrayInputStream(data) - val onEnd = () => {} - StreamingResponse(inputStream, onEnd, -1, headers, Nil, statusCode) - case 2 => - // OutputStreamResponse - val out: OutputStream => Unit = (os: OutputStream) => { - os.write(data) - os.flush() - } - OutputStreamResponse(out, -1, headers, Nil, statusCode) - case 3 => - // BasicResponse (NotFoundResponse) - NotFoundResponse() - } - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Response should be valid") - http4sResponse should not be null - http4sResponse.status should not be null - - And("Status code should be preserved (or expected for BasicResponse)") - if (responseType == 3) { - http4sResponse.status.code should equal(404) - } else { - http4sResponse.status.code should equal(statusCode) - } - - And("Headers should be preserved (except for BasicResponse)") - if (responseType != 3) { - headers.foreach { case (name, value) => - val header = http4sResponse.headers.get(CIString(name)) - header should not be empty - header.get.head.value should equal(value) - } - } - - And("Body should be preserved (except for BasicResponse)") - if (responseType != 3) { - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - bodyBytes should equal(data) - } - - successCount += 1 - } - - info(s"[Property Test] Comprehensive response conversion: $successCount/$iterations successful") - successCount should equal(iterations) - } - - scenario("Summary: Property 3 validation", PropertyTag, Property3Tag) { - info("=" * 80) - info("Property 3: Response Conversion Completeness - VALIDATION SUMMARY") - info("=" * 80) - info("") - info("InMemoryResponse status code preservation: 100/100 iterations") - info("InMemoryResponse header preservation: 100/100 iterations") - info("InMemoryResponse body preservation: 100/100 iterations") - info("InMemoryResponse large body preservation: 100/100 iterations") - info("InMemoryResponse Content-Type preservation: 100/100 iterations") - info("StreamingResponse status and headers preservation: 100/100 iterations") - info("StreamingResponse body preservation: 100/100 iterations") - info("StreamingResponse callback invocation: 100/100 iterations") - info("OutputStreamResponse status and headers preservation: 100/100 iterations") - info("OutputStreamResponse body preservation: 100/100 iterations") - info("OutputStreamResponse large body preservation: 100/100 iterations") - info("BasicResponse status code preservation: 100/100 iterations") - info("Comprehensive response conversion: 100/100 iterations") - info("") - info("Total Iterations: 1,300+") - info("Expected Success Rate: 100%") - info("") - info("Property Statement:") - info("For any Lift response type (InMemoryResponse, StreamingResponse,") - info("OutputStreamResponse, BasicResponse), when converted to HTTP4S response") - info("by the bridge, all response data (status code, headers, body content,") - info("cookies) should be preserved in the HTTP4S response.") - info("") - info("Validates: Requirements 2.4") - info("=" * 80) - } - } -} diff --git a/obp-api/src/test/scala/code/api/util/http4s/Http4sResponseConversionTest.scala b/obp-api/src/test/scala/code/api/util/http4s/Http4sResponseConversionTest.scala deleted file mode 100644 index 03e60cf0bd..0000000000 --- a/obp-api/src/test/scala/code/api/util/http4s/Http4sResponseConversionTest.scala +++ /dev/null @@ -1,567 +0,0 @@ -package code.api.util.http4s - -import cats.effect.IO -import cats.effect.unsafe.implicits.global -import net.liftweb.http._ -import org.http4s.Response -import org.scalatest.{FeatureSpec, GivenWhenThen, Matchers} -import org.typelevel.ci.CIString - -import java.io.{ByteArrayInputStream, InputStream, OutputStream} -import java.util.concurrent.atomic.AtomicBoolean - -/** - * Unit tests for Lift → HTTP4S response conversion in Http4sLiftWebBridge. - * - * Tests validate: - * - Handling of all Lift response types (InMemoryResponse, StreamingResponse, OutputStreamResponse, BasicResponse) - * - HTTP status code and header preservation - * - Error response format consistency - * - Streaming responses and callbacks - * - Edge cases (empty responses, large payloads, special characters) - * - * Validates: Requirements 2.4 (Task 2.5) - */ -class Http4sResponseConversionTest extends FeatureSpec with Matchers with GivenWhenThen { - - feature("Lift to HTTP4S response conversion - InMemoryResponse") { - scenario("Convert simple InMemoryResponse with JSON body") { - Given("A Lift InMemoryResponse with JSON data") - val jsonData = """{"status":"success","message":"Test response"}""" - val data = jsonData.getBytes("UTF-8") - val headers = List(("Content-Type", "application/json; charset=utf-8")) - val liftResponse = InMemoryResponse(data, headers, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Status code should be preserved") - http4sResponse.status.code should equal(200) - - And("Headers should be preserved") - val contentType = http4sResponse.headers.get(CIString("Content-Type")) - contentType should not be empty - contentType.get.head.value should include("application/json") - - And("Body should be preserved") - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - new String(bodyBytes, "UTF-8") should equal(jsonData) - } - - scenario("Convert InMemoryResponse with empty body") { - Given("A Lift InMemoryResponse with empty body") - val liftResponse = InMemoryResponse(Array.emptyByteArray, Nil, Nil, 204) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Status code should be 204 No Content") - http4sResponse.status.code should equal(204) - - And("Body should be empty") - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - bodyBytes.length should equal(0) - } - - scenario("Convert InMemoryResponse with multiple headers") { - Given("A Lift InMemoryResponse with multiple headers") - val data = "test".getBytes("UTF-8") - val headers = List( - ("Content-Type", "application/json"), - ("X-Custom-Header", "custom-value"), - ("X-Request-Id", "12345"), - ("Cache-Control", "no-cache") - ) - val liftResponse = InMemoryResponse(data, headers, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("All headers should be preserved") - http4sResponse.headers.get(CIString("Content-Type")) should not be empty - http4sResponse.headers.get(CIString("X-Custom-Header")).get.head.value should equal("custom-value") - http4sResponse.headers.get(CIString("X-Request-Id")).get.head.value should equal("12345") - http4sResponse.headers.get(CIString("Cache-Control")).get.head.value should equal("no-cache") - } - - scenario("Convert InMemoryResponse with UTF-8 characters") { - Given("A Lift InMemoryResponse with UTF-8 data") - val utf8Data = """{"name":"Bänk Tëst","currency":"€"}""" - val data = utf8Data.getBytes("UTF-8") - val headers = List(("Content-Type", "application/json; charset=utf-8")) - val liftResponse = InMemoryResponse(data, headers, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("UTF-8 characters should be preserved") - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - new String(bodyBytes, "UTF-8") should equal(utf8Data) - } - - scenario("Convert InMemoryResponse with large payload") { - Given("A Lift InMemoryResponse with large payload (>1MB)") - val largeData = ("x" * (1024 * 1024 + 100)).getBytes("UTF-8") // 1MB + 100 bytes - val liftResponse = InMemoryResponse(largeData, Nil, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Large payload should be preserved") - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - bodyBytes.length should equal(largeData.length) - } - - scenario("Convert InMemoryResponse with error status codes") { - Given("Lift InMemoryResponses with various error status codes") - val errorCodes = List(400, 401, 403, 404, 500, 502, 503) - - errorCodes.foreach { code => - val errorData = s"""{"code":$code,"message":"Error message"}""".getBytes("UTF-8") - val liftResponse = InMemoryResponse(errorData, Nil, Nil, code) - - When(s"Response with status $code is converted") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then(s"Status code $code should be preserved") - http4sResponse.status.code should equal(code) - } - } - } - - feature("Lift to HTTP4S response conversion - StreamingResponse") { - scenario("Convert StreamingResponse with callback") { - Given("A Lift StreamingResponse with data and callback") - val testData = "streaming test data" - val inputStream = new ByteArrayInputStream(testData.getBytes("UTF-8")) - val callbackInvoked = new AtomicBoolean(false) - val onEnd = () => callbackInvoked.set(true) - val headers = List(("Content-Type", "text/plain")) - val liftResponse = StreamingResponse(inputStream, onEnd, -1, headers, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Status code should be preserved") - http4sResponse.status.code should equal(200) - - And("Headers should be preserved") - http4sResponse.headers.get(CIString("Content-Type")).get.head.value should include("text/plain") - - And("Body should be preserved") - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - new String(bodyBytes, "UTF-8") should equal(testData) - - And("Callback should be invoked") - callbackInvoked.get() should be(true) - } - - scenario("Convert StreamingResponse with empty stream") { - Given("A Lift StreamingResponse with empty stream") - val emptyStream = new ByteArrayInputStream(Array.emptyByteArray) - val callbackInvoked = new AtomicBoolean(false) - val onEnd = () => callbackInvoked.set(true) - val liftResponse = StreamingResponse(emptyStream, onEnd, 0, Nil, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Body should be empty") - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - bodyBytes.length should equal(0) - - And("Callback should still be invoked") - callbackInvoked.get() should be(true) - } - - scenario("Convert StreamingResponse with large stream") { - Given("A Lift StreamingResponse with large stream (>1MB)") - val largeData = "x" * (1024 * 1024 + 100) // 1MB + 100 bytes - val inputStream = new ByteArrayInputStream(largeData.getBytes("UTF-8")) - val callbackInvoked = new AtomicBoolean(false) - val onEnd = () => callbackInvoked.set(true) - val liftResponse = StreamingResponse(inputStream, onEnd, -1, Nil, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Large stream should be preserved") - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - bodyBytes.length should equal(largeData.length) - - And("Callback should be invoked") - callbackInvoked.get() should be(true) - } - - scenario("Convert StreamingResponse ensures callback invocation on error") { - Given("A Lift StreamingResponse with failing stream") - val failingStream = new InputStream { - override def read(): Int = throw new RuntimeException("Stream read error") - } - val callbackInvoked = new AtomicBoolean(false) - val onEnd = () => callbackInvoked.set(true) - val liftResponse = StreamingResponse(failingStream, onEnd, -1, Nil, Nil, 200) - - When("Response conversion is attempted") - val result = try { - liftResponseToHttp4sForTest(liftResponse) - "no-error" - } catch { - case _: RuntimeException => "error-caught" - } - - Then("Error should be caught") - result should equal("error-caught") - - And("Callback should still be invoked (finally block)") - callbackInvoked.get() should be(true) - } - } - - feature("Lift to HTTP4S response conversion - OutputStreamResponse") { - scenario("Convert OutputStreamResponse with simple output") { - Given("A Lift OutputStreamResponse") - val testData = "output stream test data" - val out: OutputStream => Unit = (os: OutputStream) => { - os.write(testData.getBytes("UTF-8")) - os.flush() - } - val headers = List(("Content-Type", "text/plain")) - val liftResponse = OutputStreamResponse(out, -1, headers, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Status code should be preserved") - http4sResponse.status.code should equal(200) - - And("Headers should be preserved") - http4sResponse.headers.get(CIString("Content-Type")).get.head.value should include("text/plain") - - And("Body should be preserved") - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - new String(bodyBytes, "UTF-8") should equal(testData) - } - - scenario("Convert OutputStreamResponse with JSON output") { - Given("A Lift OutputStreamResponse with JSON data") - val jsonData = """{"status":"success","data":{"id":123,"name":"Test"}}""" - val out: OutputStream => Unit = (os: OutputStream) => { - os.write(jsonData.getBytes("UTF-8")) - os.flush() - } - val headers = List(("Content-Type", "application/json")) - val liftResponse = OutputStreamResponse(out, -1, headers, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("JSON body should be preserved") - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - new String(bodyBytes, "UTF-8") should equal(jsonData) - } - - scenario("Convert OutputStreamResponse with empty output") { - Given("A Lift OutputStreamResponse with no output") - val out: OutputStream => Unit = (os: OutputStream) => { - os.flush() - } - val liftResponse = OutputStreamResponse(out, 0, Nil, Nil, 204) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Status code should be 204") - http4sResponse.status.code should equal(204) - - And("Body should be empty") - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - bodyBytes.length should equal(0) - } - - scenario("Convert OutputStreamResponse with large output") { - Given("A Lift OutputStreamResponse with large output (>1MB)") - val largeData = "x" * (1024 * 1024 + 100) // 1MB + 100 bytes - val out: OutputStream => Unit = (os: OutputStream) => { - os.write(largeData.getBytes("UTF-8")) - os.flush() - } - val liftResponse = OutputStreamResponse(out, -1, Nil, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Large output should be preserved") - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - bodyBytes.length should equal(largeData.length) - } - - scenario("Convert OutputStreamResponse with UTF-8 output") { - Given("A Lift OutputStreamResponse with UTF-8 data") - val utf8Data = """{"name":"Tëst Bänk","symbol":"€£¥"}""" - val out: OutputStream => Unit = (os: OutputStream) => { - os.write(utf8Data.getBytes("UTF-8")) - os.flush() - } - val headers = List(("Content-Type", "application/json; charset=utf-8")) - val liftResponse = OutputStreamResponse(out, -1, headers, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("UTF-8 characters should be preserved") - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - new String(bodyBytes, "UTF-8") should equal(utf8Data) - } - } - - feature("Lift to HTTP4S response conversion - BasicResponse (via NotFoundResponse)") { - scenario("Convert NotFoundResponse with no body") { - Given("A Lift NotFoundResponse") - val liftResponse = NotFoundResponse() - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Status code should be 404") - http4sResponse.status.code should equal(404) - - And("Body should be empty") - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - bodyBytes.length should equal(0) - } - - scenario("Convert InternalServerErrorResponse") { - Given("A Lift InternalServerErrorResponse") - val liftResponse = InternalServerErrorResponse() - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Status code should be 500") - http4sResponse.status.code should equal(500) - } - - scenario("Convert ForbiddenResponse") { - Given("A Lift ForbiddenResponse") - val liftResponse = ForbiddenResponse() - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Status code should be 403") - http4sResponse.status.code should equal(403) - } - - scenario("Convert UnauthorizedResponse") { - Given("A Lift UnauthorizedResponse") - val liftResponse = UnauthorizedResponse("DirectLogin") - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Status code should be 401") - http4sResponse.status.code should equal(401) - } - - scenario("Convert BadResponse") { - Given("A Lift BadResponse") - val liftResponse = BadResponse() - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Status code should be 400") - http4sResponse.status.code should equal(400) - } - } - - feature("Lift to HTTP4S response conversion - Content-Type handling") { - scenario("Add default Content-Type when missing") { - Given("A Lift InMemoryResponse without Content-Type header") - val data = """{"status":"success"}""".getBytes("UTF-8") - val liftResponse = InMemoryResponse(data, Nil, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Default Content-Type should be added") - val contentType = http4sResponse.headers.get(CIString("Content-Type")) - contentType should not be empty - contentType.get.head.value should include("application/json") - } - - scenario("Preserve existing Content-Type header") { - Given("A Lift InMemoryResponse with Content-Type header") - val data = "plain text".getBytes("UTF-8") - val headers = List(("Content-Type", "text/plain; charset=utf-8")) - val liftResponse = InMemoryResponse(data, headers, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Existing Content-Type should be preserved") - val contentType = http4sResponse.headers.get(CIString("Content-Type")) - contentType should not be empty - contentType.get.head.value should equal("text/plain; charset=utf-8") - } - - scenario("Handle various Content-Type formats") { - Given("Lift responses with various Content-Type formats") - val contentTypes = List( - "application/json", - "application/json; charset=utf-8", - "text/html", - "text/plain; charset=iso-8859-1", - "application/xml", - "application/octet-stream" - ) - - contentTypes.foreach { ct => - val data = "test".getBytes("UTF-8") - val headers = List(("Content-Type", ct)) - val liftResponse = InMemoryResponse(data, headers, Nil, 200) - - When(s"Response with Content-Type '$ct' is converted") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Content-Type should be preserved") - val contentType = http4sResponse.headers.get(CIString("Content-Type")) - contentType should not be empty - contentType.get.head.value should equal(ct) - } - } - } - - feature("Lift to HTTP4S response conversion - Error responses") { - scenario("Convert error response with JSON body") { - Given("A Lift error response with JSON error message") - val errorJson = """{"code":400,"message":"Invalid request"}""" - val data = errorJson.getBytes("UTF-8") - val headers = List(("Content-Type", "application/json")) - val liftResponse = InMemoryResponse(data, headers, Nil, 400) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Error status code should be preserved") - http4sResponse.status.code should equal(400) - - And("Error body should be preserved") - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - new String(bodyBytes, "UTF-8") should equal(errorJson) - } - - scenario("Convert 404 Not Found response") { - Given("A Lift 404 response") - val errorJson = """{"code":404,"message":"Resource not found"}""" - val data = errorJson.getBytes("UTF-8") - val liftResponse = InMemoryResponse(data, Nil, Nil, 404) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("404 status should be preserved") - http4sResponse.status.code should equal(404) - } - - scenario("Convert 500 Internal Server Error response") { - Given("A Lift 500 response") - val errorJson = """{"code":500,"message":"Internal server error"}""" - val data = errorJson.getBytes("UTF-8") - val liftResponse = InMemoryResponse(data, Nil, Nil, 500) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("500 status should be preserved") - http4sResponse.status.code should equal(500) - } - - scenario("Convert 401 Unauthorized response") { - Given("A Lift 401 response") - val errorJson = """{"code":401,"message":"Authentication required"}""" - val data = errorJson.getBytes("UTF-8") - val headers = List(("WWW-Authenticate", "DirectLogin")) - val liftResponse = InMemoryResponse(data, headers, Nil, 401) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("401 status should be preserved") - http4sResponse.status.code should equal(401) - - And("WWW-Authenticate header should be preserved") - http4sResponse.headers.get(CIString("WWW-Authenticate")).get.head.value should equal("DirectLogin") - } - } - - feature("Lift to HTTP4S response conversion - Edge cases") { - scenario("Handle response with special characters in headers") { - Given("A Lift response with special characters in header values") - val headers = List( - ("X-Special", "value with spaces, commas, and \"quotes\""), - ("X-Unicode", "Tëst Hëädër Välüë") - ) - val liftResponse = InMemoryResponse(Array.emptyByteArray, headers, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Special characters in headers should be preserved") - http4sResponse.headers.get(CIString("X-Special")).get.head.value should equal("value with spaces, commas, and \"quotes\"") - http4sResponse.headers.get(CIString("X-Unicode")).get.head.value should equal("Tëst Hëädër Välüë") - } - - scenario("Handle response with many headers") { - Given("A Lift response with many headers") - val headers = (1 to 50).map(i => (s"X-Header-$i", s"value-$i")).toList - val liftResponse = InMemoryResponse(Array.emptyByteArray, headers, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("All headers should be preserved") - (1 to 50).foreach { i => - http4sResponse.headers.get(CIString(s"X-Header-$i")).get.head.value should equal(s"value-$i") - } - } - - scenario("Handle response with binary data") { - Given("A Lift response with binary data") - val binaryData = (0 to 255).map(_.toByte).toArray - val headers = List(("Content-Type", "application/octet-stream")) - val liftResponse = InMemoryResponse(binaryData, headers, Nil, 200) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Binary data should be preserved") - val bodyBytes = http4sResponse.body.compile.to(Array).unsafeRunSync() - bodyBytes should equal(binaryData) - } - - scenario("Handle response with invalid status code") { - Given("A Lift response with unusual status code") - val liftResponse = InMemoryResponse(Array.emptyByteArray, Nil, Nil, 999) - - When("Response is converted to HTTP4S") - val http4sResponse = liftResponseToHttp4sForTest(liftResponse) - - Then("Status code should be handled gracefully") - // HTTP4S will either accept it or convert to 500 - http4sResponse.status.code should (equal(999) or equal(500)) - } - } - - // Helper method to access private liftResponseToHttp4s method for testing - private def liftResponseToHttp4sForTest(response: LiftResponse): Response[IO] = { - // Use reflection to access private method - val method = Http4sLiftWebBridge.getClass.getDeclaredMethod( - "liftResponseToHttp4s", - classOf[LiftResponse] - ) - method.setAccessible(true) - method.invoke(Http4sLiftWebBridge, response).asInstanceOf[IO[Response[IO]]].unsafeRunSync() - } -} diff --git a/obp-api/src/test/scala/code/api/util/http4s/ResourceDocMatcherTest.scala b/obp-api/src/test/scala/code/api/util/http4s/ResourceDocMatcherTest.scala index a2c7c52233..99d10b2e4e 100644 --- a/obp-api/src/test/scala/code/api/util/http4s/ResourceDocMatcherTest.scala +++ b/obp-api/src/test/scala/code/api/util/http4s/ResourceDocMatcherTest.scala @@ -36,7 +36,6 @@ class ResourceDocMatcherTest extends FeatureSpec with Matchers with GivenWhenThe operationId: String = "testOperation" ): ResourceDoc = { ResourceDoc( - partialFunction = null, // Not needed for matching tests implementedInApiVersion = ApiVersion.v7_0_0, partialFunctionName = operationId, requestVerb = verb, diff --git a/obp-api/src/test/scala/code/api/util/http4s/ResourceDocMiddlewareEnableDisableTest.scala b/obp-api/src/test/scala/code/api/util/http4s/ResourceDocMiddlewareEnableDisableTest.scala index 60c2254545..ae87a41c9c 100644 --- a/obp-api/src/test/scala/code/api/util/http4s/ResourceDocMiddlewareEnableDisableTest.scala +++ b/obp-api/src/test/scala/code/api/util/http4s/ResourceDocMiddlewareEnableDisableTest.scala @@ -28,7 +28,6 @@ class ResourceDocMiddlewareEnableDisableTest extends FeatureSpec with Matchers w private def doc(operationName: String, version: ScannedApiVersion = ApiVersion.v7_0_0): ResourceDoc = ResourceDoc( - partialFunction = null, implementedInApiVersion = version, partialFunctionName = operationName, requestVerb = "GET", diff --git a/obp-api/src/test/scala/code/api/v5_0_0/CardTest.scala b/obp-api/src/test/scala/code/api/v5_0_0/CardTest.scala deleted file mode 100644 index 82715a1e72..0000000000 --- a/obp-api/src/test/scala/code/api/v5_0_0/CardTest.scala +++ /dev/null @@ -1,178 +0,0 @@ -package code.api.v5_0_0 - -/* - * CardTest is completely commented out due to initialization issues. - * - * The problem: When this test class is loaded during test discovery, it triggers initialization of - * V500ServerSetupAsync which tries to start a test server. This causes port binding issues and - * initialization errors that abort the entire test suite. - * - * Additional issues: - * - createPhysicalCardJsonV500 causes circular dependency chain - * - ExampleValue$ → Glossary$ → Helper$.ObpS → cglib proxy creation fails - * - NoClassDefFoundError when running on Java 17 with Java 11 project configuration - * - Port 8018 binding conflicts - * - * TODO: Fix the initialization order, move createPhysicalCardJsonV500 call inside test methods, - * and resolve server setup issues before re-enabling this test. - */ - -/* -import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON -import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON.{createPhysicalCardJsonV500} -import code.api.util.ApiRole -import code.api.util.APIUtil.OAuth._ -import code.api.util.ApiRole.CanCreateCustomer -import code.api.util.ErrorMessages._ -import code.api.v1_3_0.ReplacementJSON -import code.api.v3_1_0.CustomerJsonV310 -import code.api.v5_0_0.APIMethods500.Implementations5_0_0 -import code.entitlement.Entitlement -import code.setup.DefaultUsers -import com.github.dwickern.macros.NameOf.nameOf -import com.openbankproject.commons.model.{CardAction, CardReplacementReason} -import com.openbankproject.commons.util.ApiVersion -import net.liftweb.json.Serialization.write -import org.scalatest.{Ignore, Tag} - -import java.util.Date - -@Ignore -class CardTest extends V500ServerSetupAsync with DefaultUsers { - - object VersionOfApi extends Tag(ApiVersion.v5_0_0.toString) - object ApiEndpointAddCardForBank extends Tag(nameOf(Implementations5_0_0.addCardForBank)) - - - - feature("test Card APIs") { - scenario("We will create Card with many error cases", - ApiEndpointAddCardForBank, - VersionOfApi - ) { - Given("The test bank and test account") - val testBank = testBankId1 - val testAccount = testAccountId1 - val dummyCard = createPhysicalCardJsonV500 - - And("We need to prepare the Customer Info") - - Then("We prepare the Customer data") - val request310 = (v5_0_0_Request / "banks" / testBankId1.value / "customers").POST <@(user1) - val postCustomerJson = SwaggerDefinitionsJSON.postCustomerJsonV310 - Entitlement.entitlement.vend.addEntitlement(testBank.value, resourceUser1.userId, CanCreateCustomer.toString) - val responseCustomer310 = makePostRequest(request310, write(postCustomerJson)) - val customerId = responseCustomer310.body.extract[CustomerJsonV310].customer_id - - val properCardJson = dummyCard.copy(account_id = testAccount.value, issue_number = "123", customer_id = customerId) - - val requestAnonymous = (v5_0_0_Request / "management"/"banks" / testBank.value / "cards" ).POST - val requestWithAuthUser = (v5_0_0_Request / "management" /"banks" / testBank.value / "cards" ).POST <@ (user1) - - Then(s"We test with anonymous user.") - val responseAnonymous = makePostRequest(requestAnonymous, write(properCardJson)) - And(s"We should get 401 and get the authentication error") - responseAnonymous.code should equal(401) - responseAnonymous.body.toString contains(s"$AuthenticatedUserIsRequired") should be (true) - - Then(s"We call the authentication user, but without proper role: ${ApiRole.canCreateCardsForBank}") - val responseUserButNoRole = makePostRequest(requestWithAuthUser, write(properCardJson)) - And(s"We should get 403 and the error message missing can ${ApiRole.canCreateCardsForBank} role") - responseUserButNoRole.code should equal(403) - responseUserButNoRole.body.toString contains(s"${ApiRole.canCreateCardsForBank}") should be (true) - - Then(s"We grant the user ${ApiRole.canCreateCardsForBank} role, but with the wrong AccountId") - Entitlement.entitlement.vend.addEntitlement(testBankId1.value, resourceUser1.userId, ApiRole.canCreateCardsForBank.toString) - val wrongAccountCardJson = dummyCard - val responseHasRoleWrongAccountId = makePostRequest(requestWithAuthUser, write(wrongAccountCardJson)) - And(s"We should get 404 and get the error message: $BankAccountNotFound.") - responseHasRoleWrongAccountId.code should equal(404) - responseHasRoleWrongAccountId.body.toString contains(s"$BankAccountNotFound") - - Then(s"We call the authentication user, but totally wrong Json format.") - val wrongPostJsonFormat = testBankId1 - val responseWrongJsonFormat = makePostRequest(requestWithAuthUser, write(wrongPostJsonFormat)) - And(s"We should get 400 and get the error message: $InvalidJsonFormat.") - responseWrongJsonFormat.code should equal(400) - responseWrongJsonFormat.body.toString contains(s"$InvalidJsonFormat") - - Then(s"We call the authentication user, but wrong card.allows value") - val withWrongVlaueForAllows = properCardJson.copy(allows = List("123")) - val responseWithWrongVlaueForAllows = makePostRequest(requestWithAuthUser, write(withWrongVlaueForAllows)) - And(s"We should get 400 and get the error message") - responseWithWrongVlaueForAllows.code should equal(400) - responseWithWrongVlaueForAllows.body.toString contains(AllowedValuesAre++ CardAction.availableValues.mkString(", ")) - - Then(s"We call the authentication user, but wrong card.replacement value") - val wrongCardReplacementReasonJson = dummyCard.copy(replacement = Some(ReplacementJSON(new Date(),"Wrong"))) // The replacement must be Enum of `CardReplacementReason` - val responseWrongCardReplacementReasonJson = makePostRequest(requestWithAuthUser, write(wrongCardReplacementReasonJson)) - And(s"We should get 400 and get the error message") - responseWrongCardReplacementReasonJson.code should equal(400) - responseWrongCardReplacementReasonJson.body.toString contains(AllowedValuesAre + CardReplacementReason.availableValues.mkString(", ")) - - Then(s"We call the authentication user, but too long issue number.") - val properCardJsonTooLongIssueNumber = dummyCard.copy(account_id = testAccount.value, issue_number = "01234567891") - val responseUserWrongIssueNumber = makePostRequest(requestWithAuthUser, write(properCardJsonTooLongIssueNumber)) - And(s"We should get 400 and the error message missing can ${ApiRole.canCreateCardsForBank} role") - responseUserWrongIssueNumber.code should equal(400) - responseUserWrongIssueNumber.body.toString contains(s"${maximumLimitExceeded.replace("10000", "10")}") should be (true) - - Then(s"We grant the user ${ApiRole.canCreateCardsForBank} role, but wrong customerId") - val wrongCustomerCardJson = properCardJson.copy(customer_id = "wrongId") - val responsewrongCustomerCardJson = makePostRequest(requestWithAuthUser, write(wrongCustomerCardJson)) - And(s"We should get 400 and get the error message: $CustomerNotFoundByCustomerId.") - responsewrongCustomerCardJson.code should equal(404) - responsewrongCustomerCardJson.body.toString contains(s"$CustomerNotFoundByCustomerId") should be (true) - - Then(s"We test the success case, prepare all stuff.") - val responseProper = makePostRequest(requestWithAuthUser, write(properCardJson)) - And("We should get 400 and get the error message: Not Found the BankAccount.") - responseProper.code should equal(201) - val cardJsonV500 = responseProper.body.extract[PhysicalCardJsonV500] - cardJsonV500.card_number should be (properCardJson.card_number) - cardJsonV500.card_type should be (properCardJson.card_type) - cardJsonV500.name_on_card should be (properCardJson.name_on_card) - cardJsonV500.issue_number should be (properCardJson.issue_number) - cardJsonV500.serial_number should be (properCardJson.serial_number ) - cardJsonV500.valid_from_date should be (properCardJson.valid_from_date ) - cardJsonV500.expires_date should be (properCardJson.expires_date ) - cardJsonV500.enabled should be (properCardJson.enabled ) - cardJsonV500.cancelled should be (false) - cardJsonV500.on_hot_list should be (false) - cardJsonV500.technology should be (properCardJson.technology ) - cardJsonV500.networks should be (properCardJson.networks ) - cardJsonV500.allows should be (properCardJson.allows ) - cardJsonV500.account.id should be (properCardJson.account_id ) - cardJsonV500.replacement should be { - properCardJson.replacement match { - case Some(x) => x - case None => null - } - } - cardJsonV500.pin_reset.toString() should be(properCardJson.pin_reset.toString()) - cardJsonV500.collected should be { - properCardJson.collected match { - case Some(x) => x - case None => null - } - } - cardJsonV500.posted should be { - properCardJson.posted match { - case Some(x) => x - case None => null - } - } - - cardJsonV500.cvv.length equals (3) should be(true) - cardJsonV500.brand equals ("Visa") should be(true) - - Then(s"We create the card with same bankId, cardNumber and issueNumber") - val responseDeplicated = makePostRequest(requestWithAuthUser, write(properCardJson)) - And("We should get 400 and get the error message: the card already existing .") - responseDeplicated.code should equal(400) - responseDeplicated.body.toString contains(s"$CardAlreadyExists") should be (true) - } - } - -} -*/ diff --git a/obp-api/src/test/scala/code/api/v5_0_0/Http4s500RoutesTest.scala b/obp-api/src/test/scala/code/api/v5_0_0/Http4s500RoutesTest.scala deleted file mode 100644 index 9f78fce922..0000000000 --- a/obp-api/src/test/scala/code/api/v5_0_0/Http4s500RoutesTest.scala +++ /dev/null @@ -1,138 +0,0 @@ -package code.api.v5_0_0 - -import org.scalatest.Ignore -import cats.effect.IO -import cats.effect.unsafe.implicits.global -import code.api.util.APIUtil -import code.setup.ServerSetupWithTestData -import net.liftweb.json.JValue -import net.liftweb.json.JsonAST.{JArray, JField, JObject} -import net.liftweb.json.JsonParser.parse -import org.http4s.{Method, Request, Status, Uri} -import org.scalatest.Tag - -@Ignore -class Http4s500RoutesTest extends ServerSetupWithTestData { - - object Http4s500RoutesTag extends Tag("Http4s500Routes") - - private def runAndParseJson(request: Request[IO]): (Status, JValue) = { - val response = Http4s500.wrappedRoutesV500Services.orNotFound.run(request).unsafeRunSync() - val body = response.as[String].unsafeRunSync() - val json = if (body.trim.isEmpty) JObject(Nil) else parse(body) - (response.status, json) - } - - private def toFieldMap(fields: List[JField]): Map[String, JValue] = { - fields.map(field => field.name -> field.value).toMap - } - - feature("Http4s500 root endpoint") { - - scenario("Return API info JSON", Http4s500RoutesTag) { - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString("/obp/v5.0.0/root") - ) - - val (status, json) = runAndParseJson(request) - - status shouldBe Status.Ok - json match { - case JObject(fields) => - val keys = fields.map(_.name) - keys should contain("version") - keys should contain("version_status") - keys should contain("git_commit") - keys should contain("connector") - case _ => - fail("Expected JSON object for root endpoint") - } - } - } - - feature("Http4s500 banks endpoint") { - - scenario("Return banks list JSON", Http4s500RoutesTag) { - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString("/obp/v5.0.0/banks") - ) - - val (status, json) = runAndParseJson(request) - - status shouldBe Status.Ok - json match { - case JObject(fields) => - toFieldMap(fields).get("banks") match { - case Some(JArray(_)) => succeed - case _ => fail("Expected banks field to be an array") - } - case _ => - fail("Expected JSON object for banks endpoint") - } - } - } - - feature("Http4s500 bank endpoint") { - - scenario("Return single bank JSON", Http4s500RoutesTag) { - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString(s"/obp/v5.0.0/banks/${APIUtil.defaultBankId}") - ) - - val (status, json) = runAndParseJson(request) - - status shouldBe Status.Ok - json match { - case JObject(fields) => - val keys = fields.map(_.name) - keys should contain("id") - keys should contain("bank_code") - case _ => - fail("Expected JSON object for get bank endpoint") - } - } - } - - feature("Http4s500 products endpoints") { - - scenario("Return products list JSON", Http4s500RoutesTag) { - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString(s"/obp/v5.0.0/banks/${APIUtil.defaultBankId}/products") - ) - - val (status, json) = runAndParseJson(request) - - status shouldBe Status.Ok - json match { - case JObject(fields) => - toFieldMap(fields).get("products") match { - case Some(JArray(_)) => succeed - case _ => fail("Expected products field to be an array") - } - case _ => - fail("Expected JSON object for products endpoint") - } - } - - scenario("Return 404 for missing product", Http4s500RoutesTag) { - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString(s"/obp/v5.0.0/banks/${APIUtil.defaultBankId}/products/DOES_NOT_EXIST") - ) - - val (status, json) = runAndParseJson(request) - - status shouldBe Status.NotFound - json match { - case JObject(fields) => - toFieldMap(fields).get("message") should not be empty - case _ => - fail("Expected JSON object for error response") - } - } - } -} diff --git a/obp-api/src/test/scala/code/api/v5_0_0/Http4s500SystemViewsTest.scala b/obp-api/src/test/scala/code/api/v5_0_0/Http4s500SystemViewsTest.scala index 28dd0b224e..12deeb73cf 100644 --- a/obp-api/src/test/scala/code/api/v5_0_0/Http4s500SystemViewsTest.scala +++ b/obp-api/src/test/scala/code/api/v5_0_0/Http4s500SystemViewsTest.scala @@ -463,4 +463,79 @@ class Http4s500SystemViewsTest extends ServerSetupWithTestData { statusCode shouldBe 200 } } + + // Ported from the retired Lift-era SystemViewsTests (ApiEndpoint5 getSystemViewsIds), + // so deleting that suite does not drop the /system-views-ids coverage. + feature("Http4s500 GET /system-views-ids - Get System View Ids") { + + scenario("Reject unauthenticated access", Http4s500SystemViewsTag) { + Given("GET /obp/v5.0.0/system-views-ids request without auth headers") + When("Making HTTP request to server") + val (statusCode, json) = makeHttpRequest( + "GET", + "/obp/v5.0.0/system-views-ids" + ) + + Then("Response is 401 Unauthorized") + statusCode shouldBe 401 + json match { + case JObject(fields) => + toFieldMap(fields).get("message") match { + case Some(JString(message)) => + message should include(AuthenticatedUserIsRequired) + case _ => + fail("Expected message field for unauthorized response") + } + case _ => + fail("Expected JSON object for unauthorized response") + } + } + + scenario("Reject authenticated access without required role", Http4s500SystemViewsTag) { + Given("GET /obp/v5.0.0/system-views-ids request with auth but no CanGetSystemView role") + When("Making HTTP request to server") + val headers = Map("DirectLogin" -> s"token=${token1.value}") + val (statusCode, json) = makeHttpRequest( + "GET", + "/obp/v5.0.0/system-views-ids", + headers + ) + + Then("Response is 403 Forbidden") + statusCode shouldBe 403 + json match { + case JObject(fields) => + toFieldMap(fields).get("message") match { + case Some(JString(message)) => + message should include(UserHasMissingRoles) + message should include(CanGetSystemView.toString) + case _ => + fail("Expected message field for missing-role response") + } + case _ => + fail("Expected JSON object for missing-role response") + } + } + + scenario("Get system view ids when authenticated and entitled", Http4s500SystemViewsTag) { + Given("GET /obp/v5.0.0/system-views-ids request with auth and CanGetSystemView role") + addEntitlement("", resourceUser1.userId, CanGetSystemView.toString) + + When("Making HTTP request to server") + val headers = Map("DirectLogin" -> s"token=${token1.value}") + val (statusCode, json) = makeHttpRequest( + "GET", + "/obp/v5.0.0/system-views-ids", + headers + ) + + Then("Response is 200 OK with a JSON object of system view ids") + statusCode shouldBe 200 + json match { + case JObject(_) => // ViewsIdsJsonV500 shape + case _ => + fail("Expected JSON object for system view ids response") + } + } + } } diff --git a/obp-api/src/test/scala/code/api/v5_0_0/SystemViewsTests.scala b/obp-api/src/test/scala/code/api/v5_0_0/SystemViewsTests.scala deleted file mode 100644 index 0fa0e0b77f..0000000000 --- a/obp-api/src/test/scala/code/api/v5_0_0/SystemViewsTests.scala +++ /dev/null @@ -1,331 +0,0 @@ -/** -Open Bank Project - API -Copyright (C) 2011-2019, TESOBE GmbH. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see . - -Email: contact@tesobe.com -TESOBE GmbH. -Osloer Strasse 16/17 -Berlin 13359, Germany - -This product includes software developed at -TESOBE (http://www.tesobe.com/) - - */ -package code.api.v5_0_0 - -import _root_.net.liftweb.json.Serialization.write -import code.api.Constant._ -import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON._ -import code.api.util.APIUtil -import code.api.util.APIUtil.OAuth._ -import code.api.util.ApiRole.{CanCreateSystemView, CanDeleteSystemView, CanGetSystemView, CanUpdateSystemView} -import code.api.util.ErrorMessages.{UserHasMissingRoles, AuthenticatedUserIsRequired} -import code.api.v5_0_0.APIMethods500.Implementations5_0_0 -import code.entitlement.Entitlement -import code.setup.APIResponse -import code.views.MapperViews -import code.views.system.AccountAccess -import com.github.dwickern.macros.NameOf.nameOf -import com.openbankproject.commons.model.{CreateViewJson, ErrorMessage, UpdateViewJSON} -import com.openbankproject.commons.util.ApiVersion -import net.liftweb.mapper.By -import org.scalatest.Tag - -import scala.collection.immutable.List - -class SystemViewsTests extends V500ServerSetup { - override def beforeAll(): Unit = { - super.beforeAll() - } - - override def afterAll(): Unit = { - super.afterAll() - } - - /** - * Test tags - * Example: To run tests with tag "getPermissions": - * mvn test -D tagsToInclude - * - * This is made possible by the scalatest maven plugin - */ - object VersionOfApi extends Tag(ApiVersion.v5_0_0.toString) - object ApiEndpoint1 extends Tag(nameOf(Implementations5_0_0.getSystemView)) - object ApiEndpoint2 extends Tag(nameOf(Implementations5_0_0.createSystemView)) - object ApiEndpoint3 extends Tag(nameOf(Implementations5_0_0.updateSystemView)) - object ApiEndpoint4 extends Tag(nameOf(Implementations5_0_0.deleteSystemView)) - object ApiEndpoint5 extends Tag(nameOf(Implementations5_0_0.getSystemViewsIds)) - - // Custom view, name starts from `_` - // System view, owner - val randomSystemViewId = "a"+APIUtil.generateUUID() - val postBodySystemViewJson = createSystemViewJsonV500 - .copy(name=randomSystemViewId) - .copy(metadata_view = randomSystemViewId).toCreateViewJson - - def getSystemView(viewId : String, consumerAndToken: Option[(Consumer, Token)]): APIResponse = { - val request = v5_0_0_Request / "system-views" / viewId <@(consumerAndToken) - makeGetRequest(request) - } - def getSystemViewsIds(consumerAndToken: Option[(Consumer, Token)]): APIResponse = { - val request = v5_0_0_Request / "system-views-ids" <@(consumerAndToken) - makeGetRequest(request) - } - def postSystemView(view: CreateViewJson, consumerAndToken: Option[(Consumer, Token)]): APIResponse = { - val request = (v5_0_0_Request / "system-views").POST <@(consumerAndToken) - makePostRequest(request, write(view)) - } - def putSystemView(viewId : String, view: UpdateViewJSON, consumerAndToken: Option[(Consumer, Token)]): APIResponse = { - val request = (v5_0_0_Request / "system-views" / viewId).PUT <@(consumerAndToken) - makePutRequest(request, write(view)) - } - def deleteSystemView(viewId : String, consumerAndToken: Option[(Consumer, Token)]): APIResponse = { - val request = (v5_0_0_Request / "system-views" / viewId).DELETE <@(consumerAndToken) - makeDeleteRequest(request) - } - def createSystemView(viewId: String): Boolean = { - Entitlement.entitlement.vend.addEntitlement("", resourceUser1.userId, CanCreateSystemView.toString) - val postBody = postBodySystemViewJson.copy(name=viewId).copy(metadata_view = viewId) - val response400 = postSystemView(postBody, user1) - response400.code == 201 - } - - - - feature(s"test $ApiEndpoint2 version $VersionOfApi - Unauthorized access") { - scenario("We will call the endpoint without user credentials", ApiEndpoint1, VersionOfApi) { - When(s"We make a request $ApiEndpoint2") - val response400 = postSystemView(postBodySystemViewJson, None) - Then("We should get a 401") - response400.code should equal(401) - response400.body.extract[ErrorMessage].message should equal(AuthenticatedUserIsRequired) - } - } - feature(s"test $ApiEndpoint2 version $VersionOfApi - Authorized access") { - scenario("We will call the endpoint without user credentials", ApiEndpoint1, VersionOfApi) { - When(s"We make a request $ApiEndpoint2") - val response400 = postSystemView(postBodySystemViewJson, user1) - Then("We should get a 403") - response400.code should equal(403) - response400.body.extract[ErrorMessage].message should equal(UserHasMissingRoles + CanCreateSystemView) - } - } - feature(s"test $ApiEndpoint2 version $VersionOfApi - Authorized access with proper Role") { - scenario("We will call the endpoint without user credentials", ApiEndpoint1, VersionOfApi) { - When(s"We make a request $ApiEndpoint2") - Entitlement.entitlement.vend.addEntitlement("", resourceUser1.userId, CanCreateSystemView.toString) - val response400 = postSystemView(postBodySystemViewJson, user1) - Then("We should get a 201") - response400.code should equal(201) - response400.body.extract[ViewJsonV500] - } - } - - - feature(s"test $ApiEndpoint1 version $VersionOfApi - Unauthorized access") { - scenario("We will call the endpoint without user credentials", ApiEndpoint1, VersionOfApi) { - val viewId = APIUtil.generateUUID() - createSystemView(viewId) - When(s"We make a request $ApiEndpoint1") - val response400 = getSystemView(viewId, None) - Then("We should get a 401") - response400.code should equal(401) - response400.body.extract[ErrorMessage].message should equal(AuthenticatedUserIsRequired) - } - } - feature(s"test $ApiEndpoint1 version $VersionOfApi - Authorized access") { - scenario("We will call the endpoint without user credentials", ApiEndpoint1, VersionOfApi) { - val viewId = APIUtil.generateUUID() - createSystemView(viewId) - When(s"We make a request $ApiEndpoint1") - val response400 = getSystemView(viewId, user1) - Then("We should get a 403") - response400.code should equal(403) - response400.body.extract[ErrorMessage].message should equal(UserHasMissingRoles + CanGetSystemView) - } - } - feature(s"test $ApiEndpoint1 version $VersionOfApi - Authorized access with proper Role") { - scenario("We will call the endpoint without user credentials", ApiEndpoint1, VersionOfApi) { - val viewId = APIUtil.generateUUID() - createSystemView(viewId) - When(s"We make a request $ApiEndpoint1") - Entitlement.entitlement.vend.addEntitlement("", resourceUser1.userId, CanGetSystemView.toString) - val response400 = getSystemView(viewId, user1) - Then("We should get a 200") - response400.code should equal(200) - response400.body.extract[ViewJsonV500] - } - } - - - feature(s"test $ApiEndpoint3 version $VersionOfApi - Unauthorized access") { - scenario("We will call the endpoint without user credentials", ApiEndpoint3, VersionOfApi) { - val viewId = APIUtil.generateUUID() - createSystemView(viewId) - When(s"We make a request $ApiEndpoint3") - val response400 = getSystemView(viewId, None) - Then("We should get a 401") - response400.code should equal(401) - response400.body.extract[ErrorMessage].message should equal(AuthenticatedUserIsRequired) - } - } - feature(s"test $ApiEndpoint3 version $VersionOfApi - Authorized access") { - scenario("We will call the endpoint without user credentials", ApiEndpoint3, VersionOfApi) { - val viewId = APIUtil.generateUUID() - createSystemView(viewId) - When(s"We make a request $ApiEndpoint3") - val response400 = getSystemView(viewId, user1) - Then("We should get a 403") - response400.code should equal(403) - response400.body.extract[ErrorMessage].message should equal(UserHasMissingRoles + CanGetSystemView) - } - } - feature(s"test $ApiEndpoint3 version $VersionOfApi - Authorized access with proper Role") { - scenario("we will update a view on a bank account", ApiEndpoint3, VersionOfApi) { - val updatedViewDescription = "aloha" - val updatedAliasToUse = "public" - val allowedActions = List("can_see_images", "can_delete_comment") - - def viewUpdateJson(originalView : ViewJsonV500) = { - //it's not perfect, assumes too much about originalView (i.e. randomView(true, "")) - UpdateViewJSON( - description = updatedViewDescription, - metadata_view = originalView.metadata_view, - is_public = originalView.is_public, - is_firehose = Some(true), - which_alias_to_use = updatedAliasToUse, - hide_metadata_if_alias_used = !originalView.hide_metadata_if_alias_used, - allowed_actions = allowedActions, - can_grant_access_to_views = Some(originalView.can_grant_access_to_views), - can_revoke_access_to_views = Some(originalView.can_revoke_access_to_views) - ) - } - Entitlement.entitlement.vend.addEntitlement("", resourceUser1.userId, CanCreateSystemView.toString) - Entitlement.entitlement.vend.addEntitlement("", resourceUser1.userId, CanUpdateSystemView.toString) - - Given("A view exists") - val creationReply = postSystemView(postBodySystemViewJson, user1) - creationReply.code should equal (201) - val createdView : ViewJsonV500 = creationReply.body.extract[ViewJsonV500] - createdView.id should not startWith("_") - createdView.can_see_images should equal(true) - createdView.can_delete_comment should equal(true) - createdView.can_delete_physical_location should equal(true) - createdView.can_edit_owner_comment should equal(true) - createdView.description should not equal(updatedViewDescription) - createdView.hide_metadata_if_alias_used should equal(false) - - When("We use a valid access token and valid put json") - val reply = putSystemView(createdView.id, viewUpdateJson(createdView), user1) - Then("We should get back the updated view") - reply.code should equal (200) - val updatedView = reply.body.extract[ViewJsonV500] - updatedView.can_see_images should equal(true) - updatedView.can_delete_comment should equal(true) - updatedView.can_delete_physical_location should equal(false) - updatedView.can_edit_owner_comment should equal(false) - updatedView.description should equal(updatedViewDescription) - updatedView.hide_metadata_if_alias_used should equal(true) - updatedView.is_firehose should equal(Some(true)) - } - } - - - feature(s"test $ApiEndpoint4 version $VersionOfApi - Unauthorized access") { - scenario("We will call the endpoint without user credentials", ApiEndpoint4, VersionOfApi) { - val viewId = APIUtil.generateUUID() - createSystemView(viewId) - When(s"We make a request $ApiEndpoint4") - val response400 = deleteSystemView(viewId, None) - Then("We should get a 401") - response400.code should equal(401) - response400.body.extract[ErrorMessage].message should equal(AuthenticatedUserIsRequired) - } - } - feature(s"test $ApiEndpoint4 version $VersionOfApi - Authorized access") { - scenario("We will call the endpoint without user credentials", ApiEndpoint4, VersionOfApi) { - val viewId = APIUtil.generateUUID() - createSystemView(viewId) - When(s"We make a request $ApiEndpoint4") - val response400 = deleteSystemView(viewId, user1) - Then("We should get a 403") - response400.code should equal(403) - response400.body.extract[ErrorMessage].message should equal(UserHasMissingRoles + CanDeleteSystemView) - } - } - feature(s"test $ApiEndpoint4 version $VersionOfApi - Authorized access with proper Role") { - scenario("We will call the endpoint without user credentials", ApiEndpoint4, VersionOfApi) { - val viewId = APIUtil.generateUUID() - createSystemView(viewId) - Entitlement.entitlement.vend.addEntitlement("", resourceUser1.userId, CanDeleteSystemView.toString) - When(s"We make a request $ApiEndpoint4") - val response400 = deleteSystemView(viewId, user1) - Then("We should get a 200") - response400.code should equal(200) - } - } - feature(s"test $ApiEndpoint4 version $VersionOfApi - Authorized access with proper Role in order to delete system view") { - scenario("We will call the endpoint without user credentials", ApiEndpoint4, VersionOfApi) { - When(s"We make a request $ApiEndpoint2") - Entitlement.entitlement.vend.addEntitlement("", resourceUser1.userId, CanCreateSystemView.toString) - val responseCreate400 = postSystemView(postBodySystemViewJson, user1) - Then("We should get a 201") - responseCreate400.code should equal(201) - - Entitlement.entitlement.vend.addEntitlement("", resourceUser1.userId, CanDeleteSystemView.toString) - When(s"We make a request $ApiEndpoint4") - AccountAccess.findAll( - By(AccountAccess.view_id, randomSystemViewId), - By(AccountAccess.user_fk, resourceUser1.id.get) - ).forall(_.delete_!) // Remove all rows assigned to the system view in order to delete it - val response400 = deleteSystemView(randomSystemViewId, user1) - Then("We should get a 200") - response400.code should equal(200) - } - } - - - feature(s"test $ApiEndpoint5 version $VersionOfApi - Unauthorized access") { - scenario("We will call the endpoint without user credentials", ApiEndpoint1, VersionOfApi) { - When(s"We make a request $ApiEndpoint5") - val response400 = getSystemViewsIds(None) - Then("We should get a 401") - response400.code should equal(401) - response400.body.extract[ErrorMessage].message should equal(AuthenticatedUserIsRequired) - } - } - feature(s"test $ApiEndpoint5 version $VersionOfApi - Authorized access") { - scenario("We will call the endpoint without user credentials", ApiEndpoint1, VersionOfApi) { - When(s"We make a request $ApiEndpoint2") - val response400 = getSystemViewsIds(user1) - Then("We should get a 403") - response400.code should equal(403) - response400.body.extract[ErrorMessage].message should equal(UserHasMissingRoles + CanGetSystemView) - } - } - feature(s"test $ApiEndpoint5 version $VersionOfApi - Authorized access with proper Role") { - scenario("We will call the endpoint without user credentials", ApiEndpoint1, VersionOfApi) { - When(s"We make a request $ApiEndpoint2") - Entitlement.entitlement.vend.addEntitlement("", resourceUser1.userId, CanGetSystemView.toString) - val response400 = getSystemViewsIds(user1) - Then("We should get a 200") - response400.code should equal(200) - response400.body.extract[ViewsIdsJsonV500] - } - } - - -} diff --git a/obp-api/src/test/scala/code/api/v5_0_0/V500ContractParityTest.scala b/obp-api/src/test/scala/code/api/v5_0_0/V500ContractParityTest.scala deleted file mode 100644 index 90ccf2ad14..0000000000 --- a/obp-api/src/test/scala/code/api/v5_0_0/V500ContractParityTest.scala +++ /dev/null @@ -1,201 +0,0 @@ -package code.api.v5_0_0 - -import org.scalatest.Ignore -import cats.effect.IO -import cats.effect.unsafe.implicits.global -import code.api.util.APIUtil -import code.api.util.APIUtil.OAuth._ -import net.liftweb.json.JValue -import net.liftweb.json.JsonAST.{JArray, JField, JObject, JString} -import net.liftweb.json.JsonParser.parse -import org.http4s.{Method, Request, Status, Uri} -import org.http4s.Header -import org.typelevel.ci.CIString -import org.scalatest.Tag - -@Ignore -class V500ContractParityTest extends V500ServerSetup { - - object V500ContractParityTag extends Tag("V500ContractParity") - - private def http4sRunAndParseJson(path: String): (Status, JValue) = { - val request = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString(path) - ) - val response = Http4s500.wrappedRoutesV500ServicesWithJsonNotFound.orNotFound.run(request).unsafeRunSync() - val body = response.as[String].unsafeRunSync() - val json = if (body.trim.isEmpty) JObject(Nil) else parse(body) - (response.status, json) - } - - private def toFieldMap(fields: List[JField]): Map[String, JValue] = { - fields.map(field => field.name -> field.value).toMap - } - - private def getStringField(json: JValue, key: String): Option[String] = { - json match { - case JObject(fields) => - toFieldMap(fields).get(key) match { - case Some(JString(v)) => Some(v) - case _ => None - } - case _ => None - } - } - - feature("V500 liftweb vs http4s parity") { - - scenario("root returns consistent status and key fields", V500ContractParityTag) { - val liftResponse = makeGetRequest((v5_0_0_Request / "root").GET) - val (http4sStatus, http4sJson) = http4sRunAndParseJson("/obp/v5.0.0/root") - - liftResponse.code should equal(http4sStatus.code) - - liftResponse.body match { - case JObject(fields) => - val keys = fields.map(_.name) - keys should contain("version") - keys should contain("version_status") - keys should contain("git_commit") - keys should contain("connector") - case _ => - fail("Expected liftweb JSON object for root endpoint") - } - - http4sJson match { - case JObject(fields) => - val keys = fields.map(_.name) - keys should contain("version") - keys should contain("version_status") - keys should contain("git_commit") - keys should contain("connector") - case _ => - fail("Expected http4s JSON object for root endpoint") - } - } - - scenario("banks returns consistent status and banks array shape", V500ContractParityTag) { - val liftResponse = makeGetRequest((v5_0_0_Request / "banks").GET) - val (http4sStatus, http4sJson) = http4sRunAndParseJson("/obp/v5.0.0/banks") - - liftResponse.code should equal(http4sStatus.code) - - liftResponse.body match { - case JObject(fields) => - toFieldMap(fields).get("banks") match { - case Some(JArray(_)) => succeed - case _ => fail("Expected liftweb banks field to be an array") - } - case _ => - fail("Expected liftweb JSON object for banks endpoint") - } - - http4sJson match { - case JObject(fields) => - toFieldMap(fields).get("banks") match { - case Some(JArray(_)) => succeed - case _ => fail("Expected http4s banks field to be an array") - } - case _ => - fail("Expected http4s JSON object for banks endpoint") - } - } - - scenario("bank returns consistent status and bank id", V500ContractParityTag) { - val bankId = APIUtil.defaultBankId - val liftResponse = makeGetRequest((v5_0_0_Request / "banks" / bankId).GET) - val (http4sStatus, http4sJson) = http4sRunAndParseJson(s"/obp/v5.0.0/banks/$bankId") - - liftResponse.code should equal(http4sStatus.code) - - getStringField(liftResponse.body, "id") shouldBe Some(bankId) - getStringField(http4sJson, "id") shouldBe Some(bankId) - } - - scenario("products list returns consistent status and products array shape", V500ContractParityTag) { - val bankId = APIUtil.defaultBankId - val liftResponse = makeGetRequest((v5_0_0_Request / "banks" / bankId / "products").GET) - val (http4sStatus, http4sJson) = http4sRunAndParseJson(s"/obp/v5.0.0/banks/$bankId/products") - - liftResponse.code should equal(http4sStatus.code) - - liftResponse.body match { - case JObject(fields) => - toFieldMap(fields).get("products") match { - case Some(JArray(_)) => succeed - case _ => fail("Expected liftweb products field to be an array") - } - case _ => - fail("Expected liftweb JSON object for products endpoint") - } - - http4sJson match { - case JObject(fields) => - toFieldMap(fields).get("products") match { - case Some(JArray(_)) => succeed - case _ => fail("Expected http4s products field to be an array") - } - case _ => - fail("Expected http4s JSON object for products endpoint") - } - } - - scenario("product returns consistent 404 for missing product", V500ContractParityTag) { - val bankId = APIUtil.defaultBankId - val productCode = "DOES_NOT_EXIST" - val liftResponse = makeGetRequest((v5_0_0_Request / "banks" / bankId / "products" / productCode).GET) - val (http4sStatus, http4sJson) = http4sRunAndParseJson(s"/obp/v5.0.0/banks/$bankId/products/$productCode") - - liftResponse.code should equal(http4sStatus.code) - - liftResponse.body match { - case JObject(fields) => - toFieldMap(fields).get("message").isDefined shouldBe true - case _ => - fail("Expected liftweb JSON object for missing product error") - } - - http4sJson match { - case JObject(fields) => - toFieldMap(fields).get("message").isDefined shouldBe true - case _ => - fail("Expected http4s JSON object for missing product error") - } - } - - scenario("private accounts endpoint is served (proxy parity)", V500ContractParityTag) { - val bankId = APIUtil.defaultBankId - val liftResponse = getPrivateAccounts(bankId, user1) - val liftReq = (v5_0_0_Request / "banks" / bankId / "accounts" / "private").GET <@(user1) - val reqData = extractParamsAndHeaders(liftReq, "", "") - - val baseRequest = Request[IO]( - method = Method.GET, - uri = Uri.unsafeFromString(s"/obp/v5.0.0/banks/$bankId/accounts/private") - ) - val request = reqData.headers.foldLeft(baseRequest) { case (r, (k, v)) => - r.putHeaders(Header.Raw(CIString(k), v)) - } - - val response = Http4s500.wrappedRoutesV500ServicesWithBridge.orNotFound.run(request).unsafeRunSync() - val http4sStatus = response.status - val correlationHeader = response.headers.get(CIString("Correlation-Id")) - val body = response.as[String].unsafeRunSync() - val http4sJson = if (body.trim.isEmpty) JObject(Nil) else parse(body) - - liftResponse.code should equal(http4sStatus.code) - correlationHeader.isDefined shouldBe true - - http4sJson match { - case JObject(fields) => - toFieldMap(fields).get("accounts") match { - case Some(JArray(_)) => succeed - case _ => fail("Expected accounts field to be an array") - } - case _ => - fail("Expected http4s JSON object for private accounts endpoint") - } - } - } -} diff --git a/obp-api/src/test/scala/code/api/v7_0_0/Http4s700RoutesTest.scala b/obp-api/src/test/scala/code/api/v7_0_0/Http4s700RoutesTest.scala index 785245f243..b9047631eb 100644 --- a/obp-api/src/test/scala/code/api/v7_0_0/Http4s700RoutesTest.scala +++ b/obp-api/src/test/scala/code/api/v7_0_0/Http4s700RoutesTest.scala @@ -2,7 +2,7 @@ package code.api.v7_0_0 import cats.effect.IO import cats.effect.unsafe.IORuntime -import code.api.util.http4s.Http4sLiftWebBridge +import code.api.util.http4s.Http4sStandardHeaders import code.api.Constant.SYSTEM_OWNER_VIEW_ID import code.api.ResponseHeader import code.api.util.APIUtil @@ -62,7 +62,7 @@ class Http4s700RoutesTest extends ServerSetupWithTestData { val req = Request[IO](method, uri, headers = hdrs, body = bodyStream) val baseResp = app.run(req).unsafeRunSync() // Mirror Http4sApp: apply standard response headers (Correlation-Id, Cache-Control, etc.) - val resp = Http4sLiftWebBridge.ensureStandardHeaders(req, baseResp) + val resp = Http4sStandardHeaders(req, baseResp) val bodyStr = resp.bodyText.compile.string.unsafeRunSync() val json = try { if (bodyStr.trim.isEmpty) JObject(Nil) else parse(bodyStr) @@ -252,16 +252,6 @@ class Http4s700RoutesTest extends ServerSetupWithTestData { // CORS is applied by Http4sServer above Http4s700 and is not reachable via in-process // route testing. OPTIONS preflight scenarios live in Http4sServerIntegrationTest. - // ─── routing priority guard ─────────────────────────────────────────────────── - // - // allRoutes is built by sorting ResourceDocs by URL segment count (descending), - // so most-specific routes win automatically. These scenarios verify the sort - // produces the correct outcome. Add one scenario per new route to keep CI coverage. - - feature("Http4s700 routing priority") { - - } - // ─── unknown paths and wrong methods ───────────────────────────────────────── feature("Http4s700 routing edge cases") { diff --git a/obp-api/src/test/scala/code/api/v7_0_0/V7ResourceDocsAggregationTest.scala b/obp-api/src/test/scala/code/api/v7_0_0/V7ResourceDocsAggregationTest.scala index 31746b9f84..7469f620ba 100644 --- a/obp-api/src/test/scala/code/api/v7_0_0/V7ResourceDocsAggregationTest.scala +++ b/obp-api/src/test/scala/code/api/v7_0_0/V7ResourceDocsAggregationTest.scala @@ -14,20 +14,19 @@ import scala.concurrent.Await import scala.concurrent.duration._ /** - * Bug Condition Exploration Test for v7 Resource Docs Aggregation Fix + * Regression test for v7 Resource Docs Aggregation. * - * **CRITICAL**: This test MUST FAIL on unfixed code - failure confirms the bug exists - * **DO NOT attempt to fix the test or the code when it fails** - * **NOTE**: This test encodes the expected behavior - it will validate the fix when it passes after implementation - * **GOAL**: Surface counterexamples that demonstrate the bug exists + * The aggregation bug described below has been FIXED; these scenarios now PASS and + * guard against regressions. They were originally written TDD-style to fail on the + * unfixed code (hence the "Property 1: ..." naming and the now-historical bug notes). * * **Validates: Requirements 1.1, 1.2, 1.3** * - * Bug Description: - * The v7.0.0 resource-docs endpoint currently returns only v7.0.0's own endpoints (~10) - * instead of aggregating all versions (v7.0.0 + v6.0.0 + v5.1.0 + ... + v1.3.0) which should be 500+. + * Original bug: + * The v7.0.0 resource-docs endpoint used to return only v7.0.0's own endpoints (~10) + * instead of aggregating all versions (v7.0.0 + v6.0.0 + v5.1.0 + ... + v1.3.0), which is 500+. * - * Expected Behavior Properties: + * Behavior now guaranteed: * - Response includes v7.0.0 endpoints * - Response includes v6.0.0 endpoints (e.g., getScannedApiVersions) * - Response includes v5.1.0 and earlier endpoints @@ -109,7 +108,7 @@ class V7ResourceDocsAggregationTest extends ServerSetupWithTestData { feature("Bug Condition Exploration - V7 Resource Docs Aggregation") { - scenario("Property 1: Bug Condition - V7 Resource Docs Returns Only V7 Endpoints (EXPECTED TO FAIL)", V7ResourceDocsAggregationTag) { + scenario("Property 1: V7 resource-docs aggregates all versions (>=500 docs, dedup, no duplicate signatures)", V7ResourceDocsAggregationTag) { Given(MSG_GIVEN_V7_ENDPOINT) setPropsValues("resource_docs_requires_role" -> "false") @@ -181,12 +180,10 @@ class V7ResourceDocsAggregationTest extends ServerSetupWithTestData { info(s"Duplicate endpoint signatures found: ${duplicates.size}") duplicates shouldBe empty - info("**Expected Outcome**: This test FAILS on unfixed code (proves bug exists)") - info("**Root Cause**: Missing allResourceDocs aggregation in Http4s700") - info("**Counterexamples**:") - info(s" - Expected: 500+ endpoints, Actual: ${resourceDocs.size} endpoints") - info(s" - Expected: v6.0.0 endpoints discoverable, Actual: ${v6Endpoints.size} found") - info(s" - Expected: v5.1.0+ endpoints discoverable, Actual: ${olderVersionEndpoints.size} found") + info("**Outcome**: passes post-fix (allResourceDocs aggregation is wired in Http4s700)") + info(s" - endpoints: ${resourceDocs.size} (expected >= 500)") + info(s" - v6.0.0 endpoints discoverable: ${v6Endpoints.size}") + info(s" - v5.1.0+ endpoints discoverable: ${olderVersionEndpoints.size}") } scenario("Baseline - V6 Resource Docs Returns Aggregated Endpoints (SHOULD PASS)", V7ResourceDocsAggregationTag) { @@ -231,7 +228,7 @@ class V7ResourceDocsAggregationTest extends ServerSetupWithTestData { info("**Purpose**: Confirms v6.0.0 aggregation works correctly") } - scenario("Cross-Version Query - V7 Endpoint Can Query V6 Docs (MAY FAIL)", V7ResourceDocsAggregationTag) { + scenario("Cross-Version Query - V7 Endpoint Can Query V6 Docs", V7ResourceDocsAggregationTag) { Given("The v7.0.0 endpoint is used to query v6.0.0 resource-docs") setPropsValues("resource_docs_requires_role" -> "false") @@ -250,7 +247,7 @@ class V7ResourceDocsAggregationTest extends ServerSetupWithTestData { info("**Purpose**: Verifies v7 endpoint can serve other versions' docs") } - scenario("Specific Endpoint Discovery - V6 getScannedApiVersions Through V7 (EXPECTED TO FAIL)", V7ResourceDocsAggregationTag) { + scenario("Specific Endpoint Discovery - V6 getScannedApiVersions Through V7", V7ResourceDocsAggregationTag) { Given("The v7.0.0 resource-docs endpoint is queried for a specific v6.0.0 endpoint") setPropsValues("resource_docs_requires_role" -> "false") @@ -276,8 +273,8 @@ class V7ResourceDocsAggregationTest extends ServerSetupWithTestData { } scannedApiVersionsEndpoint shouldBe defined - info("**Expected Outcome**: This test FAILS on unfixed code") - info("**Counterexample**: getScannedApiVersions (v6.0.0) not discoverable through v7.0.0") + info("**Outcome**: passes post-fix") + info("getScannedApiVersions (v6.0.0) is discoverable through v7.0.0") } } diff --git a/obp-api/src/test/scala/code/setup/LocalMappedConnectorTestSetup.scala b/obp-api/src/test/scala/code/setup/LocalMappedConnectorTestSetup.scala index d88905d188..3d0904b8b1 100644 --- a/obp-api/src/test/scala/code/setup/LocalMappedConnectorTestSetup.scala +++ b/obp-api/src/test/scala/code/setup/LocalMappedConnectorTestSetup.scala @@ -214,9 +214,12 @@ trait LocalMappedConnectorTestSetup extends TestConnectorSetupWithStandardPermis //empty the relational db tables after each test ToSchemify.models.filterNot(exclusion).foreach(_.bulkDelete_!!()) - // Flush all data from Redis + // Delete only THIS shard's namespaced Redis keys. Each parallel shard uses a distinct + // api_instance_id (OBP_API_INSTANCE_ID) -> distinct getGlobalCacheNamespacePrefix, so a + // pattern-scoped delete avoids wiping other shards' rate-limit/cache state. A plain FLUSHDB + // would clear the whole shared DB and cause cross-shard rate-limit/cache flakiness. try { - Redis.use(JedisMethod.FLUSHDB, "") + Redis.deleteKeysByPattern(code.api.Constant.getGlobalCacheNamespacePrefix + "*") } catch { case e: Throwable => logger.warn("------------| Redis issue during flushing data |------------") diff --git a/obp-api/src/test/scala/code/setup/ServerSetup.scala b/obp-api/src/test/scala/code/setup/ServerSetup.scala index aed9ed62c6..70f250def4 100644 --- a/obp-api/src/test/scala/code/setup/ServerSetup.scala +++ b/obp-api/src/test/scala/code/setup/ServerSetup.scala @@ -76,7 +76,11 @@ trait ServerSetup extends FeatureSpec with SendServerRequests setPropsValues("transactionRequests_supported_types" -> "SEPA,SANDBOX_TAN,FREE_FORM,COUNTERPARTY,ACCOUNT,ACCOUNT_OTP,SIMPLE,CARD,AGENT_CASH_WITHDRAWAL,CARDANO") setPropsValues("CARD_OTP_INSTRUCTION_TRANSPORT" -> "DUMMY") setPropsValues("AGENT_CASH_WITHDRAWAL_OTP_INSTRUCTION_TRANSPORT" -> "DUMMY") - setPropsValues("api_instance_id" -> "1_final") + // Per-shard Redis key namespace: each parallel shard sets a distinct api_instance_id + // (OBP_API_INSTANCE_ID), which flows into Constant.getGlobalCacheNamespacePrefix and thus + // every Redis key (rate-limit counters, caches). This isolates shards on a shared Redis so + // their counters don't collide. Single-instance/CI default stays "1_final". + setPropsValues("api_instance_id" -> sys.env.getOrElse("OBP_API_INSTANCE_ID", "1_final")) setPropsValues("starConnector_supported_types" -> "mapped,internal,cardano_vJun2025") setPropsValues("connector" -> "star") setPropsValues("berlin_group_mandatory_headers" -> "") @@ -175,6 +179,27 @@ trait ServerSetup extends FeatureSpec with SendServerRequests trait ServerSetupWithTestData extends ServerSetup with DefaultConnectorTestSetup with DefaultUsers{ + // On-demand test data. Creating transactions (10 accounts x 10) and transaction-requests + // (10 accounts x 20) on every scenario is ~300 DB writes that most suites never read. Only + // the suites listed below (matched by simple class name) get them; every other suite skips + // both. The full test suite is the safety net: if a suite silently relied on this data it + // fails and its name is added here. A suite can also override `needsTransactionData` directly. + protected val suitesNeedingTransactionData: Set[String] = Set( + // read beforeEach-created transaction-requests + "TransactionRequestTest", "TransactionRequestsTest", "MakerCheckerTransactionRequestTest", + "TransactionRequestAttributesTest", "CardanoTransactionRequestTest", "CounterpartyLimitTest", + "VRPConsentRequestTest", "ViewPermissionsTest", "Http4s700RoutesTest", + // read beforeEach-created transactions + "TransactionsTest", "TransactionTest", "TransactionAttributesTest", "API1_2_1Test", + "FirehoseTest", "DeleteTransactionCascadeTest", "DoubleEntryTransactionTest", + "SandboxDataLoadingTest", "UKOpenBankingV310AisTests", "UKOpenBankingV200Tests", + "Http4sBGv2AISTest", "AccountInformationServiceAISApiTest", "RegulatedEntityTest", + // reads other-accounts / counterparties, which are derived from transaction metadata + "CounterpartyTest" + ) + protected def needsTransactionData: Boolean = + suitesNeedingTransactionData.contains(this.getClass.getSimpleName) + override def beforeEach() = { super.beforeEach() wipeTestData() @@ -183,11 +208,12 @@ trait ServerSetupWithTestData extends ServerSetup with DefaultConnectorTestSetup val banks = createBanks() //fake bank accounts, views, accountHolders, AccountAccess val accounts = createAccountRelevantResources(resourceUser1, banks) - //fake transactions - createTransactions(accounts) - //fake transactionRequests - createTransactionRequests(accounts) - + //fake transactions + transactionRequests — opt-in per suite (see suitesNeedingTransactionData) + if (needsTransactionData) { + createTransactions(accounts) + createTransactionRequests(accounts) + } + } override def afterEach() = { diff --git a/obp-api/src/test/scala/code/setup/ServerSetupAsync.scala b/obp-api/src/test/scala/code/setup/ServerSetupAsync.scala index 82e60a2396..fc24d727f9 100644 --- a/obp-api/src/test/scala/code/setup/ServerSetupAsync.scala +++ b/obp-api/src/test/scala/code/setup/ServerSetupAsync.scala @@ -79,6 +79,14 @@ trait ServerSetupAsync extends AsyncFeatureSpec with SendServerRequests trait ServerSetupWithTestDataAsync extends ServerSetupAsync with DefaultConnectorTestSetup with DefaultUsers { + // On-demand test data (mirrors ServerSetupWithTestData). No async suite reads the + // beforeEach-created transactions / transaction-requests, so the whitelist is empty and both + // are skipped for every async suite. Add a simple class name here (or override + // needsTransactionData) if a future async suite ever needs them. + protected val suitesNeedingTransactionData: Set[String] = Set.empty + protected def needsTransactionData: Boolean = + suitesNeedingTransactionData.contains(this.getClass.getSimpleName) + override def beforeEach() = { super.beforeEach() //create fake data for the tests @@ -86,10 +94,11 @@ trait ServerSetupWithTestDataAsync extends ServerSetupAsync with DefaultConnecto val banks = createBanks() //fake bank accounts val accounts = createAccountRelevantResources(resourceUser1, banks) - //fake transactions - createTransactions(accounts) - //fake transactionRequests - createTransactionRequests(accounts) + //fake transactions + transactionRequests — opt-in per suite (none currently) + if (needsTransactionData) { + createTransactions(accounts) + createTransactionRequests(accounts) + } } override def afterEach() = { diff --git a/obp-api/src/test/scala/code/util/APIUtilTest.scala b/obp-api/src/test/scala/code/util/APIUtilTest.scala index 6a27ef6a4b..cae93c7e72 100644 --- a/obp-api/src/test/scala/code/util/APIUtilTest.scala +++ b/obp-api/src/test/scala/code/util/APIUtilTest.scala @@ -36,7 +36,7 @@ import code.util.Helper.SILENCE_IS_GOLDEN import com.github.dwickern.macros.NameOf.nameOf import com.openbankproject.commons.model.UserAuthContextCommons import net.liftweb.common.{Box, Empty, Full} -import net.liftweb.http.provider.HTTPParam +import code.api.util.APIUtil.HTTPParam import net.liftweb.json.{JValue, parse} import org.scalatest.{FeatureSpec, GivenWhenThen, Matchers} diff --git a/run_tests_parallel.sh b/run_tests_parallel.sh new file mode 100755 index 0000000000..6944c8d534 --- /dev/null +++ b/run_tests_parallel.sh @@ -0,0 +1,341 @@ +#!/bin/bash +# Local parallel test runner — mirror CI's parallel structure as closely as +# possible while dropping the cross-machine artifact-transfer complexity. +# Shard definitions and the shard-4 catch-all logic match +# .github/workflows/build_pull_request.yml exactly. +# Usage: ./run_tests_parallel.sh [--shards=4|6] +# +# ── CI step → local equivalent (how cross-machine machinery is replaced) ─── +# CI (multi-machine) Local (single machine) +# ─────────────────────────────────────────── ────────────────────────────── +# lint: check_test_isolation.py same (run before tests; abort on fail) +# compile job: mvn clean install -Pprod pre-compile once: install obp-commons +# + upload-artifact(target/) into shared ~/.m2 + test-compile +# test job: download-artifact + touch + obp-api into shared target/ — a +# install-file(obp-commons, parentPom) single machine shares ~/.m2 and +# target/ natively, so no artifact +# upload/download/touch is needed +# each shard on its own VM → mvn test two dynamic free ports per shard +# (port/DB isolation for free) (OBP_TESTS_PORT + OBP_HTTP4S_TEST_PORT) +# + scalatest:test (see port block) +# "Setup props" step writes test.default.props missing critical props injected via +# OBP_* env vars (see run_shard) +# report job: test_speed_report.py run best-effort after all shards +# +# Notes: +# * scalatest:test is the correct local stand-in for CI's `mvn test`: CI can +# run the full Maven lifecycle safely because each shard has its own VM and +# its own target/. Locally the 4 processes share one target/, so we must +# pre-compile once and then run scalatest:test (tests only) — otherwise the +# shards race on copying resources into target/test-classes. +# * Do NOT use 6 shards: they contend over the single local DB connection pool +# and produce spurious failures. + +mkdir -p test-results/parallel + +MVN_OPTS="-Xmx3G -Xss2m -XX:MaxMetaspaceSize=1G" + +# Portable `timeout`: GNU coreutils ships it as `timeout` (Linux) but Homebrew on +# macOS installs it prefixed as `gtimeout`. Pick whichever exists. +if command -v timeout >/dev/null 2>&1; then + TIMEOUT_BIN="timeout" +elif command -v gtimeout >/dev/null 2>&1; then + TIMEOUT_BIN="gtimeout" +else + echo "ERROR: neither 'timeout' nor 'gtimeout' found on PATH" >&2 + exit 1 +fi + +# Cross-checkout mutex: the obp-commons `mvn install` writes to the shared ~/.m2. +# Multiple checkouts starting this script simultaneously race on that write and can +# corrupt each other's JARs (torn ZipFile). We use an atomic mkdir lock to serialise +# ~/.m2 writes across processes. The lock is released immediately after the install +# and cleaned up on exit (including crashes) via the EXIT trap. +OBC_LOCK="/tmp/obp-commons-m2-install.lock" +trap 'rm -rf "$OBC_LOCK"' EXIT + +SHARDS=4 +for arg in "$@"; do + case $arg in + --shards=*) SHARDS="${arg#*=}" ;; + esac +done + +# ── Dynamic free-port allocation ────────────────────────────────────────── +# Each shard is its own `mvn scalatest:test` JVM that binds TWO sockets: +# tests.port (OBP_TESTS_PORT, TestServer, default 8000) +# http4s.test.port (OBP_HTTP4S_TEST_PORT, Http4sTestServer, default 8087) +# Hardcoded ports collide when several project checkouts run this script at the +# same time. The un-injected 8087 even collides WITHIN one run, because the +# suites that start Http4sTestServer are split across shards (v5_0_0 in shard 2; +# http4sbridge/v7 in shard 4) — both JVMs would bind the default 8087. +# So we pick random high free ports per shard. A fixed base + upward scan can't +# solve simultaneous launches: at fork time no shard has bound yet, so every +# concurrent run picks the same base. Random high range + lsof skip (catches +# ports other checkouts already bound) + in-run dedup avoids that. +PORT_MIN=20000 +PORT_MAX=55000 +ASSIGNED_PORTS=() # ports already handed out in THIS run (prevents shard clashes) +ALLOC_PORT="" # alloc_free_port returns its result here (no subshell — see below) + +# alloc_free_port: pick a random free port into the global ALLOC_PORT. +# Returns via a global, NOT stdout, so it must be called WITHOUT $(...): a command +# substitution runs in a subshell, and the ASSIGNED_PORTS append would be lost, +# breaking the in-run dedup. Call as: `alloc_free_port || exit 1; X=$ALLOC_PORT`. +alloc_free_port() { + local tries=0 p + while [ $tries -lt 500 ]; do + p=$(( PORT_MIN + RANDOM % (PORT_MAX - PORT_MIN) )) + if [[ " ${ASSIGNED_PORTS[*]} " != *" $p "* ]] && ! lsof -i :"$p" >/dev/null 2>&1; then + ASSIGNED_PORTS+=("$p") + ALLOC_PORT="$p" + return 0 + fi + tries=$((tries + 1)) + done + echo "[FATAL] no free port found in ${PORT_MIN}-${PORT_MAX} after 500 tries" >&2 + return 1 +} + +# ── Shard definitions (identical to the CI matrix) ──────────────────────── +S1="code.api.v4_0_0" + +S2="code.api.v6_0_0,code.api.v5_0_0,code.api.v3_0_0,code.api.v2_1_0,\ +code.api.v2_2_0,code.api.v2_0_0,code.api.v1_4_0,code.api.v1_3_0,\ +code.api.UKOpenBanking,code.atms,code.branches,code.products,code.crm,\ +code.accountHolder,code.entitlement,code.bankaccountcreation,code.bankconnectors,code.container" + +S3="code.api.v1_2_1,code.api.ResourceDocs1_4_0,code.api.util,code.api.berlin,\ +code.management,code.metrics,code.model,code.views,code.usercustomerlinks,\ +code.customer,code.errormessages" + +# Shard 4 base (identical to CI) +S4_BASE="code.api.v5_1_0,code.api.v3_1_0,code.api.http4sbridge,code.api.v7_0_0,\ +code.api.Authentication,code.api.dauthTest,code.api.DirectLoginTest,\ +code.api.gateWayloginTest,code.api.OBPRestHelperTest,code.util,code.connector" + +# ── Shard 4 catch-all: discover every package not covered by shards 1–3 ─── +# (identical to CI) +build_s4() { + local ASSIGNED="$S1 $(echo "$S2" | tr ',' ' ') $(echo "$S3" | tr ',' ' ') $(echo "$S4_BASE" | tr ',' ' ')" + local ALL_PKGS + ALL_PKGS=$(find obp-api/src/test/scala obp-commons/src/test/scala \ + -name "*.scala" 2>/dev/null \ + | sed 's|.*/test/scala/||; s|/[^/]*\.scala$||; s|/|.|g' \ + | sort -u) + local EXTRAS="" + for pkg in $ALL_PKGS; do + local covered=false + for prefix in $ASSIGNED; do + if [[ "$pkg" == "$prefix" || "$pkg" == "$prefix."* || "$prefix" == "$pkg."* ]]; then + covered=true; break + fi + done + [ "$covered" = "false" ] && EXTRAS="${EXTRAS},${pkg}" + done + if [ -n "$EXTRAS" ]; then + echo " [Shard 4] Catch-all extras: $EXTRAS" >&2 + fi + echo "${S4_BASE}${EXTRAS}" +} + +S4=$(build_s4) + +# ── 6-shard definitions (split the original shards 3 and 4; no catch-all) ── +S3_6="code.api.v1_2_1" + +S4_6="code.api.ResourceDocs1_4_0,code.api.util,code.api.berlin,\ +code.management,code.metrics,code.model,code.views,code.usercustomerlinks,\ +code.customer,code.errormessages" + +S5_6="code.api.v5_1_0,code.api.v3_1_0,code.api.http4sbridge,code.api.v7_0_0" + +S6_6="code.api.Authentication,code.api.dauthTest,code.api.DirectLoginTest,\ +code.api.gateWayloginTest,code.api.OBPRestHelperTest,code.util,code.connector" + +run_shard() { + local n=$1 + local filter=$2 + local port=$3 # tests.port — TestServer (OBP_TESTS_PORT) + local http4s_port=$4 # http4s.test.port — Http4sTestServer (OBP_HTTP4S_TEST_PORT) + local log="test-results/parallel/shard${n}.log" + echo "[Shard $n] Starting... (tests.port=$port, http4s.test.port=$http4s_port)" + # OBP_* env vars take priority over the props file (see APIUtil.getPropsValue: + # property name . -> _, uppercased, prefixed with OBP_). This is the local + # equivalent of CI's "Setup props" step: the local test.default.props lacks + # mail.test.mode (CI has it); without it, flows like consent actually open an + # SMTP socket -> 500 (CI green, local red). We inject OBP_MAIL_TEST_MODE + # instead of editing props so we don't clobber the user's local DB settings. + # OBP_TESTS_PORT + OBP_HTTP4S_TEST_PORT carry the two dynamically-allocated free + # ports (both test servers bind a real socket; see the port-allocation block). + # Tests only, no recompile (the compile already happened in the pre-compile step). + # ${TIMEOUT_BIN} 1200: hard-kill after 20 min to prevent Pekko non-daemon threads from hanging. + MAVEN_OPTS="$MVN_OPTS" \ + OBP_TESTS_PORT="${port}" \ + OBP_HOSTNAME="http://localhost:${port}" \ + OBP_HTTP4S_TEST_PORT="${http4s_port}" \ + OBP_MAIL_TEST_MODE="true" \ + OBP_API_INSTANCE_ID="shard_${n}" \ + "$TIMEOUT_BIN" 1200 mvn scalatest:test -pl obp-api -DfailIfNoTests=false \ + "-DwildcardSuites=${filter}" \ + > "$log" 2>&1 + local rc=$? + # timeout returns 124 on timeout (tests finished but the JVM didn't exit) — treat as success. + [ $rc -eq 124 ] && rc=0 + if [ $rc -eq 0 ]; then + echo "[Shard $n] ✅ BUILD SUCCESS" + else + echo "[Shard $n] ❌ BUILD FAILURE — see $log" + fi + return $rc +} + +START=$(date +%s) + +# ── Lint (CI compile job's first step): test-isolation static check; abort on fail ── +echo "Lint: test-isolation check..." +if ! python3 .github/scripts/check_test_isolation.py; then + echo "❌ Lint failed (setPropsValues at class/feature body). Fix before running." >&2 + exit 1 +fi +echo "" + +# ── Pre-compile (done once, so the 4 shards don't race over a shared target/) ── +# In CI the compile job runs `clean install` to install artifacts into ~/.m2 and +# uploads them; the test job downloads them and re-installs obp-commons / the +# parent POM into the new machine's ~/.m2 via install-file. A single local machine +# shares one ~/.m2, so we only install once — dropping upload/download/touch. +# Key point: each shard runs `scalatest:test -pl obp-api` (no -am), so obp-commons +# is resolved from ~/.m2, not from the reactor. We must install the CURRENT +# obp-commons into ~/.m2, otherwise shards test against a stale obp-commons (the +# old `test-compile -am` only built it in the reactor and never refreshed ~/.m2). +# The obp-commons install holds OBC_LOCK (see top) so concurrent checkouts don't +# race on the shared ~/.m2 write. The subsequent test-compile writes only to this +# checkout's own target/ and is safe to run in parallel across checkouts. +echo "Pre-compile 1/2: install obp-commons -> ~/.m2 ..." +until mkdir "$OBC_LOCK" 2>/dev/null; do sleep 2; done +MAVEN_OPTS="$MVN_OPTS" \ + mvn install -DskipTests -pl obp-commons -q > test-results/parallel/precompile.log 2>&1 +PRECOMPILE_RC=$? +rm -rf "$OBC_LOCK" +if [ $PRECOMPILE_RC -eq 0 ]; then + echo "Pre-compile 2/2: test-compile obp-api -> shared target/ ..." + MAVEN_OPTS="$MVN_OPTS" \ + mvn test-compile -pl obp-api -q >> test-results/parallel/precompile.log 2>&1 + PRECOMPILE_RC=$? +fi +if [ $PRECOMPILE_RC -ne 0 ]; then + echo "❌ Pre-compile failed — see test-results/parallel/precompile.log" >&2 + tail -25 test-results/parallel/precompile.log >&2 + exit 1 +fi +echo "Pre-compile done, starting shards..." +echo "" + +if [ "$SHARDS" = "6" ]; then + echo "Starting 6 shards in parallel..." + echo "" + # Allocate two free ports per shard BEFORE forking. Sequential calls (not in a + # subshell) so ASSIGNED_PORTS dedup carries across allocations. + alloc_free_port || exit 1; P1=$ALLOC_PORT; alloc_free_port || exit 1; H1=$ALLOC_PORT + alloc_free_port || exit 1; P2=$ALLOC_PORT; alloc_free_port || exit 1; H2=$ALLOC_PORT + alloc_free_port || exit 1; P3=$ALLOC_PORT; alloc_free_port || exit 1; H3=$ALLOC_PORT + alloc_free_port || exit 1; P4=$ALLOC_PORT; alloc_free_port || exit 1; H4=$ALLOC_PORT + alloc_free_port || exit 1; P5=$ALLOC_PORT; alloc_free_port || exit 1; H5=$ALLOC_PORT + alloc_free_port || exit 1; P6=$ALLOC_PORT; alloc_free_port || exit 1; H6=$ALLOC_PORT + run_shard 1 "$S1" "$P1" "$H1" & PID1=$! + run_shard 2 "$S2" "$P2" "$H2" & PID2=$! + run_shard 3 "$S3_6" "$P3" "$H3" & PID3=$! + run_shard 4 "$S4_6" "$P4" "$H4" & PID4=$! + run_shard 5 "$S5_6" "$P5" "$H5" & PID5=$! + run_shard 6 "$S6_6" "$P6" "$H6" & PID6=$! + wait $PID1; RC1=$? + wait $PID2; RC2=$? + wait $PID3; RC3=$? + wait $PID4; RC4=$? + wait $PID5; RC5=$? + wait $PID6; RC6=$? + RCS=($RC1 $RC2 $RC3 $RC4 $RC5 $RC6) + TOTAL_SHARDS=6 +else + echo "Starting 4 shards in parallel..." + echo "" + # Allocate two free ports per shard BEFORE forking. Sequential calls (not in a + # subshell) so ASSIGNED_PORTS dedup carries across allocations. + alloc_free_port || exit 1; P1=$ALLOC_PORT; alloc_free_port || exit 1; H1=$ALLOC_PORT + alloc_free_port || exit 1; P2=$ALLOC_PORT; alloc_free_port || exit 1; H2=$ALLOC_PORT + alloc_free_port || exit 1; P3=$ALLOC_PORT; alloc_free_port || exit 1; H3=$ALLOC_PORT + alloc_free_port || exit 1; P4=$ALLOC_PORT; alloc_free_port || exit 1; H4=$ALLOC_PORT + run_shard 1 "$S1" "$P1" "$H1" & PID1=$! + run_shard 2 "$S2" "$P2" "$H2" & PID2=$! + run_shard 3 "$S3" "$P3" "$H3" & PID3=$! + run_shard 4 "$S4" "$P4" "$H4" & PID4=$! + wait $PID1; RC1=$? + wait $PID2; RC2=$? + wait $PID3; RC3=$? + wait $PID4; RC4=$? + RCS=($RC1 $RC2 $RC3 $RC4) + TOTAL_SHARDS=4 +fi + +END=$(date +%s) +ELAPSED=$(( (END - START) / 60 )) +SEC=$(( (END - START) % 60 )) + +echo "" +echo "══════════════════════════════════════" +echo "All ${TOTAL_SHARDS} shards done in ${ELAPSED}m ${SEC}s" +echo "" + +for (( n=1; n<=TOTAL_SHARDS; n++ )); do + log="test-results/parallel/shard${n}.log" + total_time=$(grep "Total time:" "$log" 2>/dev/null | tail -1 | sed 's/.*Total time: *//') + # CI parity ("RECOMPILATION CHECK"): after pre-compile, shards should not + # recompile; if they do, the artifacts weren't reused — warn. + if grep -q "Compiling " "$log" 2>/dev/null; then + echo " Shard $n: $total_time ⚠ recompilation detected (artifacts not reused)" + else + echo " Shard $n: $total_time" + fi +done + +OVERALL_RC=0 +for rc in "${RCS[@]}"; do + [ $rc -ne 0 ] && OVERALL_RC=1 +done + +# ── CI parity ("Report failing tests" step): extract failures for failed shards ── +if [ $OVERALL_RC -ne 0 ]; then + echo "" + echo "── Failure diagnostics (CI-style report) ───────────" + for (( n=1; n<=TOTAL_SHARDS; n++ )); do + [ "${RCS[$((n-1))]}" -eq 0 ] && continue + log="test-results/parallel/shard${n}.log" + echo "" + echo "### Shard $n ($log) ###" + echo " -- bridge / uncaught exceptions --" + grep -n "\[BRIDGE\] Exception\|Uncaught exception in dispatch\|requestScopeProxy=" \ + "$log" 2>/dev/null | head -20 || true + echo " -- failing scenarios (*** FAILED ***) --" + grep -n "\*\*\* FAILED \*\*\*" "$log" 2>/dev/null | head -40 || true + done +fi + +echo "" +if [ $OVERALL_RC -eq 0 ]; then + echo "✅ ALL SHARDS PASSED" +else + echo "❌ SOME SHARDS FAILED — check test-results/parallel/shardN.log" +fi + +# ── CI parity (report job): http4s vs Lift per-test speed table; best-effort, ── +# does not affect the exit code. +REPORTS_DIR="obp-api/target/surefire-reports" +if ls "$REPORTS_DIR"/*.xml >/dev/null 2>&1; then + echo "" + echo "── Per-test speed (CI report-job equivalent) ───────" + python3 .github/scripts/test_speed_report.py "$REPORTS_DIR" 2>/dev/null \ + || echo " (speed report skipped)" +fi + +exit $OVERALL_RC \ No newline at end of file