From 4395950f4e94656b35410d2b59bbbb23a7816f39 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Mon, 26 Feb 2024 20:46:54 +0800 Subject: [PATCH] rechore: client to strapiClient --- models/Activity/Award.ts | 6 +++--- models/Activity/Enrollment.ts | 4 ++-- models/Activity/Log.ts | 4 ++-- models/Activity/Message.ts | 4 ++-- models/Activity/Organization.ts | 4 ++-- models/Activity/Staff.ts | 4 ++-- models/Activity/Team.ts | 10 +++++----- models/Activity/index.ts | 4 ++-- models/Base/File.ts | 4 ++-- models/Git.ts | 4 ++-- models/TemplateRepo.ts | 4 ++-- models/User/PlatformAdmin.ts | 4 ++-- models/User/index.ts | 4 ++-- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/models/Activity/Award.ts b/models/Activity/Award.ts index e888cc45..94c9fe32 100644 --- a/models/Activity/Award.ts +++ b/models/Activity/Award.ts @@ -2,7 +2,7 @@ import { User } from '@authing/native-js-ui-components'; import { ListModel, Stream, toggle } from 'mobx-restful'; import { Base, createListStream, InputData, Media } from '../Base'; -import sessionStore from '../User/Session'; +import sessionStore, { strapiClient } from '../User/Session'; import { Team } from './Team'; export interface Award @@ -23,7 +23,7 @@ export interface AwardAssignment } export class AwardModel extends Stream(ListModel) { - client = sessionStore.client; + client = strapiClient; currentAssignment?: AwardAssignmentModel; constructor(baseURI: string) { @@ -56,7 +56,7 @@ export class AwardModel extends Stream(ListModel) { } export class AwardAssignmentModel extends Stream(ListModel) { - client = sessionStore.client; + client = strapiClient; constructor(baseURI: string) { super(); diff --git a/models/Activity/Enrollment.ts b/models/Activity/Enrollment.ts index 850a8f1a..b073d8ea 100644 --- a/models/Activity/Enrollment.ts +++ b/models/Activity/Enrollment.ts @@ -5,7 +5,7 @@ import { buildURLData, countBy, groupBy } from 'web-utility'; import { Base, createListStream, Filter } from '../Base'; import { i18n } from '../Base/Translation'; import { User } from '../User'; -import sessionStore from '../User/Session'; +import sessionStore, { strapiClient } from '../User/Session'; const { t } = i18n; @@ -40,7 +40,7 @@ export class EnrollmentModel extends Stream( this.baseURI = `${baseURI}/enrollment`; } - client = sessionStore.client; + client = strapiClient; indexKey = 'userId' as const; @observable diff --git a/models/Activity/Log.ts b/models/Activity/Log.ts index 379489d9..001eb2ff 100644 --- a/models/Activity/Log.ts +++ b/models/Activity/Log.ts @@ -1,7 +1,7 @@ import { IDType, ListModel, Stream } from 'mobx-restful'; import { Base, createListStream } from '../Base'; -import sessionStore from '../User/Session'; +import sessionStore, { strapiClient } from '../User/Session'; export interface Log extends Base { operatorId: IDType; @@ -11,7 +11,7 @@ export interface Log extends Base { } export class LogModel extends Stream(ListModel) { - client = sessionStore.client; + client = strapiClient; constructor(baseURI: string) { super(); diff --git a/models/Activity/Message.ts b/models/Activity/Message.ts index a0c066e8..49202e20 100644 --- a/models/Activity/Message.ts +++ b/models/Activity/Message.ts @@ -3,7 +3,7 @@ import { buildURLData } from 'web-utility'; import { Base, createListStream, Filter, InputData } from '../Base'; import { i18n } from '../Base/Translation'; -import sessionStore from '../User/Session'; +import sessionStore, { strapiClient } from '../User/Session'; const { t } = i18n; @@ -23,7 +23,7 @@ export interface Message extends Base { export type MessageFilter = Filter; export class MessageModel extends Stream(ListModel) { - client = sessionStore.client; + client = strapiClient; constructor(baseURI: string) { super(); diff --git a/models/Activity/Organization.ts b/models/Activity/Organization.ts index b87e05a0..0204bba7 100644 --- a/models/Activity/Organization.ts +++ b/models/Activity/Organization.ts @@ -4,7 +4,7 @@ import { groupBy } from 'web-utility'; import { Base, createListStream, InputData, Media } from '../Base'; import { i18n } from '../Base/Translation'; -import sessionStore from '../User/Session'; +import sessionStore, { strapiClient } from '../User/Session'; const { t } = i18n; @@ -33,7 +33,7 @@ export interface Organization extends Base { } export class OrganizationModel extends Stream(ListModel) { - client = sessionStore.client; + client = strapiClient; constructor(public baseURI: string) { super(); diff --git a/models/Activity/Staff.ts b/models/Activity/Staff.ts index d56a73ec..2a3b752c 100644 --- a/models/Activity/Staff.ts +++ b/models/Activity/Staff.ts @@ -4,7 +4,7 @@ import { groupBy, mergeStream } from 'web-utility'; import { Base, createListStream, InputData } from '../Base'; import { User } from '../User'; -import sessionStore from '../User/Session'; +import sessionStore, { strapiClient } from '../User/Session'; export interface HackathonAdmin extends Base, @@ -17,7 +17,7 @@ export interface Staff extends HackathonAdmin { } export class StaffModel extends Stream(ListModel) { - client = sessionStore.client; + client = strapiClient; indexKey = 'userId' as const; constructor(public baseURI: string) { diff --git a/models/Activity/Team.ts b/models/Activity/Team.ts index a5a64c58..8ca7ca74 100644 --- a/models/Activity/Team.ts +++ b/models/Activity/Team.ts @@ -11,7 +11,7 @@ import { } from '../Base'; import { WorkspaceModel } from '../Git'; import { User } from '../User'; -import sessionStore from '../User/Session'; +import sessionStore, { strapiClient } from '../User/Session'; import { AwardAssignment } from './Award'; import { NameAvailability } from './index'; @@ -74,7 +74,7 @@ export class TeamModel extends Stream(ListModel) { this.baseURI = `${baseURI}/team`; } - client = sessionStore.client; + client = strapiClient; currentMember?: TeamMemberModel; currentWork?: TeamWorkModel; currentWorkspace?: WorkspaceModel; @@ -182,7 +182,7 @@ export class TeamMemberModel extends Stream>( this.baseURI = `${baseURI}/member`; } - client = sessionStore.client; + client = strapiClient; @observable accessor sessionOne: TeamMember | undefined; @@ -226,7 +226,7 @@ export class TeamMemberModel extends Stream>( } export class TeamWorkModel extends Stream(ListModel) { - client = sessionStore.client; + client = strapiClient; constructor(baseURI: string) { super(); @@ -252,7 +252,7 @@ export class TeamWorkModel extends Stream(ListModel) { } export class TeamAssignmentModel extends Stream(ListModel) { - client = sessionStore.client; + client = strapiClient; constructor(baseURI: string) { super(); diff --git a/models/Activity/index.ts b/models/Activity/index.ts index a576630b..4faf3223 100644 --- a/models/Activity/index.ts +++ b/models/Activity/index.ts @@ -6,7 +6,7 @@ import { Base, createListStream, Filter, InputData, Media } from '../Base'; import { GitModel } from '../Git'; import { GitTemplateModal } from '../TemplateRepo'; import platformAdmin from '../User/PlatformAdmin'; -import sessionStore from '../User/Session'; +import sessionStore, { strapiClient } from '../User/Session'; import { AwardModel } from './Award'; import { Enrollment, EnrollmentModel } from './Enrollment'; import { LogModel } from './Log'; @@ -74,7 +74,7 @@ export interface Questionnaire extends Base { } export class ActivityModel extends Stream(ListModel) { - client = sessionStore.client; + client = strapiClient; baseURI = 'hackathon'; indexKey = 'name' as const; diff --git a/models/Base/File.ts b/models/Base/File.ts index 34878561..76f7e335 100644 --- a/models/Base/File.ts +++ b/models/Base/File.ts @@ -2,7 +2,7 @@ import { HTTPError, Request, request } from 'koajax'; import { DataObject, toggle } from 'mobx-restful'; import { FileModel } from 'mobx-restful-table'; -import sessionStore from '../User/Session'; +import sessionStore, { strapiClient } from '../User/Session'; import { ErrorBaseData, UploadUrl } from './index'; export class AzureFileModel extends FileModel { @@ -38,7 +38,7 @@ export class AzureFileModel extends FileModel { async upload(file: File) { const { type, name } = file; - const { body } = await sessionStore.client.post( + const { body } = await strapiClient.post( `user/generateFileUrl`, { filename: name, diff --git a/models/Git.ts b/models/Git.ts index 16599443..1512df5b 100644 --- a/models/Git.ts +++ b/models/Git.ts @@ -6,7 +6,7 @@ import { averageOf } from 'web-utility'; import { TeamWork, TeamWorkType } from './Activity/Team'; import { Base, createListStream } from './Base'; -import sessionStore from './User/Session'; +import sessionStore, { strapiClient } from './User/Session'; type Repository = components['schemas']['repository']; @@ -133,7 +133,7 @@ const DefaultTemplates = [ ]; export class WorkspaceModel extends GitModel { - client = sessionStore.client; + client = strapiClient; constructor(baseURI: string) { super(); diff --git a/models/TemplateRepo.ts b/models/TemplateRepo.ts index 86910d4b..2b4b6e05 100644 --- a/models/TemplateRepo.ts +++ b/models/TemplateRepo.ts @@ -1,7 +1,7 @@ import { ListModel, Stream, toggle } from 'mobx-restful'; import { Base, createListStream, InputData } from './Base'; -import sessionStore from './User/Session'; +import sessionStore, { strapiClient } from './User/Session'; export interface GitTemplate extends Base { url: string; @@ -14,7 +14,7 @@ export interface GitTemplate extends Base { } export class GitTemplateModal extends Stream(ListModel) { - client = sessionStore.client; + client = strapiClient; constructor(public baseURI: string) { super(); diff --git a/models/User/PlatformAdmin.ts b/models/User/PlatformAdmin.ts index 7233f894..bbb61e88 100644 --- a/models/User/PlatformAdmin.ts +++ b/models/User/PlatformAdmin.ts @@ -3,7 +3,7 @@ import { IDType, ListModel, Stream, toggle } from 'mobx-restful'; import { HackathonAdmin } from '../Activity/Staff'; import { createListStream, Filter } from '../Base'; -import sessionStore from './Session'; +import sessionStore, { strapiClient } from './Session'; export type PlatformAdmin = HackathonAdmin; @@ -13,7 +13,7 @@ export class PlatformAdminModel extends Stream< PlatformAdmin, PlatformAdminFilter >(ListModel) { - client = sessionStore.client; + client = strapiClient; baseURI = 'platform/admin'; indexKey = 'userId' as const; diff --git a/models/User/index.ts b/models/User/index.ts index a975936f..2fc37910 100644 --- a/models/User/index.ts +++ b/models/User/index.ts @@ -2,7 +2,7 @@ import { ListModel, Stream } from 'mobx-restful'; import { buildURLData } from 'web-utility'; import { Base, createListStream, Filter, ListData } from '../Base'; -import sessionStore from './Session'; +import sessionStore, { strapiClient } from './Session'; export interface UserBase { username: string; @@ -126,7 +126,7 @@ export interface UserFilter extends Filter { } export class UserModel extends Stream(ListModel) { - client = sessionStore.client; + client = strapiClient; baseURI = 'user'; async getUserTopList() {