-
Notifications
You must be signed in to change notification settings - Fork 115
Add endpoint to update push device from mobile #289
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.
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
Open
VihangaMunasinghe
wants to merge
4
commits into
wso2:master
Choose a base branch
from
VihangaMunasinghe:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
1748e31
Add endpoint to update push device from mobile
VihangaMunasinghe d583ec1
Update API documentation to specify mobile device context
VihangaMunasinghe 555cf90
Change device update success status code to 204
VihangaMunasinghe 123d530
Merge branch 'wso2:master' into master
VihangaMunasinghe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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
104 changes: 104 additions & 0 deletions
104
...1/src/gen/java/org/wso2/carbon/identity/rest/api/user/push/v1/model/UpdateRequestDTO.java
This file contains hidden or 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,104 @@ | ||
| /* | ||
| * Copyright (c) 2026, WSO2 LLC. (http://www.wso2.com). | ||
| * | ||
| * WSO2 LLC. licenses this file to you under the Apache License, | ||
| * Version 2.0 (the "License"); you may not use this file except | ||
| * in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.wso2.carbon.identity.rest.api.user.push.v1.model; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import com.fasterxml.jackson.annotation.JsonCreator; | ||
| import io.swagger.annotations.ApiModel; | ||
| import io.swagger.annotations.ApiModelProperty; | ||
| import javax.validation.constraints.*; | ||
|
|
||
| /** | ||
| * Update device request body sent from the mobile device | ||
| **/ | ||
|
|
||
| import io.swagger.annotations.*; | ||
| import java.util.Objects; | ||
| import javax.validation.Valid; | ||
| import javax.xml.bind.annotation.*; | ||
| @ApiModel(description = "Update device request body sent from the mobile device") | ||
| public class UpdateRequestDTO { | ||
|
|
||
| private String token; | ||
|
|
||
| /** | ||
| * JWT containing the device information to be updated signed with the unique private key | ||
| **/ | ||
| public UpdateRequestDTO token(String token) { | ||
|
|
||
| this.token = token; | ||
| return this; | ||
| } | ||
|
|
||
| @ApiModelProperty(example = "signedJWTToken", required = true, value = "JWT containing the device information to be updated signed with the unique private key") | ||
| @JsonProperty("token") | ||
| @Valid | ||
| @NotNull(message = "Property token cannot be null.") | ||
|
|
||
| public String getToken() { | ||
| return token; | ||
| } | ||
| public void setToken(String token) { | ||
| this.token = token; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| @Override | ||
| public boolean equals(java.lang.Object o) { | ||
|
|
||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| UpdateRequestDTO updateRequestDTO = (UpdateRequestDTO) o; | ||
| return Objects.equals(this.token, updateRequestDTO.token); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(token); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
|
|
||
| StringBuilder sb = new StringBuilder(); | ||
| sb.append("class UpdateRequestDTO {\n"); | ||
|
|
||
| sb.append(" token: ").append(toIndentedString(token)).append("\n"); | ||
| sb.append("}"); | ||
| return sb.toString(); | ||
| } | ||
|
|
||
| /** | ||
| * Convert the given object to string with each line indented by 4 spaces | ||
| * (except the first line). | ||
| */ | ||
| private String toIndentedString(java.lang.Object o) { | ||
|
|
||
| if (o == null) { | ||
| return "null"; | ||
| } | ||
| return o.toString().replace("\n", "\n"); | ||
| } | ||
| } | ||
|
|
This file contains hidden or 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 | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -149,6 +149,21 @@ public void removeDeviceFromMobile(String deviceId, String token) { | |||||||||||||
| } | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| /** | ||||||||||||||
| * Update device from mobile. | ||||||||||||||
| * | ||||||||||||||
| * @param deviceId Device ID. | ||||||||||||||
| * @param token Token. | ||||||||||||||
| */ | ||||||||||||||
| public void updateDeviceFromMobile(String deviceId, String token) { | ||||||||||||||
|
|
||||||||||||||
| try { | ||||||||||||||
| deviceHandlerService.editDeviceMobile(deviceId, token); | ||||||||||||||
| } catch (PushDeviceHandlerException e) { | ||||||||||||||
|
Comment on lines
+161
to
+162
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Log Improvement Suggestion No: 2
Suggested change
|
||||||||||||||
| throw handlePushDeviceHandlerException(e); | ||||||||||||||
| } | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| /** | ||||||||||||||
| * Register a device. | ||||||||||||||
| * | ||||||||||||||
|
|
||||||||||||||
This file contains hidden or 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 | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,5 +1,5 @@ | ||||||||||||||
| /* | ||||||||||||||
| * Copyright (c) 2025, WSO2 LLC. (http://www.wso2.com). | ||||||||||||||
| * Copyright (c) 2025-2026, WSO2 LLC. (http://www.wso2.com). | ||||||||||||||
| * | ||||||||||||||
| * WSO2 LLC. licenses this file to you under the Apache License, | ||||||||||||||
| * Version 2.0 (the "License"); you may not use this file except | ||||||||||||||
|
|
@@ -24,6 +24,7 @@ | |||||||||||||
| import org.wso2.carbon.identity.rest.api.user.push.v1.model.DeviceDTO; | ||||||||||||||
| import org.wso2.carbon.identity.rest.api.user.push.v1.model.RegistrationRequestDTO; | ||||||||||||||
| import org.wso2.carbon.identity.rest.api.user.push.v1.model.RemoveRequestDTO; | ||||||||||||||
| import org.wso2.carbon.identity.rest.api.user.push.v1.model.UpdateRequestDTO; | ||||||||||||||
|
|
||||||||||||||
| import java.util.List; | ||||||||||||||
|
|
||||||||||||||
|
|
@@ -73,6 +74,14 @@ public Response registerDevice(RegistrationRequestDTO registrationRequestDTO) { | |||||||||||||
| return Response.status(Response.Status.CREATED).build(); | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| @Override | ||||||||||||||
| public Response updateDeviceFromMobile(String deviceId, UpdateRequestDTO updateRequestDTO) { | ||||||||||||||
|
|
||||||||||||||
|
Comment on lines
+77
to
+79
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Log Improvement Suggestion No: 3
Suggested change
|
||||||||||||||
| String token = updateRequestDTO.getToken(); | ||||||||||||||
| pushDeviceManagementService.updateDeviceFromMobile(deviceId, token); | ||||||||||||||
|
Comment on lines
+80
to
+81
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Log Improvement Suggestion No: 4
Suggested change
|
||||||||||||||
| return Response.noContent().build(); | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| @Override | ||||||||||||||
| public Response removeDeviceFromMobile(String deviceId, RemoveRequestDTO removeRequestDTO) { | ||||||||||||||
|
|
||||||||||||||
|
|
||||||||||||||
This file contains hidden or 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.
Log Improvement Suggestion No: 1