Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-10-27 11:02:16 +01:00
Code Issues Projects Releases Wiki Activity

chore: remove feature toggle kill switch for admin token UI (#9154)

Browse Source 
## About the changes
This was released with 6.6 and now this flag is no longer needed
This commit is contained in:
Gastón Fournier 2025-01-27 10:01:35 +01:00 committed by GitHub
parent b39adc1d54
commit fb95415d27
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/lib/routes/admin-api/api-token.test.ts
View File

@ -6,17 +6,12 @@ import getApp from '../../app';
import supertest from 'supertest';
import { addDays } from 'date-fns';
async function getSetup(adminTokenKillSwitchEnabled: boolean) {
async function getSetup() {
const base = `/random${Math.round(Math.random() * 1000)}`;
const perms = permissions();
const config = createTestConfig({
preHook: perms.hook,
server: { baseUriPath: base },
experimental: {
flags: {
adminTokenKillSwitch: adminTokenKillSwitchEnabled,
},
},
//@ts-ignore - Just testing, so only need the isEnabled call here
});
const stores = createStores();
@ -41,23 +36,8 @@ async function getSetup(adminTokenKillSwitchEnabled: boolean) {
}
describe('Admin token killswitch', () => {
test('If killswitch is off we can still create admin tokens', async () => {
const setup = await getSetup(false);
return setup.request
.post(`${setup.base}/api/admin/api-tokens`)
.set('Content-Type', 'application/json')
.send({
expiresAt: addDays(new Date(), 60),
type: 'ADMIN',
tokenName: 'Non killswitched',
})
.expect(201)
.expect((res) => {
expect(res.body.secret).toBeTruthy();
});
});
test('If killswitch is on we will get an operation denied if we try to create an admin token', async () => {
const setup = await getSetup(true);
const setup = await getSetup();
return setup.request
.post(`${setup.base}/api/admin/api-tokens`)
.set('Content-Type', 'application/json')
@ -74,7 +54,7 @@ describe('Admin token killswitch', () => {
});
});
test('If killswitch is on we can still create a client token', async () => {
const setup = await getSetup(true);
const setup = await getSetup();
return setup.request
.post(`${setup.base}/api/admin/api-tokens`)
.set('Content-Type', 'application/json')
@ -91,7 +71,7 @@ describe('Admin token killswitch', () => {
});
});
test('If killswitch is on we can still create a frontend token', async () => {
const setup = await getSetup(true);
const setup = await getSetup();
return setup.request
.post(`${setup.base}/api/admin/api-tokens`)
.set('Content-Type', 'application/json')

5
src/lib/routes/admin-api/api-token.ts
View File

@ -306,10 +306,7 @@ export class ApiTokenController extends Controller {
const permissionRequired = tokenTypeToCreatePermission(
createToken.type,
);
if (
createToken.type.toUpperCase() === 'ADMIN' &&
this.flagResolver.isEnabled('adminTokenKillSwitch')
) {
if (createToken.type.toUpperCase() === 'ADMIN') {
throw new OperationDeniedError(
`Admin tokens are disabled in this instance. Use a Service account or a PAT to access admin operations instead`,
);

5
src/lib/types/experimental.ts
View File

@ -29,7 +29,6 @@ export type IFlagKey =
| 'celebrateUnleash'
| 'feedbackPosting'
| 'extendedUsageMetrics'
| 'adminTokenKillSwitch'
| 'feedbackComments'
| 'showInactiveUsers'
| 'killScheduledChangeRequestCache'
@ -158,10 +157,6 @@ const flags: IFlags = {
process.env.UNLEASH_EXPERIMENTAL_EXTENDED_USAGE_METRICS,
false,
),
adminTokenKillSwitch: parseEnvVarBoolean(
process.env.UNLEASH_EXPERIMENTAL_ADMIN_TOKEN_KILL_SWITCH,
true,
),
outdatedSdksBanner: parseEnvVarBoolean(
process.env.UNLEASH_EXPERIMENTAL_OUTDATED_SDKS_BANNER,
false,