From 27b2b2f8d92caec6aaacc3e194246a120771b63f Mon Sep 17 00:00:00 2001
From: niravparikh05 <nir.parikh05@gmail.com>
Date: Tue, 3 May 2022 13:08:23 +0530
Subject: [PATCH] fixes to callback url and associate default org admin group
 to role

---
 pkg/service/oidc_provider.go | 10 +++++-----
 scripts/initialize/main.go   |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkg/service/oidc_provider.go b/pkg/service/oidc_provider.go
index 2b8278a..aabb8d5 100644
--- a/pkg/service/oidc_provider.go
+++ b/pkg/service/oidc_provider.go
@@ -158,7 +158,7 @@ func (s *oidcProvider) Create(ctx context.Context, provider *systemv3.OIDCProvid
 			TokenUrl:        entity.TokenURL,
 			RequestedClaims: rclaims,
 			Predefined:      entity.Predefined,
-			CallbackUrl:     generateCallbackUrl(entity.Id.String(), s.kratosUrl),
+			CallbackUrl:     generateCallbackUrl(entity.Name, s.kratosUrl),
 		},
 	}
 
@@ -199,7 +199,7 @@ func (s *oidcProvider) GetByID(ctx context.Context, provider *systemv3.OIDCProvi
 			TokenUrl:        entity.TokenURL,
 			RequestedClaims: rclaims,
 			Predefined:      entity.Predefined,
-			CallbackUrl:     generateCallbackUrl(entity.Id.String(), s.kratosUrl),
+			CallbackUrl:     generateCallbackUrl(entity.Name, s.kratosUrl),
 		},
 	}
 	return rv, nil
@@ -245,7 +245,7 @@ func (s *oidcProvider) GetByName(ctx context.Context, provider *systemv3.OIDCPro
 			TokenUrl:        entity.TokenURL,
 			RequestedClaims: rclaims,
 			Predefined:      entity.Predefined,
-			CallbackUrl:     generateCallbackUrl(entity.Id.String(), s.kratosUrl),
+			CallbackUrl:     generateCallbackUrl(entity.Name, s.kratosUrl),
 		},
 	}
 	return rv, nil
@@ -283,7 +283,7 @@ func (s *oidcProvider) List(ctx context.Context) (*systemv3.OIDCProviderList, er
 				TokenUrl:        entity.TokenURL,
 				RequestedClaims: rclaims,
 				Predefined:      entity.Predefined,
-				CallbackUrl:     generateCallbackUrl(entity.Id.String(), s.kratosUrl),
+				CallbackUrl:     generateCallbackUrl(entity.Name, s.kratosUrl),
 			},
 		}
 		result = append(result, e)
@@ -383,7 +383,7 @@ func (s *oidcProvider) Update(ctx context.Context, provider *systemv3.OIDCProvid
 			TokenUrl:        entity.TokenURL,
 			RequestedClaims: rclaims,
 			Predefined:      entity.Predefined,
-			CallbackUrl:     generateCallbackUrl(provider.GetMetadata().GetId(), s.kratosUrl),
+			CallbackUrl:     generateCallbackUrl(provider.GetMetadata().GetName(), s.kratosUrl),
 		},
 	}
 
diff --git a/scripts/initialize/main.go b/scripts/initialize/main.go
index 95f5575..8c822ec 100644
--- a/scripts/initialize/main.go
+++ b/scripts/initialize/main.go
@@ -259,6 +259,11 @@ func main() {
 		},
 		Spec: &userv3.GroupSpec{
 			Type: "DEFAULT_ADMINS",
+			ProjectNamespaceRoles: []*userv3.ProjectNamespaceRole{
+				{
+					Role: "ADMIN",
+				},
+			},
 		},
 	})
 	if err != nil {