chore: update to .NET 10.0 & ABP 10.0.2

.github/workflows/build.yml

@@ -7,7 +7,7 @@ on:
         - "**.csproj"
 
 env:
-  DOTNET_VERSION: "9.0.307"
+  DOTNET_VERSION: "10.0.102"
 
 jobs:
   build:

.github/workflows/publish.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
     branches: [ main ]
 env:
-  DOTNET_VERSION: "9.0.307"
+  DOTNET_VERSION: "10.0.102"
 
 jobs:
   publish:

.github/workflows/release.yml

@@ -14,4 +14,4 @@ jobs:
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         prerelease: false
-        automatic_release_tag: "9.3.6"
+        automatic_release_tag: "10.0.2"

apps/vben5/apps/app-antd/.env.development

@@ -18,7 +18,7 @@ VITE_INJECT_APP_LOADING=true
 # 是否仅允许OIDC登录
 VITE_GLOB_ONLY_OIDC=false
 # 认证服务器
-VITE_GLOB_AUTHORITY="http://127.0.0.1:30001"
+VITE_GLOB_AUTHORITY="http://localhost:30000"
 # 授权范围
 VITE_GLOB_AUDIENCE="openid email address phone profile offline_access lingyun-abp-application"
 # 客户端Id

apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json

@@ -18,7 +18,8 @@
       "invalidUserNameOrPassword": "Invalid username or password!",
       "tokenHasExpired": "The token is no longer valid!",
       "requiresTwoFactor": "Identity verification is required. Please select a verification method!",
