Jc/0 0 15 updates #43
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
| using HathoraCloud; | ||
| using HathoraCloud.Models.Operations; | ||
| using HathoraCloud.Models.Shared; | ||
| using Debug = UnityEngine.Debug; | ||
|
|
||
| namespace Hathora.Core.Scripts.Runtime.Server.ApiWrapper | ||
| { | ||
| /// <summary> | ||
| /// Operations that allow you manage your org tokens. | ||
| /// Apps Concept | https://hathora.dev/docs/concepts/hathora-entities#application | ||
| /// API Docs | https://hathora.dev/api#tag/AppV1 | ||
| /// </summary> | ||
| public class HathoraServerOrgApiWrapper | ||
| { | ||
|
|
||
| // protected IOrganizationsV1 OrgApi { get; } | ||
| // protected ITokensV1 TokenApi { get; } | ||
|
|
||
| public HathoraServerOrgApiWrapper() | ||
| { | ||
| Debug.Log($"[{nameof(HathoraServerOrgApiWrapper)}.Constructor] " + | ||
| "Initializing Server API..."); | ||
|
|
||
| // this.OrgApi = _hathoraSdk.OrganizationsV1; | ||
| // this.TokenApi = _hathoraSdk.TokensV1; | ||
| } | ||
|
|
||
|
|
||
| #region Server App Async Hathora SDK Calls | ||
| /// <summary> | ||
| /// Wrapper for `CreateAppAsync` to upload and app a cloud app to Hathora. | ||
| /// </summary> | ||
| /// <param name="_cancelToken">TODO: This may be implemented in the future</param> | ||
| /// <returns>Returns App on success</returns> | ||
| public async Task<string> CreateOrgTokenAsync( | ||
| string bearerToken, | ||
| CancellationToken _cancelToken = default) | ||
| { | ||
| Debug.Log("CreateOrgTokenAsync - test"); | ||
| var sdk = new HathoraCloudSDK( | ||
| security: new Security() | ||
| { | ||
| HathoraDevToken = bearerToken, | ||
| }); | ||
| IOrganizationsV1 OrgApi = sdk.OrganizationsV1; | ||
| ITokensV1 TokenApi = sdk.TokensV1; | ||
|
|
||
| string logPrefix = $"[{nameof(HathoraServerAppApiWrapper)}.{nameof(CreateOrgTokenAsync)}]"; | ||
| Debug.Log($"{logPrefix} making GetAppsAsync request"); | ||
|
|
||
| // Get response async => | ||
| GetOrgsResponse getOrgsResponse = null; | ||
|
|
||
| try | ||
| { | ||
| getOrgsResponse = await OrgApi.GetOrgsAsync(); | ||
| } | ||
| catch (Exception e) | ||
| { | ||
| Debug.LogError($"{logPrefix} {nameof(OrgApi.GetOrgsAsync)} => Error: {e.Message}"); | ||
| return null; // fail | ||
| } | ||
|
|
||
| // Get inner response to return -> Log/Validate | ||
| // TODO: this assumes one org per user | ||
| List<Scope> userScopes = | ||
| getOrgsResponse.OrgsPage != null && getOrgsResponse.OrgsPage.Orgs[0] != null ? | ||
| getOrgsResponse.OrgsPage.Orgs[0].Scopes : new List<Scope>(); | ||
| Debug.Log($"{logPrefix} num: '{userScopes?.Count ?? 0}'"); | ||
|
|
||
| getOrgsResponse.RawResponse?.Dispose(); // Prevent mem leaks | ||
|
|
||
| // Create org tokenw ith same user scopes | ||
| // Get response async => | ||
| CreateOrgTokenResponse createOrgTokenResponse = null; | ||
|
|
||
| string currentDateTime = DateTime.Now.ToString("MM/dd/yyyy HH:mm:ss"); | ||
| CreateOrgTokenRequest createTokenRequest = new CreateOrgTokenRequest() { | ||
| CreateOrgToken = new CreateOrgToken() { | ||
| Name = "unity-plugin-token_" + currentDateTime, | ||
| Scopes = Scopes.CreateArrayOfScope(userScopes) | ||
| }, | ||
| // TODO: this assumes one org per user | ||
| OrgId = getOrgsResponse.OrgsPage.Orgs[0].OrgId, | ||
| }; | ||
|
|
||
| try | ||
| { | ||
| createOrgTokenResponse = await TokenApi.CreateOrgTokenAsync(createTokenRequest); | ||
| } | ||
| catch (Exception e) | ||
| { | ||
| Debug.LogError($"{logPrefix} {nameof(TokenApi.CreateOrgTokenAsync)} => Error: {e.Message}"); | ||
| return null; // fail | ||
| } | ||
|
|
||
| string createdOrgToken = | ||
| createOrgTokenResponse.CreatedOrgToken != null && createOrgTokenResponse.CreatedOrgToken.PlainTextToken.Length > 0 ? | ||
| createOrgTokenResponse.CreatedOrgToken.PlainTextToken : ""; | ||
|
There was a problem hiding this comment. should you do something more than just assign it |
||
| Debug.Log($"{logPrefix} num: 'orgToken created, named: " + "unity-plugin-token_" + currentDateTime); | ||
|
|
||
| createOrgTokenResponse.RawResponse?.Dispose(); // Prevent mem leaks | ||
|
|
||
| return createdOrgToken; | ||
| } | ||
| #endregion // Server Org Async Hathora SDK Calls | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
as discussed - you should use the bearer token instead of the refresh token