From 579d8c08f867ae329dbaeba56de6b0433743b1b2 Mon Sep 17 00:00:00 2001
From: Mike Audi <mike@mytiki.com>
Date: Sat, 29 Apr 2023 21:40:50 -0500
Subject: [PATCH 1/2] fix: auth integration

- incorrect scope
- missing app info call
---
 .../l0_registry/features/latest/config/ConfigService.java   | 6 ++++--
 .../java/com/mytiki/l0_registry/l0/auth/L0AuthConfig.java   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/mytiki/l0_registry/features/latest/config/ConfigService.java b/src/main/java/com/mytiki/l0_registry/features/latest/config/ConfigService.java
index 68324eb..33527c7 100644
--- a/src/main/java/com/mytiki/l0_registry/features/latest/config/ConfigService.java
+++ b/src/main/java/com/mytiki/l0_registry/features/latest/config/ConfigService.java
@@ -5,6 +5,7 @@
 
 package com.mytiki.l0_registry.features.latest.config;
 
+import com.mytiki.l0_registry.l0.auth.L0AuthAOApp;
 import com.mytiki.l0_registry.l0.auth.L0AuthAOOrg;
 import com.mytiki.l0_registry.l0.auth.L0AuthAOToken;
 import com.mytiki.l0_registry.l0.auth.L0AuthService;
@@ -39,8 +40,9 @@ public ConfigDO getBilling(String appId){
                     .properties("appId", appId)
                     .build();
         if(found.get().getBillingId() == null){
-            L0AuthAOToken token = l0AuthService.getToken(List.of("internal:org"));
-            L0AuthAOOrg org = l0AuthService.getOrg(appId, token.getAccessToken());
+            L0AuthAOToken token = l0AuthService.getToken(List.of("auth:internal:read"));
+            L0AuthAOApp app = l0AuthService.getApp(appId, token.getAccessToken());
+            L0AuthAOOrg org = l0AuthService.getOrg(app.getOrgId(), token.getAccessToken());
             ConfigDO update = found.get();
             update.setBillingId(org.getBillingId());
             return repository.save(update);
diff --git a/src/main/java/com/mytiki/l0_registry/l0/auth/L0AuthConfig.java b/src/main/java/com/mytiki/l0_registry/l0/auth/L0AuthConfig.java
index b808a58..a1e9ef4 100644
--- a/src/main/java/com/mytiki/l0_registry/l0/auth/L0AuthConfig.java
+++ b/src/main/java/com/mytiki/l0_registry/l0/auth/L0AuthConfig.java
@@ -13,6 +13,6 @@ public L0AuthService l0AuthService(
             @Value("${com.mytiki.l0_registry.l0_auth.key.id}") String id,
             @Value("${com.mytiki.l0_registry.l0_auth.key.secret}") String secret,
             @Autowired RestTemplateBuilder builder){
-        return new L0AuthService(builder.rootUri(uri).build(),id,secret);
+        return new L0AuthService(builder.rootUri(uri).build(), id, secret);
     }
 }

From 7a67353a76ec3d7ade5026b54c6204a074948839 Mon Sep 17 00:00:00 2001
From: GH Action <action@github.com>
Date: Sun, 30 Apr 2023 02:42:56 +0000
Subject: [PATCH 2/2] version bump

---
 openapi.yaml | 2 +-
 pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openapi.yaml b/openapi.yaml
index 4501b74..b354363 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -5,7 +5,7 @@ info:
   license:
     name: MIT
     url: https://github.com/tiki/l0-registry/blob/main/LICENSE
-  version: 1.1.2
+  version: 1.1.3
 servers:
 - url: https://registry.l0.mytiki.com
 paths:
diff --git a/pom.xml b/pom.xml
index a5d2e7d..62e8975 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.mytiki</groupId>
     <artifactId>l0_registry</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
     <packaging>jar</packaging>
 
     <name>L0 Registry</name>