diff --git a/src/helpers/redirectToProvider.ts b/src/helpers/redirectToProvider.ts index 236394de8..50ca39671 100644 --- a/src/helpers/redirectToProvider.ts +++ b/src/helpers/redirectToProvider.ts @@ -11,13 +11,15 @@ export function getRedirectUrlFromCurrentFrontendPath(provider: IProvider): stri export const redirectToProvider = (provider: IProvider) => { - console.log({provider}) - const redirectUrl = getRedirectUrlFromCurrentFrontendPath(provider) const state = createRandomID(24) localStorage.setItem('state', state) - window.location.href = `${provider.authUrl}?client_id=${provider.clientId}&redirect_uri=${redirectUrl}&response_type=code&scope=openid email profile&state=${state}` + let scope = 'openid email profile' + if (provider.scope !== null){ + scope = provider.scope + } + window.location.href = `${provider.authUrl}?client_id=${provider.clientId}&redirect_uri=${redirectUrl}&response_type=code&scope=${scope}&state=${state}` } export const redirectToProviderOnLogout = (provider: IProvider) => { if (provider.logoutUrl.length > 0) { diff --git a/src/modelTypes/ITeam.ts b/src/modelTypes/ITeam.ts index cd5a7dc73..3cdaae987 100644 --- a/src/modelTypes/ITeam.ts +++ b/src/modelTypes/ITeam.ts @@ -9,6 +9,7 @@ export interface ITeam extends IAbstract { description: string members: ITeamMember[] right: Right + oidcId: string createdBy: IUser created: Date diff --git a/src/models/team.ts b/src/models/team.ts index 9d86ca8c4..1e75738bb 100644 --- a/src/models/team.ts +++ b/src/models/team.ts @@ -13,6 +13,7 @@ export default class TeamModel extends AbstractModel implements ITeam { description = '' members: ITeamMember[] = [] right: Right = RIGHTS.READ + oidcId = '' createdBy: IUser = {} // FIXME: seems wrong created: Date = null diff --git a/src/types/IProvider.ts b/src/types/IProvider.ts index 420728926..2dec662a6 100644 --- a/src/types/IProvider.ts +++ b/src/types/IProvider.ts @@ -4,4 +4,5 @@ export interface IProvider { authUrl: string; clientId: string; logoutUrl: string; + scope: string; } diff --git a/src/views/teams/EditTeam.vue b/src/views/teams/EditTeam.vue index 03cc7e96c..a218669eb 100644 --- a/src/views/teams/EditTeam.vue +++ b/src/views/teams/EditTeam.vue @@ -3,11 +3,7 @@ class="loader-container is-max-width-desktop" :class="{ 'is-loading': teamService.loading }" > - +