@frigear-nu/oauth-server 0.1.3 → 0.2.1

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@frigear-nu/oauth-server",
   "configKey": "oauthServer",
-  "version": "0.1.3",
+  "version": "0.2.1",
   "builder": {
     "@nuxt/module-builder": "1.0.3",
     "unbuild": "unknown"

package/dist/runtime/app/components/OAuthApplicationSlideover.vue

@@ -1,6 +1,7 @@
 <script setup>
 import * as z from "zod";
 import { isNativeRedirectUri, isSecureOrigin } from "../../utils";
+import { computed, reactive, useAction, useModuleT } from "#imports";
 defineOptions({ name: "OAuthApplicationSlideover" });
 const props = defineProps({
   application: { type: Object, required: false },

package/dist/runtime/app/components/OAuthCredentialsModal.vue

@@ -1,4 +1,5 @@
 <script setup>
+import { useCopyToClipboard, useModuleT } from "#imports";
 defineOptions({ name: "OAuthCredentialsModal" });
 defineProps({
   name: { type: String, required: true },

package/dist/runtime/app/composables/useOAuthApplicationActions.js

@@ -1,6 +1,7 @@
 import OAuthApplicationSlideover from "../components/OAuthApplicationSlideover.vue";
 import OAuthCredentialsModal from "../components/OAuthCredentialsModal.vue";
 import { OAUTH_APPLICATIONS_KEY, oauthApplicationsApi } from "./useOAuthApplications.js";
+import { ref, refreshNuxtData, useAction, useConfirmDialog, useCopyToClipboard, useModuleT, useOverlay, useRoute, useRouter, useToast } from "#imports";
 export function useOAuthApplicationActions() {
   const t = useModuleT("oauthServer");
   const overlay = useOverlay();

package/dist/runtime/app/composables/useOAuthApplications.d.ts

@@ -1,5 +1,7 @@
-import type { MaybeRefOrGetter } from 'vue';
-import type { AdminApplicationDto, ApplicationInput, CreatedApplicationDto } from '../../../types.js';
+import type { ComputedRef, MaybeRefOrGetter } from 'vue';
+import type { AsyncData, NuxtError } from 'nuxt/app';
+import type { AdminApplicationDto, AdminApplicationsPage, ApplicationInput, CreatedApplicationDto } from '../../../types.js';
+type Application = AdminApplicationDto;
 /** The `useFetch` key of the admin list; `refreshNuxtData(OAUTH_APPLICATIONS_KEY)` reloads it from anywhere. */
 export declare const OAUTH_APPLICATIONS_KEY = "oauth-server:applications";
 /** The admin endpoints as plain calls (no refresh). Every call needs the host's `oauth:authorize` hook to allow the user. */
@@ -16,15 +18,33 @@ export declare const oauthApplicationsApi: {
 };
 /** The list query: `page`, `pageSize`, `q` (name or client id), `sort` (`createdAt`, `name`, `priority`) and `order`. */
 export type OAuthApplicationsQuery = Record<string, string | number | undefined>;
+type ApplicationsAsyncData = Awaited<AsyncData<AdminApplicationsPage | undefined, NuxtError | undefined>>;
+/** What `useOAuthApplications` returns (and resolves with when awaited). */
+export interface OAuthApplicationsState {
+    applications: ComputedRef<Application[]>;
+    total: ComputedRef<number>;
+    data: ApplicationsAsyncData['data'];
+    status: ApplicationsAsyncData['status'];
+    error: ApplicationsAsyncData['error'];
+    loading: ComputedRef<boolean>;
+    refreshing: ComputedRef<boolean>;
+    refresh: ApplicationsAsyncData['refresh'];
+    create: (input: ApplicationInput) => Promise<CreatedApplicationDto>;
+    update: (id: string, patch: Partial<ApplicationInput>) => Promise<Application>;
+    remove: (id: string) => Promise<null>;
+    rotateSecret: (id: string) => Promise<string>;
+    revokeGrants: (id: string) => Promise<Application>;
+}
 /**
  * Admin CRUD for applications, with one page of the list. Awaitable: `await useOAuthApplications(query)` in a page
  * renders the list on the server; pass `useTableQuery().query` to page, search and sort it. `applications` is `[]`
  * until loaded and after an error: check `loading` and `error` first. Every call needs the host's `oauth:authorize`
  * hook to allow the user.
  */
-export declare function useOAuthApplications(query?: MaybeRefOrGetter<OAuthApplicationsQuery>): any;
+export declare function useOAuthApplications(query?: MaybeRefOrGetter<OAuthApplicationsQuery>): OAuthApplicationsState & Promise<OAuthApplicationsState>;
 /**
  * The applications the signed-in user may sign in to. Awaitable: `await useMyApplications()` in a page renders them on
  * the server. `applications` is `[]` until loaded and after an error: check `loading` and `error` first.
  */
 export declare function useMyApplications(): any;
+export {};

package/dist/runtime/app/composables/useOAuthApplications.js

@@ -1,4 +1,5 @@
 import { oauthServerApi } from "../../utils/api.js";
+import { $fetch, computed, useCachedFetch, useFetch, useUserSession, watch } from "#imports";
 export const OAUTH_APPLICATIONS_KEY = "oauth-server:applications";
 export const oauthApplicationsApi = {
   get: (id) => $fetch(oauthServerApi.admin.application(id)),

package/dist/runtime/app/pages/admin.vue

@@ -1,5 +1,6 @@
 <script setup>
 import { oauthApplicationsApi } from "../composables/useOAuthApplications";
+import { computed, numericColumn, onMounted, useModuleT, useOAuthApplicationActions, useOAuthApplications, useRoute, useTableQuery, useTableSort, watch } from "#imports";
 defineOptions({ name: "OAuthAdminPage" });
 const t = useModuleT("oauthServer");
 const route = useRoute();

package/dist/runtime/app/pages/applications.vue

@@ -1,4 +1,5 @@
 <script setup>
+import { useModuleT, useMyApplications } from "#imports";
 defineOptions({ name: "OAuthApplicationsPage" });
 const t = useModuleT("oauthServer");
 const { applications, loading, error, refresh } = await useMyApplications();

package/dist/runtime/app/pages/authorize.vue

@@ -1,5 +1,7 @@
 <script setup>
+import { isNativeRedirectUri } from "../../utils";
 import { oauthServerApi, oidc } from "../../utils/api";
+import { $fetch, navigateTo, ref, useAuthPages, useErrorToast, useFetch, useModuleT, useRoute } from "#imports";
 defineOptions({ name: "OAuthAuthorizePage" });
 const t = useModuleT("oauthServer");
 const route = useRoute();
@@ -21,6 +23,7 @@ const scopeLabel = (scope) => {
   return known[scope] ?? scope;
 };
 const pending = ref(null);
+const appRedirectUrl = ref(null);
 async function decide(approved) {
   pending.value = approved ? "approve" : "deny";
   try {
@@ -28,6 +31,12 @@ async function decide(approved) {
       method: "POST",
       body: { ...route.query, approved }
     });
+    if (isNativeRedirectUri(redirectUrl)) {
+      appRedirectUrl.value = redirectUrl;
+      pending.value = null;
+      window.location.href = redirectUrl;
+      return;
+    }
     await navigateTo(redirectUrl, { external: true });
   } catch (err) {
     showError(err, t("authorize.failed", "Could not complete the sign-in. Please try again."));
@@ -38,7 +47,22 @@ async function decide(approved) {
 
 <template>
   <AuthCard
-    v-if="consent"
+    v-if="consent && appRedirectUrl"
+    :title="t('authorize.returnTitle', 'Return to {name}', { name: consent.application.name })"
+    :description="t('authorize.returnHint', 'If the app did not open, tap the button below. You can close this window afterwards.')"
+  >
+    <UButton
+      :to="appRedirectUrl"
+      external
+      block
+      size="lg"
+      icon="i-lucide-external-link"
+      :label="t('authorize.returnToApp', 'Return to the app')"
+    />
+  </AuthCard>
+
+  <AuthCard
+    v-else-if="consent"
     :title="t('authorize.title', 'Sign in to {name}', { name: consent.application.name })"
   >
     <template #description>

package/dist/runtime/i18n/lang/da.json

@@ -109,6 +109,9 @@
       "invalidTitle": "Denne loginanmodning kan ikke gennemføres",
       "invalidDescription": "Anmodningen er ugyldig.",
       "failed": "Login kunne ikke gennemføres. Prøv igen.",
+      "returnTitle": "Vend tilbage til {name}",
+      "returnToApp": "Vend tilbage til appen",
+      "returnHint": "Hvis appen ikke åbnede, så tryk på knappen nedenfor. Du kan lukke dette vindue bagefter.",
       "scope": {
         "openid": "Bekræfte din identitet",
         "profile": "Dit navn og profilbillede",

package/dist/runtime/i18n/lang/en.json

@@ -109,6 +109,9 @@
       "invalidTitle": "This sign-in request cannot be completed",
       "invalidDescription": "The request is invalid.",
       "failed": "Could not complete the sign-in. Please try again.",
+      "returnTitle": "Return to {name}",
+      "returnToApp": "Return to the app",
+      "returnHint": "If the app did not open, tap the button below. You can close this window afterwards.",
       "scope": {
         "openid": "Verify your identity",
         "profile": "Your name and profile picture",

package/dist/runtime/menus.js

@@ -1,4 +1,5 @@
 import { defineMenuItem, defineMenuSource, extendMenuItem } from "@frigear-nu/menu/utils";
+import { useRuntimeConfig } from "#imports";
 export default defineMenuSource(() => {
   const config = useRuntimeConfig().public.oauthServer;
   if (config?.pages?.applications) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frigear-nu/oauth-server",
-  "version": "0.1.3",
+  "version": "0.2.1",
   "description": "OAuth 2.0 / OpenID Connect server for the frigear ecosystem: register applications that users with certain roles may sign in to.",
   "url": "https://docs.frigear.dev/modules/oauth-server",
   "author": {
@@ -42,12 +42,12 @@
     "playground"
   ],
   "dependencies": {
-    "@frigear-nu/admin": "0.1.3",
-    "@frigear-nu/module-kit": "1.1.3",
-    "@frigear-nu/ui": "0.1.3",
-    "@frigear-nu/auth": "0.1.4",
-    "@frigear-nu/mcp": "0.1.3",
-    "@frigear-nu/users": "1.1.4",
+    "@frigear-nu/admin": "0.2.0",
+    "@frigear-nu/module-kit": "1.2.0",
+    "@frigear-nu/ui": "0.2.0",
+    "@frigear-nu/auth": "0.2.0",
+    "@frigear-nu/mcp": "0.2.0",
+    "@frigear-nu/users": "1.2.0",
     "@libsql/client": "^0.18.0",
     "@nuxt/kit": "^4.6.1",
     "drizzle-kit": "^0.31.11",
@@ -57,7 +57,7 @@
     "zod": "^4.6.5"
   },
   "peerDependencies": {
-    "@frigear-nu/menu": "0.1.3",
+    "@frigear-nu/menu": "0.2.0",
     "@nuxt/ui": "^4.12.0",
     "@nuxthub/core": "^0.10.8"
   },
@@ -70,7 +70,7 @@
     }
   },
   "devDependencies": {
-    "@frigear-nu/menu": "0.1.3",
+    "@frigear-nu/menu": "0.2.0",
     "@nuxt/devtools": "^3.4.2",
     "@nuxt/eslint-config": "^1.17.0",
     "@nuxt/module-builder": "^1.0.3",