mirror of
https://github.com/status-im/consul.git
synced 2025-02-04 09:55:49 +00:00
03a1a86dfe
* v3.20.2...v3.24.0 * Fix handle undefined outlet in route component * Don't use template helper for optional modal.open Using the optional-helper here will trigger a computation in the same runloop error. This is because we are setting the `modal`-property when the `<Ref>` component gets rendered which will update the `this.modal`-property which will then recompute the `optional`-helper leading to this error. Instead we will create an action that will call the `open`-method on the modal when it is defined. This gets rid of the double computation error as we will not access the modal property twice in the same runloop when `modal` is getting set. * Fix - fn needs to be passed function tab-nav We create functions in the component file instead so that fn-helper stops complaining about the need to pass a function. * Update ember-exam to 6.1 version "Makes it compatible" with ember-qunit v5 * scheduleOnce setMaxHeight paged-collection We need to schedule to get around double-computation error. * Fix - model.data is removed from ember-data This has been private API all along - we need to work around the removal. Reference: https://github.com/emberjs/data/pull/7338/files#diff-9a8746fc5c86fd57e6122f00fef3155f76f0f3003a24b53fb7c4621d95dcd9bfL1310 * Fix `propContains` instead of `deepEqual` policy Recent model.data works differently than iterating attributes. We use `propContains` instead of `deepEqual`. We are only interested in the properties we assert against and match the previous behavior with this change. * Fix `propContains` instead of `deepEqual` token * Better handling single-records repo test-helper `model.data` has been removed we need to handle proxies and model instances differently. * Fix remaining repository tests with propContains We don't want to match entire objects - we don't care about properties we haven't defined in the assertion. * Don't use template helper for optional modal.open Using a template helper will give us a recomputation error - we work around it by creating an explicit action on the component instead. * Await `I $verb the $pageObject object` step * Fix no more customization ember-can No need to customize, the helper handles destruction fine on its own. * Fix - don't pass `optional` functions to fn We will declare the functions on the component instead. This gives us the same behavior but no error from `fn`, which expects a function to be passed. * Fix - handle `undefined` state on validate modifier StateChart can yield out an undefined `state` we need to handle that in the validate modifier * Fix linting errors tests directory * Warn / turn off new ember linting issues We will tackle them one by one and don't want to autofix issues that could be dangerous to auto-fix. * Auto-fix linting issues * More linting configuration * Fix remaining linting issues * Fix linting issues new files after rebase * ui: Remove ember-cli-uglify config now we are using terser (#14574) Co-authored-by: John Cowen <johncowen@users.noreply.github.com>
100 lines
3.7 KiB
JavaScript
100 lines
3.7 KiB
JavaScript
import { inject as service } from '@ember/service';
|
|
import RepositoryService from 'consul-ui/services/repository';
|
|
import { getOwner } from '@ember/application';
|
|
import { set } from '@ember/object';
|
|
import dataSource from 'consul-ui/decorators/data-source';
|
|
|
|
const modelName = 'oidc-provider';
|
|
const OAUTH_PROVIDER_NAME = 'oidc-with-url';
|
|
export default class OidcProviderService extends RepositoryService {
|
|
@service('torii') manager;
|
|
@service('settings') settings;
|
|
|
|
init() {
|
|
super.init(...arguments);
|
|
this.provider = getOwner(this).lookup(`torii-provider:${OAUTH_PROVIDER_NAME}`);
|
|
}
|
|
|
|
getModelName() {
|
|
return modelName;
|
|
}
|
|
|
|
@dataSource('/:partition/:ns/:dc/oidc/providers')
|
|
async findAllByDatacenter() {
|
|
const res = await super.findAllByDatacenter(...arguments);
|
|
if (res.length === 0) {
|
|
const err = new Error('Not found');
|
|
err.statusCode = 404;
|
|
this.store.adapterFor(this.getModelName()).error(err);
|
|
return;
|
|
}
|
|
return res;
|
|
}
|
|
|
|
@dataSource('/:partition/:ns/:dc/oidc/provider/:id')
|
|
async findBySlug(params) {
|
|
// This addition is mainly due to ember-data book-keeping This is one of
|
|
// the only places where Consul w/namespaces enabled doesn't return a
|
|
// response with a Namespace property, but in order to keep ember-data
|
|
// id's happy we need to fake one. Usually when we make a request to consul
|
|
// with an empty `ns=` Consul will use the namespace that is assigned to
|
|
// the token, and when we get the response we can pick that back off the
|
|
// responses `Namespace` property. As we don't receive a `Namespace`
|
|
// property here, we have to figure this out ourselves. But we also want
|
|
// to make this completely invisible to 'the application engineer/a
|
|
// template engineer'. This feels like the best place/way to do it as we
|
|
// are already in a asynchronous method, and we avoid adding extra 'just
|
|
// for us' parameters to the query object. There is a chance that as we
|
|
// are discovering the tokens default namespace on the frontend and
|
|
// assigning that to the ns query param, the token default namespace 'may'
|
|
// have changed by the time the request hits the backend. As this is
|
|
// extremely unlikely and in the scheme of things not a big deal, we
|
|
// decided that doing this here is ok and avoids doing this in a more
|
|
// complicated manner.
|
|
const token = (await this.settings.findBySlug('token')) || {};
|
|
return super.findBySlug({
|
|
ns: params.ns || token.Namespace || 'default',
|
|
partition: params.partition || token.Partition || 'default',
|
|
dc: params.dc,
|
|
id: params.id,
|
|
});
|
|
}
|
|
|
|
@dataSource('/:partition/:ns/:dc/oidc/authorize/:id/:code/:state')
|
|
authorize(params, configuration = {}) {
|
|
return this.store.authorize(this.getModelName(), params);
|
|
}
|
|
|
|
logout(id, code, state, dc, nspace, configuration = {}) {
|
|
// TODO: Temporarily call this secret, as we alreayd do that with
|
|
// self in the `store` look to see whether we should just call it id like
|
|
// the rest
|
|
const query = {
|
|
id: id,
|
|
};
|
|
return this.store.logout(this.getModelName(), query);
|
|
}
|
|
|
|
close() {
|
|
this.manager.close(OAUTH_PROVIDER_NAME);
|
|
}
|
|
|
|
findCodeByURL(src) {
|
|
// TODO: Maybe move this to the provider itself
|
|
set(this.provider, 'baseUrl', src);
|
|
return this.manager.open(OAUTH_PROVIDER_NAME, {}).catch((e) => {
|
|
let err;
|
|
switch (true) {
|
|
case e.message.startsWith('remote was closed'):
|
|
err = new Error('Remote was closed');
|
|
err.statusCode = 499;
|
|
break;
|
|
default:
|
|
err = new Error(e.message);
|
|
err.statusCode = 500;
|
|
}
|
|
this.store.adapterFor(this.getModelName()).error(err);
|
|
});
|
|
}
|
|
}
|