-      "shouldChangePassword": "Your password has expired. Please change it and login!"
+      "shouldChangePassword": "Your password has expired. Please change it and login!",
+      "accessDenied": "You have refused the necessary authorization for the application. Please log in again!"
     }
   },
   "manage": {

apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json

@@ -18,7 +18,8 @@
       "invalidUserNameOrPassword": "用户名或密码错误!",
       "tokenHasExpired": "您的请求会话已过期,请重新登录!",
       "requiresTwoFactor": "需要验证身份,请选择一种验证方式!",
-      "shouldChangePassword": "您的密码已过期,请修改密码后登录!"
+      "shouldChangePassword": "您的密码已过期,请修改密码后登录!",
+      "accessDenied": "您拒绝了应用程序必须的授权, 请重新登录!"
     }
   },
   "manage": {

apps/vben5/apps/app-antd/src/router/routes/core.ts

@@ -28,7 +28,7 @@ const coreRoutes: RouteRecordRaw[] = [
       hideInBreadcrumb: true,
       hideInMenu: true,
       hideInTab: true,
-      title: 'Processing login',
+      title: $t('page.auth.processingLogin'),
     },
     name: 'OidcFallback',
     path: '/signin-callback',

apps/vben5/apps/app-antd/src/store/auth.ts

@@ -1,4 +1,4 @@
-import type { TokenResult } from '@abp/account';
+import type { OAuthError, TokenResult } from '@abp/account';
 
 import type { Recordable, UserInfo } from '@vben/types';
 
@@ -45,7 +45,7 @@ export const useAuthStore = defineStore('auth', () => {
     await oAuthService.login();
   }
 
-  async function oidcCallback() {
+  async function oidcCallback(onError?: (error: OAuthError) => void) {
     try {
       const user = await oAuthService.handleCallback();
       return await _loginSuccess({
@@ -55,6 +55,8 @@ export const useAuthStore = defineStore('auth', () => {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         expiresIn: user.expires_in!,
       });
+    } catch (error: any) {
+      onError && onError(error as OAuthError);
     } finally {
       loginLoading.value = false;
     }

apps/vben5/apps/app-antd/src/views/_core/fallback/login-callback.vue

@@ -1,12 +1,26 @@
 <script lang="ts" setup>
 import { onMounted } from 'vue';
 
+import { useOAuthError } from '@abp/account';
+import { Modal } from 'ant-design-vue';
+
 import { useAuthStore } from '#/store/auth';
 
+const { formatError } = useOAuthError();
 const authStore = useAuthStore();
 
 onMounted(async () => {
-  await authStore.oidcCallback();
+  await authStore.oidcCallback((error) => {
+    Modal.warn({
+      centered: true,
+      maskClosable: false,
+      closable: false,
+      title: formatError(error),
+      onOk: () => {
+        authStore.logout();
+      },
+    });
+  });
 });
 </script>
 

apps/vben5/apps/app-antd/vite.config.mts

@@ -8,19 +8,19 @@ export default defineConfig(async () => {
         proxy: {
           '/.well-known': {
             changeOrigin: true,
-            target: 'http://127.0.0.1:30001/',
+            target: 'http://localhost:30000/',
           },
           '/api': {
             changeOrigin: true,
-            target: 'http://127.0.0.1:30001/',
+            target: 'http://localhost:30000/',
           },
           '/connect': {
             changeOrigin: true,
-            target: 'http://127.0.0.1:30001/',
+            target: 'http://localhost:30000/',
           },
           '/signalr-hubs': {
             changeOrigin: true,
-            target: 'http://127.0.0.1:30001/',
+            target: 'http://localhost:30000/',
             ws: true,
           },
         },

apps/vben5/packages/@abp/account/src/hooks/useOAuthError.ts

@@ -1,10 +1,6 @@
-import { $t } from '@vben/locales';
+import type { OAuthError } from '../types/token';
 
-interface OAuthError {
-  error: string;
-  error_description?: string;
-  error_uri?: string;
-}
+import { $t } from '@vben/locales';
 
 export function useOAuthError() {
   function formatError(error: OAuthError) {
@@ -22,6 +18,10 @@ export function useOAuthError() {
       case 'RequiresTwoFactor': {
         return $t('abp.oauth.errors.requiresTwoFactor');
       }
+      // 用户拒绝授权
+      case 'The authorization was denied by the end user.': {
+        return $t('abp.oauth.errors.accessDenied');
+      }
       // Token已失效
       case 'The token is no longer valid.':
       case 'The user is no longer allowed to sign in.': {

apps/vben5/packages/@abp/account/src/utils/auth.ts

@@ -157,6 +157,7 @@ const oidcSettings: UserManagerSettings = {
   silent_redirect_uri: `${window.location.origin}/silent-renew.html`,
   automaticSilentRenew: true,
   loadUserInfo: true,
+  prompt: 'select_account',
   userStore: new WebStorageStateStore({
     store: import.meta.env.DEV
       ? localStorage

apps/vben5/packages/@abp/openiddict/src/components/applications/ApplicationModal.vue

@@ -125,6 +125,7 @@ const endpoints = reactive<DefaultOptionType[]>([
   { label: 'device', value: 'device' },
   { label: 'revocation', value: 'revocation' },
   { label: 'introspection', value: 'introspection' },
+  { label: 'pushed_authorization', value: 'pushed_authorization' },
 ]);
 const getGrantTypes = computed(() => {
   const types = openIdConfiguration.value?.grant_types_supported ?? [];

apps/vben5/packages/@abp/openiddict/src/components/scopes/ScopeModal.vue

@@ -1,20 +1,17 @@
 <script setup lang="ts">
-import type { OpenIdConfiguration } from '@abp/core';
 import type { FormInstance } from 'ant-design-vue';
-import type { TransferItem } from 'ant-design-vue/es/transfer';
 
 import type { OpenIddictScopeDto } from '../../types/scopes';
 import type { DisplayNameInfo } from '../display-names/types';
 import type { PropertyInfo } from '../properties/types';
 
-import { computed, defineEmits, defineOptions, ref, toValue } from 'vue';
+import { defineEmits, defineOptions, ref, toValue } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 
-import { Form, Input, message, Tabs, Transfer } from 'ant-design-vue';
+import { Form, Input, message, Select, Tabs } from 'ant-design-vue';
 
-import { useOpenIdApi } from '../../api/useOpenIdApi';
 import { useScopesApi } from '../../api/useScopesApi';
 import DisplayNameTable from '../display-names/DisplayNameTable.vue';
 import PropertyTable from '../properties/PropertyTable.vue';
@@ -41,20 +38,8 @@ const defaultModel = {} as OpenIddictScopeDto;
 
 const form = ref<FormInstance>();
 const formModel = ref<OpenIddictScopeDto>({ ...defaultModel });
-const openIdConfiguration = ref<OpenIdConfiguration>();
 const activeTab = ref<TabKeys>('basic');
 
-const getSupportClaims = computed((): TransferItem[] => {
-  const types = openIdConfiguration.value?.claims_supported ?? [];
-  return types.map((type) => {
-    return {
-      key: type,
-      title: type,
-    };
-  });
-});
-
-const { discoveryApi } = useOpenIdApi();
 const { cancel, createApi, getApi, updateApi } = useScopesApi();
 const [Modal, modalApi] = useVbenModal({
   class: 'w-1/2',
@@ -91,7 +76,6 @@ const [Modal, modalApi] = useVbenModal({
       });
       try {
         modalApi.setState({ loading: true });
-        await onDiscovery();
         const { id } = modalApi.getData<OpenIddictScopeDto>();
         id && (await onGet(id));
       } finally {
@@ -108,9 +92,6 @@ async function onGet(id: string) {
     title: `${$t('AbpOpenIddict.Scopes')} - ${dto.name}`,
   });
 }
-async function onDiscovery() {
-  openIdConfiguration.value = await discoveryApi();
-}
 function onDescriptionChange(displayName: DisplayNameInfo) {
   formModel.value.descriptions ??= {};
   formModel.value.descriptions[displayName.culture] = displayName.displayName;
@@ -155,6 +136,16 @@ function onPropDelete(prop: PropertyInfo) {
           >
             <Input v-model:value="formModel.name" autocomplete="off" />
           </FormItem>
+          <FormItem
+            :label="$t('AbpOpenIddict.DisplayName:Resources')"
+            name="resources"
+          >
+            <Select
+              allow-clear
+              v-model:value="formModel.resources"
+              mode="tags"
+            />
+          </FormItem>
         </TabPane>
         <!-- 显示名称 -->
         <TabPane key="dispalyName" :tab="$t('AbpOpenIddict.DisplayNames')">
@@ -184,23 +175,6 @@ function onPropDelete(prop: PropertyInfo) {
             @delete="onDescriptionDelete"
           />
         </TabPane>
-        <!-- 资源 -->
-        <TabPane key="resource" :tab="$t('AbpOpenIddict.Resources')">
-          <Transfer
-            v-model:target-keys="formModel.resources"
-            :data-source="getSupportClaims"
-            :list-style="{
-              width: '47%',
-              height: '338px',
-            }"
-            :render="(item) => item.title"
-            :titles="[
-              $t('AbpOpenIddict.Assigned'),
-              $t('AbpOpenIddict.Available'),
-            ]"
-            class="tree-transfer"
-          />
-        </TabPane>
         <!-- 属性 -->
         <TabPane key="props" :tab="$t('AbpOpenIddict.Propertites')">
           <PropertyTable

apps/vben5/packages/@abp/request/src/hooks/useWrapperResult.ts

@@ -8,7 +8,11 @@ export function useWrapperResult(response: AxiosResponse) {
   const { data, headers } = response;
   /** 是否已包装结果 */
   function hasWrapResult(): boolean {
-    return headers[_defaultWrapperHeaderKey] === 'true' || hasError();
+    const wrapperHeader = headers[_defaultWrapperHeaderKey];
+    if (!wrapperHeader) {
+      return false;
+    }
+    return String(wrapperHeader).includes('true') || hasError();
   }
 
   /** 获取包装结果 */

apps/vben5/packages/@abp/saas/src/components/tenants/TenantModal.vue

@@ -148,7 +148,7 @@ async function onGet() {
 async function onSubmit() {
   try {
     modalApi.setState({ submitting: true });
-    if (!tenant.value.useSharedDatabase) {
+    if (!tenant.value.id && !tenant.value.useSharedDatabase) {
       await checkConnectionString({
         connectionString: tenant.value.defaultConnectionString,
         provider: tenant.value.provider,