feat: handle instance from context (#3382)

* commander

* commander

* selber!

* move to packages

* fix(errors): implement Is interface

* test: command

* test: commands

* add init steps

* setup tenant

* add default step yaml

* possibility to set password

* merge v2 into v2-commander

* fix: rename iam command side to instance

* fix: rename iam command side to instance

* fix: rename iam command side to instance

* fix: rename iam command side to instance

* fix: search query builder can filter events in memory

* fix: filters for add member

* fix(setup): add `ExternalSecure` to config

* chore: name iam to instance

* fix: matching

* remove unsued func

* base url

* base url

* test(command): filter funcs

* test: commands

* fix: rename orgiampolicy to domain policy

* start from init

* commands

* config

* fix indexes and add constraints

* fixes

* fix: merge conflicts

* fix: protos

* fix: md files

* setup

* add deprecated org iam policy again

* typo

* fix search query

* fix filter

* Apply suggestions from code review

* remove custom org from org setup

* add todos for verification

* change apps creation

* simplify package structure

* fix error

* move preparation helper for tests

* fix unique constraints

* fix config mapping in setup

* fix error handling in encryption_keys.go

* fix projection config

* fix query from old views to projection

* fix setup of mgmt api

* set iam project and fix instance projection

* fix tokens view

* fix steps.yaml and defaults.yaml

* fix projections

* change instance context to interface

* instance interceptors and additional events in setup

* cleanup

* tests for interceptors

* fix label policy

* add todo

* single api endpoint in environment.json

Co-authored-by: adlerhurst <silvan.reusser@gmail.com>
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>

console/src/app/modules/info-row/info-row.component.ts

@@ -29,9 +29,7 @@ export class InfoRowComponent implements OnInit {
         .toPromise().then((env: any) => {
           this.environmentMap = {
             issuer: env.issuer,
-            adminServiceUrl: env.adminServiceUrl,
-            mgmtServiceUrl: env.mgmtServiceUrl,
-            authServiceUrl: env.adminServiceUrl,
+            api: env.api,
           };
         });
     }

console/src/app/services/asset.service.ts

@@ -84,9 +84,8 @@ export class AssetService {
       .get('./assets/environment.json')
       .toPromise()
       .then((data: any) => {
-        if (data && data.assetServiceUrl) {
-          console.log(data.assetServiceUrl);
-          return data.assetServiceUrl;
+        if (data && data.api) {
+          return data.api;
         }
       })
       .catch((error) => {

console/src/app/services/grpc.service.ts

@@ -34,7 +34,7 @@ export class GrpcService {
       .get('./assets/environment.json')
       .toPromise()
       .then((data: any) => {
-        if (data && data.authServiceUrl && data.mgmtServiceUrl && data.issuer) {
+        if (data && data.api && data.issuer) {
           const interceptors = {
             unaryInterceptors: [
               new OrgInterceptor(this.storageService),
@@ -44,20 +44,19 @@ export class GrpcService {
           };
 
           this.auth = new AuthServiceClient(
-            data.authServiceUrl,
+            data.api,
             null,
             // @ts-ignore
             interceptors,
           );
           this.mgmt = new ManagementServiceClient(
-            data.mgmtServiceUrl,
+            data.api,
             null,
             // @ts-ignore
             interceptors,
           );
           this.admin = new AdminServiceClient(
-            // TODO: replace with service url
-            data.mgmtServiceUrl,
+            data.api,
             null,
             // @ts-ignore
             interceptors,

console/src/app/services/subscription.service.ts

@@ -26,7 +26,7 @@ export class SubscriptionService {
     return this.http.get('./assets/environment.json')
       .toPromise().then((data: any) => {
         if (data && data.subscriptionServiceUrl) {
-          const serviceUrl = data.subscriptionServiceUrl;
+          const serviceUrl = data.api;
           const accessToken = this.storageService.getItem(accessTokenStorageKey);
           return this.http.get(`${serviceUrl}/redirect`, {
             headers: {
@@ -48,7 +48,7 @@ export class SubscriptionService {
     return this.http.get('./assets/environment.json')
       .toPromise().then((data: any) => {
         if (data && data.subscriptionServiceUrl) {
-          const serviceUrl = data.subscriptionServiceUrl;
+          const serviceUrl = data.api;
           const accessToken = this.storageService.getItem(accessTokenStorageKey);
           return this.http.get(`${serviceUrl}/customer`, {
             headers: {
@@ -68,7 +68,7 @@ export class SubscriptionService {
     return this.http.get('./assets/environment.json')
       .toPromise().then((data: any) => {
         if (data && data.subscriptionServiceUrl) {
-          const serviceUrl = data.subscriptionServiceUrl;
+          const serviceUrl = data.api;
           const accessToken = this.storageService.getItem(accessTokenStorageKey);
           return this.http.post(`${serviceUrl}/customer`, body, {
             headers: {

console/src/assets/environment.json

@@ -1,9 +1,5 @@
 {
-  "authServiceUrl": "https://api.zitadel.dev",
-  "mgmtServiceUrl": "https://api.zitadel.dev",
-  "adminServiceUrl": "https://api.zitadel.dev",
-  "subscriptionServiceUrl": "https://sub.zitadel.dev",
-  "assetServiceUrl": "https://api.zitadel.dev",
+  "api": "https://api.zitadel.dev",
   "issuer": "https://issuer.zitadel.dev",
   "clientid": "70669160379706195@zitadel"
 }