JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

web/satellite: avoid querystring

Browse Source 
querystring dependency is deprecated in favor of URLSearchParams.

Change-Id: If7006cca1c590fff3b50440240307c00c2a23399
This commit is contained in:
Egon Elbre 2022-05-06 13:19:01 +03:00
parent dedccbd2e4
commit 89cc544b34
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
web/satellite/src/views/AuthorizeArea.vue
View File

@ -73,10 +73,10 @@
</div>
<form method="post">
<input v-model="oauthData['client_id']" type="hidden" name="client_id">
<input v-model="oauthData['redirect_uri']" type="hidden" name="redirect_uri">
<input v-model="oauthData['response_type']" type="hidden" name="response_type">
<input v-model="oauthData['state']" type="hidden" name="state">
<input v-model="oauthData.client_id" type="hidden" name="client_id">
<input v-model="oauthData.redirect_uri" type="hidden" name="redirect_uri">
<input v-model="oauthData.response_type" type="hidden" name="response_type">
<input v-model="oauthData.state" type="hidden" name="state">
<input v-model="scope" type="hidden" name="scope">
<input class="authorize-area__content-area__container__button" :class="{ 'disabled-button': !valid }" type="submit" :disabled="!valid" value="Authorize">
@ -93,7 +93,6 @@ import HeaderlessInput from '@/components/common/HeaderlessInput.vue';
import LogoIcon from '@/../static/images/logo.svg';
import {Validator} from '@/utils/validation';
import {RouteConfig} from '@/router';
import querystring, {ParsedUrlQueryInput} from 'querystring';
import {BUCKET_ACTIONS} from '@/store/modules/buckets';
import {PROJECTS_ACTIONS} from '@/store/modules/projects';
import {USER_ACTIONS} from '@/store/modules/users';
@ -103,6 +102,7 @@ import {APP_STATE_ACTIONS} from '@/utils/constants/actionNames';
import {AppState} from '@/utils/constants/appStateEnum';
import {ACCESS_GRANTS_ACTIONS} from '@/store/modules/accessGrants';
import {OAuthClient, OAuthClientsAPI} from '@/api/oauthClients';
import {URLSearchParams} from "url";
const oauthClientsAPI = new OAuthClientsAPI();
@ -116,7 +116,13 @@ const oauthClientsAPI = new OAuthClientsAPI();
export default class Authorize extends Vue {
private requestErr = '';
private oauthData: ParsedUrlQueryInput = {};
private oauthData: {
client_id?: string;
redirect_uri?: string;
state?: string;
response_type?: string;
scope?: string;
} = {};
private clientKey = '';
private client: OAuthClient = {
@ -153,7 +159,7 @@ export default class Authorize extends Vue {
await this.$notify.error(error.message);
}
const query = querystring.stringify(this.oauthData) as string;
const query = new URLSearchParams(this.oauthData).toString();
const path = `${RouteConfig.Authorize.path}?${query}#${this.clientKey}`;
await this.$router.push(`${RouteConfig.Login.path}?return_url=${encodeURIComponent(path)}`);
@ -175,11 +181,11 @@ export default class Authorize extends Vue {
}
private async verifyClientConfiguration(): Promise<void> {
const clientID = 'client_id' in this.oauthData ? `${this.oauthData['client_id']}` : '';
const redirectURL = 'redirect_uri' in this.oauthData ? `${this.oauthData['redirect_uri']}` : '';
const state = 'state' in this.oauthData ? `${this.oauthData['state']}` : '';
const responseType = 'response_type' in this.oauthData ? `${this.oauthData['response_type']}` : '';
const scope = 'scope' in this.oauthData ? `${this.oauthData['scope']}` : '';
const clientID: string = this.oauthData.client_id ?? "";
const redirectURL: string = this.oauthData.redirect_uri ?? "";
const state: string = this.oauthData.state ?? "";
const responseType: string = this.oauthData.response_type ?? "";
const scope: string = this.oauthData.scope ?? "";
if (!clientID || !redirectURL) {
this.requestErr = 'Both client_id and redirect_uri must be provided.';
@ -211,7 +217,7 @@ export default class Authorize extends Vue {
}
if (err) {
location.href = `${redirectURL}?${querystring.stringify(err)}`;
location.href = `${redirectURL}?${(new URLSearchParams(err)).toString()}`;
return
}
@ -239,8 +245,8 @@ export default class Authorize extends Vue {
* Makes activated banner visible on successful account activation.
*/
public async mounted(): Promise<void> {
this.oauthData = this.$route.query as ParsedUrlQueryInput;
this.clientKey = this.$route.hash ? this.$route.hash.substr(1) : "";
this.oauthData = this.$route.query;
this.clientKey = this.$route.hash ? this.$route.hash.substring(1) : "";
await this.ensureLogin();
await this.ensureWorker();
@ -300,7 +306,7 @@ export default class Authorize extends Vue {
return;
}
const scope = this.oauthData['scope'],
const scope = this.oauthData.scope,
project = this.selectedProjectID,
bucket = this.selectedBucketName,
cubbyhole = event.data.value;
@ -309,9 +315,9 @@ export default class Authorize extends Vue {
}
public async onDeny(): Promise<void> {
location.href = `${this.oauthData['redirect_uri']}?${querystring.stringify({
location.href = `${this.oauthData.redirect_uri}?${new URLSearchParams({
error_description: 'The resource owner or authorization server denied the request',
})}`;
}).toString()}`;
}
private validate(): boolean {
@ -358,7 +364,7 @@ function formatObjectPermissions(scope: string): string {
for (const scope of scopes) {
if (scope.startsWith("object:")) {
const perm = scope.substr("object:".length);
const perm = scope.substring("object:".length);
if (validPerms[perm]) {
perms.push(perm);
}