From 9583afea2c185db94d73405bd037268994494711 Mon Sep 17 00:00:00 2001 From: Nathan Freeman Date: Fri, 28 Jun 2024 17:15:21 -0500 Subject: [PATCH 1/3] Add implict auth and logic for rendering permitted auth methods on Login page --- lib/icicle-tapisui-extension/src/gen/index.ts | 11 +- .../src/gen/test-function-2.ts | 32 ++--- .../src/gen/test-function.ts | 34 +++--- lib/icicle-tapisui-extension/src/index.ts | 6 +- lib/tapisui-extensions-core/src/core.ts | 1 + lib/tapisui-extensions-core/src/extension.ts | 15 +++ lib/tapisui-extensions-core/src/oauth2.ts | 2 +- .../Login/_components/Login/Login.module.scss | 5 + src/app/Login/_components/Login/Login.tsx | 114 ++++++++++++------ src/app/OAuth2/OAuth2.tsx | 26 ++++ src/app/OAuth2/index.ts | 1 + src/app/_Router/Router.tsx | 4 + src/extensions/useExtension.ts | 4 - src/utils/resolveBasePath.ts | 2 +- 14 files changed, 174 insertions(+), 83 deletions(-) create mode 100644 src/app/Login/_components/Login/Login.module.scss create mode 100644 src/app/OAuth2/OAuth2.tsx create mode 100644 src/app/OAuth2/index.ts diff --git a/lib/icicle-tapisui-extension/src/gen/index.ts b/lib/icicle-tapisui-extension/src/gen/index.ts index 7e46f6cf5..4a2666b0d 100644 --- a/lib/icicle-tapisui-extension/src/gen/index.ts +++ b/lib/icicle-tapisui-extension/src/gen/index.ts @@ -1,7 +1,4 @@ -import { Workflows } from '@tapis/tapis-typescript'; -import { task as task0 } from './test-function'; -import { task as task1 } from './test-function-2'; -export const tasks: Array = [ - Workflows.FunctionTaskFromJSON(task0), - Workflows.FunctionTaskFromJSON(task1), -]; +import { Workflows } from "@tapis/tapis-typescript" +import { task as task0 } from "./test-function" +import { task as task1 } from "./test-function-2" +export const tasks: Array = [Workflows.FunctionTaskFromJSON(task0),Workflows.FunctionTaskFromJSON(task1),] \ No newline at end of file diff --git a/lib/icicle-tapisui-extension/src/gen/test-function-2.ts b/lib/icicle-tapisui-extension/src/gen/test-function-2.ts index e98411905..27bd58251 100644 --- a/lib/icicle-tapisui-extension/src/gen/test-function-2.ts +++ b/lib/icicle-tapisui-extension/src/gen/test-function-2.ts @@ -1,19 +1,21 @@ export const task = { - id: 'test-function-2', - type: 'function', - execution_profile: { - flavor: 'c1tiny', + "id": "test-function-2", + "type": "function", + "execution_profile": { + "flavor": "c1tiny" }, - installer: 'pip', - packages: ['tapipy'], - runtime: 'python:3.9', - entrypoint: '/tapis-owe-functions/functions/tapis-etl-push-pull-data.py', - git_repositories: [ + "installer": "pip", + "packages": [ + "tapipy" + ], + "runtime": "python:3.9", + "entrypoint": "/tapis-owe-functions/functions/tapis-etl-push-pull-data.py", + "git_repositories": [ { - url: 'https://github.com/tapis-project/tapis-workflows-task-templates.git', - branch: 'master', - directory: 'tapis-owe-functions', - }, + "url": "https://github.com/tapis-project/tapis-workflows-task-templates.git", + "branch": "master", + "directory": "tapis-owe-functions" + } ], - code: '"""Transfers data files from the Remote Outbox to the Local Inbox"""

#-------- Workflow Context import: DO NOT REMOVE ----------------
from owe_python_sdk.runtime import execution_context as ctx
#-------- Workflow Context import: DO NOT REMOVE ----------------

import json, os

from constants.etl import LOCKFILE_FILENAME
from utils.etl import (
    ManifestModel,
    ManifestsLock,
    EnumManifestStatus,
    EnumPhase,
    poll_transfer_task,
    get_tapis_file_contents_json,
    fetch_system_files,
    validate_manifest_data_files,
    cleanup
)
from utils.tapis import get_client


# Instantiate a Tapis client
try:
    client = get_client(
        ctx.get_input("TAPIS_BASE_URL"),
        username=ctx.get_input("TAPIS_USERNAME"),
        password=ctx.get_input("TAPIS_PASSWORD"),
        jwt=ctx.get_input("TAPIS_JWT")
    )
except Exception as e:
    ctx.stderr(str(e))

# Deserialize system details
try:
    egress_system = json.loads(ctx.get_input("EGRESS_SYSTEM"))
    ingress_system = json.loads(ctx.get_input("INGRESS_SYSTEM"))
except json.JSONDecodeError as e:
    ctx.stderr(1, f"{e}")

# Set the phase-dependent variables
phase = ctx.get_input("PHASE")

# The that has the manifest files for this phase of the pipeline
manifests_system = ingress_system if phase == EnumPhase.Ingress else egress_system

try:
    # Lock the manifests directory to prevent other concurrent pipeline runs
    # from mutating manifest files
    lock = ManifestsLock(client, manifests_system)
    lock.acquire()

    # Register the lock release hook to be called on called to stderr and
    # stdout. This will unlock the manifests lock when the program exits with any
    # code
    ctx.add_hook(1, lock.release)
    ctx.add_hook(0, lock.release)
except Exception as e:
    ctx.stderr(1, f"Failed to lock pipeline: {str(e)}")

# Load all manfiest files from the manifests directory of the manifests system
try:
    manifest_files = fetch_system_files(
        system_id=manifests_system.get("manifests").get("system_id"),
        path=manifests_system.get("manifests").get("path"),
        client=client,
        include_patterns=manifests_system.get("manifests").get("include_patterns"),
        exclude_patterns=[
            *manifests_system.get("manifests").get("exclude_patterns"),
            LOCKFILE_FILENAME # Ignore the lockfile.
        ]
    )
except Exception as e:
    ctx.stderr(1, f"Failed to fetch manifest files: {e}")

# Load manifests that have the current phase
try:
    manifests = []
    for manifest_file in manifest_files:
        manifest = ManifestModel(
            filename=manifest_file.name,
            path=manifest_file.path,
            url=manifest_file.url,
            **json.loads(
                get_tapis_file_contents_json(
                    client,
                    manifests_system.get("manifests").get("system_id"),
                    manifest_file.path
                )
            )
        )

        if (
            manifest.phase == phase
            and manifest.status != EnumManifestStatus.Completed
        ):
            manifests.append(manifest)
except Exception as e:
    ctx.stderr(1, f"Failed to initialize manifests: {e}")

# Transfer all files in each manifest to the data directory of the ingress system
for manifest in manifests:
    # Which property contains the correct data files depends on the phase. For the
    # ingress phase it's remote_files and for egress it's local_files
    data_files = getattr(manifest, "local_files")
    if phase == EnumPhase.Ingress:
        data_files = getattr(manifest, "remote_files")

    # Check to see if the data files in the manifests pass data integrity checks
    try:
        validated, err = validate_manifest_data_files(
            egress_system,
            data_files,
            client
        )
    except Exception as e:
        ctx.stderr(1, f"Error validating data integrity: {e}")

    try:
        # Log the failed data integrity check in the manifest
        if not validated:
            manifest.log(f"Data integrity checks failed | {err}")
            manifest.set_status(EnumManifestStatus.IntegrityCheckFailed)
            manifest.save(ingress_system.get("manifests").get("system_id"), client)
            continue
        
        manifest.log(f"Data integrity checks successful")
        manifest.save(ingress_system.get("manifests").get("system_id"), client)
    except Exception as e:
        ctx.stderr(1, f"Error updating manifest: {e}")

    elements = []
    for data_file in data_files:
        # Build the transfer elements
        url = data_file.get("url")
        destination_system_id = ingress_system.get("data").get("system_id")
        destination_path = ingress_system.get("data").get("path")
        destination_filename = url.rsplit("/", 1)[1]
        destination_uri = f"tapis://{destination_system_id}/{os.path.join(destination_path.strip('/'), destination_filename)}"
        elements.append({
            "sourceURI": data_file.get("url"),
            "destinationURI": destination_uri
        })

    # Transfer elements
    try:
        manifest.log(f"Starting transfer of {len(elements)} data files from the remote outbox to the local inbox")
        # Start the transfer task and poll until terminal state
        task = client.files.createTransferTask(elements=elements)
        task = poll_transfer_task(client, task)
    except Exception as e:
        ctx.stderr(1, f"Error transferring files: {e}")
    
    # Add the transfer data to the manfiest
    manifest.transfers.append(task.uuid)

    try:
        if task.status != "COMPLETED":
            task_err = f"Transfer task failed | Task UUID: {task.uuid} | Status: '{task.status}' | Error: {task.errorMessage}"
            manifest.set_status(EnumManifestStatus.Failed)
            manifest.log(task_err)
            manifest.save(manifests_system.get("manifests").get("system_id"), client)
            ctx.stderr(1, task_err)

        manifest.log(f"Transfer task completed | Task UUID: {task.uuid}")
        manifest.set_status(EnumManifestStatus.Completed)
        manifest.save(manifests_system.get("manifests").get("system_id"), client)
    except Exception as e:
        ctx.stderr(1, f"Error updating manifests after transfer: {e}")

try:
    if phase == EnumPhase.Ingress:
        # Modify the path and url of the files tracked in the manifest to replace
        # egress system path and system id with the ingress system data path and 
        # ingress system transform system id
        unconverted_manifests = [
            manifest for manifest in manifests
            if (
                manifest.phase == EnumPhase.Ingress
                and manifest.status == EnumManifestStatus.Completed
            )
        ]

        for unconverted_manifest in unconverted_manifests:
            modified_data_files = []
            for data_file in unconverted_manifest.remote_files:
                ingress_system_id = ingress_system.get("data").get("system_id")
                ingress_data_files_path = ingress_system.get("data").get("path")
                path = os.path.join(f"/{ingress_data_files_path.strip('/')}", data_file["name"])
                modified_data_files.append({
                    **data_file,
                    "url": f'tapis://{ingress_system_id}/{os.path.join(path, data_file["name"]).strip("/")}',
                    "path": path
                })
            
            unconverted_manifest.local_files = modified_data_files
            unconverted_manifest.set_phase(EnumPhase.Transform)
            unconverted_manifest.save(ingress_system.get("manifests").get("system_id"), client)
except Exception as e:
    ctx.stderr(1, f"Error converting manifest: {e}")

cleanup(ctx)

', -}; + "code": """"Transfers data files from the Remote Outbox to the Local Inbox"""

#-------- Workflow Context import: DO NOT REMOVE ----------------
from owe_python_sdk.runtime import execution_context as ctx
#-------- Workflow Context import: DO NOT REMOVE ----------------

import json, os

from constants.etl import LOCKFILE_FILENAME
from utils.etl import (
    ManifestModel,
    ManifestsLock,
    EnumManifestStatus,
    EnumPhase,
    poll_transfer_task,
    get_tapis_file_contents_json,
    fetch_system_files,
    validate_manifest_data_files,
    cleanup
)
from utils.tapis import get_client


# Instantiate a Tapis client
try:
    client = get_client(
        ctx.get_input("TAPIS_BASE_URL"),
        username=ctx.get_input("TAPIS_USERNAME"),
        password=ctx.get_input("TAPIS_PASSWORD"),
        jwt=ctx.get_input("TAPIS_JWT")
    )
except Exception as e:
    ctx.stderr(str(e))

# Deserialize system details
try:
    egress_system = json.loads(ctx.get_input("EGRESS_SYSTEM"))
    ingress_system = json.loads(ctx.get_input("INGRESS_SYSTEM"))
except json.JSONDecodeError as e:
    ctx.stderr(1, f"{e}")

# Set the phase-dependent variables
phase = ctx.get_input("PHASE")

# The that has the manifest files for this phase of the pipeline
manifests_system = ingress_system if phase == EnumPhase.Ingress else egress_system

try:
    # Lock the manifests directory to prevent other concurrent pipeline runs
    # from mutating manifest files
    lock = ManifestsLock(client, manifests_system)
    lock.acquire()

    # Register the lock release hook to be called on called to stderr and
    # stdout. This will unlock the manifests lock when the program exits with any
    # code
    ctx.add_hook(1, lock.release)
    ctx.add_hook(0, lock.release)
except Exception as e:
    ctx.stderr(1, f"Failed to lock pipeline: {str(e)}")

# Load all manfiest files from the manifests directory of the manifests system
try:
    manifest_files = fetch_system_files(
        system_id=manifests_system.get("manifests").get("system_id"),
        path=manifests_system.get("manifests").get("path"),
        client=client,
        include_patterns=manifests_system.get("manifests").get("include_patterns"),
        exclude_patterns=[
            *manifests_system.get("manifests").get("exclude_patterns"),
            LOCKFILE_FILENAME # Ignore the lockfile.
        ]
    )
except Exception as e:
    ctx.stderr(1, f"Failed to fetch manifest files: {e}")

# Load manifests that have the current phase
try:
    manifests = []
    for manifest_file in manifest_files:
        manifest = ManifestModel(
            filename=manifest_file.name,
            path=manifest_file.path,
            url=manifest_file.url,
            **json.loads(
                get_tapis_file_contents_json(
                    client,
                    manifests_system.get("manifests").get("system_id"),
                    manifest_file.path
                )
            )
        )

        if (
            manifest.phase == phase
            and manifest.status != EnumManifestStatus.Completed
        ):
            manifests.append(manifest)
except Exception as e:
    ctx.stderr(1, f"Failed to initialize manifests: {e}")

# Transfer all files in each manifest to the data directory of the ingress system
for manifest in manifests:
    # Which property contains the correct data files depends on the phase. For the
    # ingress phase it's remote_files and for egress it's local_files
    data_files = getattr(manifest, "local_files")
    if phase == EnumPhase.Ingress:
        data_files = getattr(manifest, "remote_files")

    # Check to see if the data files in the manifests pass data integrity checks
    try:
        validated, err = validate_manifest_data_files(
            egress_system,
            data_files,
            client
        )
    except Exception as e:
        ctx.stderr(1, f"Error validating data integrity: {e}")

    try:
        # Log the failed data integrity check in the manifest
        if not validated:
            manifest.log(f"Data integrity checks failed | {err}")
            manifest.set_status(EnumManifestStatus.IntegrityCheckFailed)
            manifest.save(ingress_system.get("manifests").get("system_id"), client)
            continue
        
        manifest.log(f"Data integrity checks successful")
        manifest.save(ingress_system.get("manifests").get("system_id"), client)
    except Exception as e:
        ctx.stderr(1, f"Error updating manifest: {e}")

    elements = []
    for data_file in data_files:
        # Build the transfer elements
        url = data_file.get("url")
        destination_system_id = ingress_system.get("data").get("system_id")
        destination_path = ingress_system.get("data").get("path")
        destination_filename = url.rsplit("/", 1)[1]
        destination_uri = f"tapis://{destination_system_id}/{os.path.join(destination_path.strip('/'), destination_filename)}"
        elements.append({
            "sourceURI": data_file.get("url"),
            "destinationURI": destination_uri
        })

    # Transfer elements
    try:
        manifest.log(f"Starting transfer of {len(elements)} data files from the remote outbox to the local inbox")
        # Start the transfer task and poll until terminal state
        task = client.files.createTransferTask(elements=elements)
        task = poll_transfer_task(client, task)
    except Exception as e:
        ctx.stderr(1, f"Error transferring files: {e}")
    
    # Add the transfer data to the manfiest
    manifest.transfers.append(task.uuid)

    try:
        if task.status != "COMPLETED":
            task_err = f"Transfer task failed | Task UUID: {task.uuid} | Status: '{task.status}' | Error: {task.errorMessage}"
            manifest.set_status(EnumManifestStatus.Failed)
            manifest.log(task_err)
            manifest.save(manifests_system.get("manifests").get("system_id"), client)
            ctx.stderr(1, task_err)

        manifest.log(f"Transfer task completed | Task UUID: {task.uuid}")
        manifest.set_status(EnumManifestStatus.Completed)
        manifest.save(manifests_system.get("manifests").get("system_id"), client)
    except Exception as e:
        ctx.stderr(1, f"Error updating manifests after transfer: {e}")

try:
    if phase == EnumPhase.Ingress:
        # Modify the path and url of the files tracked in the manifest to replace
        # egress system path and system id with the ingress system data path and 
        # ingress system transform system id
        unconverted_manifests = [
            manifest for manifest in manifests
            if (
                manifest.phase == EnumPhase.Ingress
                and manifest.status == EnumManifestStatus.Completed
            )
        ]

        for unconverted_manifest in unconverted_manifests:
            modified_data_files = []
            for data_file in unconverted_manifest.remote_files:
                ingress_system_id = ingress_system.get("data").get("system_id")
                ingress_data_files_path = ingress_system.get("data").get("path")
                path = os.path.join(f"/{ingress_data_files_path.strip('/')}", data_file["name"])
                modified_data_files.append({
                    **data_file,
                    "url": f'tapis://{ingress_system_id}/{os.path.join(path, data_file["name"]).strip("/")}',
                    "path": path
                })
            
            unconverted_manifest.local_files = modified_data_files
            unconverted_manifest.set_phase(EnumPhase.Transform)
            unconverted_manifest.save(ingress_system.get("manifests").get("system_id"), client)
except Exception as e:
    ctx.stderr(1, f"Error converting manifest: {e}")

cleanup(ctx)

" +} \ No newline at end of file diff --git a/lib/icicle-tapisui-extension/src/gen/test-function.ts b/lib/icicle-tapisui-extension/src/gen/test-function.ts index 8e6e56653..5ae570fe3 100644 --- a/lib/icicle-tapisui-extension/src/gen/test-function.ts +++ b/lib/icicle-tapisui-extension/src/gen/test-function.ts @@ -1,19 +1,21 @@ export const task = { - id: 'test-function', - type: 'function', - code: 'test', - execution_profile: { - flavor: 'c1tiny', + "id": "test-function", + "type": "function", + "code": "test", + "execution_profile": { + "flavor": "c1tiny" }, - installer: 'pip', - packages: ['tapipy'], - runtime: 'python:3.9', - entrypoint: 'tapis-owe-functions/functions/tapis-etl-push-pull-data.py', - git_repositories: [ - { - url: 'https://github.com/tapis-project/tapis-workflows-task-templates.git', - branch: 'master', - directory: 'tapis-owe-functions', - }, + "installer": "pip", + "packages": [ + "tapipy" ], -}; + "runtime": "python:3.9", + "entrypoint": "tapis-owe-functions/functions/tapis-etl-push-pull-data.py", + "git_repositories": [ + { + "url": "https://github.com/tapis-project/tapis-workflows-task-templates.git", + "branch": "master", + "directory": "tapis-owe-functions" + } + ] +} \ No newline at end of file diff --git a/lib/icicle-tapisui-extension/src/index.ts b/lib/icicle-tapisui-extension/src/index.ts index 5606ab7bd..5e530eb45 100644 --- a/lib/icicle-tapisui-extension/src/index.ts +++ b/lib/icicle-tapisui-extension/src/index.ts @@ -9,9 +9,9 @@ const extension = createExtension({ allowMultiTenant: false, authentication: { implicit: { - authorizationPath: 'https://dev.develop.tapis.io/v3/oauth2/authorize', - clientId: 'myclientid', - redirectURI: 'https://dev.develop.tapis.io/tapis-ui/#/oauth2/callback', + authorizationPath: 'https://icicle.develop.tapis.io/v3/oauth2/authorize', + clientId: 'tapisui-implicit-client', + redirectURI: 'https://dev.develop.tapis.io/tapis-ui/#/oauth2', responseType: 'token', }, }, diff --git a/lib/tapisui-extensions-core/src/core.ts b/lib/tapisui-extensions-core/src/core.ts index 08f9bf2b8..3c0271bc1 100644 --- a/lib/tapisui-extensions-core/src/core.ts +++ b/lib/tapisui-extensions-core/src/core.ts @@ -33,6 +33,7 @@ type ServiceCustomizations = { }; export type Configuration = { + component?: Component allowMultiTenant?: boolean; authentication?: OAuth; mainSidebarServices?: Array; diff --git a/lib/tapisui-extensions-core/src/extension.ts b/lib/tapisui-extensions-core/src/extension.ts index 0e42a6152..41d7ae80f 100644 --- a/lib/tapisui-extensions-core/src/extension.ts +++ b/lib/tapisui-extensions-core/src/extension.ts @@ -1,4 +1,5 @@ import { Service, Configuration, EnumTapisCoreService, Logo } from './core'; +import { Implicit } from "./oauth2" import { WorkflowsCustomizations } from './workflows'; type RegisteredService = Service & { @@ -24,6 +25,7 @@ const defaultServiceCustomizations = { export class Extension { public mainSidebarServices = []; + public authMethods = [] public allowMutiTenant: boolean = true; public serviceMap: ServiceMap = {}; private config: Configuration; @@ -44,6 +46,7 @@ export class Extension { } private setAuthentication(): void { + this.authMethods = this.config.authMethods || [] let modifiedAuthPath = this.config?.authentication?.implicit?.authorizationPath; if (modifiedAuthPath !== undefined) { @@ -53,6 +56,18 @@ export class Extension { } } + public getAuthByType(type: "password" | "implicit"): Implicit | boolean | undefined { + if (type === "password" && this.authMethods.includes("password")) { + return this.config.authentication?.password + } + + if (type === "implicit" && this.authMethods.includes("implicit")) { + return this.config.authentication?.implicit + } + + return undefined + } + private setServiceCustomizations(): void { // Set the services customizations based on the config this.serviceCustomizations = defaultServiceCustomizations; diff --git a/lib/tapisui-extensions-core/src/oauth2.ts b/lib/tapisui-extensions-core/src/oauth2.ts index 49658ea49..5f6a2e315 100644 --- a/lib/tapisui-extensions-core/src/oauth2.ts +++ b/lib/tapisui-extensions-core/src/oauth2.ts @@ -1,4 +1,4 @@ -type Implicit = { +export type Implicit = { authorizationPath: string; clientId: string; redirectURI: string; diff --git a/src/app/Login/_components/Login/Login.module.scss b/src/app/Login/_components/Login/Login.module.scss new file mode 100644 index 000000000..628fbab38 --- /dev/null +++ b/src/app/Login/_components/Login/Login.module.scss @@ -0,0 +1,5 @@ +.buttons { + display: flex; + flex-direction: row; + padding: 16px; +} \ No newline at end of file diff --git a/src/app/Login/_components/Login/Login.tsx b/src/app/Login/_components/Login/Login.tsx index da64fb317..6c07f75a4 100644 --- a/src/app/Login/_components/Login/Login.tsx +++ b/src/app/Login/_components/Login/Login.tsx @@ -1,15 +1,30 @@ import React from 'react'; import { Button } from 'reactstrap'; -import { Authenticator as AuthenticatorHooks } from '@tapis/tapisui-hooks'; -import { useTapisConfig } from '@tapis/tapisui-hooks'; -import { FormikInput } from '@tapis/tapisui-common'; -import { SubmitWrapper } from '@tapis/tapisui-common'; +import { Authenticator as AuthenticatorHooks, useTapisConfig } from '@tapis/tapisui-hooks'; +import { FormikInput, SubmitWrapper } from '@tapis/tapisui-common'; import { Formik, Form } from 'formik'; import * as Yup from 'yup'; +import { useExtension } from 'extensions'; +import { Implicit } from "@tapis/tapisui-extensions-core/dist/oauth2" +import styles from "./Login.module.scss" const Login: React.FC = () => { const { login, isLoading, error } = AuthenticatorHooks.useLogin(); const { accessToken } = useTapisConfig(); + const { extension } = useExtension() + + let implicitAuthURL: string | undefined = undefined + let passwordAuth = false + if ( extension) { + let implicitAuth = (extension.getAuthByType("implicit") as Implicit) + // implicitAuthURL = implicitAuth.authorizationPath + // + `?client_id=${implicitAuth.clientId}&response_type=${implicitAuth.responseType}&redirect_uri=${encodeURIComponent(implicitAuth.redirectURI)}` + // TODO Remove below. Testing only + implicitAuthURL = implicitAuth.authorizationPath + + `?client_id=${implicitAuth.clientId}&response_type=${implicitAuth.responseType}&redirect_uri=${encodeURIComponent("http://localhost:3000/#/oauth2")}` + + passwordAuth = (extension.getAuthByType("password") as boolean | undefined) || false + } const onSubmit = ({ username, @@ -30,41 +45,68 @@ const Login: React.FC = () => { }; return ( - -
- - - +
+ { + passwordAuth && ( + + + + + + + + + + ) + } + +
+ { + passwordAuth && ( + + ) + } + {implicitAuthURL !== undefined && ( - - - + )} +
+
); }; diff --git a/src/app/OAuth2/OAuth2.tsx b/src/app/OAuth2/OAuth2.tsx new file mode 100644 index 000000000..8b9a16b3a --- /dev/null +++ b/src/app/OAuth2/OAuth2.tsx @@ -0,0 +1,26 @@ +import React, { useEffect } from 'react'; +import { useHistory } from 'react-router-dom'; +import { useTapisConfig } from '@tapis/tapisui-hooks'; + +const OAuth2: React.FC = () => { + const { setAccessToken } = useTapisConfig(); + const navigate = useHistory(); + + const queryString = window.location.href; + const access_token = queryString.substring( + queryString.indexOf('access_token=') + 13, + queryString.lastIndexOf('&state') + ); + const expires_at = 't'; + const expires_in = 14400; + + useEffect(() => { + setAccessToken({ access_token, expires_at, expires_in }); + navigate.push(`/`); + // eslint-disable-next-line + }, []); + + return <>; +}; + +export default OAuth2; \ No newline at end of file diff --git a/src/app/OAuth2/index.ts b/src/app/OAuth2/index.ts new file mode 100644 index 000000000..431662643 --- /dev/null +++ b/src/app/OAuth2/index.ts @@ -0,0 +1 @@ +export { default } from "./OAuth2" \ No newline at end of file diff --git a/src/app/_Router/Router.tsx b/src/app/_Router/Router.tsx index 2acc7adf9..085110bbd 100644 --- a/src/app/_Router/Router.tsx +++ b/src/app/_Router/Router.tsx @@ -12,6 +12,7 @@ import Pods from '../Pods'; import Files from '../Files'; import Workflows from '../Workflows'; import MlHub from '../MlHub'; +import OAuth2 from "../OAuth2" import UIPatterns from '../UIPatterns'; import { useExtension } from 'extensions'; @@ -35,6 +36,9 @@ const Router: React.FC = () => { return ; }} /> + + + diff --git a/src/extensions/useExtension.ts b/src/extensions/useExtension.ts index 5be8a3bc3..273756f5b 100644 --- a/src/extensions/useExtension.ts +++ b/src/extensions/useExtension.ts @@ -9,10 +9,6 @@ import { resolveBasePath } from 'utils/resolveBasePath'; const useExtension = () => { const { extensions } = useContext(ExtensionsContext); let basePath = resolveBasePath(); - // TODO Add logic to toggle between baseUrls iff in a local environment - if (basePath == 'https://dev.develop.tapis.io') { - basePath = 'https://icicleai.tapis.io'; - } let extension = undefined; let extensionName = undefined; diff --git a/src/utils/resolveBasePath.ts b/src/utils/resolveBasePath.ts index b31caa792..3c42f9592 100644 --- a/src/utils/resolveBasePath.ts +++ b/src/utils/resolveBasePath.ts @@ -4,7 +4,7 @@ export const resolveBasePath = () => { // Direct request from local dev env to dev.develop if (/127\.0\.0\.1|localhost|0\.0\.0\.0/.test(baseUrl)) { // return 'https://dev.develop.tapis.io'; - return 'https://dev.develop.tapis.io'; + return 'https://icicle.develop.tapis.io'; } return baseUrl; From bfe9a70788ccfe7fc035543de68289b0ee530cd9 Mon Sep 17 00:00:00 2001 From: Nathan Freeman Date: Mon, 1 Jul 2024 16:35:16 -0500 Subject: [PATCH 2/3] Allow password auth for now --- lib/icicle-tapisui-extension/src/index.ts | 19 +++++++++++++- .../src/pages/index.tsx | 25 +++++++++++++++++++ .../src/registeredExtensions.ts | 1 + src/utils/resolveBasePath.ts | 2 +- 4 files changed, 45 insertions(+), 2 deletions(-) diff --git a/lib/icicle-tapisui-extension/src/index.ts b/lib/icicle-tapisui-extension/src/index.ts index 5e530eb45..014a16222 100644 --- a/lib/icicle-tapisui-extension/src/index.ts +++ b/lib/icicle-tapisui-extension/src/index.ts @@ -3,11 +3,12 @@ import { EnumTapisCoreService, } from '@tapis/tapisui-extensions-core'; import { tasks as generatedTasks } from './gen'; -import { MLEdge, SmartScheduler, JupyterLab, OpenWebUI } from './pages'; +import { MLEdge, SmartScheduler, JupyterLab, OpenWebUI, DigitalAg, VisualAnalytics } from './pages'; const extension = createExtension({ allowMultiTenant: false, authentication: { + password: true, implicit: { authorizationPath: 'https://icicle.develop.tapis.io/v3/oauth2/authorize', clientId: 'tapisui-implicit-client', @@ -24,6 +25,8 @@ const extension = createExtension({ 'open-web-ui', 'jupyter-lab', 'smart-scheduler', + 'digital-ag', + 'visual-analytics' ], authMethods: ['implicit', 'password'], logo: { @@ -68,6 +71,20 @@ extension.registerService({ component: OpenWebUI, }); +extension.registerService({ + id: 'digital-ag', + sidebarDisplayName: 'Digital Ag', + iconName: 'globe', + component: DigitalAg, +}); + +extension.registerService({ + id: 'visual-analytics', + sidebarDisplayName: 'Visual Analytics', + iconName: 'globe', + component: VisualAnalytics, +}); + extension.serviceCustomizations.workflows.dagTasks = generatedTasks; export { extension }; diff --git a/lib/icicle-tapisui-extension/src/pages/index.tsx b/lib/icicle-tapisui-extension/src/pages/index.tsx index 0c2bc4dab..29d93339f 100644 --- a/lib/icicle-tapisui-extension/src/pages/index.tsx +++ b/lib/icicle-tapisui-extension/src/pages/index.tsx @@ -51,3 +51,28 @@ export const OpenWebUI: React.FC = () => { ); }; + +export const DigitalAg: React.FC = () => { + return ( + Digital Ag + ); +}; + +export const VisualAnalytics: React.FC = () => { + return ( +
+