Separate out oidc deeplink protocol from Verus deeplink protocol

dist/vdxf/classes/Challenge.d.ts

@@ -1,92 +1,67 @@
-import { Client, ClientInterface } from "./Client";
 import { VDXFObject } from "../";
+export declare class RedirectUri extends VDXFObject {
+    uri: string;
+    constructor(uri: string, vdxfkey: string);
+    stringable(): {
+        uri: string;
+        vdxfkey: string;
+    };
+}
+export declare class Subject extends VDXFObject {
+    data: string;
+    constructor(data: string, vdxfkey: string);
+    stringable(): {
+        data: string;
+        vdxfkey: string;
+    };
+}
 export interface ChallengeInterface {
-    uuid: string;
-    requested_scope?: Array<string> | null;
-    requested_access_token_audience?: Array<string> | null;
-    skip?: boolean;
-    subject?: string;
-    oidc_context?: {
-        acr_values: Array<string>;
-        display: string;
-        id_token_hint_claims: {
-            [key: string]: any;
-        };
-        login_hint: string;
-        ui_locales: Array<string>;
-    } | {};
-    request_url?: string;
-    login_challenge?: string;
-    login_session_id?: string;
-    acr?: string;
+    challenge_id: string;
+    requested_access?: Array<string> | null;
+    requested_access_audience?: Array<string> | null;
+    subject?: Array<Subject>;
+    alt_auth_factors?: Array<string> | null;
     session_id?: string;
-    client: ClientInterface;
+    attestations?: null;
+    redirect_uris?: Array<RedirectUri>;
+    created_at: string;
+    salt?: string;
+    context?: {
+        [key: string]: any;
+    };
 }
