Skip to content

switch to sso-auth instead of apiml-auth #617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 12, 2020
Merged

switch to sso-auth instead of apiml-auth #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
19461d2
Change zlux references to prefer safsso. Not sure if this is even nec…
1000TurquoisePogs Apr 23, 2020
300a3da
Merge branch 'master' of github.com:zowe/api-layer into feature/sso-a…
1000TurquoisePogs May 8, 2020
a7de10f
Remove use of tokenInjector since sso-auth, which replaces apiml-auth…
1000TurquoisePogs May 8, 2020
d4a3abd
Merge branch 'master' into feature/sso-auth-consolidation
1000TurquoisePogs May 11, 2020
c01958b
Merge branch 'master' into feature/sso-auth-consolidation
plavjanik May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions zlux-api-catalog/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,4 @@

This an example of zLUX application plugin that uses an IFRAME to display API Catalog.

You need to create following file `zowe/zlux/zlux-example-server/plugins/org.zowe.api.catalog.json`
in order to include the plugin to your zLUX on desktop:

```json
{
"identifier": "org.zowe.api.catalog",
"pluginLocation": "../../../api-layer/zlux-api-catalog"
}
```

We assume that the `api-layer` directory is under `zowe`.
To use, run `$INSTANCE_DIR/bin/install-app.sh PATH_TO_THIS_FOLDER`, and it will be registered for use with the Zowe App Server, and visible within the Zowe Desktop.
2 changes: 1 addition & 1 deletion zlux-api-catalog/web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<body>
<iframe
id="zluxIframe"
src="https://localhost:8544/ZLUX/plugins/org.zowe.zlux.auth.apiml/services/tokenInjector/1.0.0/ui/v1/apicatalog/";
src="https://localhost:10010/ui/v1/apicatalog/";
style="position:fixed; top:0px; left:0px; bottom:0px; right:0px; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;">
Your browser doesn't support iframes
</iframe>
Expand Down
9 changes: 2 additions & 7 deletions zowe-install/src/main/resources/component-scripts/configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,8 @@ rm ${STATIC_DEF_CONFIG_DIR}/zosmf.ebcidic.yml
chmod 770 $STATIC_DEF_CONFIG_DIR/zosmf.yml

if [[ $LAUNCH_COMPONENT_GROUPS == *"DESKTOP"* ]]; then
if [[ $APIML_ENABLE_SSO == "true" ]]; then
# Access API Catalog with token injector
CATALOG_GATEWAY_URL=https://${ZOWE_EXPLORER_HOST}:${ZOWE_ZLUX_SERVER_HTTPS_PORT}/ZLUX/plugins/org.zowe.zlux.auth.apiml/services/tokenInjector/1.0.0/ui/v1/apicatalog/
else
# Access API Catalog directly
CATALOG_GATEWAY_URL=https://${ZOWE_EXPLORER_HOST}:${GATEWAY_PORT}/ui/v1/apicatalog
fi
# Access API Catalog directly
CATALOG_GATEWAY_URL=https://${ZOWE_EXPLORER_HOST}:${GATEWAY_PORT}/ui/v1/apicatalog

# Create desktop app plugin
${ROOT_DIR}/bin/utils/zowe-install-iframe-plugin.sh \
Expand Down