github/paralus
1
0
Fork 0
mirror of https://github.com/paralus/paralus.git synced 2026-02-14 17:49:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes to callback url and associate default org admin group to role

Browse Source
This commit is contained in:
niravparikh05
2022-05-03 13:08:23 +05:30
parent 597be0538e
commit 27b2b2f8d9
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/service/oidc_provider.go
View File

@@ -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),
},
}

5
scripts/initialize/main.go
View File

@@ -259,6 +259,11 @@ func main() {
},
Spec: &userv3.GroupSpec{
Type: "DEFAULT_ADMINS",
ProjectNamespaceRoles: []*userv3.ProjectNamespaceRole{
{
Role: "ADMIN",
},
},
},
})
if err != nil {