Skip to content

Commit 8aea66b

Browse files
authored
Revert "OIDC default resource assignments" (#7159)
1 parent 29fefc6 commit 8aea66b

File tree

16 files changed

+33
-658
lines changed

16 files changed

+33
-658
lines changed

integration-tests/tests/api/oidc-integrations/assigned-resources.spec.ts

Lines changed: 0 additions & 266 deletions
This file was deleted.

packages/migrations/src/actions/2025.10.30T00-00-00.granular-oidc-role-permissions.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.

packages/migrations/src/run-pg-migrations.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,5 @@ export const runPGMigrations = async (args: { slonik: DatabasePool; runTo?: stri
168168
await import('./actions/2025.05.15T00-00-01.organization-member-pagination'),
169169
await import('./actions/2025.05.28T00-00-00.schema-log-by-ids'),
170170
await import('./actions/2025.10.16T00-00-00.schema-log-by-commit-ordered'),
171-
await import('./actions/2025.10.30T00-00-00.granular-oidc-role-permissions'),
172171
],
173172
});
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { createModule } from 'graphql-modules';
2-
import { ResourceAssignments } from '../organization/providers/resource-assignments';
32
import { OIDCIntegrationsProvider } from './providers/oidc-integrations.provider';
43
import { resolvers } from './resolvers.generated';
54
import typeDefs from './module.graphql';
@@ -9,5 +8,5 @@ export const oidcIntegrationsModule = createModule({
98
dirname: __dirname,
109
typeDefs,
1110
resolvers,
12-
providers: [OIDCIntegrationsProvider, ResourceAssignments],
11+
providers: [OIDCIntegrationsProvider],
1312
});

packages/services/api/src/modules/oidc-integrations/module.graphql.ts

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export default gql`
1919
authorizationEndpoint: String!
2020
oidcUserAccessOnly: Boolean!
2121
defaultMemberRole: MemberRole!
22-
defaultResourceAssignment: ResourceAssignment
2322
}
2423
2524
extend type Mutation {
@@ -30,30 +29,6 @@ export default gql`
3029
updateOIDCDefaultMemberRole(
3130
input: UpdateOIDCDefaultMemberRoleInput!
3231
): UpdateOIDCDefaultMemberRoleResult!
33-
updateOIDCDefaultResourceAssignment(
34-
input: UpdateOIDCDefaultResourceAssignmentInput!
35-
): UpdateOIDCDefaultResourceAssignmentResult!
36-
}
37-
38-
"""
39-
@oneOf
40-
"""
41-
type UpdateOIDCDefaultResourceAssignmentResult {
42-
ok: UpdateOIDCDefaultResourceAssignmentOk
43-
error: UpdateOIDCDefaultResourceAssignmentError
44-
}
45-
46-
type UpdateOIDCDefaultResourceAssignmentOk {
47-
updatedOIDCIntegration: OIDCIntegration!
48-
}
49-
50-
type UpdateOIDCDefaultResourceAssignmentError implements Error {
51-
message: String!
52-
}
53-
54-
input UpdateOIDCDefaultResourceAssignmentInput {
55-
oidcIntegrationId: ID!
56-
resources: ResourceAssignmentInput!
5732
}
5833
5934
extend type Subscription {

0 commit comments

Comments
 (0)