-export declare class Challenge extends VDXFObject {
-    uuid: string;
-    client: Client;
-    requested_scope?: Array<string> | null;
-    requested_access_token_audience?: Array<string> | null;
-    skip?: boolean;
-    subject?: string;
-    oidc_context?: {
-        acr_values: Array<string>;
-        display: string;
-        id_token_hint_claims: {
-            [key: string]: any;
-        };
-        login_hint: string;
-        ui_locales: Array<string>;
-    } | {};
-    request_url?: string;
-    login_challenge?: string;
-    login_session_id?: string;
-    acr?: string;
+export declare class Challenge extends VDXFObject implements ChallengeInterface {
+    challenge_id: string;
+    requested_access?: Array<string> | null;
+    requested_access_audience?: Array<string> | null;
+    subject?: Array<Subject>;
+    alt_auth_factors?: Array<string> | null;
     session_id?: string;
+    attestations?: null;
+    redirect_uris?: Array<RedirectUri>;
+    created_at: string;
+    salt?: string;
+    context?: {
+        [key: string]: any;
+    };
     constructor(challenge: ChallengeInterface);
     stringable(): {
         vdxfkey: string;
-        uuid: string;
-        client: {
+        challenge_id: string;
+        requested_access: string[];
+        requested_access_audience: string[];
+        subject: Subject[];
+        alt_auth_factors: string[];
+        session_id: string;
+        attestations: null;
+        redirect_uris: {
+            uri: string;
             vdxfkey: string;
-            client_id: string;
-            name: string;
-            redirect_uris: import("./Client").RedirectUri[];
-            grant_types: string[];
-            response_types: string[];
-            scope: string;
-            audience: string[];
-            owner: string;
-            policy_uri: string;
-            allowed_cors_origins: string[];
-            tos_uri: string;
-            client_uri: string;
-            logo_uri: string;
-            contacts: string[];
-            client_secret_expires_at: number;
-            subject_type: string;
-            token_endpoint_auth_method: string;
-            userinfo_signed_response_alg: string;
-            created_at: string;
-            updated_at: string;
-        };
-        requested_scope: string[];
-        requested_access_token_audience: string[];
-        skip: boolean;
-        subject: string;
-        oidc_context: {} | {
-            acr_values: string[];
-            display: string;
-            id_token_hint_claims: {
-                [key: string]: any;
-            };
-            login_hint: string;
-            ui_locales: string[];
+        }[];
+        created_at: string;
+        salt: string;
+        context: {
+            [key: string]: any;
         };
-        request_url: string;
-        login_challenge: string;
-        login_session_id: string;
-        acr: string;
-        session_id: string;
     };
 }

dist/vdxf/classes/Challenge.js

@@ -1,40 +1,66 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Challenge = void 0;
-const Client_1 = require("./Client");
+exports.Challenge = exports.Subject = exports.RedirectUri = void 0;
 const __1 = require("../");
+class RedirectUri extends __1.VDXFObject {
+    constructor(uri, vdxfkey) {
+        super(vdxfkey);
+        this.uri = uri;
+    }
+    stringable() {
+        return {
+            uri: this.uri,
+            vdxfkey: this.vdxfkey
+        };
+    }
+}
+exports.RedirectUri = RedirectUri;
+class Subject extends __1.VDXFObject {
+    constructor(data, vdxfkey) {
+        super(vdxfkey);
+        this.data = data;
+    }
+    stringable() {
+        return {
+            data: this.data,
+            vdxfkey: this.vdxfkey
+        };
+    }
+}
+exports.Subject = Subject;
 class Challenge extends __1.VDXFObject {
     constructor(challenge) {
         super(__1.LOGIN_CONSENT_CHALLENGE_VDXF_KEY.vdxfid);
-        this.uuid = "";
-        this.uuid = challenge.uuid;
-        this.requested_scope = challenge.requested_scope;
-        this.requested_access_token_audience = challenge.requested_access_token_audience;
-        this.skip = challenge.skip;
+        this.challenge_id = challenge.challenge_id;
+        this.requested_access = challenge.requested_access;
+        this.requested_access_audience = challenge.requested_access_audience;
         this.subject = challenge.subject;
-        this.oidc_context = challenge.oidc_context;
-        this.request_url = challenge.request_url;
-        this.login_challenge = challenge.login_challenge;
-        this.login_session_id = challenge.login_session_id;
-        this.acr = challenge.acr;
+        this.alt_auth_factors = challenge.alt_auth_factors;
         this.session_id = challenge.session_id;
-        this.client = new Client_1.Client(challenge.client);
+        this.attestations = challenge.attestations;
+        this.redirect_uris = challenge.redirect_uris
+            ? challenge.redirect_uris.map((x) => new RedirectUri(x.uri, x.vdxfkey))
+            : challenge.redirect_uris;
+        this.created_at = challenge.created_at;
+        this.salt = challenge.salt;
+        this.context = challenge.context;
     }
     stringable() {
         return {
             vdxfkey: this.vdxfkey,
-            uuid: this.uuid,
-            client: this.client.stringable(),
-            requested_scope: this.requested_scope,
-            requested_access_token_audience: this.requested_access_token_audience,
-            skip: this.skip,
+            challenge_id: this.challenge_id,
+            requested_access: this.requested_access,
+            requested_access_audience: this.requested_access_audience,
             subject: this.subject,
-            oidc_context: this.oidc_context,
-            request_url: this.request_url,
-            login_challenge: this.login_challenge,
-            login_session_id: this.login_session_id,
-            acr: this.acr,
+            alt_auth_factors: this.alt_auth_factors,
             session_id: this.session_id,
+            attestations: this.attestations,
+            redirect_uris: this.redirect_uris
+                ? this.redirect_uris.map((x) => x.stringable())
+                : this.redirect_uris,
+            created_at: this.created_at,
+            salt: this.salt,
+            context: this.context
         };
     }
 }

dist/vdxf/classes/Decision.d.ts

@@ -1,104 +1,56 @@
-import { VDXFObject } from "../";
+import { VDXFObject } from "..";
+import { OidcDecision } from "./oidc/OidcDecision";
 import { Request, RequestInterface } from "./Request";
 export interface DecisionInterface {
-    subject?: string;
-    remember?: boolean;
-    remember_for?: number;
-    acr?: string;
+    decision_id: string;
+    request: RequestInterface;
+    created_at: string;
     context?: {
         [key: string]: any;
     };
-    force_subject_identifier?: string;
-    error?: string;
-    error_description?: string;
-    error_hint?: string;
-    error_debug?: string;
-    status_code?: number;
-    request: RequestInterface;
 }
 export declare class Decision extends VDXFObject {
-    subject?: string;
-    remember?: boolean;
-    remember_for?: number;
-    acr?: string;
+    decision_id: string;
     context?: {
         [key: string]: any;
     };
-    force_subject_identifier?: string;
-    error?: string;
-    error_description?: string;
-    error_hint?: string;
-    error_debug?: string;
-    status_code?: number;
     request: Request;
+    created_at: string;
     constructor(decision: DecisionInterface);
+    toOidcDecision(): OidcDecision;
     stringable(): {
         vdxfkey: string;
-        subject: string;
-        remember: boolean;
-        remember_for: number;
-        acr: string;
+        decision_id: string;
         context: {
             [key: string]: any;
         };
-        force_subject_identifier: string;
-        error: string;
-        error_description: string;
-        error_hint: string;
-        error_debug: string;
-        status_code: number;
+        created_at: string;
         request: {
             vdxfkey: string;
-            chain_id: string;
+            system_id: string;
             signing_id: string;
             signature: {
                 vdxfkey: string;
                 signature: string;
             };
             challenge: {
                 vdxfkey: string;
-                uuid: string;
-                client: {
+                challenge_id: string;
+                requested_access: string[];
+                requested_access_audience: string[];
+                subject: import("./Challenge").Subject[];
+                alt_auth_factors: string[];
+                session_id: string;
+                attestations: null;
+                redirect_uris: {
+                    uri: string;
                     vdxfkey: string;
-                    client_id: string;
-                    name: string;
-                    redirect_uris: import("./Client").RedirectUri[];
-                    grant_types: string[];
-                    response_types: string[];
-                    scope: string;
-                    audience: string[];
-                    owner: string;
-                    policy_uri: string;
-                    allowed_cors_origins: string[];
-                    tos_uri: string;
-                    client_uri: string;
-                    logo_uri: string;
-                    contacts: string[];
-                    client_secret_expires_at: number;
-                    subject_type: string;
-                    token_endpoint_auth_method: string;
-                    userinfo_signed_response_alg: string;
-                    created_at: string;
-                    updated_at: string;
+                }[];
+                created_at: string;
+                salt: string;
+                context: {
+                    [key: string]: any;
                 };
-                requested_scope: string[];
-                requested_access_token_audience: string[];
-                skip: boolean;
-                subject: string;
-                oidc_context: {} | {
-                    acr_values: string[];
-                    display: string;
-                    id_token_hint_claims: {
-                        [key: string]: any;
-                    };
-                    login_hint: string;
-                    ui_locales: string[];
-                };
-                request_url: string;
-                login_challenge: string;
-                login_session_id: string;
-                acr: string;
-                session_id: string;
             };
         };
     };